From 09f5c6ea6f22ac365370f2195b70449f22b77472 Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Fri, 8 Mar 2024 00:53:18 -0300
Subject: [PATCH] feat(Settings): add an "always show top bar logo" setting
 (#219)

---
 src/_locales/cmn-CN.yml                     |  1 +
 src/_locales/cmn-TW.yml                     |  1 +
 src/_locales/en.yml                         |  1 +
 src/_locales/jyut.yml                       |  1 +
 src/components/Settings/components/Home.vue | 46 ++++++++++++---------
 src/contentScripts/views/App.vue            |  9 ++--
 src/logic/storage.ts                        |  6 ++-
 7 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/src/_locales/cmn-CN.yml b/src/_locales/cmn-CN.yml
index ebd77ff4..fac965fd 100644
--- a/src/_locales/cmn-CN.yml
+++ b/src/_locales/cmn-CN.yml
@@ -127,6 +127,7 @@ settings:
   search_page_mode_wallpaper_fixed: 将搜索页模式的壁纸固定
   home_tabs_adjustment: 标签栏调整
   home_tabs_adjustment_desc: 第一个激活的标签项是默认界面
+  always_show_the_top_bar_logo: 总是显示顶栏 Logo
 
   # Compatibility
   # Common
diff --git a/src/_locales/cmn-TW.yml b/src/_locales/cmn-TW.yml
index a56fe174..1f2ed227 100644
--- a/src/_locales/cmn-TW.yml
+++ b/src/_locales/cmn-TW.yml
@@ -78,6 +78,7 @@ settings:
   auto_hide_dock: 自動隱藏 Dock
   dock_content_adjustment: Dock 內容調整
   dock_content_adjustment_desc: 第一個啓用的 Dock 項目的頁面將是起始頁面
+  always_show_the_top_bar_logo: 永遠顯示頂欄 Logo
 
   # Appearance
   theme: 主題
diff --git a/src/_locales/en.yml b/src/_locales/en.yml
index 1e51303e..23cd12d2 100644
--- a/src/_locales/en.yml
+++ b/src/_locales/en.yml
@@ -128,6 +128,7 @@ settings:
   search_page_mode_wallpaper_fixed: Make the wallpaper of the search page mode fixed
   home_tabs_adjustment: Tabs adjustment
   home_tabs_adjustment_desc: The first activated tab is the default page
+  always_show_the_top_bar_logo: Always show the top bar logo
 
   # Compatibility
   # Common
diff --git a/src/_locales/jyut.yml b/src/_locales/jyut.yml
index 99322813..7b6631e7 100644
--- a/src/_locales/jyut.yml
+++ b/src/_locales/jyut.yml
@@ -130,6 +130,7 @@ settings:
   search_page_mode_wallpaper_fixed: 定住搵嘢頁模式嘅背景
   home_tabs_adjustment: 分頁欄調整
   home_tabs_adjustment_desc: 第一個啓用嘅分頁項目會係開始頁面
+  always_show_the_top_bar_logo: 永遠顯示頂欄 Logo
 
   # Compatibility
   # Common
diff --git a/src/components/Settings/components/Home.vue b/src/components/Settings/components/Home.vue
index a265bfde..77fb48ee 100644
--- a/src/components/Settings/components/Home.vue
+++ b/src/components/Settings/components/Home.vue
@@ -240,31 +240,37 @@ function handleToggleHomeTab(tab: any) {
       <SettingsItem :title="$t('settings.use_search_page_mode')">
         <Radio v-model="settings.useSearchPageModeOnHomePage" />
       </SettingsItem>
-      <SettingsItem :title="$t('settings.settings_shared_with_the_search_page')">
-        <template #desc>
-          <span color="$bew-warning-color">{{ $t('settings.settings_shared_with_the_search_page_desc') }}</span>
-        </template>
-        <Button type="secondary" block center @click="handleOpenSearchPageModeSharedSettings">
-          {{ $t('settings.btn.open_settings') }}
-        </Button>
-
-        <ChildSettingsDialog
-          v-if="showSearchPageModeSharedSettings"
-          :title="$t('settings.settings_shared_with_the_search_page')"
-          style="--b-dialog-height: 85%;"
-          @close="handleCloseSearchPageModeSharedSettings"
-        >
+      <template v-if="settings.useSearchPageModeOnHomePage">
+        <SettingsItem :title="$t('settings.settings_shared_with_the_search_page')">
           <template #desc>
             <span color="$bew-warning-color">{{ $t('settings.settings_shared_with_the_search_page_desc') }}</span>
           </template>
+          <Button type="secondary" block center @click="handleOpenSearchPageModeSharedSettings">
+            {{ $t('settings.btn.open_settings') }}
+          </Button>
 
-          <SearchPage />
-        </ChildSettingsDialog>
-      </SettingsItem>
+          <ChildSettingsDialog
+            v-if="showSearchPageModeSharedSettings"
+            :title="$t('settings.settings_shared_with_the_search_page')"
+            style="--b-dialog-height: 85%;"
+            @close="handleCloseSearchPageModeSharedSettings"
+          >
+            <template #desc>
+              <span color="$bew-warning-color">{{ $t('settings.settings_shared_with_the_search_page_desc') }}</span>
+            </template>
 
-      <SettingsItem :title="$t('settings.search_page_mode_wallpaper_fixed')">
-        <Radio v-model="settings.searchPageModeWallpaperFixed" />
-      </SettingsItem>
+            <SearchPage />
+          </ChildSettingsDialog>
+        </SettingsItem>
+
+        <SettingsItem :title="$t('settings.search_page_mode_wallpaper_fixed')">
+          <Radio v-model="settings.searchPageModeWallpaperFixed" />
+        </SettingsItem>
+
+        <SettingsItem :title="$t('settings.always_show_the_top_bar_logo')">
+          <Radio v-model="settings.alwaysShowTheTopBarLogoOnSearchPageMode" />
+        </SettingsItem>
+      </template>
     </SettingsItemGroup>
   </div>
 </template>
diff --git a/src/contentScripts/views/App.vue b/src/contentScripts/views/App.vue
index 1d360ac0..98276a3a 100644
--- a/src/contentScripts/views/App.vue
+++ b/src/contentScripts/views/App.vue
@@ -323,9 +323,12 @@ provide<BewlyAppProvider>('BEWLY_APP', {
               || activatedPage !== AppPage.Home && activatedPage !== AppPage.Search
             )
             || settings.useOriginalBilibiliHomepage"
-          :show-logo="showTopBarMask && settings.useSearchPageModeOnHomePage
-            || (!settings.useSearchPageModeOnHomePage || activatedPage !== AppPage.Home)
-            || settings.useOriginalBilibiliHomepage"
+          :show-logo="settings.alwaysShowTheTopBarLogoOnSearchPageMode
+            || (
+              showTopBarMask && settings.useSearchPageModeOnHomePage
+              || (!settings.useSearchPageModeOnHomePage || activatedPage !== AppPage.Home)
+              || settings.useOriginalBilibiliHomepage
+            )"
           :mask="showTopBarMask"
           pos="fixed top-0 left-0" z="99 hover:1001" w-full
         />
diff --git a/src/logic/storage.ts b/src/logic/storage.ts
index 6a041f2e..d8d287eb 100644
--- a/src/logic/storage.ts
+++ b/src/logic/storage.ts
@@ -41,9 +41,10 @@ export interface Settings {
   searchPageWallpaperBlurIntensity: number
 
   recommendationMode: 'web' | 'app'
+  homePageTabVisibilityList: { page: HomeSubPage, visible: boolean }[]
   useSearchPageModeOnHomePage: boolean
   searchPageModeWallpaperFixed: boolean
-  homePageTabVisibilityList: { page: HomeSubPage, visible: boolean }[]
+  alwaysShowTheTopBarLogoOnSearchPageMode: boolean
 
   adaptToOtherPageStyles: boolean
   showTopBar: boolean
@@ -83,9 +84,10 @@ export const settings = useStorageLocal('settings', ref<Settings>({
   searchPageWallpaperBlurIntensity: 0,
 
   recommendationMode: 'web',
+  homePageTabVisibilityList: [],
   useSearchPageModeOnHomePage: false,
   searchPageModeWallpaperFixed: false,
-  homePageTabVisibilityList: [],
+  alwaysShowTheTopBarLogoOnSearchPageMode: false,
 
   adaptToOtherPageStyles: true,
   showTopBar: true,