Merge pull request #114 from code-payments/chore/modal-dismiss-ime-first

chore(modals): have all modals dismiss IME before hiding

Author: bmc08gt

app/src/main/java/com/getcode/navigation/screens/ModalScreens.kt

@@ -7,20 +7,20 @@ import cafe.adriel.voyager.core.screen.ScreenKey
 import cafe.adriel.voyager.core.screen.uniqueScreenKey
 import cafe.adriel.voyager.hilt.getViewModel
 import com.getcode.R
-import com.getcode.analytics.AnalyticsScreenWatcher
 import com.getcode.analytics.AnalyticsManager
+import com.getcode.analytics.AnalyticsScreenWatcher
 import com.getcode.navigation.core.LocalCodeNavigator
 import com.getcode.util.getActivityScopedViewModel
 import com.getcode.util.getStackScopedViewModel
 import com.getcode.view.login.PhoneConfirm
 import com.getcode.view.login.PhoneVerify
 import com.getcode.view.login.PhoneVerifyViewModel
-import com.getcode.view.main.account.BackupKey
-import com.getcode.view.main.account.BetaFlagsScreen
 import com.getcode.view.main.account.AccountDeposit
 import com.getcode.view.main.account.AccountDetails
 import com.getcode.view.main.account.AccountFaq
 import com.getcode.view.main.account.AccountPhone
+import com.getcode.view.main.account.BackupKey
+import com.getcode.view.main.account.BetaFlagsScreen
 import com.getcode.view.main.account.ConfirmDeleteAccount
 import com.getcode.view.main.account.DeleteCodeAccount
 import com.getcode.view.main.currency.CurrencySelectionSheet

app/src/main/java/com/getcode/navigation/screens/Modals.kt

@@ -16,7 +16,9 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import cafe.adriel.voyager.core.screen.Screen
 import cafe.adriel.voyager.core.screen.ScreenKey
 import cafe.adriel.voyager.core.screen.uniqueScreenKey
@@ -26,6 +28,8 @@ import com.getcode.theme.CodeTheme
 import com.getcode.theme.sheetHeight
 import com.getcode.util.recomposeHighlighter
 import com.getcode.view.components.SheetTitle
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import timber.log.Timber
 
 internal interface ModalContent {
@@ -91,6 +95,16 @@ internal interface ModalContent {
                 derivedStateOf { closeButton(lastItem) }
             }
 
+            val keyboardController = LocalSoftwareKeyboardController.current
+            val composeScope = rememberCoroutineScope()
+
+            val hideSheet = {
+                composeScope.launch {
+                    keyboardController?.hide()
+                    delay(500)
+                    navigator.hide()
+                }
+            }
             SheetTitle(
                 modifier = Modifier,
                 title = {
@@ -106,7 +120,7 @@ internal interface ModalContent {
                 backButton = isBackEnabled,
                 closeButton = isCloseEnabled,
                 onBackIconClicked = onBackClicked?.let { { it() } } ?: { navigator.pop() },
-                onCloseIconClicked = onCloseClicked?.let { { it() } } ?: { navigator.hide() }
+                onCloseIconClicked = onCloseClicked?.let { { it() } } ?: { hideSheet() }
             )
             Box(
                 modifier = Modifier