refactor: update edge-to-edge implementation

naveensingh · naveensingh · commit 56302757e025 · 2025-10-25T21:20:26.000+05:30
diff --git a/app/src/main/kotlin/org/fossify/home/activities/HiddenIconsActivity.kt b/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() {
diff --git a/app/src/main/kotlin/org/fossify/home/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/home/activities/MainActivity.kt
@@ -38,8 +38,6 @@ import androidx.core.graphics.drawable.toDrawable
 import androidx.core.net.toUri
 import androidx.core.view.GestureDetectorCompat
 import androidx.core.view.WindowCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.WindowInsetsCompat.Type
 import androidx.core.view.isVisible
 import androidx.core.view.iterator
 import androidx.viewbinding.ViewBinding
@@ -135,11 +133,16 @@ class MainActivity : SimpleActivity(), FlingListener {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
         appLaunched(BuildConfig.APPLICATION_ID)
+        setupEdgeToEdge(
+            padTopSystem = listOf(binding.widgetsFragment.root),
+            padBottomImeAndSystem = listOf(
+                binding.allAppsFragment.root, binding.widgetsFragment.root
+            ),
+            padBottomSystem = listOf(binding.homeScreenGrid.root)
+        )
 
         mDetector = GestureDetectorCompat(this, MyGestureListener(this))
 
-        WindowCompat.setDecorFitsSystemWindows(window, false)
-
         mScreenHeight = realScreenSize.y
         mAllAppsFragmentY = mScreenHeight
         mWidgetsFragmentY = mScreenHeight
@@ -206,21 +209,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 ->
-                val windowInsets = WindowInsetsCompat.toWindowInsetsCompat(insets)
-                val systemBarInsets = windowInsets.getInsets(Type.systemBars() or Type.ime())
-                binding.allAppsFragment.root.setPadding(0, systemBarInsets.top, 0, 0)
-                binding.widgetsFragment.root.setPadding(0, systemBarInsets.top, 0, 0)
-                insets
             }
         }
 
@@ -246,11 +239,6 @@ class MainActivity : SimpleActivity(), FlingListener {
             refreshLaunchers()
         }
 
