From f328e38b51dfd49ceba74cd902eaad9966e63b28 Mon Sep 17 00:00:00 2001
From: schroda <50052685+schroda@users.noreply.github.com>
Date: Thu, 5 Sep 2024 00:25:45 +0200
Subject: [PATCH] Move "manga item width" to "Appearance" page

---
 src/screens/Settings.tsx            | 23 ++---------------------
 src/screens/settings/Appearance.tsx | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/screens/Settings.tsx b/src/screens/Settings.tsx
index 2860f7e3..7d141002 100644
--- a/src/screens/Settings.tsx
+++ b/src/screens/Settings.tsx
@@ -6,7 +6,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-import { useContext, useEffect, useMemo } from 'react';
+import { useContext, useEffect } from 'react';
 import AutoStoriesIcon from '@mui/icons-material/AutoStories';
 import List from '@mui/material/List';
 import ListAltIcon from '@mui/icons-material/ListAlt';
@@ -22,7 +22,6 @@ 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 ViewModuleIcon from '@mui/icons-material/ViewModule';
 import DnsIcon from '@mui/icons-material/Dns';
 import WebIcon from '@mui/icons-material/Web';
 import DeleteForeverIcon from '@mui/icons-material/DeleteForever';
@@ -31,10 +30,8 @@ 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 { useLocalStorage } from '@/util/useStorage.tsx';
 import { ListItemLink } from '@/components/util/ListItemLink';
 import { NavBarContext } from '@/components/context/NavbarContext.tsx';
-import { NumberSetting } from '@/components/settings/NumberSetting.tsx';
 import { requestManager } from '@/lib/requests/RequestManager.ts';
 import { makeToast } from '@/components/util/Toast.tsx';
 import { Select } from '@/components/atoms/Select.tsx';
@@ -54,10 +51,6 @@ export function Settings() {
         };
     }, [t]);
 
-    const DEFAULT_ITEM_WIDTH = 300;
-    const itemWidthIcon = useMemo(() => <ViewModuleIcon />, []);
-    const [itemWidth, setItemWidth] = useLocalStorage<number>('ItemWidth', DEFAULT_ITEM_WIDTH);
-
     const [triggerClearServerCache, { loading: isClearingServerCache }] = requestManager.useClearServerCache();
 
     const clearServerCache = async () => {
@@ -113,19 +106,7 @@ export function Settings() {
                 </ListItemIcon>
                 <ListItemText primary={t('settings.backup.title')} />
             </ListItemLink>
-            <NumberSetting
-                settingTitle={t('settings.label.manga_item_width')}
-                settingValue={`px:${itemWidth}`}
-                settingIcon={itemWidthIcon}
-                value={itemWidth}
-                defaultValue={DEFAULT_ITEM_WIDTH}
-                minValue={100}
-                maxValue={1000}
-                stepSize={10}
-                valueUnit="px"
-                showSlider
-                handleUpdate={setItemWidth}
-            />
+
             <ListItem>
                 <ListItemIcon>
                     <LanguageIcon />
diff --git a/src/screens/settings/Appearance.tsx b/src/screens/settings/Appearance.tsx
index e637ffbc..9ad6b01d 100644
--- a/src/screens/settings/Appearance.tsx
+++ b/src/screens/settings/Appearance.tsx
@@ -18,6 +18,8 @@ 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';
 
 export const Appearance = () => {
     const { t } = useTranslation();
@@ -35,6 +37,9 @@ export const Appearance = () => {
         };
     }, [t]);
 
+    const DEFAULT_ITEM_WIDTH = 300;
+    const [itemWidth, setItemWidth] = useLocalStorage<number>('ItemWidth', DEFAULT_ITEM_WIDTH);
+
     return (
         <List
             subheader={
@@ -63,6 +68,26 @@ export const Appearance = () => {
                     <Switch checked={pureBlackMode} onChange={(_, enabled) => setPureBlackMode(enabled)} />
                 </ListItem>
             )}
+            <List
+                subheader={
+                    <ListSubheader component="div" id="appearance-theme">
+                        {t('global.label.display')}
+                    </ListSubheader>
+                }
+            >
+                <NumberSetting
+                    settingTitle={t('settings.label.manga_item_width')}
+                    settingValue={`px: ${itemWidth}`}
+                    value={itemWidth}
+                    defaultValue={DEFAULT_ITEM_WIDTH}
+                    minValue={100}
+                    maxValue={1000}
+                    stepSize={10}
+                    valueUnit="px"
+                    showSlider
+                    handleUpdate={setItemWidth}
+                />
+            </List>
         </List>
     );
 };