Optimize IvyModal.kt

Ivy-Apps · May 23, 2022 · 81338f9 · 81338f9
1 parent 79fb5f9
commit 81338f9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 24 deletions.
diff --git a/app/src/main/java/com/ivy/wallet/ui/edit/core/EditBottomSheet.kt b/app/src/main/java/com/ivy/wallet/ui/edit/core/EditBottomSheet.kt
@@ -40,7 +40,7 @@ import com.ivy.wallet.ui.IvyWalletPreview
 import com.ivy.wallet.ui.ivyWalletCtx
 import com.ivy.wallet.ui.theme.*
 import com.ivy.wallet.ui.theme.components.*
-import com.ivy.wallet.ui.theme.modal.DURATION_MODAL_KEYBOARD
+import com.ivy.wallet.ui.theme.modal.DURATION_MODAL_ANIM
 import com.ivy.wallet.ui.theme.modal.ModalSave
 import com.ivy.wallet.ui.theme.modal.ModalSet
 import com.ivy.wallet.ui.theme.modal.edit.AmountModal
@@ -83,13 +83,13 @@ fun BoxWithConstraintsScope.EditBottomSheet(
         targetValue = densityScope {
             if (keyboardShown) keyboardOnlyWindowInsets().bottom.toDp() else 0.dp
         },
-        animationSpec = tween(DURATION_MODAL_KEYBOARD)
+        animationSpec = tween(DURATION_MODAL_ANIM)
     )
     val navBarPadding by animateDpAsState(
         targetValue = densityScope {
             if (keyboardShown) 0.dp else navigationBarInsets().bottom.toDp()
         },
-        animationSpec = tween(DURATION_MODAL_KEYBOARD)
+        animationSpec = tween(DURATION_MODAL_ANIM)
     )
 
     var bottomBarHeight by remember { mutableStateOf(0) }

diff --git a/app/src/main/java/com/ivy/wallet/ui/search/SearchScreen.kt b/app/src/main/java/com/ivy/wallet/ui/search/SearchScreen.kt
@@ -33,7 +33,7 @@ import com.ivy.wallet.ui.ivyWalletCtx
 import com.ivy.wallet.ui.theme.Gray
 import com.ivy.wallet.ui.theme.components.IvyBasicTextField
 import com.ivy.wallet.ui.theme.components.IvyIcon
-import com.ivy.wallet.ui.theme.modal.DURATION_MODAL_KEYBOARD
+import com.ivy.wallet.ui.theme.modal.DURATION_MODAL_ANIM
 import com.ivy.wallet.ui.theme.transaction.transactions
 import com.ivy.wallet.utils.*
 
@@ -135,7 +135,7 @@ private fun UI(
                     targetValue = densityScope {
                         if (keyboardVisible) keyboardOnlyWindowInsets().bottom.toDp() else 0.dp
                     },
-                    animationSpec = tween(DURATION_MODAL_KEYBOARD)
+                    animationSpec = tween(DURATION_MODAL_ANIM)
                 )
 
                 Spacer(Modifier.height(keyboardShownInsetDp))

diff --git a/app/src/main/java/com/ivy/wallet/ui/theme/components/CurrencyPicker.kt b/app/src/main/java/com/ivy/wallet/ui/theme/components/CurrencyPicker.kt
@@ -41,7 +41,7 @@ import com.ivy.wallet.ui.theme.GradientGreen
 import com.ivy.wallet.ui.theme.GradientIvy
 import com.ivy.wallet.ui.theme.Ivy
 import com.ivy.wallet.ui.theme.White
-import com.ivy.wallet.ui.theme.modal.DURATION_MODAL_KEYBOARD
+import com.ivy.wallet.ui.theme.modal.DURATION_MODAL_ANIM
 import com.ivy.wallet.utils.*
 import java.util.*
 
@@ -72,7 +72,7 @@ fun CurrencyPicker(
         targetValue = densityScope {
             if (keyboardShown) keyboardOnlyWindowInsets().bottom.toDp() else 0.dp
         },
-        animationSpec = tween(DURATION_MODAL_KEYBOARD)
+        animationSpec = tween(DURATION_MODAL_ANIM)
     )
 
     Column(

diff --git a/app/src/main/java/com/ivy/wallet/ui/theme/modal/IvyModal.kt b/app/src/main/java/com/ivy/wallet/ui/theme/modal/IvyModal.kt
@@ -24,7 +24,6 @@ import com.ivy.frp.view.navigation.Navigation
 import com.ivy.frp.view.navigation.navigation
 import com.ivy.wallet.ui.IvyWalletPreview
 import com.ivy.wallet.ui.ivyWalletCtx
-import com.ivy.wallet.ui.theme.Black
 import com.ivy.wallet.ui.theme.components.ActionsRow
 import com.ivy.wallet.ui.theme.components.CloseButton
 import com.ivy.wallet.ui.theme.gradientCutBackgroundTop
@@ -34,8 +33,8 @@ import java.util.*
 import kotlin.math.roundToInt
 
 
-private const val DURATION_BACKGROUND_BLUR = 400
-const val DURATION_MODAL_KEYBOARD = 200
+private const val DURATION_BACKGROUND_BLUR_ANIM = 400
+const val DURATION_MODAL_ANIM = 200
 
 @Composable
 fun BoxScope.IvyModal(
@@ -62,22 +61,16 @@ fun BoxScope.IvyModal(
         targetValue = densityScope {
             if (keyboardShown) keyboardOnlyWindowInsets().bottom.toDp() else 0.dp
         },
-        animationSpec = tween(DURATION_MODAL_KEYBOARD)
-    )
-    val navBarPadding by animateDpAsState(
-        targetValue = densityScope {
-            if (keyboardShown) 0.dp else navigationBarInsets().bottom.toDp()
-        },
-        animationSpec = tween(DURATION_MODAL_KEYBOARD)
+        animationSpec = tween(DURATION_MODAL_ANIM)
     )
     val blurAlpha by animateFloatAsState(
         targetValue = if (visible) 1f else 0f,
-        animationSpec = tween(DURATION_BACKGROUND_BLUR),
+        animationSpec = tween(DURATION_BACKGROUND_BLUR_ANIM),
         visibilityThreshold = 0.01f
     )
     val modalPercentVisible by animateFloatAsState(
         targetValue = if (visible) 1f else 0f,
-        animationSpec = tween(DURATION_MODAL_KEYBOARD),
+        animationSpec = tween(DURATION_MODAL_ANIM),
         visibilityThreshold = 0.01f
     )
 
@@ -121,10 +114,6 @@ fun BoxScope.IvyModal(
                 .fillMaxWidth()
                 .statusBarsPadding()
                 .padding(top = 24.dp)
-                .drawColoredShadow(
-                    color = Black,
-                    alpha = if (UI.colors.isLight) 0.05f else 0.5f,
-                )
                 .background(UI.colors.pure, UI.shapes.r2Top)
                 .consumeClicks()
                 .thenIf(scrollState != null) {
@@ -154,7 +143,7 @@ fun BoxScope.IvyModal(
             visible = visible,
             modalPercentVisible = modalPercentVisible,
             keyboardShownInsetDp = keyboardShownInsetDp,
-            navBarPadding = navBarPadding,
+            navBarPadding = navigationBarInsets().bottom.toDensityDp(),
             onHeightChanged = {
                 actionsRowHeight = it
             },