-        // avoid showing fully colored navigation bars
-        if (window.navigationBarColor != resources.getColor(R.color.semitransparent_navigation)) {
-            window.navigationBarColor = Color.TRANSPARENT
-        }
-
         binding.homeScreenGrid.root.resizeGrid(
             newRowCount = config.homeRowCount,
             newColumnCount = config.homeColumnCount
@@ -328,7 +316,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 {
diff --git a/app/src/main/kotlin/org/fossify/home/activities/SettingsActivity.kt b/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()
diff --git a/app/src/main/kotlin/org/fossify/home/extensions/View.kt b/app/src/main/kotlin/org/fossify/home/extensions/View.kt
@@ -1,12 +1,12 @@
 package org.fossify.home.extensions
 
-import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.LayerDrawable
 import android.view.RoundedCorner.POSITION_TOP_LEFT
 import android.view.RoundedCorner.POSITION_TOP_RIGHT
 import android.view.View
 import android.view.animation.AccelerateDecelerateInterpolator
 import androidx.core.content.res.ResourcesCompat
+import androidx.core.graphics.drawable.toDrawable
 import org.fossify.commons.R
 import org.fossify.commons.extensions.applyColorFilter
 import org.fossify.commons.extensions.getProperBackgroundColor
@@ -28,7 +28,7 @@ fun View.animateScale(
 
 fun View.setupDrawerBackground() {
     val backgroundColor = context.getProperBackgroundColor()
-    background = ColorDrawable(backgroundColor)
+    background = backgroundColor.toDrawable()
 
     val insets = rootWindowInsets
     if (isSPlus() && insets != null) {
diff --git a/app/src/main/kotlin/org/fossify/home/fragments/AllAppsFragment.kt b/app/src/main/kotlin/org/fossify/home/fragments/AllAppsFragment.kt
@@ -4,22 +4,14 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.util.AttributeSet
 import android.view.MotionEvent
-import android.view.Surface
-import android.view.WindowManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.OnScrollListener
-import org.fossify.commons.R
 import org.fossify.commons.extensions.beGone
 import org.fossify.commons.extensions.beVisibleIf
 import org.fossify.commons.extensions.getProperPrimaryColor
 import org.fossify.commons.extensions.getProperTextColor
 import org.fossify.commons.extensions.hideKeyboard
-import org.fossify.commons.extensions.navigationBarHeight
-import org.fossify.commons.extensions.navigationBarOnBottom
-import org.fossify.commons.extensions.navigationBarOnSide
-import org.fossify.commons.extensions.navigationBarWidth
 import org.fossify.commons.extensions.normalizeString
-import org.fossify.commons.helpers.isRPlus
 import org.fossify.commons.views.MyGridLayoutManager
 import org.fossify.home.activities.MainActivity
 import org.fossify.home.adapters.LaunchersAdapter
@@ -189,39 +181,6 @@ class AllAppsFragment(
         }
 
         binding.allAppsFastscroller.updateColors(context.getProperPrimaryColor())
-
-        var bottomListPadding = 0
-        var leftListPadding = 0
-        var rightListPadding = 0
-
-        // TODO: Use WindowInsets API
-        if (activity!!.navigationBarOnBottom) {
-            bottomListPadding = activity!!.navigationBarHeight
-            leftListPadding = 0
-            rightListPadding = 0
-        } else if (activity!!.navigationBarOnSide) {
-            bottomListPadding = 0
-
-            val display = if (isRPlus()) {
-                display!!
-            } else {
-                (activity!!.getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay
-            }
-
-            if (display.rotation == Surface.ROTATION_90) {
-                rightListPadding = activity!!.navigationBarWidth
-            } else if (display.rotation == Surface.ROTATION_270) {
-                leftListPadding = activity!!.navigationBarWidth
-            }
-        }
-
-        binding.allAppsGrid.setPadding(
-            0,
-            0,
-            resources.getDimension(R.dimen.medium_margin).toInt(),
-            bottomListPadding
-        )
-        binding.allAppsFastscroller.setPadding(leftListPadding, 0, rightListPadding, 0)
         binding.allAppsGrid.addOnScrollListener(object : OnScrollListener() {
             override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                 // Hiding is expensive, only do it if focused
@@ -235,7 +194,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()
 
diff --git a/app/src/main/kotlin/org/fossify/home/fragments/WidgetsFragment.kt b/app/src/main/kotlin/org/fossify/home/fragments/WidgetsFragment.kt
@@ -9,18 +9,11 @@ import android.content.pm.PackageManager
 import android.os.Process
 import android.util.AttributeSet
 import android.view.MotionEvent
-import android.view.Surface
-import android.view.WindowManager
 import org.fossify.commons.extensions.getProperPrimaryColor
 import org.fossify.commons.extensions.getProperTextColor
-import org.fossify.commons.extensions.navigationBarHeight
-import org.fossify.commons.extensions.navigationBarOnBottom
-import org.fossify.commons.extensions.navigationBarOnSide
-import org.fossify.commons.extensions.navigationBarWidth
 import org.fossify.commons.extensions.showErrorToast
 import org.fossify.commons.extensions.toast
 import org.fossify.commons.helpers.ensureBackgroundThread
-import org.fossify.commons.helpers.isRPlus
 import org.fossify.home.R
 import org.fossify.home.activities.MainActivity
 import org.fossify.home.adapters.WidgetsAdapter
@@ -232,33 +225,6 @@ class WidgetsFragment(context: Context, attributeSet: AttributeSet) :
         }
 
         binding.widgetsFastscroller.updateColors(context.getProperPrimaryColor())
-
-        var bottomListPadding = 0
-        var leftListPadding = 0
-        var rightListPadding = 0
-
-        if (activity!!.navigationBarOnBottom) {
-            bottomListPadding = activity!!.navigationBarHeight
-            leftListPadding = 0
-            rightListPadding = 0
-        } else if (activity!!.navigationBarOnSide) {
-            bottomListPadding = 0
-
-            val display = if (isRPlus()) {
-                display!!
-            } else {
-                (activity!!.getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay
-            }
-
-            if (display.rotation == Surface.ROTATION_90) {
-                rightListPadding = activity!!.navigationBarWidth
-            } else if (display.rotation == Surface.ROTATION_270) {
-                leftListPadding = activity!!.navigationBarWidth
-            }
-        }
-
-        binding.widgetsList.setPadding(0, 0, 0, bottomListPadding)
-        binding.widgetsFastscroller.setPadding(leftListPadding, 0, rightListPadding, 0)
         (binding.widgetsList.adapter as? WidgetsAdapter)?.updateTextColor(context.getProperTextColor())
         setupDrawerBackground()
     }
diff --git a/app/src/main/kotlin/org/fossify/home/views/HomeScreenGrid.kt b/app/src/main/kotlin/org/fossify/home/views/HomeScreenGrid.kt
@@ -38,6 +38,7 @@ import androidx.core.graphics.toRect
 import androidx.core.graphics.withScale
 import androidx.core.graphics.withTranslation
 import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat.Type
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
 import androidx.customview.widget.ExploreByTouchHelper
 import com.google.android.material.math.MathUtils
@@ -48,9 +49,7 @@ import org.fossify.commons.extensions.beVisible
 import org.fossify.commons.extensions.getContrastColor
 import org.fossify.commons.extensions.getProperBackgroundColor
 import org.fossify.commons.extensions.getProperTextColor
-import org.fossify.commons.extensions.navigationBarHeight
 import org.fossify.commons.extensions.performHapticFeedback
-import org.fossify.commons.extensions.statusBarHeight
 import org.fossify.commons.helpers.ensureBackgroundThread
 import org.fossify.commons.helpers.isSPlus
 import org.fossify.home.R
@@ -189,13 +188,31 @@ class HomeScreenGrid(context: Context, attrs: AttributeSet, defStyle: Int) :
             style = Paint.Style.FILL
         }
 
-        val sideMargin =
-            context.resources.getDimension(org.fossify.commons.R.dimen.normal_margin).toInt()
-        sideMargins.apply {
-            top = context.statusBarHeight
-            bottom = context.navigationBarHeight
-            left = sideMargin
-            right = sideMargin
+        ViewCompat.setOnApplyWindowInsetsListener(this) { _, insets ->
+            val bars = insets.getInsets(Type.systemBars() or Type.displayCutout())
+            val gestures = insets.getInsets(Type.systemGestures())
+            val navIgnoring = insets.getInsetsIgnoringVisibility(Type.navigationBars())
+
+            val sideMargin = context.resources
+                .getDimension(org.fossify.commons.R.dimen.normal_margin).toInt()
+
+            val newLeft   = sideMargin + bars.left
+            val newRight  = sideMargin + bars.right
+            val newTop    = bars.top
+            val newBottom = max(bars.bottom, max(gestures.bottom, navIgnoring.bottom))
+            val marginsChanged = sideMargins.left != newLeft
+                    || sideMargins.top != newTop
+                    || sideMargins.right != newRight
+                    || sideMargins.bottom != newBottom
+            if (marginsChanged) {
+                sideMargins.set(newLeft, newTop, newRight, newBottom)
+                cells.clear()
+                gridCenters.clear()
+                isFirstDraw = true
+                redrawGrid()
+            }
+
+            insets
         }
 
         fetchGridItems()
diff --git a/app/src/main/res/layout/activity_hidden_icons.xml b/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"
diff --git a/app/src/main/res/layout/activity_settings.xml b/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"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
