Removed Default cursor position settings

sora-xor · Sep 12, 2023 · 9c4d85e · 9c4d85e
1 parent 459860b
commit 9c4d85e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 82 deletions.
diff --git a/common/src/main/java/jp/co/soramitsu/common/domain/AssetAmountInputState.kt b/common/src/main/java/jp/co/soramitsu/common/domain/AssetAmountInputState.kt
@@ -33,7 +33,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package jp.co.soramitsu.common.domain
 
 import java.math.BigDecimal
-import jp.co.soramitsu.ui_core.component.input.number.DefaultCursorPosition
 
 data class AssetAmountInputState(
     val token: Token,
@@ -43,6 +42,5 @@ data class AssetAmountInputState(
     val enabled: Boolean,
     val readOnly: Boolean = false,
     val error: Boolean = false,
-    val errorHint: String = "",
-    val defaultCursorPosition: DefaultCursorPosition = DefaultCursorPosition.END
+    val errorHint: String = ""
 )
diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/AssetAmount.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/AssetAmount.kt
@@ -159,7 +159,7 @@ fun AssetAmountInput(
                     textStyle = MaterialTheme.customTypography.displayS.copy(textAlign = TextAlign.End),
                     enabled = state?.let { it.enabled && !it.readOnly } ?: false,
                     precision = state?.token?.precision ?: OptionsProvider.defaultScale,
-                    defaultCursorPosition = state?.defaultCursorPosition ?: DefaultCursorPosition.END,
+                    defaultCursorPosition = DefaultCursorPosition.START,
                     initial = state?.initialAmount,
                     onValueChanged = onAmountChange,
                     focusRequester = focusRequester,

diff --git a/.../jp/co/soramitsu/feature_assets_impl/presentation/screens/send/TransferAmountViewModel.kt b/.../jp/co/soramitsu/feature_assets_impl/presentation/screens/send/TransferAmountViewModel.kt
@@ -62,7 +62,6 @@ import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter
 import jp.co.soramitsu.feature_assets_impl.presentation.states.SendState
 import jp.co.soramitsu.feature_wallet_api.launcher.WalletRouter
 import jp.co.soramitsu.sora.substrate.runtime.SubstrateOptionsProvider
-import jp.co.soramitsu.ui_core.component.input.number.DefaultCursorPosition
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.catch
@@ -167,8 +166,7 @@ class TransferAmountViewModel @AssistedInject constructor(
                         amountFiat = "",
                         enabled = false,
                         error = false,
-                        errorHint = "",
-                        defaultCursorPosition = DefaultCursorPosition.END
+                        errorHint = ""
                     )
                 )
             } else {
@@ -179,8 +177,7 @@ class TransferAmountViewModel @AssistedInject constructor(
                         amountFiat = asset.token.printFiat(
                             _sendState.value.input?.initialAmount.orZero(),
                             numbersFormatter
-                        ),
-                        defaultCursorPosition = DefaultCursorPosition.END
+                        )
                     )
                 )
             }
@@ -232,8 +229,7 @@ class TransferAmountViewModel @AssistedInject constructor(
                     _sendState.value = _sendState.value.copy(
                         input = _sendState.value.input?.copy(
                             readOnly = false,
-                            initialAmount = _sendState.value.input?.initialAmount?.nullZero(),
-                            defaultCursorPosition = DefaultCursorPosition.END
+                            initialAmount = _sendState.value.input?.initialAmount?.nullZero()
                         ),
                     )
                 }
@@ -396,8 +392,7 @@ class TransferAmountViewModel @AssistedInject constructor(
     fun onReviewClick() {
         _sendState.value = _sendState.value.copy(
             input = _sendState.value.input?.copy(
-                initialAmount = _sendState.value.input?.initialAmount.orZero(),
-                defaultCursorPosition = DefaultCursorPosition.START
+                initialAmount = _sendState.value.input?.initialAmount.orZero()
             )
         )
     }
@@ -409,8 +404,7 @@ class TransferAmountViewModel @AssistedInject constructor(
                 amountFiat = _sendState.value.input?.token?.printFiat(
                     value,
                     numbersFormatter
-                ).orEmpty(),
-                defaultCursorPosition = DefaultCursorPosition.END
+                ).orEmpty()
             )
         )
         enteredFlow.value = value
@@ -433,8 +427,7 @@ class TransferAmountViewModel @AssistedInject constructor(
                 amountFiat = _sendState.value.input?.token?.printFiat(
                     amount,
                     numbersFormatter
-                ).orEmpty(),
-                defaultCursorPosition = DefaultCursorPosition.START
+                ).orEmpty()
             )
         )
         enteredFlow.value = amount

