Fix edge to edge window insets padding config

Author: WSTxda

app/src/main/java/com/wstxda/gsl/activity/BaseActivity.kt

@@ -3,33 +3,19 @@ package com.wstxda.gsl.activity
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
+import android.view.View
 import androidx.activity.SystemBarStyle
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
-import androidx.core.view.WindowCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 
 abstract class BaseActivity : AppCompatActivity() {
 
-    open val edgeToEdge: Boolean = true
-    open val enforceNoContrast: Boolean = true
-    open val decorFitsSystemWindows: Boolean = false
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
-        if (edgeToEdge) {
-            if (enforceNoContrast && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                enableEdgeToEdge(
-                    navigationBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
-                )
-                window.isNavigationBarContrastEnforced = false
-            } else {
-                enableEdgeToEdge()
-            }
-        }
-
-        WindowCompat.setDecorFitsSystemWindows(window, decorFitsSystemWindows)
+        enableEdgeToEdgeNoContrast()
     }
 
     protected fun setupToolbar(toolbar: Toolbar, showBackButton: Boolean = true) {
@@ -39,4 +25,23 @@ abstract class BaseActivity : AppCompatActivity() {
             toolbar.setNavigationOnClickListener { onBackPressedDispatcher.onBackPressed() }
         }
     }
+
+    private fun enableEdgeToEdgeNoContrast() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            enableEdgeToEdge(
+                navigationBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT)
+            )
+            window.isNavigationBarContrastEnforced = false
+        }
+    }
+
+    protected fun applySystemBarInsets(target: View) {
+        ViewCompat.setOnApplyWindowInsetsListener(target) { view, insets ->
+            val systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            view.setPadding(
+                systemBarsInsets.left, 0, systemBarsInsets.right, systemBarsInsets.bottom
+            )
+            WindowInsetsCompat.CONSUMED
+        }
+    }
 }

app/src/main/java/com/wstxda/gsl/activity/LibraryActivity.kt

@@ -16,11 +16,10 @@ class LibraryActivity : BaseActivity() {
         setContentView(binding.root)
 
         setupToolbar(binding.toolbar)
-
         binding.collapsingToolbar.title = getString(R.string.pref_used_library_summary)
 
         if (savedInstanceState == null) {
-            val fragment = LibsBuilder().supportFragment()
+            val fragment = LibsBuilder().withEdgeToEdge(true).supportFragment()
             supportFragmentManager.beginTransaction()
                 .replace(binding.libraryFragmentContainer.id, fragment).commit()
         }

app/src/main/java/com/wstxda/gsl/activity/SettingsActivity.kt

@@ -1,8 +1,6 @@
 package com.wstxda.gsl.activity
 
 import android.os.Bundle
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import com.wstxda.gsl.R
 import com.wstxda.gsl.databinding.ActivitySettingsBinding
 
@@ -13,16 +11,9 @@ class SettingsActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
+        applySystemBarInsets(binding.navHostContainer)
 
         setupToolbar(binding.toolbar, showBackButton = false)
         binding.collapsingToolbar.title = getString(R.string.app_settings)
-
-        ViewCompat.setOnApplyWindowInsetsListener(binding.navHostContainer) { view, insets ->
-            val systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-            view.setPadding(
-                systemBarsInsets.left, 0, systemBarsInsets.right, systemBarsInsets.bottom * 2
-            )
-            insets
-        }
     }
 }

app/src/main/java/com/wstxda/gsl/activity/ShortcutsActivity.kt

@@ -4,8 +4,6 @@ import android.os.Bundle
 
 abstract class ShortcutsActivity : BaseActivity() {
 
-    override val decorFitsSystemWindows = true
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         onCreateInternal()