refactor: update edge-to-edge implementation

Author: naveensingh

app/src/main/kotlin/org/fossify/home/activities/HiddenIconsActivity.kt

@@ -25,19 +25,16 @@ class HiddenIconsActivity : SimpleActivity(), RefreshRecyclerViewListener {
         setContentView(binding.root)
         updateIcons()
 
-        updateEdgeToEdge(
-            topAppBar = binding.manageHiddenIconsToolbar,
-            scrollingView = binding.manageHiddenIconsList,
-        )
-        setupMaterialScrollListener(binding.manageHiddenIconsList, binding.manageHiddenIconsToolbar)
+        setupEdgeToEdge(padBottomSystem = listOf(binding.manageHiddenIconsList))
+        setupMaterialScrollListener(binding.manageHiddenIconsList, binding.manageHiddenIconsAppbar)
 
         val layoutManager = binding.manageHiddenIconsList.layoutManager as MyGridLayoutManager
         layoutManager.spanCount = config.drawerColumnCount
     }
 
     override fun onResume() {
         super.onResume()
-        setupTopAppBar(binding.manageHiddenIconsToolbar, NavigationIcon.Arrow)
+        setupTopAppBar(binding.manageHiddenIconsAppbar, NavigationIcon.Arrow)
     }
 
     private fun updateIcons() {

app/src/main/kotlin/org/fossify/home/activities/MainActivity.kt

@@ -206,13 +206,11 @@ class MainActivity : SimpleActivity(), FlingListener {
     override fun onResume() {
         super.onResume()
         wasJustPaused = false
-        updateStatusbarColor(Color.TRANSPARENT)
 
         with(binding.mainHolder) {
             onGlobalLayout {
                 binding.allAppsFragment.root.setupViews()
                 binding.widgetsFragment.root.setupViews()
-                updateStatusbarColor(Color.TRANSPARENT)
             }
 
             setOnApplyWindowInsetsListener { _, insets ->
@@ -328,7 +326,6 @@ class MainActivity : SimpleActivity(), FlingListener {
         super.onConfigurationChanged(newConfig)
         binding.allAppsFragment.root.onConfigurationChanged()
         binding.widgetsFragment.root.onConfigurationChanged()
-        updateStatusbarColor(Color.TRANSPARENT)
     }
 
     override fun onTouchEvent(event: MotionEvent?): Boolean {

app/src/main/kotlin/org/fossify/home/activities/SettingsActivity.kt

@@ -34,17 +34,14 @@ class SettingsActivity : SimpleActivity() {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
 
-        updateEdgeToEdge(
-            topAppBar = binding.settingsToolbar,
-            scrollingView = binding.settingsNestedScrollview,
-        )
-        setupMaterialScrollListener(binding.settingsNestedScrollview, binding.settingsToolbar)
+        setupEdgeToEdge(padBottomSystem = listOf(binding.settingsNestedScrollview))
+        setupMaterialScrollListener(binding.settingsNestedScrollview, binding.settingsAppbar)
         setupOptionsMenu()
     }
 
     override fun onResume() {
         super.onResume()
-        setupTopAppBar(binding.settingsToolbar, NavigationIcon.Arrow)
+        setupTopAppBar(binding.settingsAppbar, NavigationIcon.Arrow)
         refreshMenuItems()
 
         setupCustomizeColors()

app/src/main/kotlin/org/fossify/home/fragments/AllAppsFragment.kt

@@ -235,7 +235,7 @@ class AllAppsFragment(
         getAdapter()?.updateTextColor(context.getProperTextColor())
 
         binding.searchBar.beVisibleIf(context.config.showSearchBar)
-        binding.searchBar.getToolbar().beGone()
+        binding.searchBar.requireToolbar().beGone()
         binding.searchBar.updateColors()
         binding.searchBar.setupMenu()
 

app/src/main/res/layout/activity_hidden_icons.xml

@@ -5,19 +5,26 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/manage_hidden_icons_toolbar"
+    <org.fossify.commons.views.MyAppBarLayout
+        android:id="@+id/manage_hidden_icons_appbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/color_primary"
-        app:title="@string/hidden_icons"
-        app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/manage_hidden_icons_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:title="@string/hidden_icons"
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+
+    </org.fossify.commons.views.MyAppBarLayout>
 
     <RelativeLayout
         android:id="@+id/manage_hidden_icons_wrapper"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="?attr/actionBarSize">
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <org.fossify.commons.views.MyRecyclerView
             android:id="@+id/manage_hidden_icons_list"

app/src/main/res/layout/activity_settings.xml

@@ -6,22 +6,29 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/settings_toolbar"
+    <org.fossify.commons.views.MyAppBarLayout
+        android:id="@+id/settings_appbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/color_primary"
-        app:menu="@menu/menu_settings"
-        app:title="@string/settings"
-        app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/settings_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:menu="@menu/menu_settings"
+            app:title="@string/settings"
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+
+    </org.fossify.commons.views.MyAppBarLayout>
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/settings_nested_scrollview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="?attr/actionBarSize"
         android:fillViewport="true"
-        android:scrollbars="none">
+        android:scrollbars="none"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
             android:id="@+id/settings_holder"

gradle/libs.versions.toml

@@ -9,7 +9,7 @@ detektCompose = "0.4.27"
 #Room
 room = "2.8.2"
 #Fossify
-commons = "5.4.0"
+commons = "6.0.0"
 #Gradle
 gradlePlugins-agp = "8.11.1"
 #build