fix: hide sidebar count

Signed-off-by: Innei <i@innei.in>
RSSNext · Jul 23, 2024 · 81fc943 · 81fc943
1 parent 9d906d1
commit 81fc943
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/src/renderer/src/modules/feed-column/index.tsx b/src/renderer/src/modules/feed-column/index.tsx
@@ -1,6 +1,7 @@
 import { setAppSearchOpen } from "@renderer/atoms/app"
 import { getReadonlyRoute } from "@renderer/atoms/route"
 import { useGeneralSettingKey } from "@renderer/atoms/settings/general"
+import { useUISettingKey } from "@renderer/atoms/settings/ui"
 import { useSidebarActiveView } from "@renderer/atoms/sidebar"
 import { Logo } from "@renderer/components/icons/logo"
 import { ActionButton } from "@renderer/components/ui/button"
@@ -161,6 +162,8 @@ export function FeedColumn({ children }: PropsWithChildren) {
 
   const unreadByView = useUnreadByView()
 
+  const showSidebarUnreadCount = useUISettingKey("sidebarShowUnreadCount")
+
   return (
     <Vibrancy
       className="relative flex h-full flex-col gap-3 pt-2.5"
@@ -211,22 +214,25 @@ export function FeedColumn({ children }: PropsWithChildren) {
             shortcut={`${index + 1}`}
             className={cn(
               active === index && item.className,
-              "flex h-11 flex-col items-center gap-1 text-xl",
+              "flex flex-col items-center gap-1 text-xl",
               "hover:!bg-theme-vibrancyBg",
+              showSidebarUnreadCount && "h-11",
             )}
             onClick={(e) => {
               setActive(index)
               e.stopPropagation()
             }}
           >
             {item.icon}
-            <div className="text-[0.625rem] font-medium leading-none">
-              {unreadByView[index] > 99 ? (
-                <span className="-mr-0.5">99+</span>
-              ) : (
-                unreadByView[index]
-              )}
-            </div>
+            {showSidebarUnreadCount && (
+              <div className="text-[0.625rem] font-medium leading-none">
+                {unreadByView[index] > 99 ? (
+                  <span className="-mr-0.5">99+</span>
+                ) : (
+                  unreadByView[index]
+                )}
+              </div>
+            )}
           </ActionButton>
         ))}
       </div>

diff --git a/src/renderer/src/modules/settings/tabs/general.tsx b/src/renderer/src/modules/settings/tabs/general.tsx
@@ -75,10 +75,6 @@ export const SettingGeneral = () => {
                 "Automatically mark feed entries with only one level of content(e.g. Social Media, Picture, Video views) as read when the item is in the viewport.",
               onChange: (value) => setGeneralSetting("renderMarkUnread", value),
             },
-            {
-              type: "title",
-              value: "User Experience",
-            },
 
             {
               type: "title",