refactor: refactor codes related to save history mode

plateaukao · Jul 21, 2024 · c92f19f · c92f19f
1 parent 94810db
commit c92f19f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/app/src/main/java/info/plateaukao/einkbro/activity/BrowserActivity.kt b/app/src/main/java/info/plateaukao/einkbro/activity/BrowserActivity.kt
@@ -84,7 +84,6 @@ import info.plateaukao.einkbro.preference.FabPosition
 import info.plateaukao.einkbro.preference.FontType
 import info.plateaukao.einkbro.preference.HighlightStyle
 import info.plateaukao.einkbro.preference.NewTabBehavior
-import info.plateaukao.einkbro.preference.SaveHistoryMode
 import info.plateaukao.einkbro.preference.TranslationMode
 import info.plateaukao.einkbro.preference.toggle
 import info.plateaukao.einkbro.service.ClearService
@@ -1921,7 +1920,7 @@ open class BrowserActivity : FragmentActivity(), BrowserController {
 
     override fun removeAlbum(albumController: AlbumController, showHome: Boolean) {
         closeTabConfirmation {
-            if (config.saveHistoryMode == SaveHistoryMode.SAVE_WHEN_CLOSE) {
+            if (config.isSaveHistoryWhenClose()) {
                 addHistory(albumController.albumTitle, albumController.albumUrl)
             }
 

diff --git a/app/src/main/java/info/plateaukao/einkbro/browser/NinjaWebViewClient.kt b/app/src/main/java/info/plateaukao/einkbro/browser/NinjaWebViewClient.kt
@@ -28,7 +28,6 @@ import info.plateaukao.einkbro.R
 import info.plateaukao.einkbro.caption.DualCaptionProcessor
 import info.plateaukao.einkbro.caption.TimedText
 import info.plateaukao.einkbro.preference.ConfigManager
-import info.plateaukao.einkbro.preference.SaveHistoryMode
 import info.plateaukao.einkbro.unit.BrowserUnit
 import info.plateaukao.einkbro.unit.HelperUnit
 import info.plateaukao.einkbro.view.NinjaToast
@@ -83,7 +82,7 @@ class NinjaWebViewClient(
         }, 1000)
 
         // skip translation pages
-        if (config.saveHistoryMode == SaveHistoryMode.SAVE_WHEN_OPEN &&
+        if (config.isSaveHistoryWhenLoad() &&
             !ninjaWebView.incognito &&
             !isTranslationDomain(url) &&
             url != BrowserUnit.URL_ABOUT_BLANK

diff --git a/app/src/main/java/info/plateaukao/einkbro/preference/ConfigManager.kt b/app/src/main/java/info/plateaukao/einkbro/preference/ConfigManager.kt
@@ -491,6 +491,7 @@ class ConfigManager(
             }
         }
 
+    // save history logic codes
     var saveHistoryMode: SaveHistoryMode
         get() {
             val str = sp.getString(K_SAVE_HISTORY_MODE, "")
@@ -511,6 +512,10 @@ class ConfigManager(
             }
         }
 
+    fun isSaveHistoryWhenLoad() = saveHistoryMode == SaveHistoryMode.SAVE_WHEN_OPEN
+    fun isSaveHistoryWhenClose() = saveHistoryMode == SaveHistoryMode.SAVE_WHEN_CLOSE
+    fun isSaveHistoryOn() = saveHistoryMode != SaveHistoryMode.DISABLED
+
     // For tracking state in fast toggling only
     var toggledSaveHistoryMode: SaveHistoryMode = SaveHistoryMode.SAVE_WHEN_OPEN
 

diff --git a/app/src/main/java/info/plateaukao/einkbro/view/dialog/compose/FastToggleDialogFragment.kt b/app/src/main/java/info/plateaukao/einkbro/view/dialog/compose/FastToggleDialogFragment.kt
@@ -101,7 +101,7 @@ fun FastToggleItemList(context: Context, config: ConfigManager, onClicked: ((Boo
             onClicked(true)
         }
         ToggleItem(
-            state = (config.saveHistoryMode != SaveHistoryMode.DISABLED),
+            state = config.isSaveHistoryOn(),
             titleResId = R.string.history, iconResId = R.drawable.ic_history
         ) { on ->
             if (on) {