From aee564471ac54ac25bd70047ce0c374ddee1fd16 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Sun, 16 Jan 2022 12:36:37 -0600
Subject: [PATCH] Add option to disable collapsing app bars

---
 .../java/com/todoroo/astrid/activity/TaskListFragment.kt     | 4 ++++
 app/src/main/res/layout/fragment_task_list.xml               | 1 -
 app/src/main/res/values/keys.xml                             | 1 +
 app/src/main/res/values/strings.xml                          | 1 +
 app/src/main/res/xml/preferences_look_and_feel.xml           | 5 +++++
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt
index 42c802267..6ce2ca181 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt
+++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt
@@ -231,6 +231,10 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
             binding.toolbar.navigationIcon = null
             binding.bottomAppBar
         }
+        if (!preferences.getBoolean(R.string.p_app_bar_collapse, true)) {
+            binding.bottomAppBar.hideOnScroll = false
+            (binding.toolbar.layoutParams as AppBarLayout.LayoutParams).scrollFlags = 0
+        }
         toolbar.setOnMenuItemClickListener(this)
         toolbar.setNavigationOnClickListener { callbacks.onNavigationIconClicked() }
         setupMenu(toolbar)
diff --git a/app/src/main/res/layout/fragment_task_list.xml b/app/src/main/res/layout/fragment_task_list.xml
index 6589bc210..a92c210c0 100644
--- a/app/src/main/res/layout/fragment_task_list.xml
+++ b/app/src/main/res/layout/fragment_task_list.xml
@@ -74,7 +74,6 @@
       android:theme="?attr/overlay_theme"
       app:popupTheme="@style/popup_overlay"
       app:hideOnScroll="true"
-      app:layout_scrollFlags="scroll|enterAlways"
       app:navigationIcon="@drawable/ic_outline_menu_24px" />
 
   <com.google.android.material.floatingactionbutton.FloatingActionButton
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index 234f8bee8..4f0cb8845 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -446,4 +446,5 @@
   <string name="p_picker_mode_time">picker_mode_time</string>
   <string name="p_markdown">markdown</string>
   <string name="p_app_bar_position">app_bar_position</string>
+  <string name="p_app_bar_collapse">app_bar_collapse</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c95244e9a..d77ac67ab 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -708,6 +708,7 @@ File %1$s contained %2$s.\n\n
   <string name="markdown_description">Enable Markdown in title and description</string>
   <string name="completion_sound">Play completion sound</string>
   <string name="app_bar_position">App bar position</string>
+  <string name="app_bar_collapse">Collapse app bars</string>
   <string name="top">Top</string>
   <string name="bottom">Bottom</string>
   <string name="completed">Completed</string>
diff --git a/app/src/main/res/xml/preferences_look_and_feel.xml b/app/src/main/res/xml/preferences_look_and_feel.xml
index 05bc41bfd..5242b8330 100644
--- a/app/src/main/res/xml/preferences_look_and_feel.xml
+++ b/app/src/main/res/xml/preferences_look_and_feel.xml
@@ -62,6 +62,11 @@
       android:entryValues="@array/two_values"
       android:title="@string/app_bar_position" />
 
+    <SwitchPreference
+      android:defaultValue="true"
+      android:key="@string/p_app_bar_collapse"
+      android:title="@string/app_bar_collapse" />
+
     <SeekBarPreference
       android:defaultValue="16"
       android:key="@string/p_fontSize"