Merge to main (1.0.1)

gradle.properties

@@ -10,6 +10,8 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 
 org.gradle.parallel=true
 org.gradle.caching=true
+# compilation avoidance for non public code changes
+kotlin.incremental.useClasspathSnapshot=true 
 
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app"s APK

scripts/build_abacus_local.sh

@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# This script is used to build the abacus project locally.
+#
+# Please run this after making local change to the abacus project.  The change will be
+# picked up by the v4-native-android project (via the local maven repository).  Note that
+# the script needs to be run everytime a change is made to the abacus project.
+#
+# The script will update both the v4-abacus and v4-native-android repositories, so please make sure
+# you clean-up/revert the changes after you are done with the local testing
+
+ABACUS_DIR=~/v4-abacus
+ANDROID_DIR=~/v4-native-android
+
+# Create a random version number
+NEW_VERSION="local.$(date +%s)"
+
+# search for the first line that starts with "version" in build.gradle.kts
+# get the value in the quotes
+VERSION=$(grep "^version = " ${ABACUS_DIR}/build.gradle.kts | sed -n 's/version = "\(.*\)"/\1/p')
+
+sed -i '' "s/version = \"$VERSION\"/version = \"$NEW_VERSION\"/" ${ABACUS_DIR}/build.gradle.kts
+echo "Version bumped to $NEW_VERSION"
+
+echo "Building Abacus ..."
+
+cd ${ABACUS_DIR}
+./gradlew publishToMavenLocal
+
+cd ${ANDROID_DIR}
+
+# get the version from the file
+targetFileName="v4/build.gradle"
+OLD_VERSION=$(grep "^    abacusVersion = " $targetFileName | sed -n 's/    abacusVersion = ''\(.*\)''/\1/p')
+
+if [ -n "$NEW_VERSION" ] && [ -n "$OLD_VERSION" ]; then
+  echo "Bumping Abacus version from $OLD_VERSION to $NEW_VERSION"
+  sed -i '' "s/^    abacusVersion = $OLD_VERSION/    abacusVersion = '$NEW_VERSION'/" $targetFileName
+  echo "Version bumped to $NEW_VERSION"
+else
+  echo "No version found"
+fi

settings.gradle

@@ -40,7 +40,7 @@ dependencyResolutionManagement {
                 }
             }
         }
-        //  mavenLocal()
+        mavenLocal()
     }
 }
 

v4/app/build.gradle

