refactor: update edge-to-edge implementation

Author: naveensingh

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

@@ -56,11 +56,8 @@ class MainActivity : SimpleActivity(), Calculator {
         appLaunched(BuildConfig.APPLICATION_ID)
         setupOptionsMenu()
         refreshMenuItems()
-        updateEdgeToEdge(
-            topAppBar = binding.mainToolbar,
-            scrollingView = binding.mainNestedScrollview,
-        )
-        setupMaterialScrollListener(binding.mainNestedScrollview, binding.mainToolbar)
+        setupEdgeToEdge(padBottomSystem = listOf(binding.mainNestedScrollview))
+        setupMaterialScrollListener(binding.mainNestedScrollview, binding.mainAppbar!!)
 
         if (savedInstanceState != null) {
             saveCalculatorState = savedInstanceState.getCharSequence(CALCULATOR_STATE) as String
@@ -104,7 +101,7 @@ class MainActivity : SimpleActivity(), Calculator {
 
     override fun onResume() {
         super.onResume()
-        setupTopAppBar(binding.mainToolbar)
+        setupTopAppBar(binding.mainAppbar!!)
         if (storedTextColor != config.textColor) {
             binding.calculatorHolder?.let { updateViewColors(it, getProperTextColor()) }
         }

app/src/main/kotlin/org/fossify/math/activities/UnitConverterActivity.kt

@@ -47,11 +47,8 @@ class UnitConverterActivity : SimpleActivity(), ConverterView.OnUnitChangedListe
             setupOptionsMenu()
         }
 
-        updateEdgeToEdge(
-            topAppBar = binding.unitConverterToolbar,
-            scrollingView = binding.nestedScrollview,
-        )
-        setupMaterialScrollListener(binding.nestedScrollview, binding.unitConverterToolbar)
+        setupEdgeToEdge(padBottomSystem = listOf(binding.nestedScrollview))
+        setupMaterialScrollListener(binding.nestedScrollview, binding.unitConverterAppbar)
 
         val converter = Converter.ALL.getOrNull(intent.getIntExtra(EXTRA_CONVERTER_ID, 0))
 
@@ -111,7 +108,7 @@ class UnitConverterActivity : SimpleActivity(), ConverterView.OnUnitChangedListe
     override fun onResume() {
         super.onResume()
 
-        setupTopAppBar(binding.unitConverterToolbar, NavigationIcon.Arrow)
+        setupTopAppBar(binding.unitConverterAppbar, NavigationIcon.Arrow)
         binding.viewUnitConverter.viewConverter.root.updateColors()
         binding.viewUnitConverter.converterHolder.let {
             updateViewColors(it, getProperTextColor())

app/src/main/kotlin/org/fossify/math/activities/UnitConverterPickerActivity.kt

@@ -18,11 +18,11 @@ class UnitConverterPickerActivity : SimpleActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
-        updateEdgeToEdge(
-            topAppBar = binding.unitConverterPickerToolbar,
-            scrollingView = binding.unitTypesGrid,
+        setupEdgeToEdge(padBottomSystem = listOf(binding.unitTypesGrid))
+        setupMaterialScrollListener(
+            binding.unitTypesGrid,
+            binding.unitConverterPickerAppbar
         )
-        setupMaterialScrollListener(binding.unitTypesGrid, binding.unitConverterPickerToolbar)
 
         binding.unitTypesGrid.layoutManager =
             AutoGridLayoutManager(this, resources.getDimensionPixelSize(R.dimen.unit_type_size))
@@ -39,7 +39,7 @@ class UnitConverterPickerActivity : SimpleActivity() {
     override fun onResume() {
         super.onResume()
 
-        setupTopAppBar(binding.unitConverterPickerToolbar, NavigationIcon.Arrow)
+        setupTopAppBar(binding.unitConverterPickerAppbar, NavigationIcon.Arrow)
 
         if (config.preventPhoneFromSleeping) {
             window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)

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

@@ -8,21 +8,28 @@
     tools:context="org.fossify.math.activities.MainActivity"
     tools:ignore="HardcodedText">
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/main_toolbar"
+    <org.fossify.commons.views.MyAppBarLayout
+        android:id="@+id/main_appbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/color_primary"
-        app:menu="@menu/menu"
-        app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/main_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:menu="@menu/menu"
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+
+    </org.fossify.commons.views.MyAppBarLayout>
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/main_nested_scrollview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="?attr/actionBarSize"
         android:fillViewport="true"
-        android:scrollbars="none">
+        android:scrollbars="none"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <include
             layout="@layout/view_calculator"

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

@@ -9,20 +9,27 @@
     tools:context="org.fossify.math.activities.UnitConverterActivity"
     tools:ignore="HardcodedText">
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/unit_converter_toolbar"
+    <org.fossify.commons.views.MyAppBarLayout
+        android:id="@+id/unit_converter_appbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/color_primary"
-        app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/unit_converter_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+
+    </org.fossify.commons.views.MyAppBarLayout>
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/nested_scrollview"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="?attr/actionBarSize"
         android:fillViewport="true"
-        android:scrollbars="none">
+        android:scrollbars="none"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <include
             android:id="@+id/view_unit_converter"

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

@@ -9,22 +9,29 @@
     tools:context="org.fossify.math.activities.UnitConverterActivity"
     tools:ignore="HardcodedText">
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/unit_converter_picker_toolbar"
+    <org.fossify.commons.views.MyAppBarLayout
+        android:id="@+id/unit_converter_picker_appbar"
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/color_primary"
-        app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/unit_converter_picker_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@color/color_primary"
+            app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+
+    </org.fossify.commons.views.MyAppBarLayout>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/unit_types_grid"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginStart="@dimen/activity_margin"
-        android:layout_marginTop="?attr/actionBarSize"
         android:layout_marginEnd="@dimen/activity_margin"
         app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
         app:spanCount="4"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:itemCount="20"
         tools:listitem="@layout/item_unit_type" />
 

gradle/libs.versions.toml

@@ -21,7 +21,7 @@ evalex = "3.5.0"
 #Room
 room = "2.8.2"
 #Fossify
-commons = "5.4.0"
+commons = "6.0.0"
 #Gradle
 gradlePlugins-agp = "8.11.1"
 #build