fix: power consumption due to touch area type update

plateaukao · May 16, 2023 · cfdbca9 · cfdbca9
1 parent 185d5fb
commit cfdbca9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 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
@@ -191,15 +191,7 @@ open class BrowserActivity : FragmentActivity(), BrowserController {
 
     private val browserContainer: BrowserContainer = BrowserContainer()
 
-    private val touchController: TouchAreaViewController by lazy {
-        TouchAreaViewController(
-            rootView = binding.root,
-            pageUpAction = { ninjaWebView.pageUpWithNoAnimation() },
-            pageTopAction = { ninjaWebView.jumpToTop() },
-            pageDownAction = { ninjaWebView.pageDownWithNoAnimation() },
-            pageBottomAction = { ninjaWebView.jumpToBottom() },
-        )
-    }
+    private lateinit var touchController: TouchAreaViewController
 
     private lateinit var twoPaneController: TwoPaneController
 
@@ -253,6 +245,8 @@ open class BrowserActivity : FragmentActivity(), BrowserController {
         initTouchArea()
         initActionModeViewModel()
 
+        initTouchAreaViewController()
+
         downloadReceiver = createDownloadReceiver(this)
         registerReceiver(downloadReceiver, IntentFilter(ACTION_DOWNLOAD_COMPLETE))
         dispatchIntent(intent)
@@ -268,6 +262,16 @@ open class BrowserActivity : FragmentActivity(), BrowserController {
         initLanguageLabel()
     }
 
+    private fun initTouchAreaViewController() {
+        touchController = TouchAreaViewController(
+            rootView = binding.root,
+            pageUpAction = { ninjaWebView.pageUpWithNoAnimation() },
+            pageTopAction = { ninjaWebView.jumpToTop() },
+            pageDownAction = { ninjaWebView.pageDownWithNoAnimation() },
+            pageBottomAction = { ninjaWebView.jumpToBottom() },
+        )
+    }
+
     private fun initActionModeViewModel() {
         lifecycleScope.launch {
             actionModeMenuViewModel.actionModeMenuState.collect { state ->

diff --git a/app/src/main/java/info/plateaukao/einkbro/view/viewControllers/TouchAreaViewController.kt b/app/src/main/java/info/plateaukao/einkbro/view/viewControllers/TouchAreaViewController.kt
@@ -183,9 +183,11 @@ class TouchAreaViewController(
         if (enabled) showTouchAreaHint()
     }
 
+    private var disabledTemporarily = false
     fun maybeDisableTemporarily() {
         if (config.enableTouchTurn && config.touchAreaHint && config.hideTouchAreaWhenInput) {
             if (this::touchAreaPageUp.isInitialized) {
+                disabledTemporarily = true
                 with(touchAreaPageUp) {
                     visibility = View.GONE
                     setOnLongClickListener(null)
@@ -205,7 +207,13 @@ class TouchAreaViewController(
     }
 
     fun maybeEnableAgain() {
-        if (config.enableTouchTurn && config.touchAreaHint && config.hideTouchAreaWhenInput) {
+        if (
+            disabledTemporarily &&
+            config.enableTouchTurn &&
+            config.touchAreaHint &&
+            config.hideTouchAreaWhenInput
+        ) {
+            disabledTemporarily = false
             updateTouchAreaType()
         }
     }