@@ -19,7 +19,7 @@ android {
         minSdkVersion parent.minSdkVersion
         targetSdkVersion parent.targetSdkVersion
         versionCode 9
-        versionName "1.0.0"
+        versionName "1.0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

v4/build.gradle

@@ -89,7 +89,7 @@ ext {
     compileSdkVersion = 34
 
     // App dependencies
-    abacusVersion = '1.6.40'
+    abacusVersion = '1.6.46'
     carteraVersion = '0.1.13'
     kollectionsVersion = '2.0.16'
 

v4/common/src/main/java/exchange/dydx/trading/common/formatter/DydxFormatter.kt

@@ -1,21 +1,25 @@
 package exchange.dydx.trading.common.formatter
 
+import exchange.dydx.utilities.utils.rounded
 import java.math.BigDecimal
 import java.math.RoundingMode
 import java.text.DecimalFormat
 import java.text.DecimalFormatSymbols
 import java.text.NumberFormat
 import java.text.SimpleDateFormat
 import java.time.Instant
+import java.time.LocalDateTime
+import java.time.ZoneId
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 import java.time.temporal.ChronoUnit
 import java.util.Date
 import java.util.Locale
-import java.util.regex.Pattern
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlin.math.abs
 import kotlin.math.absoluteValue
+import kotlin.math.round
 
 @Singleton
 class DydxFormatter @Inject constructor() {
@@ -37,12 +41,12 @@ class DydxFormatter @Inject constructor() {
         DateTimeFormatter.ofPattern("MMM dd").withZone(ZoneOffset.UTC)
     }
 
-    private val timeFormatter: SimpleDateFormat by lazy {
-        SimpleDateFormat("HH:mm:ss", locale)
+    private val timeFormatter: DateTimeFormatter by lazy {
+        DateTimeFormatter.ofPattern("HH:mm:ss", locale)
     }
 
-    private val dateTimeFormatter: SimpleDateFormat by lazy {
-        SimpleDateFormat("yyyy-MM-dd HH:mm:ss", locale)
+    private val dateTimeFormatter: DateTimeFormatter by lazy {
+        DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss", locale)
     }
 
     fun dollarVolume(number: Double?, digits: Int = 2): String? {
@@ -97,15 +101,14 @@ class DydxFormatter @Inject constructor() {
             null
         }
     }
-    fun localFormatted(number: Double?, digits: Int): String? {
-        return localFormatted(number?.toBigDecimal(), digits)
-    }
-
-    fun localFormatted(number: BigDecimal?, digits: Int): String? {
+    fun localFormatted(number: Double?, digits: Int?): String? {
         if (number != null) {
+            val number = if (digits != null) rounded(number, digits) else number
             val decimalFormat = NumberFormat.getInstance(locale) as? DecimalFormat
-            decimalFormat?.minimumFractionDigits = maxOf(digits, 0)
-            decimalFormat?.maximumFractionDigits = maxOf(digits, 0)
+            if (digits != null) {
+                decimalFormat?.minimumFractionDigits = maxOf(digits, 0)
+                decimalFormat?.maximumFractionDigits = maxOf(digits, 0)
+            }
 
             val formatted = decimalFormat?.format(number)
             val parsed = decimalFormat?.parse(formatted)
@@ -118,39 +121,16 @@ class DydxFormatter @Inject constructor() {
         return null
     }
 
-    fun localFormatted(number: BigDecimal?, size: String): String? {
-        val digits = digits(size)
-        return localFormatted(number, digits)
+    fun dollar(number: Double?, size: Double? = null): String? {
+        return dollar(number = number, digits = digits(size))
     }
 
-    private fun digits(size: String): Int {
-        val pattern = Pattern.compile("\\.(\\d+)")
-
-        val matcher = pattern.matcher(size)
-        if (matcher.find()) {
-            return matcher.group(1).length
-        }
-        return 2 // Default digits
-    }
-
-    fun dollar(number: Double?, size: String? = null): String? {
-        return dollar(number = number?.toBigDecimal(), size = size)
-    }
-
-    fun dollar(number: BigDecimal?, size: String? = null): String? {
-        return dollar(number, digits = digits(size ?: "0.01"))
-    }
-
-    fun dollar(number: Double?, digits: Int): String? {
-        return dollar(number = number?.toBigDecimal(), digits = digits)
-    }
-
-    fun dollar(number: BigDecimal?, digits: Int): String? {
+    fun dollar(number: Double?, digits: Int?): String? {
         if (number == null) return null
-        val formattedNumber = localFormatted(number.abs(), digits)
+        val formattedNumber = localFormatted(abs(number), digits)
         return formattedNumber?.let {
-            val rawDouble = raw(number.toDouble(), digits)?.toDouble() ?: 0.0
-            if (rawDouble >= 0.0) {
+            val rounded = if (digits != null && digits >= 0) number.rounded(toPlaces = digits) else number
+            if (rounded >= 0) {
                 "$$it"
             } else {
                 "-$$it"
@@ -159,10 +139,6 @@ class DydxFormatter @Inject constructor() {
     }
 
     fun percent(number: Double?, digits: Int, minDigits: Int? = null): String? {
-        return percent(number = number?.toBigDecimal(), digits = digits, minDigits = minDigits)
-    }
-
-    fun percent(number: BigDecimal?, digits: Int, minDigits: Int? = null): String? {
         if (number != null) {
             percentFormatter.minimumFractionDigits = minDigits ?: digits
             percentFormatter.maximumFractionDigits = digits
@@ -233,17 +209,19 @@ class DydxFormatter @Inject constructor() {
         }
     }
 
-    fun dateTime(time: Instant?): String? {
+    fun dateTime(time: Instant?, timeZone: ZoneId = ZoneId.systemDefault()): String? {
         return if (time != null) {
-            dateTimeFormatter.format(Date.from(time))
+            val ldt: LocalDateTime = time.atZone(timeZone).toLocalDateTime()
+            dateTimeFormatter.format(ldt)
         } else {
             null
         }
     }
 
-    fun clock(time: Instant?): String? {
+    fun clock(time: Instant?, timeZone: ZoneId = ZoneId.systemDefault()): String? {
         return if (time != null) {
-            timeFormatter.format(Date.from(time))
+            val ldt: LocalDateTime = time.atZone(timeZone).toLocalDateTime()
+            timeFormatter.format(ldt)
         } else {
             null
         }
@@ -264,39 +242,104 @@ class DydxFormatter @Inject constructor() {
         }
     }
 
+    /*
+    xxxxx.yyyyy
+
+      Will take the number and round it to the closest step size
+      e.g. if number is 1021 and step size is "100" then output is "1000"
+    */
+    fun decimalLocaleAgnostic(number: Double?, size: Double? = null): String? {
+        return raw(number = number, size = size, locale = Locale.US)
+    }
+
     /*
    xxxxx.yyyyy
+
    */
-    fun decimalLocaleAgnostic(number: Double?, digits: Int): String? {
+    fun decimalLocaleAgnostic(number: Double?, digits: Int?): String? {
         return raw(number = number, digits = digits, locale = Locale.US)
     }
 
+    /*
+     xxxxxx,yyyyy or xxxxx.yyyyy
+
+      Will take the number and round it to the closest step size
+      e.g. if number is 1021 and step size is "100" then output is "1000"
+     */
+    fun raw(number: Double?, size: Double? = null, locale: Locale? = null): String? {
+        val digits = digits(size)
+        return raw(number = number, digits = digits, locale = locale ?: this.locale)
+    }
+
     /*
      xxxxxx,yyyyy or xxxxx.yyyyy
      */
-    fun raw(number: Double?, digits: Int? = null, locale: Locale = Locale.getDefault()): String? {
+    fun raw(number: Double?, digits: Int?, locale: Locale = Locale.getDefault()): String? {
         return number?.let { value ->
             if (value.isFinite()) {
                 if (digits != null) {
+                    val rounded = rounded(value, digits)
                     val rawFormatter = DecimalFormat.getInstance(locale).apply {
                         minimumFractionDigits = maxOf(digits, 0)
                         maximumFractionDigits = maxOf(digits, 0)
                         roundingMode = RoundingMode.HALF_UP
                         isGroupingUsed = false
                     }
-                    val formatted = rawFormatter.format(number)
+                    val formatted = rawFormatter.format(rounded)
                     val number = rawFormatter.parse(formatted)
                     if (number.toDouble() == 0.0) { // handle -0.0
                         rawFormatter.format(0.0)
                     } else {
                         formatted
                     }
                 } else {
-                    BigDecimal(number).toPlainString()
+                    number.toString()
                 }
             } else {
                 "∞"
             }
         }
     }
+
+    private fun rounded(number: Double, digits: Int): Double {
+        if (digits >= 0) {
+            return number
+        } else {
+            val reversed = digits * -1
+            val divideBy = Math.pow(10.0, reversed.toDouble() - 1)
+            return round(number / divideBy).toInt() * divideBy
+        }
+    }
+
+    /*
+       Returns the number of digits for a given size specified in the format of 10^(-x)
+         e.g.
+         0.001 -> 3,
+         0.1 -> 1,
+         1 -> 0,
+         10 -> -1
+         1000 -> -3
+     */
+    private fun digits(size: Double?): Int? {
+        if (size == null || size <= 0.0) return null
+
+        var size = size
+        if (size >= 1) {
+            var count = 0
+            while (size >= 1) {
+                count++
+                size /= 10
+            }
+            return count * -1
+        } else if (size <= 0.1) {
+            var count = 0
+            while (size <= 0.1) {
+                count++
+                size *= 10
+            }
+            return count
+        } else {
+            return null
+        }
+    }
 }

v4/common/src/main/java/exchange/dydx/trading/common/navigation/DydxRoutes.kt

@@ -52,6 +52,7 @@ object TradeRoutes {
     const val margin_type = "trade/margin_type"
     const val target_leverage = "trade/target_leverage"
     const val trigger = "trade/take_profit_stop_loss"
+    const val adjust_margin = "trade/adjust_margin"
 }
 
 object TransferRoutes {