Remove Accompanist insets

This commit is contained in:
MM20 2022-05-28 12:33:29 +02:00
parent 3fec8fc70c
commit 6bff15b643
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
2 changed files with 28 additions and 47 deletions

View File

@ -1,13 +0,0 @@
package de.mm20.launcher2.ui.component
import androidx.compose.foundation.layout.Spacer
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import com.google.accompanist.insets.navigationBarsHeight
import com.google.accompanist.insets.statusBarsHeight
@Composable
fun NavBarSpacer() = Spacer(modifier = Modifier.navigationBarsHeight())
@Composable
fun StatusBarSpacer() = Spacer(modifier = Modifier.statusBarsHeight())

View File

@ -1,7 +1,6 @@
package de.mm20.launcher2.ui.component.preferences package de.mm20.launcher2.ui.component.preferences
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
@ -16,7 +15,6 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.google.accompanist.insets.systemBarsPadding
import com.google.accompanist.systemuicontroller.rememberSystemUiController import com.google.accompanist.systemuicontroller.rememberSystemUiController
import de.mm20.launcher2.ui.locals.LocalNavController import de.mm20.launcher2.ui.locals.LocalNavController
@ -35,9 +33,6 @@ fun PreferenceScreen(
systemUiController.setNavigationBarColor(Color.Black) systemUiController.setNavigationBarColor(Color.Black)
val activity = LocalContext.current as? AppCompatActivity val activity = LocalContext.current as? AppCompatActivity
Box(
modifier = Modifier.systemBarsPadding()
) {
Scaffold( Scaffold(
floatingActionButton = floatingActionButton, floatingActionButton = floatingActionButton,
topBar = { topBar = {
@ -69,6 +64,5 @@ fun PreferenceScreen(
content = content, content = content,
) )
} }
}
} }