diff --git a/...ramitsu/feature_polkaswap_impl/presentation/screens/liquidityadd/LiquidityAddViewModel.kt b/...ramitsu/feature_polkaswap_impl/presentation/screens/liquidityadd/LiquidityAddViewModel.kt
@@ -69,7 +69,6 @@ import jp.co.soramitsu.feature_wallet_api.domain.interfaces.WalletInteractor
 import jp.co.soramitsu.feature_wallet_api.launcher.WalletRouter
 import jp.co.soramitsu.sora.substrate.runtime.SubstrateOptionsProvider
 import jp.co.soramitsu.sora.substrate.runtime.isSynthetic
-import jp.co.soramitsu.ui_core.component.input.number.DefaultCursorPosition
 import jp.co.soramitsu.ui_core.component.toolbar.Action
 import jp.co.soramitsu.ui_core.component.toolbar.BasicToolbarState
 import jp.co.soramitsu.ui_core.component.toolbar.SoramitsuToolbarState
@@ -509,12 +508,10 @@ class LiquidityAddViewModel @AssistedInject constructor(
                 val list = assets.filter { it.token.id in bases && it.token.id != addToken2 }
                 _addState.value = _addState.value.copy(
                     assetState1 = _addState.value.assetState1?.copy(
-                        initialAmount = _addState.value.assetState1?.initialAmount?.nullZero(),
-                        defaultCursorPosition = DefaultCursorPosition.END
+                        initialAmount = _addState.value.assetState1?.initialAmount?.nullZero()
                     ),
                     assetState2 = _addState.value.assetState2?.copy(
-                        initialAmount = _addState.value.assetState2?.initialAmount?.nullZero(),
-                        defaultCursorPosition = DefaultCursorPosition.END
+                        initialAmount = _addState.value.assetState2?.initialAmount?.nullZero()
                     ),
                 )
                 _searchTokenFilter.value = _searchTokenFilter.value.copy(
@@ -552,12 +549,10 @@ class LiquidityAddViewModel @AssistedInject constructor(
                     }
                 _addState.value = _addState.value.copy(
                     assetState1 = _addState.value.assetState1?.copy(
-                        initialAmount = _addState.value.assetState1?.initialAmount?.nullZero(),
-                        defaultCursorPosition = DefaultCursorPosition.END
+                        initialAmount = _addState.value.assetState1?.initialAmount?.nullZero()
                     ),
                     assetState2 = _addState.value.assetState2?.copy(
-                        initialAmount = _addState.value.assetState2?.initialAmount?.nullZero(),
-                        defaultCursorPosition = DefaultCursorPosition.END
+                        initialAmount = _addState.value.assetState2?.initialAmount?.nullZero()
                     ),
                 )
                 _searchTokenFilter.value = _searchTokenFilter.value.copy(
@@ -575,11 +570,7 @@ class LiquidityAddViewModel @AssistedInject constructor(
                 assetState1 = state.copy(
                     token = a.token,
                     balance = getAssetBalanceText(a),
-                    amountFiat = a.token.printFiat(state.initialAmount.orZero(), numbersFormatter),
-                    defaultCursorPosition = DefaultCursorPosition.END
-                ),
-                assetState2 = _addState.value.assetState2?.copy(
-                    defaultCursorPosition = DefaultCursorPosition.END
+                    amountFiat = a.token.printFiat(state.initialAmount.orZero(), numbersFormatter)
                 ),
             )
             hasXorReminderWarningBeenChecked = false
@@ -592,14 +583,10 @@ class LiquidityAddViewModel @AssistedInject constructor(
         val a = assets.first { t -> t.token.id == id }
         val state = _addState.value.assetState2
         _addState.value = _addState.value.copy(
-            assetState1 = _addState.value.assetState1?.copy(
-                defaultCursorPosition = DefaultCursorPosition.END
-            ),
             assetState2 = state?.copy(
                 token = a.token,
                 balance = getAssetBalanceText(a),
-                amountFiat = a.token.printFiat(state.initialAmount.orZero(), numbersFormatter),
-                defaultCursorPosition = DefaultCursorPosition.END
+                amountFiat = a.token.printFiat(state.initialAmount.orZero(), numbersFormatter)
             )
                 ?: buildInitialAssetState(a),
         )
@@ -624,24 +611,16 @@ class LiquidityAddViewModel @AssistedInject constructor(
             _addState.value = _addState.value.copy(
                 assetState1 = _addState.value.assetState1?.copy(
                     balance = getAssetBalanceText(asset),
-                    token = asset.token,
-                    defaultCursorPosition = DefaultCursorPosition.END
-                ),
-                assetState2 = _addState.value.assetState2?.copy(
-                    defaultCursorPosition = DefaultCursorPosition.END
+                    token = asset.token
                 )
             )
         }
         assets.find { it.token.id == addToken2 }?.let { asset ->
             balance2 = asset.balance.transferable
             _addState.value = _addState.value.copy(
-                assetState1 = _addState.value.assetState1?.copy(
-                    defaultCursorPosition = DefaultCursorPosition.END
-                ),
                 assetState2 = _addState.value.assetState2?.copy(
                     balance = getAssetBalanceText(asset),
                     token = asset.token,
-                    defaultCursorPosition = DefaultCursorPosition.END
                 )
             )
         }
@@ -737,11 +716,9 @@ class LiquidityAddViewModel @AssistedInject constructor(
         _addState.value = _addState.value.copy(
             assetState1 = _addState.value.assetState1?.copy(
                 initialAmount = _addState.value.assetState1?.initialAmount?.nullZero(),
-                defaultCursorPosition = DefaultCursorPosition.END
             ),
             assetState2 = _addState.value.assetState2?.copy(
                 initialAmount = _addState.value.assetState2?.initialAmount?.nullZero(),
-                defaultCursorPosition = DefaultCursorPosition.END
             ),
         )
     }
@@ -759,27 +736,19 @@ class LiquidityAddViewModel @AssistedInject constructor(
                     value,
                     numbersFormatter
                 ).orEmpty(),
-                defaultCursorPosition = DefaultCursorPosition.END
             ),
-            assetState2 = _addState.value.assetState2?.copy(
-                defaultCursorPosition = DefaultCursorPosition.END
-            )
         )
         amount1Flow.value = value
     }
 
     fun onAmount2Change(value: BigDecimal) {
         _addState.value = _addState.value.copy(
-            assetState1 = _addState.value.assetState1?.copy(
-                defaultCursorPosition = DefaultCursorPosition.END
-            ),
             assetState2 = _addState.value.assetState2?.copy(
                 initialAmount = value,
                 amountFiat = _addState.value.assetState2?.token?.printFiat(
                     value,
                     numbersFormatter
                 ).orEmpty(),
-                defaultCursorPosition = DefaultCursorPosition.END
             )
         )
         amount2Flow.value = value
@@ -814,10 +783,6 @@ class LiquidityAddViewModel @AssistedInject constructor(
                 assetState1 = _addState.value.assetState1?.copy(
                     amountFiat = tokenFrom.printFiat(amount, numbersFormatter),
                     initialAmount = amount,
-                    defaultCursorPosition = DefaultCursorPosition.START
-                ),
-                assetState2 = _addState.value.assetState2?.copy(
-                    defaultCursorPosition = DefaultCursorPosition.START
                 )
             )
             amount1Flow.value = amount
@@ -829,13 +794,9 @@ class LiquidityAddViewModel @AssistedInject constructor(
                     tokenTo.precision
                 )
             _addState.value = _addState.value.copy(
-                assetState1 = _addState.value.assetState1?.copy(
-                    defaultCursorPosition = DefaultCursorPosition.START
-                ),
                 assetState2 = _addState.value.assetState2?.copy(
                     amountFiat = tokenTo.printFiat(amount, numbersFormatter),
                     initialAmount = amount,
-                    defaultCursorPosition = DefaultCursorPosition.START
                 )
             )
             amount2Flow.value = amount

diff --git a/...in/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/swap/SwapViewModel.kt b/...in/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/swap/SwapViewModel.kt
@@ -75,7 +75,6 @@ import jp.co.soramitsu.feature_polkaswap_impl.presentation.states.SwapMainState
 import jp.co.soramitsu.feature_polkaswap_impl.presentation.states.defaultSwapDetailsState
 import jp.co.soramitsu.feature_wallet_api.domain.interfaces.WalletInteractor
 import jp.co.soramitsu.sora.substrate.runtime.SubstrateOptionsProvider
-import jp.co.soramitsu.ui_core.component.input.number.DefaultCursorPosition
 import jp.co.soramitsu.ui_core.component.toolbar.BasicToolbarState
 import jp.co.soramitsu.ui_core.component.toolbar.SoramitsuToolbarState
 import jp.co.soramitsu.ui_core.component.toolbar.SoramitsuToolbarType
@@ -400,11 +399,9 @@ class SwapViewModel @AssistedInject constructor(
         _swapMainState.value = _swapMainState.value.copy(
             tokenFromState = _swapMainState.value.tokenFromState?.copy(
                 initialAmount = _swapMainState.value.tokenFromState?.initialAmount?.nullZero(),
-                defaultCursorPosition = DefaultCursorPosition.END
             ),
             tokenToState = _swapMainState.value.tokenToState?.copy(
                 initialAmount = _swapMainState.value.tokenToState?.initialAmount?.nullZero(),
-                defaultCursorPosition = DefaultCursorPosition.END
             ),
         )
     }
@@ -414,11 +411,9 @@ class SwapViewModel @AssistedInject constructor(
             selectMarketState = _swapMainState.value.market to availableMarkets,
             tokenFromState = _swapMainState.value.tokenFromState?.copy(
                 initialAmount = _swapMainState.value.tokenFromState?.initialAmount?.nullZero(),
-                defaultCursorPosition = DefaultCursorPosition.END
             ),
             tokenToState = _swapMainState.value.tokenToState?.copy(
                 initialAmount = _swapMainState.value.tokenToState?.initialAmount?.nullZero(),
-                defaultCursorPosition = DefaultCursorPosition.END
             ),
         )
     }
@@ -434,11 +429,9 @@ class SwapViewModel @AssistedInject constructor(
             _swapMainState.value = _swapMainState.value.copy(
                 tokenFromState = _swapMainState.value.tokenFromState?.copy(
                     initialAmount = _swapMainState.value.tokenFromState?.initialAmount?.nullZero(),
-                    defaultCursorPosition = DefaultCursorPosition.END
                 ),
                 tokenToState = _swapMainState.value.tokenToState?.copy(
                     initialAmount = _swapMainState.value.tokenToState?.initialAmount?.nullZero(),
-                    defaultCursorPosition = DefaultCursorPosition.END
                 ),
             )
         }
@@ -455,11 +448,9 @@ class SwapViewModel @AssistedInject constructor(
             _swapMainState.value = _swapMainState.value.copy(
                 tokenFromState = _swapMainState.value.tokenFromState?.copy(
                     initialAmount = _swapMainState.value.tokenFromState?.initialAmount?.nullZero(),
-                    defaultCursorPosition = DefaultCursorPosition.END
                 ),
                 tokenToState = _swapMainState.value.tokenToState?.copy(
                     initialAmount = _swapMainState.value.tokenToState?.initialAmount?.nullZero(),
-                    defaultCursorPosition = DefaultCursorPosition.END
                 ),
             )
         }
@@ -510,11 +501,9 @@ class SwapViewModel @AssistedInject constructor(
         _swapMainState.value = _swapMainState.value.copy(
             tokenFromState = _swapMainState.value.tokenToState?.copy(
                 initialAmount = _swapMainState.value.tokenToState?.initialAmount?.nullZero(),
-                defaultCursorPosition = DefaultCursorPosition.END
             ),
             tokenToState = _swapMainState.value.tokenFromState?.copy(
                 initialAmount = _swapMainState.value.tokenFromState?.initialAmount?.nullZero(),
-                defaultCursorPosition = DefaultCursorPosition.END
             ),
         )
         setSwapButtonLoading(true)
@@ -827,16 +816,12 @@ class SwapViewModel @AssistedInject constructor(
 
     fun onFromAmountChange(value: BigDecimal) {
         _swapMainState.value = _swapMainState.value.copy(
-            tokenToState = _swapMainState.value.tokenToState?.copy(
-                defaultCursorPosition = DefaultCursorPosition.START
-            ),
             tokenFromState = _swapMainState.value.tokenFromState?.copy(
                 initialAmount = value,
                 amountFiat = _swapMainState.value.tokenFromState?.token?.printFiat(
                     value,
                     numbersFormatter
                 ).orEmpty(),
-                defaultCursorPosition = DefaultCursorPosition.START
             )
         )
         fromAmountOnEach()
@@ -987,13 +972,9 @@ class SwapViewModel @AssistedInject constructor(
                 amount = subtractFee(amount, transferable, networkFee)
             }
             _swapMainState.value = _swapMainState.value.copy(
-                tokenToState = _swapMainState.value.tokenToState?.copy(
-                    defaultCursorPosition = DefaultCursorPosition.START
-                ),
                 tokenFromState = _swapMainState.value.tokenFromState?.copy(
                     amountFiat = fromAsset.token.printFiat(amount, numbersFormatter),
                     initialAmount = amount,
-                    defaultCursorPosition = DefaultCursorPosition.START
                 )
             )
             desired = WithDesired.INPUT