fix bottom padding for add gateway/add persona field sheets

radixdlt · Aug 6, 2024 · bcae491 · bcae491
1 parent e9d2a26
commit bcae491
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/...abylon/wallet/android/presentation/settings/personas/createpersona/CreatePersonaScreen.kt b/...abylon/wallet/android/presentation/settings/personas/createpersona/CreatePersonaScreen.kt
@@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.ime
 import androidx.compose.foundation.layout.navigationBars
-import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.systemBars
@@ -198,8 +197,7 @@ fun CreatePersonaContent(
  },
  onSelectionChanged = onSelectionChanged,
  modifier = Modifier
- .fillMaxSize()
- .navigationBarsPadding(),
+ .fillMaxSize(),
  anyFieldSelected = state.anyFieldSelected
  )
  },

diff --git a/...a/com/babylon/wallet/android/presentation/settings/preferences/gateways/GatewaysScreen.kt b/...a/com/babylon/wallet/android/presentation/settings/preferences/gateways/GatewaysScreen.kt
@@ -7,14 +7,13 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.exclude
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.ime
 import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.union
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
@@ -277,11 +276,11 @@ private fun AddGatewaySheet(
  }
 
  RadixBottomBar(
- modifier = Modifier.imePadding(),
  onClick = onAddGatewayClick,
  text = stringResource(R.string.gateways_addNewGateway_addGatewayButtonTitle),
  enabled = input.isUrlValid,
- isLoading = input.isLoading
+ isLoading = input.isLoading,
+ insets = WindowInsets.navigationBars.union(WindowInsets.ime)
  )
  }
 }

diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/ui/composables/Dialogs.kt b/app/src/main/java/com/babylon/wallet/android/presentation/ui/composables/Dialogs.kt
@@ -22,7 +22,6 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -203,7 +202,6 @@ fun BottomSheetDialogWrapper(
  )
  .animateContentSize()
  .background(RadixTheme.colors.defaultBackground, shape = RadixTheme.shapes.roundedRectTopMedium)
- .navigationBarsPadding()
  .clip(RadixTheme.shapes.roundedRectTopMedium),
  horizontalAlignment = Alignment.CenterHorizontally,
  ) {