enableEdgeToEdge in SortActivity

app/build.gradle.kts

@@ -248,7 +248,6 @@ dependencies {
 
     implementation(libs.accompanist.flowlayout)
     implementation(libs.accompanist.permissions)
-    implementation(libs.accompanist.systemuicontroller)
 
     googleplayImplementation(platform(libs.firebase))
     googleplayImplementation(libs.firebase.crashlytics)

app/src/main/java/org/tasks/compose/SystemBars.kt

@@ -1,30 +0,0 @@
-package org.tasks.compose
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalLifecycleOwner
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleEventObserver
-import com.google.accompanist.systemuicontroller.rememberSystemUiController
-
-@Composable
-fun SystemBars(
-    statusBarColor: Color,
-    navigationBarColor: Color,
-) {
-    val systemUiController = rememberSystemUiController()
-    val lifecycleOwner = LocalLifecycleOwner.current
-    DisposableEffect(lifecycleOwner) {
-        val observer = LifecycleEventObserver { _, event ->
-            if (event == Lifecycle.Event.ON_START) {
-                systemUiController.setStatusBarColor(color = statusBarColor)
-                systemUiController.setNavigationBarColor(color = navigationBarColor)
-            }
-        }
-        lifecycleOwner.lifecycle.addObserver(observer)
-        onDispose {
-            lifecycleOwner.lifecycle.removeObserver(observer)
-        }
-    }
-}

app/src/main/java/org/tasks/dialogs/SortSettingsActivity.kt

@@ -7,6 +7,7 @@ import android.content.res.Configuration.UI_MODE_NIGHT_YES
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.isSystemInDarkTheme
@@ -18,6 +19,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -53,14 +55,11 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
-import androidx.core.view.WindowCompat
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.todoroo.astrid.core.SortHelper
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 import org.tasks.R
-import org.tasks.compose.SystemBars
 import org.tasks.themes.TasksTheme
 import org.tasks.themes.Theme
 import javax.inject.Inject
@@ -75,19 +74,13 @@ class SortSettingsActivity : ComponentActivity() {
     @OptIn(ExperimentalMaterial3Api::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        WindowCompat.setDecorFitsSystemWindows(window, false)
-        window.statusBarColor = ContextCompat.getColor(this, android.R.color.transparent)
+        enableEdgeToEdge()
         setContent {
             TasksTheme(theme = theme.themeBase.index) {
                 val scrimColor = if (isSystemInDarkTheme())
                     Color(0x52454545)
                 else
                     MaterialTheme.colorScheme.onSurface.copy(.5f)
-                // edge-to-edge potentially fixed in material3 v1.2.0
-                SystemBars(
-                    statusBarColor = scrimColor,
-                    navigationBarColor = MaterialTheme.colorScheme.surface,
-                )
                 val state = viewModel.state.collectAsStateWithLifecycle().value
                 val mainSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
                 val scope = rememberCoroutineScope()
@@ -96,6 +89,7 @@ class SortSettingsActivity : ComponentActivity() {
                 var showCompletedPicker by remember { mutableStateOf(false) }
                 var showSubtaskPicker by remember { mutableStateOf(false) }
                 ModalBottomSheet(
+                    modifier = Modifier.statusBarsPadding(),
                     onDismissRequest = {
                         val forceReload = viewModel.forceReload
                         val changedGroup = viewModel.changedGroup
@@ -113,28 +107,34 @@ class SortSettingsActivity : ComponentActivity() {
                     scrimColor = scrimColor,
                     shape = RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp),
                     content = {
-                        BottomSheetContent(
-                            groupMode = state.groupMode,
-                            sortMode = state.sortMode,
-                            completedMode = state.completedMode,
-                            subtaskMode = state.subtaskMode,
-                            sortAscending = state.sortAscending,
-                            groupAscending = state.groupAscending,
-                            completedAscending = state.completedAscending,
-                            subtaskAscending = state.subtaskAscending,
-                            manualSort = state.manualSort && manualEnabled,
-                            astridSort = state.astridSort && astridEnabled,
-                            completedAtBottom = state.completedAtBottom,
-                            setSortAscending = { viewModel.setSortAscending(it) },
-                            setGroupAscending = { viewModel.setGroupAscending(it) },
-                            setCompletedAscending = { viewModel.setCompletedAscending(it) },
-                            setSubtaskAscending = { viewModel.setSubtaskAscending(it) },
-                            setCompletedAtBottom = { viewModel.setCompletedAtBottom(it) },
-                            clickGroupMode = { showGroupPicker = true },
-                            clickSortMode = { showSortPicker = true },
-                            clickCompletedMode = { showCompletedPicker = true },
-                            clickSubtaskMode = { showSubtaskPicker = true },
-                        )
+                        Column(
+                            modifier = Modifier
+                                .verticalScroll(rememberScrollState())
+                                .fillMaxWidth()
+                        ) {
+                            BottomSheetContent(
+                                groupMode = state.groupMode,
+                                sortMode = state.sortMode,
+                                completedMode = state.completedMode,
+                                subtaskMode = state.subtaskMode,
+                                sortAscending = state.sortAscending,
+                                groupAscending = state.groupAscending,
+                                completedAscending = state.completedAscending,
+                                subtaskAscending = state.subtaskAscending,
+                                manualSort = state.manualSort && manualEnabled,
+                                astridSort = state.astridSort && astridEnabled,
+                                completedAtBottom = state.completedAtBottom,
+                                setSortAscending = { viewModel.setSortAscending(it) },
+                                setGroupAscending = { viewModel.setGroupAscending(it) },
+                                setCompletedAscending = { viewModel.setCompletedAscending(it) },
+                                setSubtaskAscending = { viewModel.setSubtaskAscending(it) },
+                                setCompletedAtBottom = { viewModel.setCompletedAtBottom(it) },
+                                clickGroupMode = { showGroupPicker = true },
+                                clickSortMode = { showSortPicker = true },
+                                clickCompletedMode = { showCompletedPicker = true },
+                                clickSubtaskMode = { showSubtaskPicker = true },
+                            )
+                        }
                     }
                 )
                 if (showGroupPicker) {

deps_fdroid.txt

@@ -1363,13 +1363,8 @@
 +|    +--- androidx.compose.ui:ui-util:1.7.0 -> 1.7.6 (*)
 +|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.8.1 (*)
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -> 2.0.21 (*)
-++--- com.google.accompanist:accompanist-permissions:0.36.0
-+|    +--- androidx.activity:activity-compose:1.9.0 -> 1.9.3 (*)
-+|    +--- androidx.compose.foundation:foundation:1.7.0 -> 1.7.6 (*)
-+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.8.1 (*)
-+|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -> 2.0.21 (*)
-+\--- com.google.accompanist:accompanist-systemuicontroller:0.36.0
-+     +--- androidx.core:core-ktx:1.8.0 -> 1.13.1 (*)
-+     +--- androidx.compose.ui:ui:1.7.0 -> 1.7.6 (*)
++\--- com.google.accompanist:accompanist-permissions:0.36.0
++     +--- androidx.activity:activity-compose:1.9.0 -> 1.9.3 (*)
++     +--- androidx.compose.foundation:foundation:1.7.0 -> 1.7.6 (*)
 +     +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.8.1 (*)
 +     \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -> 2.0.21 (*)

deps_googleplay.txt

@@ -1674,13 +1674,8 @@
 +|    +--- androidx.compose.ui:ui-util:1.7.0 -> 1.7.6 (*)
 +|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.8.1 (*)
 +|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -> 2.0.21 (*)
-++--- com.google.accompanist:accompanist-permissions:0.36.0
-+|    +--- androidx.activity:activity-compose:1.9.0 -> 1.9.3 (*)
-+|    +--- androidx.compose.foundation:foundation:1.7.0 -> 1.7.6 (*)
-+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.8.1 (*)
-+|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -> 2.0.21 (*)
-+\--- com.google.accompanist:accompanist-systemuicontroller:0.36.0
-+     +--- androidx.core:core-ktx:1.8.0 -> 1.13.1 (*)
-+     +--- androidx.compose.ui:ui:1.7.0 -> 1.7.6 (*)
++\--- com.google.accompanist:accompanist-permissions:0.36.0
++     +--- androidx.activity:activity-compose:1.9.0 -> 1.9.3 (*)
++     +--- androidx.compose.foundation:foundation:1.7.0 -> 1.7.6 (*)
 +     +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -> 1.8.1 (*)
 +     \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.22 -> 2.0.21 (*)

gradle/libs.versions.toml

@@ -72,7 +72,6 @@ wearCompose = "1.4.0"
 [libraries]
 accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" }
 accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }
-accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity-compose" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 androidx-compose = { module = "androidx.compose:compose-bom", version.ref = "compose" }