Move subscribed icon setting to Appearance, increase icons size (#1582)

aeharding · Aug 11, 2024 · 352c670 · 352c670
1 parent b8f305c
commit 352c670
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/src/features/labels/links/CommunityLink.tsx b/src/features/labels/links/CommunityLink.tsx
@@ -33,7 +33,6 @@ const StyledItemIcon = styled(ItemIcon)`
 const SubscribedIcon = styled(IonIcon)`
   color: var(--ion-color-danger);
   vertical-align: middle;
-  font-size: 0.85em;
 
   margin-bottom: 1px;
   margin-left: 2px;
@@ -163,7 +162,7 @@ const onStart: LongPressOptions["onStart"] = (e) => {
 function useShowSubscribedIcon() {
   const feedEnabled = useContext(ShowSubscribedIconContext);
   const subscribedIcon = useAppSelector(
-    (state) => state.settings.general.subscribedIcon,
+    (state) => state.settings.appearance.posts.subscribedIcon,
   );
 
   switch (subscribedIcon) {

diff --git a/src/features/settings/appearance/posts/Posts.tsx b/src/features/settings/appearance/posts/Posts.tsx
@@ -8,6 +8,7 @@ import EmbedExternalMedia from "./EmbedExternalMedia";
 import AlwaysShowAuthor from "./AlwaysShowAuthor";
 import RememberType from "./RememberType";
 import CommunityAtTop from "./CommunityAtTop";
+import SubscribedIcon from "./SubscribedIcon";
 
 export default function Posts() {
   return (
@@ -20,10 +21,11 @@ export default function Posts() {
         <RememberType />
         <BlurNsfw />
         <CommunityAtTop />
-        <EmbedCrossposts />
         <EmbedExternalMedia />
         <ShowCommunityIcons />
+        <SubscribedIcon />
         <AlwaysShowAuthor />
+        <EmbedCrossposts />
       </IonList>
     </>
   );

diff --git a/...settings/general/other/SubscribedIcon.tsx → ...tings/appearance/posts/SubscribedIcon.tsx b/...settings/general/other/SubscribedIcon.tsx → ...tings/appearance/posts/SubscribedIcon.tsx
@@ -6,7 +6,7 @@ import SettingSelector from "../../shared/SettingSelector";
 
 export default function SubscribedIcon() {
   const subscribedIcon = useAppSelector(
-    (state) => state.settings.general.subscribedIcon,
+    (state) => state.settings.appearance.posts.subscribedIcon,
   );
 
   return (

diff --git a/src/features/settings/general/other/Other.tsx b/src/features/settings/general/other/Other.tsx
@@ -9,7 +9,6 @@ import OpenNativeApps from "./OpenNativeApps";
 import ClearCache from "./ClearCache";
 import BackupSettings from "./backup/BackupSettings";
 import Thumbnailinator from "./Thumbnailinator";
-import SubscribedIcon from "./SubscribedIcon";
 
 export default function Other() {
   return (
@@ -25,7 +24,6 @@ export default function Other() {
         <Haptics />
         <NoSubscribedInFeed />
         <Thumbnailinator />
-        <SubscribedIcon />
         <ClearCache />
         <BackupSettings />
       </IonList>

diff --git a/src/features/settings/settingsSlice.tsx b/src/features/settings/settingsSlice.tsx
@@ -79,6 +79,7 @@ interface SettingsState {
       embedExternalMedia: boolean;
       alwaysShowAuthor: boolean;
       communityAtTop: boolean;
+      subscribedIcon: ShowSubscribedIcon;
     };
     large: {
       showVotingButtons: boolean;
@@ -138,7 +139,6 @@ interface SettingsState {
     defaultFeed: DefaultFeedType | undefined;
     noSubscribedInFeed: boolean;
     thumbnailinatorEnabled: boolean;
-    subscribedIcon: ShowSubscribedIcon;
   };
   blocks: {
     keywords: string[];
@@ -167,6 +167,7 @@ export const initialState: SettingsState = {
       embedExternalMedia: true,
       alwaysShowAuthor: false,
       communityAtTop: false,
+      subscribedIcon: OShowSubscribedIcon.Never,
     },
     large: {
       showVotingButtons: true,
@@ -226,7 +227,6 @@ export const initialState: SettingsState = {
     defaultFeed: undefined,
     noSubscribedInFeed: false,
     thumbnailinatorEnabled: true,
-    subscribedIcon: OShowSubscribedIcon.Never,
   },
   blocks: {
     keywords: [],
@@ -543,7 +543,7 @@ export const appearanceSlice = createSlice({
       db.setSetting("prefer_native_apps", action.payload);
     },
     setSubscribedIcon(state, action: PayloadAction<ShowSubscribedIcon>) {
-      state.general.subscribedIcon = action.payload;
+      state.appearance.posts.subscribedIcon = action.payload;
 
       db.setSetting("subscribed_icon", action.payload);
     },
@@ -805,6 +805,8 @@ export const fetchSettingsFromDatabase = createAsyncThunk<SettingsState>(
               initialState.appearance.posts.alwaysShowAuthor,
             communityAtTop:
               community_at_top ?? initialState.appearance.posts.communityAtTop,
+            subscribedIcon:
+              subscribed_icon ?? initialState.appearance.posts.subscribedIcon,
           },
           large: {
             showVotingButtons:
@@ -906,8 +908,6 @@ export const fetchSettingsFromDatabase = createAsyncThunk<SettingsState>(
           thumbnailinatorEnabled:
             thumbnailinator_enabled ??
             initialState.general.thumbnailinatorEnabled,
-          subscribedIcon:
-            subscribed_icon ?? initialState.general.subscribedIcon,
         },
         blocks: {
           keywords: filtered_keywords ?? initialState.blocks.keywords,