From cba26171906991dda712d899fbf5bc23c8e0e8a6 Mon Sep 17 00:00:00 2001
From: schroda <50052685+schroda@users.noreply.github.com>
Date: Thu, 5 Sep 2024 00:27:35 +0200
Subject: [PATCH] Move "language" setting to "Appearance" page

---
 src/screens/Settings.tsx            | 39 +----------------------------
 src/screens/settings/Appearance.tsx | 32 ++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/src/screens/Settings.tsx b/src/screens/Settings.tsx
index 7d141002..cd7af602 100644
--- a/src/screens/Settings.tsx
+++ b/src/screens/Settings.tsx
@@ -12,14 +12,10 @@ import List from '@mui/material/List';
 import ListAltIcon from '@mui/icons-material/ListAlt';
 import BackupIcon from '@mui/icons-material/Backup';
 import InfoIcon from '@mui/icons-material/Info';
-import ListItem from '@mui/material/ListItem';
 import ListItemIcon from '@mui/material/ListItemIcon';
 import ListItemText from '@mui/material/ListItemText';
-import Link from '@mui/material/Link';
 import ListItemButton from '@mui/material/ListItemButton';
-import MenuItem from '@mui/material/MenuItem';
 import { useTranslation } from 'react-i18next';
-import LanguageIcon from '@mui/icons-material/Language';
 import CollectionsOutlinedBookmarkIcon from '@mui/icons-material/CollectionsBookmarkOutlined';
 import GetAppOutlinedIcon from '@mui/icons-material/GetAppOutlined';
 import DnsIcon from '@mui/icons-material/Dns';
@@ -29,16 +25,13 @@ import ExploreOutlinedIcon from '@mui/icons-material/ExploreOutlined';
 import DevicesIcon from '@mui/icons-material/Devices';
 import SyncIcon from '@mui/icons-material/Sync';
 import PaletteIcon from '@mui/icons-material/Palette';
-import { langCodeToName } from '@/util/language';
 import { ListItemLink } from '@/components/util/ListItemLink';
 import { NavBarContext } from '@/components/context/NavbarContext.tsx';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
 import { makeToast } from '@/components/util/Toast.tsx';
-import { Select } from '@/components/atoms/Select.tsx';
-import { I18nResourceCode, i18nResources } from '@/i18n';
 
 export function Settings() {
-    const { t, i18n } = useTranslation();
+    const { t } = useTranslation();
 
     const { setTitle, setAction } = useContext(NavBarContext);
     useEffect(() => {
@@ -107,36 +100,6 @@ export function Settings() {
                 <ListItemText primary={t('settings.backup.title')} />
             </ListItemLink>
 
-            <ListItem>
-                <ListItemIcon>
-                    <LanguageIcon />
-                </ListItemIcon>
-                <ListItemText
-                    primary={t('global.language.label.language')}
-                    secondary={
-                        <>
-                            <span>{t('settings.label.language_description')} </span>
-                            <Link
-                                href="https://hosted.weblate.org/projects/suwayomi/suwayomi-webui"
-                                target="_blank"
-                                rel="noreferrer"
-                            >
-                                {t('global.language.title.weblate')}
-                            </Link>
-                        </>
-                    }
-                />
-                <Select
-                    value={i18nResources.includes(i18n.language as I18nResourceCode) ? i18n.language : 'en'}
-                    onChange={({ target: { value: language } }) => i18n.changeLanguage(language)}
-                >
-                    {i18nResources.map((language) => (
-                        <MenuItem key={language} value={language}>
-                            {langCodeToName(language)}
-                        </MenuItem>
-                    ))}
-                </Select>
-            </ListItem>
             <ListItemButton disabled={isClearingServerCache} onClick={clearServerCache}>
                 <ListItemIcon>
                     <DeleteForeverIcon />
diff --git a/src/screens/settings/Appearance.tsx b/src/screens/settings/Appearance.tsx
index 9ad6b01d..19033f88 100644
--- a/src/screens/settings/Appearance.tsx
+++ b/src/screens/settings/Appearance.tsx
@@ -14,15 +14,18 @@ import ListItemText from '@mui/material/ListItemText';
 import MenuItem from '@mui/material/MenuItem';
 import ListSubheader from '@mui/material/ListSubheader';
 import Switch from '@mui/material/Switch';
+import Link from '@mui/material/Link';
 import { NavBarContext } from '@/components/context/NavbarContext.tsx';
 import { ThemeMode, ThemeModeContext } from '@/components/context/ThemeModeContext.tsx';
 import { Select } from '@/components/atoms/Select.tsx';
 import { MediaQuery } from '@/lib/ui/MediaQuery.tsx';
 import { NumberSetting } from '@/components/settings/NumberSetting.tsx';
 import { useLocalStorage } from '@/util/useStorage.tsx';
+import { I18nResourceCode, i18nResources } from '@/i18n';
+import { langCodeToName } from '@/util/language.tsx';
 
 export const Appearance = () => {
-    const { t } = useTranslation();
+    const { t, i18n } = useTranslation();
     const { themeMode, setThemeMode, pureBlackMode, setPureBlackMode } = useContext(ThemeModeContext);
     const isDarkMode = MediaQuery.getThemeMode() === ThemeMode.DARK;
 
@@ -75,6 +78,33 @@ export const Appearance = () => {
                     </ListSubheader>
                 }
             >
+                <ListItem>
+                    <ListItemText
+                        primary={t('global.language.label.language')}
+                        secondary={
+                            <>
+                                <span>{t('settings.label.language_description')} </span>
+                                <Link
+                                    href="https://hosted.weblate.org/projects/suwayomi/suwayomi-webui"
+                                    target="_blank"
+                                    rel="noreferrer"
+                                >
+                                    {t('global.language.title.weblate')}
+                                </Link>
+                            </>
+                        }
+                    />
+                    <Select
+                        value={i18nResources.includes(i18n.language as I18nResourceCode) ? i18n.language : 'en'}
+                        onChange={({ target: { value: language } }) => i18n.changeLanguage(language)}
+                    >
+                        {i18nResources.map((language) => (
+                            <MenuItem key={language} value={language}>
+                                {langCodeToName(language)}
+                            </MenuItem>
+                        ))}
+                    </Select>
+                </ListItem>
                 <NumberSetting
                     settingTitle={t('settings.label.manga_item_width')}
                     settingValue={`px: ${itemWidth}`}