From 9426459ff196fdcd4264ad2740922f329f19891e Mon Sep 17 00:00:00 2001
From: darken <darken@darken.eu>
Date: Thu, 30 May 2024 14:23:33 +0200
Subject: [PATCH 1/7] Build process: Compile against Android 15 Preview

---
 app/build.gradle.kts                          | 12 ++++++++++--
 buildSrc/src/main/java/ProjectConfigPlugin.kt |  6 ++++--
 buildSrc/src/main/java/ProjectExtensions.kt   |  6 +++++-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2bb1e6f77..53b16a9d7 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -12,13 +12,21 @@ apply(plugin = "androidx.navigation.safeargs.kotlin")
 val commitHashProvider = providers.of(CommitHashValueSource::class) {}
 
 android {
-    compileSdk = projectConfig.compileSdk
+    if (projectConfig.compileSdkPreview != null) {
+        compileSdkPreview = projectConfig.compileSdkPreview
+    } else {
+        compileSdk = projectConfig.compileSdk
+    }
 
     defaultConfig {
         namespace = projectConfig.packageName
 
         minSdk = projectConfig.minSdk
-        targetSdk = projectConfig.targetSdk
+        if (projectConfig.targetSdkPreview != null) {
+            targetSdkPreview = projectConfig.targetSdkPreview
+        } else {
+            targetSdk = projectConfig.targetSdk
+        }
 
         versionCode = projectConfig.version.code.toInt()
         versionName = projectConfig.version.name
diff --git a/buildSrc/src/main/java/ProjectConfigPlugin.kt b/buildSrc/src/main/java/ProjectConfigPlugin.kt
index cb943d30f..003408ccf 100644
--- a/buildSrc/src/main/java/ProjectConfigPlugin.kt
+++ b/buildSrc/src/main/java/ProjectConfigPlugin.kt
@@ -8,8 +8,10 @@ open class ProjectConfig {
     val packageName = "eu.darken.sdmse"
     val minSdk = 26
 
-    val compileSdk = 34
-    val targetSdk = 34
+    val compileSdk = 35
+    val compileSdkPreview: String? = null
+    val targetSdk = 35
+    val targetSdkPreview: String? = null
 
     lateinit var version: Version
 
diff --git a/buildSrc/src/main/java/ProjectExtensions.kt b/buildSrc/src/main/java/ProjectExtensions.kt
index fe53bf64b..af881e29a 100644
--- a/buildSrc/src/main/java/ProjectExtensions.kt
+++ b/buildSrc/src/main/java/ProjectExtensions.kt
@@ -21,7 +21,11 @@ private fun LibraryExtension.kotlinOptions(configure: Action<KotlinJvmOptions>):
     (this as org.gradle.api.plugins.ExtensionAware).extensions.configure("kotlinOptions", configure)
 
 fun LibraryExtension.setupLibraryDefaults(projectConfig: ProjectConfig) {
-    compileSdk = projectConfig.compileSdk
+    if (projectConfig.compileSdkPreview != null) {
+        compileSdkPreview = projectConfig.compileSdkPreview
+    } else {
+        compileSdk = projectConfig.compileSdk
+    }
 
     defaultConfig {
         minSdk = projectConfig.minSdk

From ed5250e95af484e329434cf15dcb09a97dc8820a Mon Sep 17 00:00:00 2001
From: darken <darken@darken.eu>
Date: Wed, 13 Nov 2024 12:45:39 +0100
Subject: [PATCH 2/7] Adjust to SDK changes

---
 .../java/eu/darken/sdmse/common/ContextExtensions.kt   | 10 ++++++++--
 .../darken/sdmse/common/updater/FossUpdateChecker.kt   |  4 ++--
 .../eu/darken/sdmse/common/coil/PathPreviewFetcher.kt  |  3 ++-
 .../sdmse/common/debug/recorder/core/RecorderModule.kt |  3 ++-
 .../java/eu/darken/sdmse/main/core/CurriculumVitae.kt  |  5 +++--
 .../darken/sdmse/main/core/release/ReleaseManager.kt   |  3 ++-
 6 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/app-common/src/main/java/eu/darken/sdmse/common/ContextExtensions.kt b/app-common/src/main/java/eu/darken/sdmse/common/ContextExtensions.kt
index 47913e50d..7047a9d2e 100644
--- a/app-common/src/main/java/eu/darken/sdmse/common/ContextExtensions.kt
+++ b/app-common/src/main/java/eu/darken/sdmse/common/ContextExtensions.kt
@@ -3,11 +3,15 @@ package eu.darken.sdmse.common
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.res.ColorStateList
 import android.content.res.TypedArray
 import android.util.TypedValue
-import androidx.annotation.*
+import androidx.annotation.AttrRes
+import androidx.annotation.ColorInt
+import androidx.annotation.ColorRes
+import androidx.annotation.PluralsRes
 import androidx.core.content.ContextCompat
 import eu.darken.sdmse.common.debug.logging.log
 import okio.Source
@@ -77,4 +81,6 @@ fun Context.getSpanCount(widthDp: Int = 390): Int {
     return max(count, 1).also {
         log { "getSpanCount($screenWidthDp/$widthDp)=$it" }
     }
-}
\ No newline at end of file
+}
+
+fun Context.getPackageInfo(): PackageInfo = packageManager.getPackageInfo(packageName, 0)
\ No newline at end of file
diff --git a/app/src/foss/java/eu/darken/sdmse/common/updater/FossUpdateChecker.kt b/app/src/foss/java/eu/darken/sdmse/common/updater/FossUpdateChecker.kt
index 3651a4fa4..82623eea3 100644
--- a/app/src/foss/java/eu/darken/sdmse/common/updater/FossUpdateChecker.kt
+++ b/app/src/foss/java/eu/darken/sdmse/common/updater/FossUpdateChecker.kt
@@ -11,6 +11,7 @@ import eu.darken.sdmse.common.debug.logging.Logging.Priority.WARN
 import eu.darken.sdmse.common.debug.logging.asLog
 import eu.darken.sdmse.common.debug.logging.log
 import eu.darken.sdmse.common.debug.logging.logTag
+import eu.darken.sdmse.common.getPackageInfo
 import eu.darken.sdmse.common.pkgs.features.getInstallerInfo
 import java.time.Duration
 import java.time.Instant
@@ -96,8 +97,7 @@ class FossUpdateChecker @Inject constructor(
 
     override fun isEnabledByDefault(): Boolean {
         val pm = context.packageManager
-        val installers: Set<String> = pm
-            .getPackageInfo(context.packageName, 0)
+        val installers: Set<String> = context.getPackageInfo()
             .getInstallerInfo(pm)
             .allInstallers
             .map { it.id.name }
diff --git a/app/src/main/java/eu/darken/sdmse/common/coil/PathPreviewFetcher.kt b/app/src/main/java/eu/darken/sdmse/common/coil/PathPreviewFetcher.kt
index 5423468a8..35a9eac79 100644
--- a/app/src/main/java/eu/darken/sdmse/common/coil/PathPreviewFetcher.kt
+++ b/app/src/main/java/eu/darken/sdmse/common/coil/PathPreviewFetcher.kt
@@ -1,6 +1,7 @@
 package eu.darken.sdmse.common.coil
 
 import android.content.Context
+import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import androidx.core.content.ContextCompat
 import coil.ImageLoader
@@ -69,7 +70,7 @@ class PathPreviewFetcher @Inject constructor(
                     .takeIf { it.canRead() }
                     ?.let { pacMan.getPackageArchiveInfo(it.path, PackageManager.GET_META_DATA) }
                     ?.let {
-                        it.applicationInfo.apply {
+                        (it.applicationInfo ?: ApplicationInfo()).apply {
                             sourceDir = file.path
                             publicSourceDir = file.path
                         }
diff --git a/app/src/main/java/eu/darken/sdmse/common/debug/recorder/core/RecorderModule.kt b/app/src/main/java/eu/darken/sdmse/common/debug/recorder/core/RecorderModule.kt
index 9bb101e09..67d2dced8 100644
--- a/app/src/main/java/eu/darken/sdmse/common/debug/recorder/core/RecorderModule.kt
+++ b/app/src/main/java/eu/darken/sdmse/common/debug/recorder/core/RecorderModule.kt
@@ -21,6 +21,7 @@ import eu.darken.sdmse.common.debug.logging.log
 import eu.darken.sdmse.common.debug.logging.logTag
 import eu.darken.sdmse.common.debug.recorder.ui.RecorderActivity
 import eu.darken.sdmse.common.flow.DynamicStateFlow
+import eu.darken.sdmse.common.getPackageInfo
 import eu.darken.sdmse.common.startServiceCompat
 import eu.darken.sdmse.main.core.CurriculumVitae
 import kotlinx.coroutines.CoroutineScope
@@ -141,7 +142,7 @@ class RecorderModule @Inject constructor(
     }
 
     private suspend fun logInfos() {
-        val pkgInfo = context.packageManager.getPackageInfo(context.packageName, 0)!!
+        val pkgInfo = context.getPackageInfo()
         log(TAG, INFO) { "APILEVEL: ${BuildWrap.VERSION.SDK_INT}" }
         log(TAG, INFO) { "Build.FINGERPRINT: ${BuildWrap.FINGERPRINT}" }
         log(TAG, INFO) { "Build.MANUFACTOR: ${Build.MANUFACTURER}" }
diff --git a/app/src/main/java/eu/darken/sdmse/main/core/CurriculumVitae.kt b/app/src/main/java/eu/darken/sdmse/main/core/CurriculumVitae.kt
index 9dd3fcc61..f85735c32 100644
--- a/app/src/main/java/eu/darken/sdmse/main/core/CurriculumVitae.kt
+++ b/app/src/main/java/eu/darken/sdmse/main/core/CurriculumVitae.kt
@@ -15,6 +15,7 @@ import eu.darken.sdmse.common.debug.logging.Logging.Priority.VERBOSE
 import eu.darken.sdmse.common.debug.logging.Logging.Priority.WARN
 import eu.darken.sdmse.common.debug.logging.log
 import eu.darken.sdmse.common.debug.logging.logTag
+import eu.darken.sdmse.common.getPackageInfo
 import io.github.z4kn4fein.semver.Version
 import io.github.z4kn4fein.semver.VersionFormatException
 import kotlinx.coroutines.CoroutineScope
@@ -36,7 +37,7 @@ class CurriculumVitae @Inject constructor(
     private val dataStore: DataStore<Preferences>
         get() = context.dataStore
 
-    private val usPkgInfo: PackageInfo by lazy { context.packageManager.getPackageInfo(context.packageName, 0) }
+    private val usPkgInfo: PackageInfo by lazy { context.getPackageInfo() }
 
     private val _updateHistory = dataStore.createValue("stats.update.history", emptyList<String>(), moshi)
     private val _installedFirst = dataStore.createValue<Instant?>("stats.install.first", null, moshi)
@@ -100,7 +101,7 @@ class CurriculumVitae @Inject constructor(
         log(TAG) { "Current version history is $history" }
 
         val lastVersion = history.lastOrNull()
-        val current = usPkgInfo.versionName
+        val current = usPkgInfo.versionName!!
         if (lastVersion != current) {
             val versionHistory = history + current
             log(TAG) { "Update happened, new version history is $versionHistory" }
diff --git a/app/src/main/java/eu/darken/sdmse/main/core/release/ReleaseManager.kt b/app/src/main/java/eu/darken/sdmse/main/core/release/ReleaseManager.kt
index 965490c07..b8f359111 100644
--- a/app/src/main/java/eu/darken/sdmse/main/core/release/ReleaseManager.kt
+++ b/app/src/main/java/eu/darken/sdmse/main/core/release/ReleaseManager.kt
@@ -7,6 +7,7 @@ import eu.darken.sdmse.common.debug.logging.Logging.Priority.ERROR
 import eu.darken.sdmse.common.debug.logging.Logging.Priority.INFO
 import eu.darken.sdmse.common.debug.logging.log
 import eu.darken.sdmse.common.debug.logging.logTag
+import eu.darken.sdmse.common.getPackageInfo
 import eu.darken.sdmse.main.core.CurriculumVitae
 import io.github.z4kn4fein.semver.Version
 import io.github.z4kn4fein.semver.VersionFormatException
@@ -23,7 +24,7 @@ class ReleaseManager @Inject constructor(
 ) {
 
     private val ourVersion: Version by lazy {
-        val versionName = context.packageManager.getPackageInfo(context.packageName, 0).versionName
+        val versionName = context.getPackageInfo().versionName!!
         try {
             Version.parse(versionName, strict = false).also { log(TAG) { "Current version is $it" } }
         } catch (e: VersionFormatException) {

From d440d2804383f64a267ad21886b7776d21888ace Mon Sep 17 00:00:00 2001
From: darken <darken@darken.eu>
Date: Wed, 13 Nov 2024 13:24:52 +0100
Subject: [PATCH 3/7] Opt out of windowOptOutEdgeToEdgeEnforcement

---
 app/src/main/res/values-night/themes.xml | 4 +++-
 app/src/main/res/values/themes.xml       | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 9b3d1efb5..7fff26e26 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="Theme.Material3.DynamicColors.Dark.NoActionBar" parent="Theme.Material3.DynamicColors.Dark">
         <item name="windowActionBar">false</item>
@@ -44,6 +44,8 @@
         <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
 
         <item name="dynamicColorThemeOverlay">@style/Theme.Material3.DynamicColors.Dark.NoActionBar</item>
+
+        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:ignore="NewApi">true</item>
     </style>
 
     <style name="AppThemeFloating" parent="BaseAppTheme">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 7c5f38f5c..74d425ab0 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="Theme.Material3.DynamicColors.Light.NoActionBar" parent="Theme.Material3.DynamicColors.Light">
         <item name="windowActionBar">false</item>
@@ -44,6 +44,8 @@
         <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
 
         <item name="dynamicColorThemeOverlay">@style/Theme.Material3.DynamicColors.Light.NoActionBar</item>
+
+        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:ignore="NewApi">true</item>
     </style>
 
     <style name="AppTheme" parent="BaseAppTheme">

From adeb6008268b5c79caa7224e361d1b115f166216 Mon Sep 17 00:00:00 2001
From: darken <darken@darken.eu>
Date: Thu, 14 Nov 2024 14:30:25 +0100
Subject: [PATCH 4/7] UI: Handle edge-to-edge mode via insets

---
 .../common/upgrade/ui/UpgradeFragment.kt      |  6 ++
 app/src/foss/res/layout/upgrade_fragment.xml  |  3 +-
 .../common/upgrade/ui/UpgradeFragment.kt      |  6 ++
 app/src/gplay/res/layout/upgrade_fragment.xml |  2 +
 .../ui/storage/app/AppDetailsFragment.kt      |  6 ++
 .../analyzer/ui/storage/apps/AppsFragment.kt  |  6 ++
 .../ui/storage/content/ContentFragment.kt     |  6 ++
 .../storage/device/DeviceStorageFragment.kt   |  8 +++
 .../storage/storage/StorageContentFragment.kt |  7 ++
 .../ui/details/AppJunkDetailsFragment.kt      |  6 +-
 .../ui/details/appjunk/AppJunkFragment.kt     |  5 ++
 .../ui/list/AppCleanerListFragment.kt         |  6 ++
 .../ui/list/AppControlListFragment.kt         |  4 ++
 .../sdmse/common/EdgeToEdgeExtensions.kt      | 59 +++++++++++++++
 .../eu/darken/sdmse/common/theming/Theming.kt |  3 -
 .../ui/details/CorpseDetailsFragment.kt       |  5 ++
 .../ui/details/corpse/CorpseFragment.kt       |  5 ++
 .../ui/list/CorpseFinderListFragment.kt       |  6 ++
 .../ui/details/DeduplicatorDetailsFragment.kt |  5 ++
 .../ui/details/cluster/ClusterFragment.kt     |  5 ++
 .../ui/list/DeduplicatorListFragment.kt       |  6 ++
 .../ui/editor/path/PathExclusionFragment.kt   |  6 ++
 .../ui/editor/pkg/PkgExclusionFragment.kt     |  6 ++
 .../segment/SegmentExclusionFragment.kt       |  6 ++
 .../ui/list/ExclusionListFragment.kt          |  7 ++
 .../sdmse/main/ui/areas/DataAreasFragment.kt  |  7 ++
 .../main/ui/dashboard/DashboardFragment.kt    | 19 +++--
 .../privacy/OnboardingPrivacyFragment.kt      |  5 ++
 .../setup/OnboardingSetupFragment.kt          |  5 ++
 .../onboarding/versus/VersusSetupFragment.kt  |  5 ++
 .../welcome/OnboardingWelcomeFragment.kt      |  5 ++
 .../main/ui/release/BetaGoodbyeFragment.kt    |  5 ++
 .../main/ui/settings/SettingsFragment.kt      |  7 ++
 .../ui/manager/SchedulerManagerFragment.kt    |  7 ++
 .../eu/darken/sdmse/setup/SetupFragment.kt    |  6 ++
 .../stats/ui/paths/AffectedPathsFragment.kt   |  6 ++
 .../stats/ui/pkgs/AffectedPkgsFragment.kt     |  6 ++
 .../sdmse/stats/ui/reports/ReportsFragment.kt |  6 ++
 .../editor/CustomFilterEditorFragment.kt      |  7 ++
 .../details/FilterContentDetailsFragment.kt   |  5 ++
 .../filtercontent/FilterContentFragment.kt    |  5 ++
 .../ui/list/SystemCleanerListFragment.kt      |  6 ++
 .../res/layout/analyzer_apps_fragment.xml     |  2 +-
 .../res/layout/analyzer_content_fragment.xml  |  2 +-
 .../res/layout/analyzer_device_fragment.xml   | 29 +++++---
 .../res/layout/analyzer_storage_fragment.xml  | 32 +++++----
 .../layout/appcleaner_details_fragment.xml    |  8 +--
 .../res/layout/appcleaner_list_fragment.xml   |  8 +--
 .../res/layout/appcontrol_list_fragment.xml   | 21 ++++--
 .../main/res/layout/beta_goodbye_fragment.xml |  2 +-
 .../layout/corpsefinder_details_fragment.xml  |  8 +--
 .../res/layout/corpsefinder_list_fragment.xml | 14 ++--
 .../main/res/layout/data_areas_fragment.xml   |  6 +-
 .../layout/deduplicator_cluster_fragment.xml  |  1 -
 .../layout/deduplicator_details_fragment.xml  |  8 +--
 .../res/layout/deduplicator_list_fragment.xml |  2 +-
 .../layout/exclusion_editor_path_fragment.xml |  1 +
 .../layout/exclusion_editor_pkg_fragment.xml  |  1 +
 .../exclusion_editor_segment_fragment.xml     |  1 +
 .../res/layout/exclusion_list_fragment.xml    | 71 ++++++++++++-------
 .../layout/onboarding_privacy_fragment.xml    |  2 +-
 .../res/layout/onboarding_setup_fragment.xml  |  4 +-
 .../res/layout/scheduler_manager_fragment.xml | 32 +++++----
 app/src/main/res/layout/setup_fragment.xml    |  2 +-
 .../layout/stats_affected_paths_fragment.xml  | 12 ++--
 .../layout/stats_affected_pkgs_fragment.xml   | 10 +--
 .../res/layout/stats_reports_fragment.xml     |  8 +--
 ...emcleaner_customfilter_editor_fragment.xml |  1 +
 .../layout/systemcleaner_details_fragment.xml | 10 +--
 .../systemcleaner_filtercontent_fragment.xml  |  5 +-
 .../layout/systemcleaner_list_fragment.xml    | 22 +++---
 app/src/main/res/values-night/themes.xml      |  4 +-
 app/src/main/res/values/themes.xml            |  4 +-
 73 files changed, 482 insertions(+), 153 deletions(-)
 create mode 100644 app/src/main/java/eu/darken/sdmse/common/EdgeToEdgeExtensions.kt

diff --git a/app/src/foss/java/eu/darken/sdmse/common/upgrade/ui/UpgradeFragment.kt b/app/src/foss/java/eu/darken/sdmse/common/upgrade/ui/UpgradeFragment.kt
index 477d035a9..97bf26ff2 100644
--- a/app/src/foss/java/eu/darken/sdmse/common/upgrade/ui/UpgradeFragment.kt
+++ b/app/src/foss/java/eu/darken/sdmse/common/upgrade/ui/UpgradeFragment.kt
@@ -8,6 +8,7 @@ import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.uix.Fragment3
 import eu.darken.sdmse.common.viewbinding.viewBinding
 import eu.darken.sdmse.databinding.UpgradeFragmentBinding
@@ -19,6 +20,11 @@ class UpgradeFragment : Fragment3(R.layout.upgrade_fragment) {
     override val ui: UpgradeFragmentBinding by viewBinding()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.scrollView)
+        }
+
         ui.toolbar.setupWithNavController(findNavController())
 
         ui.upgradeGithubSponsorsAction.setOnClickListener {
diff --git a/app/src/foss/res/layout/upgrade_fragment.xml b/app/src/foss/res/layout/upgrade_fragment.xml
index 1c4397470..9888a9d62 100644
--- a/app/src/foss/res/layout/upgrade_fragment.xml
+++ b/app/src/foss/res/layout/upgrade_fragment.xml
@@ -8,8 +8,8 @@
         android:id="@+id/toolbar"
         style="@style/Widget.MaterialComponents.Toolbar.Surface"
         android:layout_width="0dp"
-        android:minHeight="?actionBarSize"
         android:layout_height="wrap_content"
+        android:minHeight="?actionBarSize"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -19,6 +19,7 @@
         app:titleCentered="true" />
 
     <ScrollView
+        android:id="@+id/scrollView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/gplay/java/eu/darken/sdmse/common/upgrade/ui/UpgradeFragment.kt b/app/src/gplay/java/eu/darken/sdmse/common/upgrade/ui/UpgradeFragment.kt
index 43244837b..cf00f9ef7 100644
--- a/app/src/gplay/java/eu/darken/sdmse/common/upgrade/ui/UpgradeFragment.kt
+++ b/app/src/gplay/java/eu/darken/sdmse/common/upgrade/ui/UpgradeFragment.kt
@@ -10,6 +10,7 @@ import androidx.navigation.ui.setupWithNavController
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.debug.logging.log
 import eu.darken.sdmse.common.debug.logging.logTag
 import eu.darken.sdmse.common.uix.Fragment3
@@ -24,6 +25,11 @@ class UpgradeFragment : Fragment3(R.layout.upgrade_fragment) {
     override val ui: UpgradeFragmentBinding by viewBinding()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.scrollView)
+        }
+
         ui.toolbar.setupWithNavController(findNavController())
 
         vm.state.observe2(ui) { state ->
diff --git a/app/src/gplay/res/layout/upgrade_fragment.xml b/app/src/gplay/res/layout/upgrade_fragment.xml
index 32e30bcf0..8a918b26a 100644
--- a/app/src/gplay/res/layout/upgrade_fragment.xml
+++ b/app/src/gplay/res/layout/upgrade_fragment.xml
@@ -22,12 +22,14 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:id="@+id/scrollView"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/toolbar">
 
         <LinearLayout
+            android:id="@+id/scrollview_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
diff --git a/app/src/main/java/eu/darken/sdmse/analyzer/ui/storage/app/AppDetailsFragment.kt b/app/src/main/java/eu/darken/sdmse/analyzer/ui/storage/app/AppDetailsFragment.kt
index d05ae3596..378d61012 100644
--- a/app/src/main/java/eu/darken/sdmse/analyzer/ui/storage/app/AppDetailsFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/analyzer/ui/storage/app/AppDetailsFragment.kt
@@ -9,6 +9,7 @@ import androidx.navigation.findNavController
 import androidx.navigation.ui.setupWithNavController
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.debug.logging.logTag
 import eu.darken.sdmse.common.lists.differ.update
 import eu.darken.sdmse.common.lists.setupDefaults
@@ -26,6 +27,11 @@ class AppDetailsFragment : Fragment3(R.layout.analyzer_app_fragment) {
         get() = ui.toolbar.menu?.findItem(R.id.menu_action_refresh)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.list)
+        }
+
         ui.toolbar.apply {
             setupWithNavController(findNavController())
             setOnMenuItemClickListener {
diff --git a/app/src/main/java/eu/darken/sdmse/analyzer/ui/storage/apps/AppsFragment.kt b/app/src/main/java/eu/darken/sdmse/analyzer/ui/storage/apps/AppsFragment.kt
index 7c18d7c94..e86771b78 100644
--- a/app/src/main/java/eu/darken/sdmse/analyzer/ui/storage/apps/AppsFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/analyzer/ui/storage/apps/AppsFragment.kt
@@ -9,6 +9,7 @@ import androidx.navigation.ui.setupWithNavController
 import androidx.recyclerview.widget.GridLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.debug.logging.logTag
 import eu.darken.sdmse.common.lists.differ.update
 import eu.darken.sdmse.common.lists.setupDefaults
@@ -24,6 +25,11 @@ class AppsFragment : Fragment3(R.layout.analyzer_apps_fragment) {
     override val ui: AnalyzerAppsFragmentBinding by viewBinding()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.list)
+        }
+
         ui.toolbar.apply {
             setupWithNavController(findNavController())
             setOnMenuItemClickListener {
diff --git a/app/src/main/java/eu/darken/sdmse/analyzer/ui/storage/content/ContentFragment.kt b/app/src/main/java/eu/darken/sdmse/analyzer/ui/storage/content/ContentFragment.kt
index a08cb5cc0..cf7f88905 100644
--- a/app/src/main/java/eu/darken/sdmse/analyzer/ui/storage/content/ContentFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/analyzer/ui/storage/content/ContentFragment.kt
@@ -16,6 +16,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.debug.logging.logTag
 import eu.darken.sdmse.common.error.asErrorDialogBuilder
 import eu.darken.sdmse.common.getQuantityString2
@@ -46,6 +47,11 @@ class ContentFragment : Fragment3(R.layout.analyzer_content_fragment) {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.list)
+        }
+
         ui.toolbar.apply {
             setupWithNavController(findNavController())
             setNavigationOnClickListener { vm.onNavigateBack() }
diff --git a/app/src/main/java/eu/darken/sdmse/analyzer/ui/storage/device/DeviceStorageFragment.kt b/app/src/main/java/eu/darken/sdmse/analyzer/ui/storage/device/DeviceStorageFragment.kt
index 4aacda763..015f6a7b8 100644
--- a/app/src/main/java/eu/darken/sdmse/analyzer/ui/storage/device/DeviceStorageFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/analyzer/ui/storage/device/DeviceStorageFragment.kt
@@ -9,6 +9,7 @@ import androidx.navigation.ui.setupWithNavController
 import androidx.recyclerview.widget.GridLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.debug.logging.logTag
 import eu.darken.sdmse.common.lists.differ.update
 import eu.darken.sdmse.common.lists.setupDefaults
@@ -22,7 +23,14 @@ class DeviceStorageFragment : Fragment3(R.layout.analyzer_device_fragment) {
 
     override val vm: DeviceStorageViewModel by viewModels()
     override val ui: AnalyzerDeviceFragmentBinding by viewBinding()
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.list)
+            bottomHalf(ui.refreshActionContainer)
+        }
+
         ui.toolbar.apply {
             setupWithNavController(findNavController())
             setOnMenuItemClickListener {
diff --git a/app/src/main/java/eu/darken/sdmse/analyzer/ui/storage/storage/StorageContentFragment.kt b/app/src/main/java/eu/darken/sdmse/analyzer/ui/storage/storage/StorageContentFragment.kt
index f39665c2f..aab5f0486 100644
--- a/app/src/main/java/eu/darken/sdmse/analyzer/ui/storage/storage/StorageContentFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/analyzer/ui/storage/storage/StorageContentFragment.kt
@@ -10,6 +10,7 @@ import androidx.navigation.ui.setupWithNavController
 import androidx.recyclerview.widget.GridLayoutManager
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.debug.logging.logTag
 import eu.darken.sdmse.common.lists.differ.update
 import eu.darken.sdmse.common.lists.setupDefaults
@@ -36,6 +37,12 @@ class StorageContentFragment : Fragment3(R.layout.analyzer_storage_fragment) {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.list)
+            bottomHalf(ui.refreshActionContainer)
+        }
+
         ui.toolbar.apply {
             setupWithNavController(findNavController())
             setOnMenuItemClickListener {
diff --git a/app/src/main/java/eu/darken/sdmse/appcleaner/ui/details/AppJunkDetailsFragment.kt b/app/src/main/java/eu/darken/sdmse/appcleaner/ui/details/AppJunkDetailsFragment.kt
index 3a7ae9761..9a4f519a9 100644
--- a/app/src/main/java/eu/darken/sdmse/appcleaner/ui/details/AppJunkDetailsFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/appcleaner/ui/details/AppJunkDetailsFragment.kt
@@ -10,6 +10,7 @@ import androidx.viewpager.widget.ViewPager
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.debug.logging.log
 import eu.darken.sdmse.common.uix.Fragment3
 import eu.darken.sdmse.common.viewbinding.viewBinding
@@ -26,6 +27,10 @@ class AppJunkDetailsFragment : Fragment3(R.layout.appcleaner_details_fragment) {
     @Inject lateinit var dashAdapter: DashboardAdapter
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+        }
+
         ui.toolbar.apply {
             setupWithNavController(findNavController())
             setOnMenuItemClickListener {
@@ -33,7 +38,6 @@ class AppJunkDetailsFragment : Fragment3(R.layout.appcleaner_details_fragment) {
                     else -> super.onOptionsItemSelected(it)
                 }
             }
-
         }
 
         val pagerAdapter = AppJunkDetailsPagerAdapter(requireActivity(), childFragmentManager)
diff --git a/app/src/main/java/eu/darken/sdmse/appcleaner/ui/details/appjunk/AppJunkFragment.kt b/app/src/main/java/eu/darken/sdmse/appcleaner/ui/details/appjunk/AppJunkFragment.kt
index 17f0eb301..569e2f3b3 100644
--- a/app/src/main/java/eu/darken/sdmse/appcleaner/ui/details/appjunk/AppJunkFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/appcleaner/ui/details/appjunk/AppJunkFragment.kt
@@ -15,6 +15,7 @@ import eu.darken.sdmse.appcleaner.ui.details.appjunk.elements.AppJunkElementFile
 import eu.darken.sdmse.appcleaner.ui.details.appjunk.elements.AppJunkElementHeaderVH
 import eu.darken.sdmse.appcleaner.ui.details.appjunk.elements.AppJunkElementInaccessibleVH
 import eu.darken.sdmse.appcleaner.ui.labelRes
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.lists.ViewHolderBasedDivider
 import eu.darken.sdmse.common.lists.differ.update
 import eu.darken.sdmse.common.lists.installListSelection
@@ -46,6 +47,10 @@ class AppJunkFragment : Fragment3(R.layout.appcleaner_appjunk_fragment) {
         get() = requireParentFragment().requireView().findViewById(R.id.viewpager)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            bottomHalf(ui.list)
+        }
+
         val adapter = AppJunkElementsAdapter()
         ui.list.apply {
             setupDefaults(adapter, verticalDividers = false)
diff --git a/app/src/main/java/eu/darken/sdmse/appcleaner/ui/list/AppCleanerListFragment.kt b/app/src/main/java/eu/darken/sdmse/appcleaner/ui/list/AppCleanerListFragment.kt
index 145ab7beb..ba63aab0e 100644
--- a/app/src/main/java/eu/darken/sdmse/appcleaner/ui/list/AppCleanerListFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/appcleaner/ui/list/AppCleanerListFragment.kt
@@ -13,6 +13,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.getQuantityString2
 import eu.darken.sdmse.common.lists.differ.update
 import eu.darken.sdmse.common.lists.installListSelection
@@ -30,6 +31,11 @@ class AppCleanerListFragment : Fragment3(R.layout.appcleaner_list_fragment) {
     override val ui: AppcleanerListFragmentBinding by viewBinding()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.list)
+        }
+
         ui.toolbar.apply {
             setupWithNavController(findNavController())
             setOnMenuItemClickListener {
diff --git a/app/src/main/java/eu/darken/sdmse/appcontrol/ui/list/AppControlListFragment.kt b/app/src/main/java/eu/darken/sdmse/appcontrol/ui/list/AppControlListFragment.kt
index cd60cdeaf..c0dfc3725 100644
--- a/app/src/main/java/eu/darken/sdmse/appcontrol/ui/list/AppControlListFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/appcontrol/ui/list/AppControlListFragment.kt
@@ -32,6 +32,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
 import eu.darken.sdmse.appcontrol.core.FilterSettings
 import eu.darken.sdmse.appcontrol.core.SortSettings
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.debug.logging.Logging.Priority.WARN
 import eu.darken.sdmse.common.debug.logging.log
 import eu.darken.sdmse.common.debug.logging.logTag
@@ -88,6 +89,9 @@ class AppControlListFragment : Fragment3(R.layout.appcontrol_list_fragment) {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            whole(ui.root)
+        }
         ui.list.setupDefaults(
             adapter = adapter,
             horizontalDividers = true,
diff --git a/app/src/main/java/eu/darken/sdmse/common/EdgeToEdgeExtensions.kt b/app/src/main/java/eu/darken/sdmse/common/EdgeToEdgeExtensions.kt
new file mode 100644
index 000000000..7bfadbfe7
--- /dev/null
+++ b/app/src/main/java/eu/darken/sdmse/common/EdgeToEdgeExtensions.kt
@@ -0,0 +1,59 @@
+package eu.darken.sdmse.common
+
+import android.view.View
+import androidx.core.graphics.Insets
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+
+
+class EdgeToEdge {
+
+    fun whole(view: View) {
+        ViewCompat.setOnApplyWindowInsetsListener(view) { v: View, insets: WindowInsetsCompat ->
+            val systemBars: Insets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
+            insets
+        }
+    }
+
+    fun topHalf(view: View) {
+        ViewCompat.setOnApplyWindowInsetsListener(view) { v: View, insets: WindowInsetsCompat ->
+            val systemBars: Insets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.setPadding(systemBars.left, systemBars.top, systemBars.right, 0)
+            insets
+        }
+    }
+
+    fun middleEdge(view: View) {
+        ViewCompat.setOnApplyWindowInsetsListener(view) { v: View, insets: WindowInsetsCompat ->
+            val systemBars: Insets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.setPadding(systemBars.left, 0, systemBars.right, 0)
+            insets
+        }
+    }
+
+    fun leftHalf(view: View) {
+        ViewCompat.setOnApplyWindowInsetsListener(view) { v: View, insets: WindowInsetsCompat ->
+            val systemBars: Insets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.setPadding(systemBars.left, systemBars.top, 0, systemBars.bottom)
+            insets
+        }
+    }
+
+    fun rightHalf(view: View) {
+        ViewCompat.setOnApplyWindowInsetsListener(view) { v: View, insets: WindowInsetsCompat ->
+            val systemBars: Insets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.setPadding(0, systemBars.top, systemBars.right, systemBars.bottom)
+            insets
+        }
+    }
+
+    fun bottomHalf(view: View) {
+        ViewCompat.setOnApplyWindowInsetsListener(view) { v: View, insets: WindowInsetsCompat ->
+            val systemBars: Insets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.setPadding(systemBars.left, 0, systemBars.right, systemBars.bottom)
+            insets
+        }
+    }
+
+}
diff --git a/app/src/main/java/eu/darken/sdmse/common/theming/Theming.kt b/app/src/main/java/eu/darken/sdmse/common/theming/Theming.kt
index 9922f5b5d..dba20305e 100644
--- a/app/src/main/java/eu/darken/sdmse/common/theming/Theming.kt
+++ b/app/src/main/java/eu/darken/sdmse/common/theming/Theming.kt
@@ -13,7 +13,6 @@ import eu.darken.sdmse.common.debug.logging.Logging.Priority.VERBOSE
 import eu.darken.sdmse.common.debug.logging.log
 import eu.darken.sdmse.common.debug.logging.logTag
 import eu.darken.sdmse.common.flow.setupCommonEventHandlers
-import eu.darken.sdmse.common.getColorForAttr
 import eu.darken.sdmse.main.core.GeneralSettings
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.combine
@@ -120,9 +119,7 @@ class Theming @Inject constructor(
             // We don't use DynamicColors.applyToActivitiesIfAvailable() because we can't remove it again
             activities.forEach { activity ->
                 log(TAG) { "Applying MATERIAL_YOU to $activity" }
-
                 DynamicColors.applyToActivityIfAvailable(activity)
-                activity.window.statusBarColor = activity.getColorForAttr(android.R.attr.colorPrimaryDark)
             }
         }
     }
diff --git a/app/src/main/java/eu/darken/sdmse/corpsefinder/ui/details/CorpseDetailsFragment.kt b/app/src/main/java/eu/darken/sdmse/corpsefinder/ui/details/CorpseDetailsFragment.kt
index e75d9ab96..3009de9e1 100644
--- a/app/src/main/java/eu/darken/sdmse/corpsefinder/ui/details/CorpseDetailsFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/corpsefinder/ui/details/CorpseDetailsFragment.kt
@@ -10,6 +10,7 @@ import androidx.viewpager.widget.ViewPager
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.uix.Fragment3
 import eu.darken.sdmse.common.viewbinding.viewBinding
 import eu.darken.sdmse.databinding.CorpsefinderDetailsFragmentBinding
@@ -21,6 +22,10 @@ class CorpseDetailsFragment : Fragment3(R.layout.corpsefinder_details_fragment)
     override val ui: CorpsefinderDetailsFragmentBinding by viewBinding()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+        }
+
         ui.toolbar.apply {
             setupWithNavController(findNavController())
             setOnMenuItemClickListener {
diff --git a/app/src/main/java/eu/darken/sdmse/corpsefinder/ui/details/corpse/CorpseFragment.kt b/app/src/main/java/eu/darken/sdmse/corpsefinder/ui/details/corpse/CorpseFragment.kt
index 6793e0301..d93665a07 100644
--- a/app/src/main/java/eu/darken/sdmse/corpsefinder/ui/details/corpse/CorpseFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/corpsefinder/ui/details/corpse/CorpseFragment.kt
@@ -9,6 +9,7 @@ import androidx.viewpager.widget.ViewPager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.lists.ViewHolderBasedDivider
 import eu.darken.sdmse.common.lists.differ.update
 import eu.darken.sdmse.common.lists.installListSelection
@@ -42,6 +43,10 @@ class CorpseFragment : Fragment3(R.layout.corpsefinder_corpse_fragment) {
         get() = requireParentFragment().requireView().findViewById(R.id.viewpager)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            bottomHalf(ui.list)
+        }
+
         val adapter = CorpseElementsAdapter()
         ui.list.apply {
             setupDefaults(adapter, verticalDividers = false)
diff --git a/app/src/main/java/eu/darken/sdmse/corpsefinder/ui/list/CorpseFinderListFragment.kt b/app/src/main/java/eu/darken/sdmse/corpsefinder/ui/list/CorpseFinderListFragment.kt
index 245c3deeb..281ae45bd 100644
--- a/app/src/main/java/eu/darken/sdmse/corpsefinder/ui/list/CorpseFinderListFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/corpsefinder/ui/list/CorpseFinderListFragment.kt
@@ -13,6 +13,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.lists.differ.update
 import eu.darken.sdmse.common.lists.installListSelection
 import eu.darken.sdmse.common.lists.setupDefaults
@@ -29,6 +30,11 @@ class CorpseFinderListFragment : Fragment3(R.layout.corpsefinder_list_fragment)
     override val ui: CorpsefinderListFragmentBinding by viewBinding()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.list)
+        }
+
         ui.toolbar.apply {
             setupWithNavController(findNavController())
             setOnMenuItemClickListener {
diff --git a/app/src/main/java/eu/darken/sdmse/deduplicator/ui/details/DeduplicatorDetailsFragment.kt b/app/src/main/java/eu/darken/sdmse/deduplicator/ui/details/DeduplicatorDetailsFragment.kt
index 64046a2df..f0e9ec7ed 100644
--- a/app/src/main/java/eu/darken/sdmse/deduplicator/ui/details/DeduplicatorDetailsFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/deduplicator/ui/details/DeduplicatorDetailsFragment.kt
@@ -10,6 +10,7 @@ import androidx.viewpager.widget.ViewPager
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.uix.Fragment3
 import eu.darken.sdmse.common.viewbinding.viewBinding
 import eu.darken.sdmse.databinding.DeduplicatorDetailsFragmentBinding
@@ -21,6 +22,10 @@ class DeduplicatorDetailsFragment : Fragment3(R.layout.deduplicator_details_frag
     override val ui: DeduplicatorDetailsFragmentBinding by viewBinding()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+        }
+
         ui.toolbar.apply {
             setupWithNavController(findNavController())
             setOnMenuItemClickListener {
diff --git a/app/src/main/java/eu/darken/sdmse/deduplicator/ui/details/cluster/ClusterFragment.kt b/app/src/main/java/eu/darken/sdmse/deduplicator/ui/details/cluster/ClusterFragment.kt
index 238b75634..6656808be 100644
--- a/app/src/main/java/eu/darken/sdmse/deduplicator/ui/details/cluster/ClusterFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/deduplicator/ui/details/cluster/ClusterFragment.kt
@@ -13,6 +13,7 @@ import androidx.recyclerview.selection.SelectionTracker.SelectionPredicate
 import androidx.viewpager.widget.ViewPager
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.error.asErrorDialogBuilder
 import eu.darken.sdmse.common.lists.ViewHolderBasedDivider
 import eu.darken.sdmse.common.lists.differ.update
@@ -50,6 +51,10 @@ class ClusterFragment : Fragment3(R.layout.deduplicator_cluster_fragment) {
         get() = requireParentFragment().requireView().findViewById(R.id.viewpager)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            bottomHalf(ui.list)
+        }
+
         val adapter = ClusterAdapter()
         ui.list.apply {
             setupDefaults(adapter, verticalDividers = false)
diff --git a/app/src/main/java/eu/darken/sdmse/deduplicator/ui/list/DeduplicatorListFragment.kt b/app/src/main/java/eu/darken/sdmse/deduplicator/ui/list/DeduplicatorListFragment.kt
index b0b8d1508..17ca4ae8c 100644
--- a/app/src/main/java/eu/darken/sdmse/deduplicator/ui/list/DeduplicatorListFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/deduplicator/ui/list/DeduplicatorListFragment.kt
@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.RecyclerView.VERTICAL
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.lists.differ.update
 import eu.darken.sdmse.common.lists.installListSelection
 import eu.darken.sdmse.common.lists.setupDefaults
@@ -37,6 +38,11 @@ class DeduplicatorListFragment : Fragment3(R.layout.deduplicator_list_fragment)
     @Inject lateinit var previewDialog: PreviewDeletionDialog
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.list)
+        }
+
         ui.toolbar.apply {
             setupWithNavController(findNavController())
             setOnMenuItemClickListener {
diff --git a/app/src/main/java/eu/darken/sdmse/exclusion/ui/editor/path/PathExclusionFragment.kt b/app/src/main/java/eu/darken/sdmse/exclusion/ui/editor/path/PathExclusionFragment.kt
index cb48e58c2..52f962e01 100644
--- a/app/src/main/java/eu/darken/sdmse/exclusion/ui/editor/path/PathExclusionFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/exclusion/ui/editor/path/PathExclusionFragment.kt
@@ -9,6 +9,7 @@ import androidx.navigation.ui.setupWithNavController
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.coil.loadFilePreview
 import eu.darken.sdmse.common.uix.Fragment3
 import eu.darken.sdmse.common.viewbinding.viewBinding
@@ -34,6 +35,11 @@ class PathExclusionFragment : Fragment3(R.layout.exclusion_editor_path_fragment)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.scrollView)
+        }
+
         ui.toolbar.apply {
             setupWithNavController(findNavController())
             setNavigationOnClickListener { vm.cancel() }
diff --git a/app/src/main/java/eu/darken/sdmse/exclusion/ui/editor/pkg/PkgExclusionFragment.kt b/app/src/main/java/eu/darken/sdmse/exclusion/ui/editor/pkg/PkgExclusionFragment.kt
index 3579391a4..6d24e7814 100644
--- a/app/src/main/java/eu/darken/sdmse/exclusion/ui/editor/pkg/PkgExclusionFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/exclusion/ui/editor/pkg/PkgExclusionFragment.kt
@@ -9,6 +9,7 @@ import androidx.navigation.ui.setupWithNavController
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.coil.loadAppIcon
 import eu.darken.sdmse.common.uix.Fragment3
 import eu.darken.sdmse.common.viewbinding.viewBinding
@@ -34,6 +35,11 @@ class PkgExclusionFragment : Fragment3(R.layout.exclusion_editor_pkg_fragment) {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.scrollView)
+        }
+
         ui.toolbar.apply {
             setupWithNavController(findNavController())
             setNavigationOnClickListener { vm.cancel() }
diff --git a/app/src/main/java/eu/darken/sdmse/exclusion/ui/editor/segment/SegmentExclusionFragment.kt b/app/src/main/java/eu/darken/sdmse/exclusion/ui/editor/segment/SegmentExclusionFragment.kt
index 5659b13a1..91d73cb77 100644
--- a/app/src/main/java/eu/darken/sdmse/exclusion/ui/editor/segment/SegmentExclusionFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/exclusion/ui/editor/segment/SegmentExclusionFragment.kt
@@ -11,6 +11,7 @@ import androidx.navigation.ui.setupWithNavController
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.files.joinSegments
 import eu.darken.sdmse.common.setChecked2
 import eu.darken.sdmse.common.uix.Fragment3
@@ -37,6 +38,11 @@ class SegmentExclusionFragment : Fragment3(R.layout.exclusion_editor_segment_fra
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.scrollView)
+        }
+
         ui.toolbar.apply {
             setupWithNavController(findNavController())
             setNavigationOnClickListener { vm.cancel() }
diff --git a/app/src/main/java/eu/darken/sdmse/exclusion/ui/list/ExclusionListFragment.kt b/app/src/main/java/eu/darken/sdmse/exclusion/ui/list/ExclusionListFragment.kt
index 0779e2bfd..3b0cd283e 100644
--- a/app/src/main/java/eu/darken/sdmse/exclusion/ui/list/ExclusionListFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/exclusion/ui/list/ExclusionListFragment.kt
@@ -18,6 +18,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.WebpageTool
 import eu.darken.sdmse.common.debug.logging.Logging.Priority.WARN
 import eu.darken.sdmse.common.debug.logging.log
@@ -43,6 +44,12 @@ class ExclusionListFragment : Fragment3(R.layout.exclusion_list_fragment) {
     private lateinit var exportPickerLauncher: ActivityResultLauncher<Intent>
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.list)
+            bottomHalf(ui.mainActionContainer)
+        }
+
         importPickerLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
             if (result.resultCode != Activity.RESULT_OK) {
                 log(TAG, WARN) { "importPickerLauncher returned ${result.resultCode}: ${result.data}" }
diff --git a/app/src/main/java/eu/darken/sdmse/main/ui/areas/DataAreasFragment.kt b/app/src/main/java/eu/darken/sdmse/main/ui/areas/DataAreasFragment.kt
index e7cc64d61..01bcd039d 100644
--- a/app/src/main/java/eu/darken/sdmse/main/ui/areas/DataAreasFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/main/ui/areas/DataAreasFragment.kt
@@ -9,6 +9,7 @@ import androidx.navigation.ui.setupWithNavController
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.WebpageTool
 import eu.darken.sdmse.common.lists.differ.update
 import eu.darken.sdmse.common.lists.setupDefaults
@@ -25,6 +26,11 @@ class DataAreasFragment : Fragment3(R.layout.data_areas_fragment) {
     @Inject lateinit var webpageTool: WebpageTool
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.list)
+        }
+
         ui.toolbar.apply {
             setupWithNavController(findNavController())
             setOnMenuItemClickListener {
@@ -33,6 +39,7 @@ class DataAreasFragment : Fragment3(R.layout.data_areas_fragment) {
                         vm.reloadDataAreas()
                         true
                     }
+
                     R.id.menu_action_info -> {
                         MaterialAlertDialogBuilder(requireContext()).apply {
                             setMessage(R.string.data_areas_description)
diff --git a/app/src/main/java/eu/darken/sdmse/main/ui/dashboard/DashboardFragment.kt b/app/src/main/java/eu/darken/sdmse/main/ui/dashboard/DashboardFragment.kt
index abe00055f..3a368bf53 100644
--- a/app/src/main/java/eu/darken/sdmse/main/ui/dashboard/DashboardFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/main/ui/dashboard/DashboardFragment.kt
@@ -13,6 +13,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.easterEggProgressMsg
 import eu.darken.sdmse.common.error.asErrorDialogBuilder
 import eu.darken.sdmse.common.getColorForAttr
@@ -39,12 +40,18 @@ class DashboardFragment : Fragment3(R.layout.dashboard_fragment) {
     @Inject lateinit var previewDialog: PreviewDeletionDialog
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        ui.list.setupDefaults(
-            dashAdapter,
-            verticalDividers = false,
-            fastscroll = false,
-            layouter = GridLayoutManager(context, getSpanCount(), GridLayoutManager.VERTICAL, false)
-        )
+        EdgeToEdge().apply {
+            topHalf(ui.list)
+        }
+
+        ui.list.apply {
+            setupDefaults(
+                dashAdapter,
+                verticalDividers = false,
+                fastscroll = false,
+                layouter = GridLayoutManager(context, getSpanCount(), GridLayoutManager.VERTICAL, false)
+            )
+        }
 
         vm.listItems.observe2(ui) {
             listProgress.isVisible = it.isEmpty()
diff --git a/app/src/main/java/eu/darken/sdmse/main/ui/onboarding/privacy/OnboardingPrivacyFragment.kt b/app/src/main/java/eu/darken/sdmse/main/ui/onboarding/privacy/OnboardingPrivacyFragment.kt
index e7cfd0ef8..efe084953 100644
--- a/app/src/main/java/eu/darken/sdmse/main/ui/onboarding/privacy/OnboardingPrivacyFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/main/ui/onboarding/privacy/OnboardingPrivacyFragment.kt
@@ -6,6 +6,7 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.setChecked2
 import eu.darken.sdmse.common.uix.Fragment3
 import eu.darken.sdmse.common.viewbinding.viewBinding
@@ -18,6 +19,10 @@ class OnboardingPrivacyFragment : Fragment3(R.layout.onboarding_privacy_fragment
     override val ui: OnboardingPrivacyFragmentBinding by viewBinding()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            whole(ui.root)
+        }
+
         ui.goAction.setOnClickListener {
             OnboardingPrivacyFragmentDirections.actionOnboardingPrivacyFragmentToOnboardingSetupFragment().navigate()
         }
diff --git a/app/src/main/java/eu/darken/sdmse/main/ui/onboarding/setup/OnboardingSetupFragment.kt b/app/src/main/java/eu/darken/sdmse/main/ui/onboarding/setup/OnboardingSetupFragment.kt
index 985cdd32d..d6c748baa 100644
--- a/app/src/main/java/eu/darken/sdmse/main/ui/onboarding/setup/OnboardingSetupFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/main/ui/onboarding/setup/OnboardingSetupFragment.kt
@@ -5,6 +5,7 @@ import android.view.View
 import androidx.fragment.app.viewModels
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.uix.Fragment3
 import eu.darken.sdmse.common.viewbinding.viewBinding
 import eu.darken.sdmse.databinding.OnboardingSetupFragmentBinding
@@ -16,6 +17,10 @@ class OnboardingSetupFragment : Fragment3(R.layout.onboarding_setup_fragment) {
     override val ui: OnboardingSetupFragmentBinding by viewBinding()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            whole(ui.root)
+        }
+
         ui.goAction.setOnClickListener { vm.finishOnboarding() }
         super.onViewCreated(view, savedInstanceState)
     }
diff --git a/app/src/main/java/eu/darken/sdmse/main/ui/onboarding/versus/VersusSetupFragment.kt b/app/src/main/java/eu/darken/sdmse/main/ui/onboarding/versus/VersusSetupFragment.kt
index 464695ebd..8cf80f2a2 100644
--- a/app/src/main/java/eu/darken/sdmse/main/ui/onboarding/versus/VersusSetupFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/main/ui/onboarding/versus/VersusSetupFragment.kt
@@ -5,6 +5,7 @@ import android.view.View
 import androidx.fragment.app.viewModels
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.uix.Fragment3
 import eu.darken.sdmse.common.viewbinding.viewBinding
 import eu.darken.sdmse.databinding.OnboardingVersusFragmentBinding
@@ -16,6 +17,10 @@ class VersusSetupFragment : Fragment3(R.layout.onboarding_versus_fragment) {
     override val ui: OnboardingVersusFragmentBinding by viewBinding()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            whole(ui.scrollView)
+        }
+
         ui.goAction.setOnClickListener {
             VersusSetupFragmentDirections.actionVersusSetupFragmentToOnboardingPrivacyFragment().navigate()
         }
diff --git a/app/src/main/java/eu/darken/sdmse/main/ui/onboarding/welcome/OnboardingWelcomeFragment.kt b/app/src/main/java/eu/darken/sdmse/main/ui/onboarding/welcome/OnboardingWelcomeFragment.kt
index e58d5d1d5..ce3b2142c 100644
--- a/app/src/main/java/eu/darken/sdmse/main/ui/onboarding/welcome/OnboardingWelcomeFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/main/ui/onboarding/welcome/OnboardingWelcomeFragment.kt
@@ -7,6 +7,7 @@ import androidx.fragment.app.viewModels
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
 import eu.darken.sdmse.common.BuildConfigWrap
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.pkgs.getPackageInfo2
 import eu.darken.sdmse.common.pkgs.toPkgId
 import eu.darken.sdmse.common.uix.Fragment3
@@ -20,6 +21,10 @@ class OnboardingWelcomeFragment : Fragment3(R.layout.onboarding_welcome_fragment
     override val ui: OnboardingWelcomeFragmentBinding by viewBinding()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            whole(ui.root)
+        }
+
         ui.goAction.setOnClickListener {
             val legacySdm = requireContext().packageManager.getPackageInfo2("eu.thedarken.sdm".toPkgId(), 0)
             if (legacySdm != null) {
diff --git a/app/src/main/java/eu/darken/sdmse/main/ui/release/BetaGoodbyeFragment.kt b/app/src/main/java/eu/darken/sdmse/main/ui/release/BetaGoodbyeFragment.kt
index 190d87f3a..76359031c 100644
--- a/app/src/main/java/eu/darken/sdmse/main/ui/release/BetaGoodbyeFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/main/ui/release/BetaGoodbyeFragment.kt
@@ -8,6 +8,7 @@ import androidx.fragment.app.viewModels
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
 import eu.darken.sdmse.common.BuildConfigWrap
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.uix.Fragment3
 import eu.darken.sdmse.common.viewbinding.viewBinding
 import eu.darken.sdmse.databinding.BetaGoodbyeFragmentBinding
@@ -28,6 +29,10 @@ class BetaGoodbyeFragment : Fragment3(R.layout.beta_goodbye_fragment) {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            whole(ui.root)
+        }
+
         ui.stayBetaAction.setOnClickListener { vm.consentPrerelease(true) }
         ui.optOutAction.setOnClickListener { vm.consentPrerelease(false) }
         ui.alreadyProdContainer.isGone = BuildConfigWrap.BUILD_TYPE != BuildConfigWrap.BuildType.RELEASE
diff --git a/app/src/main/java/eu/darken/sdmse/main/ui/settings/SettingsFragment.kt b/app/src/main/java/eu/darken/sdmse/main/ui/settings/SettingsFragment.kt
index fa76f10a8..1b06e3d84 100644
--- a/app/src/main/java/eu/darken/sdmse/main/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/main/ui/settings/SettingsFragment.kt
@@ -9,6 +9,7 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.uix.Fragment2
 import eu.darken.sdmse.common.viewbinding.viewBinding
 import eu.darken.sdmse.databinding.SettingsFragmentBinding
@@ -45,6 +46,7 @@ class SettingsFragment : Fragment2(R.layout.settings_fragment),
                         screenTitle = getString(eu.darken.sdmse.common.R.string.general_settings_title)
                     )
                 }
+
                 else -> {
                     // We added the current fragment to the stack, the new fragment's infos were already set, do nothing.
                     null
@@ -69,6 +71,11 @@ class SettingsFragment : Fragment2(R.layout.settings_fragment),
             screens.lastOrNull()?.let { setCurrentScreenInfo(it) }
         }
 
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.contentFrame)
+        }
+
         ui.toolbar.setNavigationOnClickListener { requireActivity().onBackPressed() }
 
         super.onViewCreated(view, savedInstanceState)
diff --git a/app/src/main/java/eu/darken/sdmse/scheduler/ui/manager/SchedulerManagerFragment.kt b/app/src/main/java/eu/darken/sdmse/scheduler/ui/manager/SchedulerManagerFragment.kt
index a2ca5ab3b..b1ad52ec6 100644
--- a/app/src/main/java/eu/darken/sdmse/scheduler/ui/manager/SchedulerManagerFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/scheduler/ui/manager/SchedulerManagerFragment.kt
@@ -10,6 +10,7 @@ import androidx.navigation.ui.setupWithNavController
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.WebpageTool
 import eu.darken.sdmse.common.debug.Bugs
 import eu.darken.sdmse.common.error.asErrorDialogBuilder
@@ -29,6 +30,12 @@ class SchedulerManagerFragment : Fragment3(R.layout.scheduler_manager_fragment)
     @Inject lateinit var webpageTool: WebpageTool
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.list)
+            bottomHalf(ui.mainActionContainer)
+        }
+
         ui.toolbar.apply {
             setupWithNavController(findNavController())
             setOnMenuItemClickListener {
diff --git a/app/src/main/java/eu/darken/sdmse/setup/SetupFragment.kt b/app/src/main/java/eu/darken/sdmse/setup/SetupFragment.kt
index 295ba3218..84445aa03 100644
--- a/app/src/main/java/eu/darken/sdmse/setup/SetupFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/setup/SetupFragment.kt
@@ -15,6 +15,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.WebpageTool
 import eu.darken.sdmse.common.debug.logging.Logging.Priority.ERROR
 import eu.darken.sdmse.common.debug.logging.asLog
@@ -71,6 +72,11 @@ class SetupFragment : Fragment3(R.layout.setup_fragment) {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.list)
+        }
+
         ui.list.setupDefaults(
             setupAdapter,
             verticalDividers = false,
diff --git a/app/src/main/java/eu/darken/sdmse/stats/ui/paths/AffectedPathsFragment.kt b/app/src/main/java/eu/darken/sdmse/stats/ui/paths/AffectedPathsFragment.kt
index dbf00e525..576429484 100644
--- a/app/src/main/java/eu/darken/sdmse/stats/ui/paths/AffectedPathsFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/stats/ui/paths/AffectedPathsFragment.kt
@@ -8,6 +8,7 @@ import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.lists.ViewHolderBasedDivider
 import eu.darken.sdmse.common.lists.differ.update
 import eu.darken.sdmse.common.lists.setupDefaults
@@ -23,6 +24,11 @@ class AffectedPathsFragment : Fragment3(R.layout.stats_affected_paths_fragment)
     override val ui: StatsAffectedPathsFragmentBinding by viewBinding()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.list)
+        }
+
         ui.toolbar.setupWithNavController(findNavController())
 
         val adapter = AffectedPathsAdapter()
diff --git a/app/src/main/java/eu/darken/sdmse/stats/ui/pkgs/AffectedPkgsFragment.kt b/app/src/main/java/eu/darken/sdmse/stats/ui/pkgs/AffectedPkgsFragment.kt
index 40f3977e8..1a967dbf9 100644
--- a/app/src/main/java/eu/darken/sdmse/stats/ui/pkgs/AffectedPkgsFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/stats/ui/pkgs/AffectedPkgsFragment.kt
@@ -8,6 +8,7 @@ import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.lists.ViewHolderBasedDivider
 import eu.darken.sdmse.common.lists.differ.update
 import eu.darken.sdmse.common.lists.setupDefaults
@@ -23,6 +24,11 @@ class AffectedPkgsFragment : Fragment3(R.layout.stats_affected_pkgs_fragment) {
     override val ui: StatsAffectedPkgsFragmentBinding by viewBinding()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.list)
+        }
+
         ui.toolbar.setupWithNavController(findNavController())
 
         val adapter = AffectedPkgsAdapter()
diff --git a/app/src/main/java/eu/darken/sdmse/stats/ui/reports/ReportsFragment.kt b/app/src/main/java/eu/darken/sdmse/stats/ui/reports/ReportsFragment.kt
index 129238665..1bb681a30 100644
--- a/app/src/main/java/eu/darken/sdmse/stats/ui/reports/ReportsFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/stats/ui/reports/ReportsFragment.kt
@@ -10,6 +10,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.lists.differ.update
 import eu.darken.sdmse.common.lists.setupDefaults
 import eu.darken.sdmse.common.navigation.getQuantityString2
@@ -25,6 +26,11 @@ class ReportsFragment : Fragment3(R.layout.stats_reports_fragment) {
     override val ui: StatsReportsFragmentBinding by viewBinding()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.list)
+        }
+
         ui.toolbar.setupWithNavController(findNavController())
 
         val adapter = ReportsAdapter()
diff --git a/app/src/main/java/eu/darken/sdmse/systemcleaner/ui/customfilter/editor/CustomFilterEditorFragment.kt b/app/src/main/java/eu/darken/sdmse/systemcleaner/ui/customfilter/editor/CustomFilterEditorFragment.kt
index 7976a09ab..947ac360d 100644
--- a/app/src/main/java/eu/darken/sdmse/systemcleaner/ui/customfilter/editor/CustomFilterEditorFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/systemcleaner/ui/customfilter/editor/CustomFilterEditorFragment.kt
@@ -16,6 +16,7 @@ import com.google.android.material.chip.Chip
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.areas.DataArea
 import eu.darken.sdmse.common.dpToPx
 import eu.darken.sdmse.common.files.FileType
@@ -55,6 +56,12 @@ class CustomFilterEditorFragment : Fragment3(R.layout.systemcleaner_customfilter
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.scrollView)
+            bottomHalf(ui.liveSearchResults)
+        }
+
         ui.toolbar.apply {
             setupWithNavController(findNavController())
             setNavigationOnClickListener { vm.cancel() }
diff --git a/app/src/main/java/eu/darken/sdmse/systemcleaner/ui/details/FilterContentDetailsFragment.kt b/app/src/main/java/eu/darken/sdmse/systemcleaner/ui/details/FilterContentDetailsFragment.kt
index 264b3cf74..6ac7087b9 100644
--- a/app/src/main/java/eu/darken/sdmse/systemcleaner/ui/details/FilterContentDetailsFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/systemcleaner/ui/details/FilterContentDetailsFragment.kt
@@ -10,6 +10,7 @@ import androidx.viewpager.widget.ViewPager.OnPageChangeListener
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.uix.Fragment3
 import eu.darken.sdmse.common.viewbinding.viewBinding
 import eu.darken.sdmse.databinding.SystemcleanerDetailsFragmentBinding
@@ -21,6 +22,10 @@ class FilterContentDetailsFragment : Fragment3(R.layout.systemcleaner_details_fr
     override val ui: SystemcleanerDetailsFragmentBinding by viewBinding()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+        }
+
         ui.toolbar.apply {
             setupWithNavController(findNavController())
             setOnMenuItemClickListener {
diff --git a/app/src/main/java/eu/darken/sdmse/systemcleaner/ui/details/filtercontent/FilterContentFragment.kt b/app/src/main/java/eu/darken/sdmse/systemcleaner/ui/details/filtercontent/FilterContentFragment.kt
index b42187588..a99eae7a3 100644
--- a/app/src/main/java/eu/darken/sdmse/systemcleaner/ui/details/filtercontent/FilterContentFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/systemcleaner/ui/details/filtercontent/FilterContentFragment.kt
@@ -9,6 +9,7 @@ import androidx.viewpager.widget.ViewPager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.lists.ViewHolderBasedDivider
 import eu.darken.sdmse.common.lists.differ.update
 import eu.darken.sdmse.common.lists.installListSelection
@@ -42,6 +43,10 @@ class FilterContentFragment : Fragment3(R.layout.systemcleaner_filtercontent_fra
         get() = requireParentFragment().requireView().findViewById(R.id.viewpager)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            bottomHalf(ui.list)
+        }
+
         val adapter = FilterContentElementsAdapter()
         ui.list.apply {
             setupDefaults(adapter, verticalDividers = false)
diff --git a/app/src/main/java/eu/darken/sdmse/systemcleaner/ui/list/SystemCleanerListFragment.kt b/app/src/main/java/eu/darken/sdmse/systemcleaner/ui/list/SystemCleanerListFragment.kt
index 317b7a14a..be4b27ad8 100644
--- a/app/src/main/java/eu/darken/sdmse/systemcleaner/ui/list/SystemCleanerListFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/systemcleaner/ui/list/SystemCleanerListFragment.kt
@@ -13,6 +13,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import eu.darken.sdmse.R
+import eu.darken.sdmse.common.EdgeToEdge
 import eu.darken.sdmse.common.lists.differ.update
 import eu.darken.sdmse.common.lists.installListSelection
 import eu.darken.sdmse.common.lists.setupDefaults
@@ -29,6 +30,11 @@ class SystemCleanerListFragment : Fragment3(R.layout.systemcleaner_list_fragment
     override val ui: SystemcleanerListFragmentBinding by viewBinding()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        EdgeToEdge().apply {
+            topHalf(ui.toolbar)
+            bottomHalf(ui.list)
+        }
+
         ui.toolbar.apply {
             setupWithNavController(findNavController())
             setOnMenuItemClickListener {
diff --git a/app/src/main/res/layout/analyzer_apps_fragment.xml b/app/src/main/res/layout/analyzer_apps_fragment.xml
index 818a31b8d..4c02136d3 100644
--- a/app/src/main/res/layout/analyzer_apps_fragment.xml
+++ b/app/src/main/res/layout/analyzer_apps_fragment.xml
@@ -32,7 +32,7 @@
 
     <eu.darken.sdmse.common.progress.ProgressOverlayView
         android:id="@+id/loading_overlay"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="@id/list"
         app:layout_constraintEnd_toEndOf="@id/list"
diff --git a/app/src/main/res/layout/analyzer_content_fragment.xml b/app/src/main/res/layout/analyzer_content_fragment.xml
index abdd7c691..2d2af31e9 100644
--- a/app/src/main/res/layout/analyzer_content_fragment.xml
+++ b/app/src/main/res/layout/analyzer_content_fragment.xml
@@ -32,7 +32,7 @@
 
     <eu.darken.sdmse.common.progress.ProgressOverlayView
         android:id="@+id/loading_overlay"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="@id/list"
         app:layout_constraintEnd_toEndOf="@id/list"
diff --git a/app/src/main/res/layout/analyzer_device_fragment.xml b/app/src/main/res/layout/analyzer_device_fragment.xml
index a1bf4b022..83f6bc775 100644
--- a/app/src/main/res/layout/analyzer_device_fragment.xml
+++ b/app/src/main/res/layout/analyzer_device_fragment.xml
@@ -18,37 +18,44 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
-        android:layout_width="match_parent"
         style="@style/BaseRecyclerList"
+        android:layout_width="match_parent"
         android:layout_height="0dp"
         android:clipToPadding="false"
         android:contentDescription="Analyzer devices"
-        tools:ignore="HardcodedText"
         android:paddingVertical="4dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/toolbar"
+        tools:ignore="HardcodedText"
         tools:listitem="@layout/analyzer_device_vh" />
 
     <eu.darken.sdmse.common.progress.ProgressOverlayView
         android:id="@+id/loading_overlay"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="@id/list"
         app:layout_constraintEnd_toEndOf="@id/list"
         app:layout_constraintStart_toStartOf="@id/list"
         app:layout_constraintTop_toTopOf="@id/list" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/refresh_action"
-        style="@style/Widget.Material3.FloatingActionButton.Primary"
+    <FrameLayout
+        android:id="@+id/refresh_action_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="32dp"
-        android:contentDescription="@string/general_refresh_action"
-        android:src="@drawable/ic_baseline_refresh_24"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintBottom_toBottomOf="@id/list"
+        app:layout_constraintEnd_toEndOf="@id/list">
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/refresh_action"
+            style="@style/Widget.Material3.FloatingActionButton.Primary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="32dp"
+            android:contentDescription="@string/general_refresh_action"
+            android:src="@drawable/ic_baseline_refresh_24" />
+    </FrameLayout>
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/analyzer_storage_fragment.xml b/app/src/main/res/layout/analyzer_storage_fragment.xml
index 4b1075c56..f763456c1 100644
--- a/app/src/main/res/layout/analyzer_storage_fragment.xml
+++ b/app/src/main/res/layout/analyzer_storage_fragment.xml
@@ -18,16 +18,16 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
         style="@style/BaseRecyclerList"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
         android:clipToPadding="false"
+        android:contentDescription="Analyzer storages"
         android:paddingVertical="4dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:contentDescription="Analyzer storages"
-        tools:ignore="HardcodedText"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/toolbar"
+        tools:ignore="HardcodedText"
         tools:listitem="@layout/analyzer_storage_vh_apps" />
 
     <eu.darken.sdmse.common.progress.ProgressOverlayView
@@ -39,17 +39,25 @@
         app:layout_constraintStart_toStartOf="@id/list"
         app:layout_constraintTop_toTopOf="@id/list" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/refresh_action"
-        style="@style/Widget.Material3.FloatingActionButton.Primary"
+    <FrameLayout
+        android:id="@+id/refresh_action_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="32dp"
-        android:contentDescription="@string/general_refresh_action"
-        android:src="@drawable/ic_baseline_refresh_24"
-        android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        tools:visibility="visible" />
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/refresh_action"
+            style="@style/Widget.Material3.FloatingActionButton.Primary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="32dp"
+            android:contentDescription="@string/general_refresh_action"
+            android:src="@drawable/ic_baseline_refresh_24"
+            android:visibility="invisible"
+            tools:visibility="visible" />
+
+    </FrameLayout>
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/appcleaner_details_fragment.xml b/app/src/main/res/layout/appcleaner_details_fragment.xml
index 3603d8a49..d0480fff7 100644
--- a/app/src/main/res/layout/appcleaner_details_fragment.xml
+++ b/app/src/main/res/layout/appcleaner_details_fragment.xml
@@ -42,11 +42,11 @@
 
     <eu.darken.sdmse.common.progress.ProgressOverlayView
         android:id="@+id/loading_overlay"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/viewpager"
+        app:layout_constraintEnd_toEndOf="@id/viewpager"
+        app:layout_constraintStart_toStartOf="@id/viewpager"
         app:layout_constraintTop_toTopOf="@id/viewpager" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/appcleaner_list_fragment.xml b/app/src/main/res/layout/appcleaner_list_fragment.xml
index 96a11596f..383e233c9 100644
--- a/app/src/main/res/layout/appcleaner_list_fragment.xml
+++ b/app/src/main/res/layout/appcleaner_list_fragment.xml
@@ -18,22 +18,22 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
-        android:layout_width="match_parent"
         style="@style/BaseRecyclerList"
+        android:layout_width="match_parent"
         android:layout_height="0dp"
         android:clipToPadding="false"
-        android:paddingVertical="4dp"
         android:contentDescription="App junk results"
-        tools:ignore="HardcodedText"
+        android:paddingVertical="4dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/toolbar"
+        tools:ignore="HardcodedText"
         tools:listitem="@layout/appcleaner_list_item" />
 
     <eu.darken.sdmse.common.progress.ProgressOverlayView
         android:id="@+id/loading_overlay"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="@id/list"
         app:layout_constraintEnd_toEndOf="@id/list"
diff --git a/app/src/main/res/layout/appcontrol_list_fragment.xml b/app/src/main/res/layout/appcontrol_list_fragment.xml
index 820abf7c3..ee78af3da 100644
--- a/app/src/main/res/layout/appcontrol_list_fragment.xml
+++ b/app/src/main/res/layout/appcontrol_list_fragment.xml
@@ -36,15 +36,15 @@
                 style="@style/BaseRecyclerList"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:contentDescription="Appcontrol apps"
-                tools:ignore="HardcodedText"
                 android:clipToPadding="false"
+                android:contentDescription="Appcontrol apps"
                 android:paddingVertical="4dp"
                 android:visibility="invisible"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
+                tools:ignore="HardcodedText"
                 tools:listitem="@layout/appcleaner_list_item"
                 tools:visibility="visible" />
 
@@ -310,15 +310,24 @@
 
     </androidx.drawerlayout.widget.DrawerLayout>
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
+    <FrameLayout
+        android:id="@+id/refresh_action_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/general_refresh_action"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/refresh_action"
         style="@style/Widget.Material3.FloatingActionButton.Primary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="32dp"
         android:contentDescription="@string/general_refresh_action"
-        android:src="@drawable/ic_baseline_refresh_24"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+            android:src="@drawable/ic_baseline_refresh_24" />
+
+    </FrameLayout>
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/beta_goodbye_fragment.xml b/app/src/main/res/layout/beta_goodbye_fragment.xml
index 3bab9ace3..3c18004a0 100644
--- a/app/src/main/res/layout/beta_goodbye_fragment.xml
+++ b/app/src/main/res/layout/beta_goodbye_fragment.xml
@@ -7,7 +7,7 @@
 
     <ScrollView
         android:id="@+id/scrollView"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toTopOf="@id/footer"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/corpsefinder_details_fragment.xml b/app/src/main/res/layout/corpsefinder_details_fragment.xml
index 5f5760ba2..64651cc37 100644
--- a/app/src/main/res/layout/corpsefinder_details_fragment.xml
+++ b/app/src/main/res/layout/corpsefinder_details_fragment.xml
@@ -42,11 +42,11 @@
 
     <eu.darken.sdmse.common.progress.ProgressOverlayView
         android:id="@+id/loading_overlay"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/viewpager"
+        app:layout_constraintEnd_toEndOf="@id/viewpager"
+        app:layout_constraintStart_toStartOf="@id/viewpager"
         app:layout_constraintTop_toTopOf="@id/viewpager" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/corpsefinder_list_fragment.xml b/app/src/main/res/layout/corpsefinder_list_fragment.xml
index 164e711ba..e998bd1d4 100644
--- a/app/src/main/res/layout/corpsefinder_list_fragment.xml
+++ b/app/src/main/res/layout/corpsefinder_list_fragment.xml
@@ -18,24 +18,24 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
+        style="@style/BaseRecyclerList"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:visibility="invisible"
-        tools:visibility="visible"
-        style="@style/BaseRecyclerList"
-        android:contentDescription="CorpseFinder results"
-        tools:ignore="HardcodedText"
         android:clipToPadding="false"
+        android:contentDescription="CorpseFinder results"
         android:paddingVertical="4dp"
+        android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/toolbar"
-        tools:listitem="@layout/corpsefinder_list_item" />
+        tools:ignore="HardcodedText"
+        tools:listitem="@layout/corpsefinder_list_item"
+        tools:visibility="visible" />
 
     <eu.darken.sdmse.common.progress.ProgressOverlayView
         android:id="@+id/loading_overlay"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="@id/list"
         app:layout_constraintEnd_toEndOf="@id/list"
diff --git a/app/src/main/res/layout/data_areas_fragment.xml b/app/src/main/res/layout/data_areas_fragment.xml
index df703b3a9..49df5c347 100644
--- a/app/src/main/res/layout/data_areas_fragment.xml
+++ b/app/src/main/res/layout/data_areas_fragment.xml
@@ -23,9 +23,9 @@
         android:layout_height="wrap_content"
         android:layout_margin="64dp"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/list"
+        app:layout_constraintEnd_toEndOf="@id/list"
+        app:layout_constraintStart_toStartOf="@id/list"
         app:layout_constraintTop_toBottomOf="@id/toolbar"
         tools:visibility="visible">
 
diff --git a/app/src/main/res/layout/deduplicator_cluster_fragment.xml b/app/src/main/res/layout/deduplicator_cluster_fragment.xml
index 6458f4541..923bf3fcc 100644
--- a/app/src/main/res/layout/deduplicator_cluster_fragment.xml
+++ b/app/src/main/res/layout/deduplicator_cluster_fragment.xml
@@ -5,7 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/deduplicator_details_fragment.xml b/app/src/main/res/layout/deduplicator_details_fragment.xml
index 91832b1d6..6742839c0 100644
--- a/app/src/main/res/layout/deduplicator_details_fragment.xml
+++ b/app/src/main/res/layout/deduplicator_details_fragment.xml
@@ -42,11 +42,11 @@
 
     <eu.darken.sdmse.common.progress.ProgressOverlayView
         android:id="@+id/loading_overlay"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/viewpager"
+        app:layout_constraintEnd_toEndOf="@id/viewpager"
+        app:layout_constraintStart_toStartOf="@id/viewpager"
         app:layout_constraintTop_toTopOf="@id/viewpager" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/deduplicator_list_fragment.xml b/app/src/main/res/layout/deduplicator_list_fragment.xml
index 80ee2bd8d..40e347b9f 100644
--- a/app/src/main/res/layout/deduplicator_list_fragment.xml
+++ b/app/src/main/res/layout/deduplicator_list_fragment.xml
@@ -35,7 +35,7 @@
 
     <eu.darken.sdmse.common.progress.ProgressOverlayView
         android:id="@+id/loading_overlay"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="@id/list"
         app:layout_constraintEnd_toEndOf="@id/list"
diff --git a/app/src/main/res/layout/exclusion_editor_path_fragment.xml b/app/src/main/res/layout/exclusion_editor_path_fragment.xml
index ada871676..acbed5c0f 100644
--- a/app/src/main/res/layout/exclusion_editor_path_fragment.xml
+++ b/app/src/main/res/layout/exclusion_editor_path_fragment.xml
@@ -20,6 +20,7 @@
 
     <ScrollView
         android:layout_width="match_parent"
+        android:id="@+id/scrollView"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
diff --git a/app/src/main/res/layout/exclusion_editor_pkg_fragment.xml b/app/src/main/res/layout/exclusion_editor_pkg_fragment.xml
index 1cf3cd9ab..17a70c0e0 100644
--- a/app/src/main/res/layout/exclusion_editor_pkg_fragment.xml
+++ b/app/src/main/res/layout/exclusion_editor_pkg_fragment.xml
@@ -19,6 +19,7 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <ScrollView
+        android:id="@+id/scrollView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
diff --git a/app/src/main/res/layout/exclusion_editor_segment_fragment.xml b/app/src/main/res/layout/exclusion_editor_segment_fragment.xml
index dfc783760..fbbe254e3 100644
--- a/app/src/main/res/layout/exclusion_editor_segment_fragment.xml
+++ b/app/src/main/res/layout/exclusion_editor_segment_fragment.xml
@@ -21,6 +21,7 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:id="@+id/scrollView"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
diff --git a/app/src/main/res/layout/exclusion_list_fragment.xml b/app/src/main/res/layout/exclusion_list_fragment.xml
index 81dff9f0b..74db29b71 100644
--- a/app/src/main/res/layout/exclusion_list_fragment.xml
+++ b/app/src/main/res/layout/exclusion_list_fragment.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
 
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            style="@style/SDMToolbar.Primary"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:menu="@menu/menu_exclusions_list"
-            app:subtitle="@string/general_details_label"
-            app:title="@string/exclusion_manager_title" />
-    </com.google.android.material.appbar.AppBarLayout>
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
+        style="@style/SDMToolbar.Primary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:menu="@menu/menu_exclusions_list"
+        app:subtitle="@string/general_details_label"
+        app:title="@string/exclusion_manager_title" />
 
     <eu.darken.sdmse.common.progress.ProgressOverlayView
         android:id="@+id/loading_overlay"
@@ -27,6 +26,10 @@
         android:layout_margin="64dp"
         android:visibility="gone"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        app:layout_constraintBottom_toBottomOf="@id/list"
+        app:layout_constraintEnd_toEndOf="@id/list"
+        app:layout_constraintStart_toStartOf="@id/list"
+        app:layout_constraintTop_toTopOf="@id/list"
         tools:visibility="visible" />
 
     <LinearLayout
@@ -36,6 +39,10 @@
         android:layout_gravity="center"
         android:layout_margin="32dp"
         android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@id/list"
+        app:layout_constraintEnd_toEndOf="@id/list"
+        app:layout_constraintStart_toStartOf="@id/list"
+        app:layout_constraintTop_toTopOf="@id/list"
         tools:visibility="visible">
 
         <com.google.android.material.textview.MaterialTextView
@@ -48,25 +55,37 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
         style="@style/BaseRecyclerList"
-        android:layout_width="match_parent"
-        android:contentDescription="Exclusions"
-        tools:ignore="HardcodedText"
-        android:layout_height="match_parent"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         android:clipToPadding="false"
+        android:contentDescription="Exclusions"
         android:paddingVertical="4dp"
         android:paddingBottom="100dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        tools:ignore="HardcodedText"
         tools:listitem="@layout/exclusion_list_item_path" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/main_action"
-        style="@style/Widget.Material3.FloatingActionButton.Primary"
+    <FrameLayout
+        android:id="@+id/main_action_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="32dp"
-        android:contentDescription="@string/exclusion_create_action"
-        app:shapeAppearance="@style/Widget.Material3.FloatingActionButton.Primary"
-        app:srcCompat="@drawable/ic_shield_plus_24" />
+        app:layout_constraintBottom_toBottomOf="@id/list"
+        app:layout_constraintEnd_toEndOf="@id/list">
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/main_action"
+            style="@style/Widget.Material3.FloatingActionButton.Primary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="32dp"
+            android:contentDescription="@string/exclusion_create_action"
+            app:shapeAppearance="@style/Widget.Material3.FloatingActionButton.Primary"
+            app:srcCompat="@drawable/ic_shield_plus_24" />
+
+    </FrameLayout>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/onboarding_privacy_fragment.xml b/app/src/main/res/layout/onboarding_privacy_fragment.xml
index 5281ab640..31d253918 100644
--- a/app/src/main/res/layout/onboarding_privacy_fragment.xml
+++ b/app/src/main/res/layout/onboarding_privacy_fragment.xml
@@ -47,8 +47,8 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/privacy_policy_action"
-                android:layout_width="wrap_content"
                 style="@style/SDMButton"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginHorizontal="32dp"
diff --git a/app/src/main/res/layout/onboarding_setup_fragment.xml b/app/src/main/res/layout/onboarding_setup_fragment.xml
index 1d72adfdb..d237a05d6 100644
--- a/app/src/main/res/layout/onboarding_setup_fragment.xml
+++ b/app/src/main/res/layout/onboarding_setup_fragment.xml
@@ -16,8 +16,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="32dp"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:padding="32dp">
 
             <ImageView
                 android:id="@+id/icon"
diff --git a/app/src/main/res/layout/scheduler_manager_fragment.xml b/app/src/main/res/layout/scheduler_manager_fragment.xml
index eae0da063..2371f55de 100644
--- a/app/src/main/res/layout/scheduler_manager_fragment.xml
+++ b/app/src/main/res/layout/scheduler_manager_fragment.xml
@@ -19,12 +19,12 @@
     <eu.darken.sdmse.common.progress.ProgressOverlayView
         android:id="@+id/loading_overlay"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_margin="64dp"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/list"
+        app:layout_constraintEnd_toEndOf="@id/list"
+        app:layout_constraintStart_toStartOf="@id/list"
         app:layout_constraintTop_toBottomOf="@id/toolbar"
         tools:visibility="visible" />
 
@@ -33,25 +33,31 @@
         style="@style/BaseRecyclerList"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:contentDescription="Schedules"
-        tools:ignore="HardcodedText"
         android:clipToPadding="false"
+        android:contentDescription="Schedules"
         android:paddingVertical="4dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/toolbar"
+        tools:ignore="HardcodedText"
         tools:listitem="@layout/scheduler_manager_list_schedule_item" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/main_action"
-        style="@style/Widget.Material3.ExtendedFloatingActionButton.Primary"
+    <FrameLayout
+        android:id="@+id/main_action_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="32dp"
-        android:contentDescription="@string/scheduler_new_schedule_action"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:srcCompat="@drawable/ic_add" />
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/main_action"
+            style="@style/Widget.Material3.ExtendedFloatingActionButton.Primary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="32dp"
+            android:contentDescription="@string/scheduler_new_schedule_action"
+            app:srcCompat="@drawable/ic_add" />
+    </FrameLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/setup_fragment.xml b/app/src/main/res/layout/setup_fragment.xml
index 30421beba..45e3ad443 100644
--- a/app/src/main/res/layout/setup_fragment.xml
+++ b/app/src/main/res/layout/setup_fragment.xml
@@ -37,7 +37,7 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
         style="@style/BaseRecyclerList"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
         android:contentDescription="Setup cards"
         tools:ignore="HardcodedText"
diff --git a/app/src/main/res/layout/stats_affected_paths_fragment.xml b/app/src/main/res/layout/stats_affected_paths_fragment.xml
index 33246c0db..3fde5fc33 100644
--- a/app/src/main/res/layout/stats_affected_paths_fragment.xml
+++ b/app/src/main/res/layout/stats_affected_paths_fragment.xml
@@ -12,8 +12,8 @@
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:subtitle="@string/stats_affected_paths_label"
         app:layout_constraintTop_toTopOf="parent"
+        app:subtitle="@string/stats_affected_paths_label"
         app:title="@string/stats_label" />
 
     <androidx.recyclerview.widget.RecyclerView
@@ -33,11 +33,11 @@
 
     <eu.darken.sdmse.common.progress.ProgressOverlayView
         android:id="@+id/loading_overlay"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintBottom_toBottomOf="@id/list"
+        app:layout_constraintEnd_toEndOf="@id/list"
+        app:layout_constraintStart_toStartOf="@id/list"
+        app:layout_constraintTop_toTopOf="@id/list" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/stats_affected_pkgs_fragment.xml b/app/src/main/res/layout/stats_affected_pkgs_fragment.xml
index b63db8de7..51dd35524 100644
--- a/app/src/main/res/layout/stats_affected_pkgs_fragment.xml
+++ b/app/src/main/res/layout/stats_affected_pkgs_fragment.xml
@@ -33,11 +33,11 @@
 
     <eu.darken.sdmse.common.progress.ProgressOverlayView
         android:id="@+id/loading_overlay"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintBottom_toBottomOf="@id/list"
+        app:layout_constraintEnd_toEndOf="@id/list"
+        app:layout_constraintStart_toStartOf="@id/list"
+        app:layout_constraintTop_toTopOf="@id/list" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/stats_reports_fragment.xml b/app/src/main/res/layout/stats_reports_fragment.xml
index 4a476f5e7..d93259359 100644
--- a/app/src/main/res/layout/stats_reports_fragment.xml
+++ b/app/src/main/res/layout/stats_reports_fragment.xml
@@ -21,10 +21,10 @@
         android:layout_height="wrap_content"
         android:layout_margin="64dp"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        app:layout_constraintBottom_toBottomOf="@id/list"
+        app:layout_constraintEnd_toEndOf="@id/list"
+        app:layout_constraintStart_toStartOf="@id/list"
+        app:layout_constraintTop_toTopOf="@id/list"
         tools:visibility="visible" />
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/systemcleaner_customfilter_editor_fragment.xml b/app/src/main/res/layout/systemcleaner_customfilter_editor_fragment.xml
index 0bc8c2669..066d01bda 100644
--- a/app/src/main/res/layout/systemcleaner_customfilter_editor_fragment.xml
+++ b/app/src/main/res/layout/systemcleaner_customfilter_editor_fragment.xml
@@ -20,6 +20,7 @@
 
     <ScrollView
         android:layout_width="match_parent"
+        android:id="@+id/scrollView"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
diff --git a/app/src/main/res/layout/systemcleaner_details_fragment.xml b/app/src/main/res/layout/systemcleaner_details_fragment.xml
index d5bca120b..2eaa10a83 100644
--- a/app/src/main/res/layout/systemcleaner_details_fragment.xml
+++ b/app/src/main/res/layout/systemcleaner_details_fragment.xml
@@ -41,11 +41,11 @@
 
     <eu.darken.sdmse.common.progress.ProgressOverlayView
         android:id="@+id/loading_overlay"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/appbarlayout" />
+        app:layout_constraintBottom_toBottomOf="@id/viewpager"
+        app:layout_constraintEnd_toEndOf="@id/viewpager"
+        app:layout_constraintStart_toStartOf="@id/viewpager"
+        app:layout_constraintTop_toTopOf="@id/viewpager" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/systemcleaner_filtercontent_fragment.xml b/app/src/main/res/layout/systemcleaner_filtercontent_fragment.xml
index cd4d4bca1..4a46768cd 100644
--- a/app/src/main/res/layout/systemcleaner_filtercontent_fragment.xml
+++ b/app/src/main/res/layout/systemcleaner_filtercontent_fragment.xml
@@ -11,12 +11,13 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:clipToPadding="false"
+        android:contentDescription="SystemCleaner filter content"
         android:paddingVertical="4dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:contentDescription="SystemCleaner filter content"
-        tools:ignore="HardcodedText"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="HardcodedText"
         tools:listitem="@layout/systemcleaner_filtercontent_element_header" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/systemcleaner_list_fragment.xml b/app/src/main/res/layout/systemcleaner_list_fragment.xml
index ed052c1fc..683ce6907 100644
--- a/app/src/main/res/layout/systemcleaner_list_fragment.xml
+++ b/app/src/main/res/layout/systemcleaner_list_fragment.xml
@@ -18,28 +18,28 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
-        android:layout_width="match_parent"
+        style="@style/BaseRecyclerList"
+        android:layout_width="0dp"
         android:layout_height="0dp"
         android:clipToPadding="false"
-        style="@style/BaseRecyclerList"
-        android:visibility="invisible"
-        tools:visibility="visible"
-        android:paddingVertical="4dp"
         android:contentDescription="SystemCleaner results"
-        tools:ignore="HardcodedText"
+        android:paddingVertical="4dp"
+        android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/toolbar"
-        tools:listitem="@layout/systemcleaner_list_item" />
+        tools:ignore="HardcodedText"
+        tools:listitem="@layout/systemcleaner_list_item"
+        tools:visibility="visible" />
 
     <eu.darken.sdmse.common.progress.ProgressOverlayView
         android:id="@+id/loading_overlay"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/list"
+        app:layout_constraintEnd_toEndOf="@id/list"
+        app:layout_constraintStart_toStartOf="@id/list"
         app:layout_constraintTop_toTopOf="@id/list" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 7fff26e26..9b3d1efb5 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
     <style name="Theme.Material3.DynamicColors.Dark.NoActionBar" parent="Theme.Material3.DynamicColors.Dark">
         <item name="windowActionBar">false</item>
@@ -44,8 +44,6 @@
         <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
 
         <item name="dynamicColorThemeOverlay">@style/Theme.Material3.DynamicColors.Dark.NoActionBar</item>
-
-        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:ignore="NewApi">true</item>
     </style>
 
     <style name="AppThemeFloating" parent="BaseAppTheme">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 74d425ab0..7c5f38f5c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
     <style name="Theme.Material3.DynamicColors.Light.NoActionBar" parent="Theme.Material3.DynamicColors.Light">
         <item name="windowActionBar">false</item>
@@ -44,8 +44,6 @@
         <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
 
         <item name="dynamicColorThemeOverlay">@style/Theme.Material3.DynamicColors.Light.NoActionBar</item>
-
-        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:ignore="NewApi">true</item>
     </style>
 
     <style name="AppTheme" parent="BaseAppTheme">

From 447ed835d88223e9a912f3626e8227afcb1103a7 Mon Sep 17 00:00:00 2001
From: darken <darken@darken.eu>
Date: Thu, 14 Nov 2024 14:36:11 +0100
Subject: [PATCH 5/7] Adjust ribbon to look better on edge-to-edge

---
 app/src/main/res/drawable/bg_ribbon.xml       |  5 ++
 .../main/res/layout/dashboard_title_item.xml  | 47 +++++++++----------
 2 files changed, 26 insertions(+), 26 deletions(-)
 create mode 100644 app/src/main/res/drawable/bg_ribbon.xml

diff --git a/app/src/main/res/drawable/bg_ribbon.xml b/app/src/main/res/drawable/bg_ribbon.xml
new file mode 100644
index 000000000..6c9c6e64f
--- /dev/null
+++ b/app/src/main/res/drawable/bg_ribbon.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?colorSurfaceContainer" />
+    <corners android:radius="16dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dashboard_title_item.xml b/app/src/main/res/layout/dashboard_title_item.xml
index dda791bc8..2f47c1119 100644
--- a/app/src/main/res/layout/dashboard_title_item.xml
+++ b/app/src/main/res/layout/dashboard_title_item.xml
@@ -3,21 +3,17 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent">
-
+    android:layout_height="wrap_content">
 
     <eu.darken.sdmse.common.MascotView
         android:id="@+id/mascot_container"
         android:layout_width="wrap_content"
         android:layout_height="96dp"
-        android:layout_marginEnd="8dp"
         android:contentDescription="SD Maid mascot"
         app:layout_constraintBottom_toBottomOf="@id/title_container"
         app:layout_constraintEnd_toStartOf="@id/title_container"
-        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@id/title_container"
         tools:ignore="HardcodedText" />
 
@@ -25,10 +21,7 @@
         android:id="@+id/title_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="56dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="24dp"
-        android:layout_marginBottom="16dp"
+        android:layout_margin="16dp"
         android:gravity="center"
         android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -56,29 +49,31 @@
         android:id="@+id/ribbon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="-50dp"
-        android:layout_marginTop="8dp"
-        android:background="?colorError"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:background="@drawable/bg_ribbon"
+        android:backgroundTint="?colorTertiaryContainer"
+        android:gravity="center"
         android:orientation="vertical"
-        android:paddingHorizontal="8dp"
-        android:paddingVertical="4dp"
-        android:rotation="-45"
+        android:paddingHorizontal="10dp"
+        android:paddingVertical="10dp"
         android:visibility="gone"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/title_container"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toEndOf="@id/title_container"
+        app:layout_constraintTop_toTopOf="@id/title_container"
         tools:visibility="visible">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/ribbon_primary"
-            style="@style/TextAppearance.Material3.BodySmall"
+            style="@style/TextAppearance.Material3.LabelMedium"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingHorizontal="52dp"
             android:text="Beta"
-            android:textColor="?colorOnError"
-            android:textSize="14dp"
+            android:textColor="?colorOnTertiaryContainer"
             android:textStyle="bold"
-            app:iconTint="?colorOnError"
+            app:iconTint="?colorOnTertiaryContainer"
             tools:ignore="HardcodedText,SpUsage" />
 
         <com.google.android.material.textview.MaterialTextView
@@ -88,9 +83,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:text="v?.?.?-beta?"
-            android:textColor="?colorOnError"
+            android:textColor="?colorOnTertiaryContainer"
             android:textSize="10dp"
-            app:iconTint="?colorOnError"
+            app:iconTint="?colorOnTertiaryContainer"
             tools:ignore="HardcodedText,SpUsage" />
     </LinearLayout>
 

From 69e7c81ab04d01e4cd0065c97bb2577c3097a98c Mon Sep 17 00:00:00 2001
From: darken <darken@darken.eu>
Date: Thu, 14 Nov 2024 17:14:43 +0100
Subject: [PATCH 6/7] Tweak build ribbon

---
 .../main/res/layout/dashboard_title_item.xml  | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout/dashboard_title_item.xml b/app/src/main/res/layout/dashboard_title_item.xml
index 2f47c1119..6c6d1b78c 100644
--- a/app/src/main/res/layout/dashboard_title_item.xml
+++ b/app/src/main/res/layout/dashboard_title_item.xml
@@ -55,7 +55,7 @@
         android:backgroundTint="?colorTertiaryContainer"
         android:gravity="center"
         android:orientation="vertical"
-        android:paddingHorizontal="10dp"
+        android:paddingHorizontal="8dp"
         android:paddingVertical="10dp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/title_container"
@@ -65,16 +65,31 @@
         app:layout_constraintTop_toTopOf="@id/title_container"
         tools:visibility="visible">
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/ribbon_primary"
-            style="@style/TextAppearance.Material3.LabelMedium"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Beta"
-            android:textColor="?colorOnTertiaryContainer"
-            android:textStyle="bold"
-            app:iconTint="?colorOnTertiaryContainer"
-            tools:ignore="HardcodedText,SpUsage" />
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="12dp"
+                android:layout_height="12dp"
+                android:layout_marginEnd="2dp"
+                android:src="@drawable/ic_bug_report"
+                app:tint="?colorOnTertiaryContainer" />
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/ribbon_primary"
+                style="@style/TextAppearance.Material3.LabelMedium"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Beta"
+                android:textColor="?colorOnTertiaryContainer"
+                android:textSize="10sp"
+                android:textStyle="bold"
+                app:iconTint="?colorOnTertiaryContainer"
+                tools:ignore="HardcodedText,SpUsage" />
+        </LinearLayout>
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/ribbon_secondary"
@@ -84,7 +99,7 @@
             android:layout_gravity="center"
             android:text="v?.?.?-beta?"
             android:textColor="?colorOnTertiaryContainer"
-            android:textSize="10dp"
+            android:textSize="8dp"
             app:iconTint="?colorOnTertiaryContainer"
             tools:ignore="HardcodedText,SpUsage" />
     </LinearLayout>

From 92543b736aca909abbd02c21ee6309f17efa2e0d Mon Sep 17 00:00:00 2001
From: darken <darken@darken.eu>
Date: Fri, 15 Nov 2024 16:24:18 +0100
Subject: [PATCH 7/7] wip

---
 app/src/main/java/eu/darken/sdmse/common/theming/Theming.kt | 2 +-
 app/src/main/java/eu/darken/sdmse/main/ui/MainActivity.kt   | 2 ++
 .../eu/darken/sdmse/main/ui/dashboard/DashboardFragment.kt  | 6 ++++++
 buildSrc/src/main/java/Dependencies.kt                      | 6 +++---
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/darken/sdmse/common/theming/Theming.kt b/app/src/main/java/eu/darken/sdmse/common/theming/Theming.kt
index dba20305e..fd99314df 100644
--- a/app/src/main/java/eu/darken/sdmse/common/theming/Theming.kt
+++ b/app/src/main/java/eu/darken/sdmse/common/theming/Theming.kt
@@ -117,7 +117,7 @@ class Theming @Inject constructor(
 
         ThemeStyle.MATERIAL_YOU -> {
             // We don't use DynamicColors.applyToActivitiesIfAvailable() because we can't remove it again
-            activities.forEach { activity ->
+            this@Theming.activities.forEach { activity ->
                 log(TAG) { "Applying MATERIAL_YOU to $activity" }
                 DynamicColors.applyToActivityIfAvailable(activity)
             }
diff --git a/app/src/main/java/eu/darken/sdmse/main/ui/MainActivity.kt b/app/src/main/java/eu/darken/sdmse/main/ui/MainActivity.kt
index 48731dd5c..4af34beb3 100644
--- a/app/src/main/java/eu/darken/sdmse/main/ui/MainActivity.kt
+++ b/app/src/main/java/eu/darken/sdmse/main/ui/MainActivity.kt
@@ -2,6 +2,7 @@ package eu.darken.sdmse.main.ui
 
 import android.os.Bundle
 import android.view.WindowManager
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import dagger.hilt.android.AndroidEntryPoint
@@ -35,6 +36,7 @@ class MainActivity : Activity2() {
         super.onCreate(savedInstanceState)
 
         val splashScreen = installSplashScreen()
+        enableEdgeToEdge()
         theming.notifySplashScreenDone(this)
         splashScreen.setKeepOnScreenCondition { showSplashScreen && savedInstanceState == null }
 
diff --git a/app/src/main/java/eu/darken/sdmse/main/ui/dashboard/DashboardFragment.kt b/app/src/main/java/eu/darken/sdmse/main/ui/dashboard/DashboardFragment.kt
index 3a368bf53..3cee2552c 100644
--- a/app/src/main/java/eu/darken/sdmse/main/ui/dashboard/DashboardFragment.kt
+++ b/app/src/main/java/eu/darken/sdmse/main/ui/dashboard/DashboardFragment.kt
@@ -42,8 +42,14 @@ class DashboardFragment : Fragment3(R.layout.dashboard_fragment) {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         EdgeToEdge().apply {
             topHalf(ui.list)
+            bottomHalf(ui.mainAction)
         }
 
+//        WindowCompat. getInsetsController(activity!!.window, ui.root).apply {
+//            isAppearanceLightStatusBars = true
+//            isAppearanceLightNavigationBars = false
+//        }
+
         ui.list.apply {
             setupDefaults(
                 dashAdapter,
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 72fade06f..051dce40f 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -120,8 +120,8 @@ fun DependencyHandlerScope.addWorkerManager() {
 }
 
 fun DependencyHandlerScope.addAndroidUI() {
-    implementation("androidx.activity:activity-ktx:1.8.2")
-    implementation("androidx.fragment:fragment-ktx:1.6.2")
+    implementation("androidx.activity:activity-ktx:1.9.3")
+    implementation("androidx.fragment:fragment-ktx:1.8.5")
 
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
@@ -131,7 +131,7 @@ fun DependencyHandlerScope.addAndroidUI() {
     implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1")
 
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("com.google.android.material:material:1.11.0")
+    implementation("com.google.android.material:material:1.12.0")
 }
 
 fun DependencyHandlerScope.addTesting() {