From be48978aae63138204ac0b566d69d95f31a01f21 Mon Sep 17 00:00:00 2001 From: Rifat Azad Date: Sun, 29 Dec 2024 13:02:37 +0600 Subject: [PATCH] manager: floating button dynamic padding depending on android navigation bar --- .../java/com/rifsxd/ksunext/ui/screen/ExecuteModuleAction.kt | 5 ++++- .../app/src/main/java/com/rifsxd/ksunext/ui/screen/Flash.kt | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/ExecuteModuleAction.kt b/manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/ExecuteModuleAction.kt index e5d6e71e..39fe86cc 100644 --- a/manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/ExecuteModuleAction.kt +++ b/manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/ExecuteModuleAction.kt @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll +import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.WindowInsetsSides import androidx.compose.foundation.layout.defaultMinSize @@ -121,7 +122,9 @@ fun ExecuteModuleActionScreen(navigator: DestinationsNavigator, moduleId: String icon = { Icon(Icons.Filled.Close, contentDescription = null) }, onClick = { navigator.popBackStack() - } + }, + modifier = Modifier + .navigationBarsPadding() ) } }, diff --git a/manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/Flash.kt b/manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/Flash.kt index a64bfe1f..324ae67a 100644 --- a/manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/Flash.kt +++ b/manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/Flash.kt @@ -6,6 +6,7 @@ import android.os.Parcelable import androidx.activity.compose.BackHandler import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.WindowInsetsSides import androidx.compose.foundation.layout.fillMaxSize @@ -190,6 +191,7 @@ fun FlashScreen(navigator: DestinationsNavigator, flashIt: FlashIt) { modifier = Modifier .align(Alignment.BottomStart) .padding(16.dp) + .navigationBarsPadding() ) } @@ -204,6 +206,7 @@ fun FlashScreen(navigator: DestinationsNavigator, flashIt: FlashIt) { modifier = Modifier .align(Alignment.BottomEnd) .padding(16.dp) + .navigationBarsPadding() ) } }