Fix "keep screen on" for query fragments

nevenz · nevenz · commit d00c039b1b80 · 2022-05-29T20:53:25.000+02:00
diff --git a/app/src/main/java/com/orgzly/android/ui/note/NoteFragment.kt b/app/src/main/java/com/orgzly/android/ui/note/NoteFragment.kt
@@ -288,6 +288,8 @@ class NoteFragment : Fragment(), View.OnClickListener, TimestampDialogFragment.O
         binding.bottomAppBar.run {
             replaceMenu(R.menu.note_actions)
 
+            ActivityUtils.keepScreenOnUpdateMenuItem(activity, menu)
+
             setNavigationIcon(context.styledAttributes(R.styleable.Icons) { typedArray ->
                 typedArray.getResourceId(R.styleable.Icons_ic_menu_24dp, 0)
             })
@@ -296,12 +298,6 @@ class NoteFragment : Fragment(), View.OnClickListener, TimestampDialogFragment.O
                 sharedMainActivityViewModel.openDrawer()
             }
 
-            // TODO: Move keep_screen_on to the fun, rename all is to be the same for this item
-            ActivityUtils.keepScreenOnUpdateMenuItem(
-                activity,
-                menu,
-                menu.findItem(R.id.keep_screen_on))
-
             if (viewModel.notePayload == null) {
                 removeMenuItemsForNoData(menu)
 
diff --git a/app/src/main/java/com/orgzly/android/ui/notes/book/BookFragment.kt b/app/src/main/java/com/orgzly/android/ui/notes/book/BookFragment.kt
@@ -513,6 +513,8 @@ class BookFragment :
         binding.bottomAppBar.run {
             replaceMenu(R.menu.book_actions)
 
+            ActivityUtils.keepScreenOnUpdateMenuItem(activity, menu)
+
             setNavigationIcon(context.styledAttributes(R.styleable.Icons) { typedArray ->
                 typedArray.getResourceId(R.styleable.Icons_ic_menu_24dp, 0)
             })
@@ -521,12 +523,6 @@ class BookFragment :
                 sharedMainActivityViewModel.openDrawer()
             }
 
-            ActivityUtils.keepScreenOnUpdateMenuItem(
-                activity,
-                menu,
-                menu.findItem(R.id.books_options_keep_screen_on))
-
-
             if (currentBook == null || viewAdapter.getDataItemCount() == 0) {
                 menu.removeItem(R.id.books_options_menu_item_cycle_visibility)
             }
@@ -564,9 +560,8 @@ class BookFragment :
                         onPrefaceClick()
                     }
 
-                    R.id.books_options_keep_screen_on -> {
-                        // TODO: Pass menu, books_options_keep_screen_on should be inside keepScreenOnToggle only
-                        val item = menu.findItem(R.id.books_options_keep_screen_on)
+                    R.id.keep_screen_on -> {
+                        val item = menu.findItem(R.id.keep_screen_on)
                         dialog = ActivityUtils.keepScreenOnToggle(activity, item)
                     }
 
diff --git a/app/src/main/java/com/orgzly/android/ui/notes/query/agenda/AgendaFragment.kt b/app/src/main/java/com/orgzly/android/ui/notes/query/agenda/AgendaFragment.kt
@@ -29,6 +29,7 @@ import com.orgzly.android.ui.notes.quickbar.QuickBarListener
 import com.orgzly.android.ui.notes.quickbar.QuickBars
 import com.orgzly.android.ui.settings.SettingsActivity
 import com.orgzly.android.ui.stickyheaders.StickyHeadersLinearLayoutManager
+import com.orgzly.android.ui.util.ActivityUtils
 import com.orgzly.android.ui.util.setup
 import com.orgzly.android.ui.util.styledAttributes
 import com.orgzly.android.util.LogUtils
@@ -122,6 +123,8 @@ class AgendaFragment :
         binding.bottomAppBar.run {
             replaceMenu(R.menu.query_actions)
 
+            ActivityUtils.keepScreenOnUpdateMenuItem(activity, menu)
+
             setNavigationIcon(context.styledAttributes(R.styleable.Icons) { typedArray ->
                 typedArray.getResourceId(R.styleable.Icons_ic_menu_24dp, 0)
             })
@@ -135,6 +138,10 @@ class AgendaFragment :
                     R.id.activity_action_settings -> {
                         startActivity(Intent(context, SettingsActivity::class.java))
                     }
+
+                    R.id.keep_screen_on -> {
+                        dialog = ActivityUtils.keepScreenOnToggle(activity, menuItem)
+                    }
                 }
                 true
             }
