Merge remote-tracking branch 'origin/develop' into build/bump-agp

* origin/develop:
  chore(phone/confirm): tweak OTP box to better match iOS
  fix(modals): only dismiss IME (and wait) when IME is open

Author: bmc08gt

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

@@ -26,6 +26,7 @@ import com.getcode.navigation.core.CodeNavigator
 import com.getcode.navigation.core.LocalCodeNavigator
 import com.getcode.theme.CodeTheme
 import com.getcode.theme.sheetHeight
+import com.getcode.util.keyboardAsState
 import com.getcode.view.components.SheetTitle
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -144,6 +145,8 @@ data object MainRoot : Screen {
         // TODO: potentially add a loading state here
         //  so app doesn't appear stuck in a dead state
         //  while we wait for auth check to complete
-        Box(modifier = Modifier.fillMaxSize().background(CodeTheme.colors.background))
+        Box(modifier = Modifier
+            .fillMaxSize()
+            .background(CodeTheme.colors.background))
     }
 }

app/src/main/java/com/getcode/util/Keyboard.kt

@@ -0,0 +1,27 @@
+package com.getcode.util
+
+import android.view.ViewTreeObserver
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.platform.LocalView
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+
+@Composable
+fun keyboardAsState(): State<Boolean> {
+    val keyboardState = remember { mutableStateOf(false) }
+    val view = LocalView.current
+    val viewTreeObserver = view.viewTreeObserver
+    DisposableEffect(viewTreeObserver) {
+        val listener = ViewTreeObserver.OnGlobalLayoutListener {
+            keyboardState.value = ViewCompat.getRootWindowInsets(view)
+                ?.isVisible(WindowInsetsCompat.Type.ime()) ?: true
+        }
+        viewTreeObserver.addOnGlobalLayoutListener(listener)
+        onDispose { viewTreeObserver.removeOnGlobalLayoutListener(listener) }
+    }
+    return keyboardState
+}

app/src/main/java/com/getcode/view/components/OtpBox.kt

@@ -26,26 +26,22 @@ fun OtpBox(
 ) {
 
     val height = when (CodeTheme.dimens.heightWindowSizeClass) {
-        WindowSizeClass.COMPACT -> 45
-        else -> 60
-    }
-    val width = when (CodeTheme.dimens.widthWindowSizeClass) {
-        WindowSizeClass.COMPACT -> 30
-        else -> 42
+        WindowSizeClass.COMPACT -> CodeTheme.dimens.staticGrid.x9
+        else -> CodeTheme.dimens.staticGrid.x11
     }
 
     Box(
         modifier = modifier
             .padding(CodeTheme.dimens.grid.x1)
-            .height(height.dp)
-            .width(width.dp)
+            .height(height)
+            .width(CodeTheme.dimens.staticGrid.x7)
             .clip(CodeTheme.shapes.small)
             .rememberedClickable(onClick = onClick)
             .border(
                 border = if (isHighlighted)
-                    BorderStroke(CodeTheme.dimens.thickBorder, color = BrandLight.copy(alpha = 0.8f))
+                    BorderStroke(CodeTheme.dimens.thickBorder, color = BrandLight.copy(alpha = 0.7f))
                 else
-                    BorderStroke(CodeTheme.dimens.border, color = BrandLight.copy(alpha = 0.4f)),
+                    BorderStroke(CodeTheme.dimens.border, color = BrandLight.copy(alpha = 0.3f)),
                 shape = CodeTheme.shapes.small
             )
             .background(Color.White.copy(alpha = 0.1f)),

app/src/main/java/com/getcode/view/login/PhoneConfirm.kt

@@ -115,7 +115,7 @@ fun PhoneConfirm(
                         .padding(top = CodeTheme.dimens.inset)
                         .wrapContentHeight()
                         .fillMaxWidth(),
-                    verticalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x1)
+                    verticalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x2)
                 ) {
 
                     ProvideTextStyle(

app/src/main/java/com/getcode/view/login/PhoneVerifyViewModel.kt

@@ -180,8 +180,7 @@ class PhoneVerifyViewModel @Inject constructor(
                         navigator.push(InviteCodeScreen(phoneNumber.urlEncode()))
                         null
                     }
-                    else ->
-                        getGenericError()
+                    else -> getGenericError()
                 }?.let { message -> TopBarManager.showMessage(message) }
                 res == PhoneVerificationService.SendVerificationCodeResponse.Result.OK
             }