Merge branch 'feature/MOB-356-Trade-Input' into feature/MOB-360-targe…

…t-leverage # Conflicts: # v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/tradeinput/DydxTradeInputMarginModeView.kt
dydxprotocol · Apr 5, 2024 · 5eed95a · 5eed95a
2 parents d1c0ea9 + b376d4f
commit 5eed95a
Show file tree

Hide file tree

Showing 19 changed files with 1,026 additions and 45 deletions.
diff --git a/v4/build.gradle b/v4/build.gradle
@@ -89,7 +89,7 @@ ext {
     compileSdkVersion = 34
 
     // App dependencies
-    abacusVersion = '1.6.26'
+    abacusVersion = '1.6.30'
     carteraVersion = '0.1.13'
     kollectionsVersion = '2.0.16'
 

diff --git a/v4/common/src/main/java/exchange/dydx/trading/common/navigation/DydxAnimation.kt b/v4/common/src/main/java/exchange/dydx/trading/common/navigation/DydxAnimation.kt
@@ -8,8 +8,10 @@ import androidx.compose.animation.ExitTransition
 import androidx.compose.animation.core.Easing
 import androidx.compose.animation.core.FastOutSlowInEasing
 import androidx.compose.animation.core.tween
+import androidx.compose.animation.expandVertically
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
 import androidx.compose.runtime.Composable
 import androidx.navigation.NavBackStackEntry
 import kotlinx.serialization.json.JsonNull.content
@@ -144,4 +146,17 @@ object DydxAnimation {
             content = content,
         )
     }
+
+    @Composable
+    fun AnimateExpandInOut(
+        visible: Boolean,
+        content: @Composable AnimatedVisibilityScope.() -> Unit
+    ) {
+        AnimatedVisibility(
+            visible = visible,
+            enter = expandVertically(),
+            exit = shrinkVertically(),
+            content = content,
+        )
+    }
 }
diff --git a/...ange/dydx/trading/feature/market/marketinfo/components/paging/DydxMarketInfoPagingView.kt b/...ange/dydx/trading/feature/market/marketinfo/components/paging/DydxMarketInfoPagingView.kt
@@ -1,9 +1,5 @@
 package exchange.dydx.trading.feature.market.marketinfo.components.paging
 
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.AnimatedVisibilityScope
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
@@ -88,17 +84,4 @@ object DydxMarketInfoPagingView : DydxComponent {
             DydxMarketFundingRateView.Content(modifier)
         }
     }
-
-    @Composable
-    private fun AnimateFadeInOut(
-        visible: Boolean,
-        content: @Composable AnimatedVisibilityScope.() -> Unit
-    ) {
-        AnimatedVisibility(
-            visible = visible,
-            enter = fadeIn(),
-            exit = fadeOut(),
-            content = content,
-        )
-    }
 }
diff --git a/.../main/java/exchange/dydx/trading/feature/trade/tradeinput/DydxTradeInputMarginModeView.kt b/.../main/java/exchange/dydx/trading/feature/trade/tradeinput/DydxTradeInputMarginModeView.kt
@@ -107,16 +107,26 @@ object DydxTradeInputMarginModeView : DydxComponent {
                 .fillMaxSize()
                 .themeColor(ThemeColor.SemanticColor.layer_4),
         ) {
-            NavigationHeader(state)
+            NavigationHeader(
+                modifier = Modifier,
+                state = state
+            )
             PlatformDivider()
-            Selection(state.crossMargin)
+            Selection(
+                modifier = Modifier,
+                marginModeState = state.crossMargin
+            )
             Spacer(modifier = Modifier.height(8.dp))
-            Selection(state.isolatedMargin)
+            Selection(
+                modifier = Modifier,
+                marginModeState = state.isolatedMargin
+            )
         }
     }
 
     @Composable
     fun NavigationHeader(
+        modifier: Modifier,
         state: ViewState,
     ) {
         Row(
@@ -156,7 +166,10 @@ object DydxTradeInputMarginModeView : DydxComponent {
     }
 
     @Composable
-    fun Selection(marginModeState: MarginTypeSelection) {
+    fun Selection(
+        modifier: Modifier,
+        marginModeState: MarginTypeSelection
+    ) {
         val shape = RoundedCornerShape(10.dp)
         Row(
             modifier = Modifier

diff --git a/...n/java/exchange/dydx/trading/feature/trade/tradeinput/DydxTradeInputTargetLeverageView.kt b/...n/java/exchange/dydx/trading/feature/trade/tradeinput/DydxTradeInputTargetLeverageView.kt
@@ -89,22 +89,38 @@ object DydxTradeInputTargetLeverageView : DydxComponent {
                 .fillMaxSize()
                 .themeColor(ThemeColor.SemanticColor.layer_4),
         ) {
-            NavigationHeader(state)
+            NavigationHeader(
+                modifier = Modifier,
+                state = state,
+            )
             PlatformDivider()
-            Description(state)
-            LeverageEditField(state)
-            LeverageOptions(state)
+            Description(
+                modifier = Modifier,
+                state = state,
+            )
+            LeverageEditField(
+                modifier = Modifier,
+                state = state,
+            )
+            LeverageOptions(
+                modifier = Modifier,
+                state = state,
+            )
             Spacer(modifier = Modifier.weight(1f))
-            ActionButton(state)
+            ActionButton(
+                modifier = Modifier,
+                state = state,
+            )
         }
     }
 
     @Composable
     fun NavigationHeader(
+        modifier: Modifier,
         state: ViewState,
     ) {
         Row(
-            modifier = Modifier
+            modifier = modifier
                 .fillMaxWidth()
                 .padding(vertical = 8.dp),
             verticalAlignment = Alignment.CenterVertically,
@@ -130,6 +146,7 @@ object DydxTradeInputTargetLeverageView : DydxComponent {
 
     @Composable
     fun Description(
+        modifier: Modifier,
         state: ViewState,
     ) {
         Row(
@@ -150,7 +167,10 @@ object DydxTradeInputTargetLeverageView : DydxComponent {
     }
 
     @Composable
-    fun LeverageEditField(state: ViewState?) {
+    fun LeverageEditField(
+        modifier: Modifier,
+        state: ViewState?
+    ) {
         Row(
             modifier = Modifier
                 .padding(
@@ -176,7 +196,10 @@ object DydxTradeInputTargetLeverageView : DydxComponent {
     }
 
     @Composable
-    fun LeverageOptions(state: ViewState?) {
+    fun LeverageOptions(
+        modifier: Modifier,
+        state: ViewState?
+    ) {
         Row(
             modifier = Modifier
                 .padding(
@@ -207,7 +230,7 @@ object DydxTradeInputTargetLeverageView : DydxComponent {
                                     .themeColor(ThemeColor.SemanticColor.text_tertiary)
                                     .themeFont(fontSize = ThemeFont.FontSize.small),
 
-                            )
+                                )
                         }
                     }
                 } ?: listOf(),
@@ -228,7 +251,7 @@ object DydxTradeInputTargetLeverageView : DydxComponent {
                                     .themeColor(ThemeColor.SemanticColor.text_primary)
                                     .themeFont(fontSize = ThemeFont.FontSize.small),
 
-                            )
+                                )
                         }
                     }
                 } ?: listOf(),
@@ -242,7 +265,10 @@ object DydxTradeInputTargetLeverageView : DydxComponent {
     }
 
     @Composable
-    fun ActionButton(state: ViewState?) {
+    fun ActionButton(
+        modifier: Modifier,
+        state: ViewState?
+    ) {
         PlatformButton(
             modifier = Modifier
                 .padding(