Merge branch 'develop' into feature/MOB-356-Trade-Input

dydxprotocol · Apr 4, 2024 · 24b218a · 24b218a
2 parents 38ddb8a + 449c249
commit 24b218a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext.ktlintVersion = '0.48.0'
     ext.kotlinVersion = '1.9.20'
-    ext.androidApplicationVersion = '8.2.2'
+    ext.androidApplicationVersion = '8.3.1'
 
     repositories {
         google()

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Jan 30 10:45:32 PST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/...ange/dydx/trading/feature/portfolio/components/positions/DydxPortfolioPositionItemView.kt b/...ange/dydx/trading/feature/portfolio/components/positions/DydxPortfolioPositionItemView.kt
@@ -64,9 +64,13 @@ object DydxPortfolioPositionItemView {
         val shape = RoundedCornerShape(10.dp)
         Row(
             modifier = modifier
+                .padding(
+                    // outer padding first, before widht and height
+                    horizontal = ThemeShapes.HorizontalPadding,
+                    vertical = ThemeShapes.VerticalPadding,
+                )
                 .fillMaxWidth()
-                .padding(horizontal = ThemeShapes.HorizontalPadding)
-                .height(if (isIsolatedMarketEnabled) 148.dp else 64.dp)
+                .height((if (isIsolatedMarketEnabled) 148.dp else 64.dp) + ThemeShapes.VerticalPadding * 2)
                 .background(
                     brush = position.gradientType.brush(ThemeColor.SemanticColor.layer_3),
                     shape = shape,
@@ -77,18 +81,21 @@ object DydxPortfolioPositionItemView {
                     shape = shape,
                 )
                 .clip(shape)
+                .padding(
+                    // inner paddings after clipping
+                    horizontal = ThemeShapes.HorizontalPadding,
+                    vertical = ThemeShapes.VerticalPadding,
+                )
                 .clickable { onTapAction(position) },
             verticalAlignment = Alignment.CenterVertically,
             horizontalArrangement = Arrangement.spacedBy(8.dp),
         ) {
             if (isIsolatedMarketEnabled) {
                 Column(
                     modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(horizontal = ThemeShapes.HorizontalPadding),
+                        .fillMaxWidth(),
                     verticalArrangement = Arrangement.spacedBy(4.dp),
                 ) {
-                    Spacer(modifier = Modifier.height(8.dp))
                     Row(
                         modifier = Modifier
                             .fillMaxWidth()
@@ -133,7 +140,6 @@ object DydxPortfolioPositionItemView {
                             position,
                         )
                     }
-                    Spacer(modifier = Modifier.height(8.dp))
                 }
             } else {
                 ComposeAssetPosition(
@@ -268,12 +274,14 @@ object DydxPortfolioPositionItemView {
             horizontalAlignment = if (forIsolatedMarket) Alignment.Start else Alignment.End,
             modifier = Modifier.width(80.dp),
         ) {
-            Text(
-                text = localizer.localize("APP.GENERAL.PROFIT_AND_LOSS"),
-                style = TextStyle.dydxDefault
-                    .themeFont(fontSize = ThemeFont.FontSize.small)
-                    .themeColor(ThemeColor.SemanticColor.text_tertiary),
-            )
+            if (forIsolatedMarket) {
+                Text(
+                    text = localizer.localize("APP.GENERAL.PROFIT_AND_LOSS"),
+                    style = TextStyle.dydxDefault
+                        .themeFont(fontSize = ThemeFont.FontSize.small)
+                        .themeColor(ThemeColor.SemanticColor.text_tertiary),
+                )
+            }
 
             SignedAmountView.Content(
                 modifier = modifier,
@@ -352,9 +360,9 @@ object DydxPortfolioPositionItemView {
                     .width(32.dp)
                     .height(32.dp),
                 action = {
-                         /*
-                         TODO: Implement edit button action
-                          */
+                    /*
+                    TODO: Implement edit button action
+                     */
                 },
                 padding = 0.dp,
                 shape = RoundedCornerShape(4.dp),