Fix broken IvyModal.kt stuff by refactoring

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

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
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
@@ -63,6 +63,12 @@ fun BoxScope.IvyModal(
         },
         animationSpec = tween(DURATION_MODAL_ANIM)
     )
+    val navBarPadding by animateDpAsState(
+        targetValue = densityScope {
+            if (keyboardShown) 0.dp else navigationBarInsets().bottom.toDp()
+        },
+        animationSpec = tween(DURATION_MODAL_ANIM)
+    )
     val blurAlpha by animateFloatAsState(
         targetValue = if (visible) 1f else 0f,
         animationSpec = tween(DURATION_BACKGROUND_BLUR_ANIM),
@@ -143,7 +149,7 @@ fun BoxScope.IvyModal(
             visible = visible,
             modalPercentVisible = modalPercentVisible,
             keyboardShownInsetDp = keyboardShownInsetDp,
-            navBarPadding = navigationBarInsets().bottom.toDensityDp(),
+            navBarPadding = navBarPadding,
             onHeightChanged = {
                 actionsRowHeight = it
             },

diff --git a/ivy-design/src/main/java/com/ivy/design/l3_ivyComponents/IvyModal.kt b/ivy-design/src/main/java/com/ivy/design/l3_ivyComponents/IvyModal.kt