Merge pull request #83 from code-payments/chore/design-review

Chore/design review

Author: bmc08gt

app/src/main/java/com/getcode/view/main/currency/CurrencySelectionSheet.kt

@@ -32,11 +32,14 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.TextFieldValue
@@ -56,22 +59,25 @@ import com.getcode.util.rememberedClickable
 import com.getcode.view.components.CodeCircularProgressIndicator
 import com.getcode.view.components.SwipeableView
 import com.getcode.view.main.giveKin.CurrencyListItem
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
 import timber.log.Timber
 
-@OptIn(ExperimentalMaterialApi::class)
+@OptIn(ExperimentalMaterialApi::class, ExperimentalComposeUiApi::class)
 @Composable
 fun CurrencySelectionSheet(
     viewModel: CurrencyViewModel,
 ) {
     val navigator = LocalCodeNavigator.current
     val state by viewModel.stateFlow.collectAsState()
-
+    val keyboardController = LocalSoftwareKeyboardController.current
+    val composeScope = rememberCoroutineScope()
     var searchQuery by remember {
         mutableStateOf(TextFieldValue())
     }
@@ -89,7 +95,11 @@ fun CurrencySelectionSheet(
             .map { it.currency }
             .distinctUntilChanged()
             .onEach {
-                navigator.hideWithResult(it)
+                composeScope.launch {
+                    keyboardController?.hide()
+                    delay(500)
+                    navigator.hideWithResult(it)
+                }
             }.launchIn(this)
     }
 

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

@@ -2,13 +2,15 @@ package com.getcode.view.main.home.components
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
@@ -20,8 +22,10 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.getcode.R
+import com.getcode.theme.CodeTheme
 import com.getcode.theme.Gray50
 import com.getcode.theme.White
+import com.getcode.util.debugBounds
 import com.getcode.util.rememberedClickable
 import com.getcode.view.components.CodeCircularProgressIndicator
 
@@ -43,16 +47,15 @@ internal fun BillManagementOptions(
         Row(
             modifier = Modifier
                 .padding(bottom = 30.dp)
-                .align(Alignment.BottomCenter)
+                .align(Alignment.BottomCenter),
+            horizontalArrangement = Arrangement.spacedBy(CodeTheme.dimens.inset)
         ) {
             if (showSend) {
                 Row(
                     modifier = Modifier
-                        .background(Gray50, RoundedCornerShape(30.dp))
-                        .clip(RoundedCornerShape(30.dp))
-                        .rememberedClickable(enabled = !isSending) {
-                            onSend()
-                        }
+                        .background(Gray50, CircleShape)
+                        .clip(CircleShape)
+                        .rememberedClickable(enabled = !isSending) { onSend() }
                         .padding(vertical = 15.dp, horizontal = 20.dp),
                     verticalAlignment = Alignment.CenterVertically,
                 ) {
@@ -83,17 +86,13 @@ internal fun BillManagementOptions(
                     }
 
                 }
-
-                Spacer(modifier = Modifier.width(16.dp))
             }
             if (showCancel) {
                 Row(
                     modifier = Modifier
-                        .background(Gray50, RoundedCornerShape(30.dp))
-                        .clip(RoundedCornerShape(30.dp))
-                        .rememberedClickable(enabled = canCancel) {
-                            onCancel()
-                        }
+                        .background(Gray50, CircleShape)
+                        .clip(CircleShape)
+                        .rememberedClickable(enabled = canCancel) { onCancel() }
                         .padding(vertical = 15.dp, horizontal = 20.dp),
                     verticalAlignment = Alignment.CenterVertically,
                 ) {