diff --git a/app/src/main/java/com/orgzly/android/ui/notes/query/search/SearchFragment.kt b/app/src/main/java/com/orgzly/android/ui/notes/query/search/SearchFragment.kt
@@ -27,6 +27,7 @@ import com.orgzly.android.ui.notes.quickbar.ItemGestureDetector
 import com.orgzly.android.ui.notes.quickbar.QuickBarListener
 import com.orgzly.android.ui.notes.quickbar.QuickBars
 import com.orgzly.android.ui.settings.SettingsActivity
+import com.orgzly.android.ui.util.ActivityUtils
 import com.orgzly.android.ui.util.setup
 import com.orgzly.android.ui.util.styledAttributes
 import com.orgzly.android.util.LogUtils
@@ -120,6 +121,8 @@ class SearchFragment :
         binding.bottomAppBar.run {
             replaceMenu(R.menu.query_actions)
 
+            ActivityUtils.keepScreenOnUpdateMenuItem(activity, menu)
+
             setNavigationIcon(context.styledAttributes(R.styleable.Icons) { typedArray ->
                 typedArray.getResourceId(R.styleable.Icons_ic_menu_24dp, 0)
             })
@@ -133,6 +136,10 @@ class SearchFragment :
                     R.id.activity_action_settings -> {
                         startActivity(Intent(context, SettingsActivity::class.java))
                     }
+
+                    R.id.keep_screen_on -> {
+                        dialog = ActivityUtils.keepScreenOnToggle(activity, menuItem)
+                    }
                 }
                 true
             }
diff --git a/app/src/main/java/com/orgzly/android/ui/util/ActivityUtils.kt b/app/src/main/java/com/orgzly/android/ui/util/ActivityUtils.kt
@@ -181,7 +181,8 @@ object ActivityUtils {
         }
     }
 
-    fun keepScreenOnUpdateMenuItem(activity: Activity?, menu: Menu, item: MenuItem?) {
+    fun keepScreenOnUpdateMenuItem(activity: Activity?, menu: Menu) {
+        val item = menu.findItem(R.id.keep_screen_on)
         if (activity != null && item != null) {
             if (AppPreferences.keepScreenOnMenuItem(activity)) {
                 item.isChecked = isKeepScreenOn(activity)
diff --git a/app/src/main/res/menu/book_actions.xml b/app/src/main/res/menu/book_actions.xml
@@ -17,7 +17,7 @@
         android:title="@string/cycle_visibility"/>
 
     <item
-        android:id="@+id/books_options_keep_screen_on"
+        android:id="@+id/keep_screen_on"
         app:showAsAction="never"
         android:checkable="true"
         android:title="@string/keep_screen_on"/>
diff --git a/app/src/main/res/menu/query_actions.xml b/app/src/main/res/menu/query_actions.xml
@@ -11,7 +11,7 @@
         app:showAsAction="collapseActionView|always" tools:ignore="AlwaysShowAction"/>
 
     <item
-        android:id="@+id/query_options_keep_screen_on"
+        android:id="@+id/keep_screen_on"
         app:showAsAction="never"
         android:checkable="true"
         android:title="@string/keep_screen_on"/>

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,8 @@ object ActivityUtils {`
`181`	`181`	`}`
`182`	`182`	`}`
`183`	`183`
`184`		`- fun keepScreenOnUpdateMenuItem(activity: Activity?, menu: Menu, item: MenuItem?) {`
	`184`	`+ fun keepScreenOnUpdateMenuItem(activity: Activity?, menu: Menu) {`
	`185`	`+ val item = menu.findItem(R.id.keep_screen_on)`
`185`	`186`	`if (activity != null && item != null) {`
`186`	`187`	`if (AppPreferences.keepScreenOnMenuItem(activity)) {`
`187`	`188`	`item.isChecked = isKeepScreenOn(activity)`