wip

d4rken-org · Nov 15, 2024 · 92543b7 · 92543b7
1 parent 69e7c81
commit 92543b7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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() {