Merge pull request #173 from code-payments/chore/dont-clip-bill-dismiss

chore: hoist management button height padding down to bill to prevent clipping

Author: bmc08gt

app/src/main/java/com/getcode/view/main/home/HomeScan.kt

@@ -15,6 +15,7 @@ import androidx.compose.animation.slideOutVertically
 import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -229,15 +230,18 @@ private fun HomeScan(
     OnLifecycleEvent { _, event ->
         when (event) {
             Lifecycle.Event.ON_START -> {
+                Timber.d("onStart")
                 isPaused = false
                 startScanPreview()
             }
 
             Lifecycle.Event.ON_STOP -> {
+                Timber.d("onStop")
                 stopScanPreview()
             }
 
             Lifecycle.Event.ON_PAUSE -> {
+                Timber.d("onPause")
                 isPaused = true
                 homeViewModel.startSheetDismissTimer {
                     Timber.d("hiding from timeout")
@@ -246,6 +250,7 @@ private fun HomeScan(
             }
 
             Lifecycle.Event.ON_RESUME -> {
+                Timber.d("onResume")
                 isPaused = false
                 homeViewModel.stopSheetDismissTimer()
             }
@@ -398,11 +403,10 @@ private fun BillContainer(
         }
 
         HomeBill(
-            modifier = Modifier
-                .fillMaxSize()
-                .addIf(showManagementOptions) { Modifier.padding(bottom = managementHeight) },
+            modifier = Modifier.fillMaxSize(),
             dismissState = billDismissState,
             dismissed = dismissed,
+            contentPadding = PaddingValues(bottom = managementHeight),
             bill = updatedState.billState.bill,
             transitionSpec = {
                 if (updatedState.presentationStyle is PresentationStyle.Slide) {

app/src/main/java/com/getcode/view/main/home/components/HomeBill.kt

@@ -4,8 +4,10 @@ import androidx.compose.animation.AnimatedContent
 import androidx.compose.animation.AnimatedContentTransitionScope
 import androidx.compose.animation.ContentTransform
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material.DismissDirection
 import androidx.compose.material.DismissState
 import androidx.compose.material.ExperimentalMaterialApi
@@ -20,6 +22,7 @@ import com.getcode.view.main.bill.Bill
 @Composable
 fun HomeBill(
     modifier: Modifier = Modifier,
+    contentPadding: PaddingValues = PaddingValues(),
     dismissState: DismissState,
     dismissed: Boolean,
     transitionSpec: AnimatedContentTransitionScope<Bill?>.() -> ContentTransform,
@@ -42,7 +45,8 @@ fun HomeBill(
                         Bill(
                             modifier = Modifier
                                 .fillMaxWidth()
-                                .weight(1f),
+                                .weight(1f)
+                                .padding(contentPadding),
                             bill = b
                         )
                     }