Update page

Author: SeniorZhai

app/src/main/java/one/mixin/android/ui/home/web3/trade/TotalPositionValueAdapter.kt

@@ -86,7 +86,23 @@ class TotalPositionValueAdapter : RecyclerView.Adapter<TotalPositionValueAdapter
                         lossColor
                     }
                 )
-                subtitleTv.isGone = true
+                if (subtitlePercent == null) {
+                    subtitleTv.isGone = true
+                } else {
+                    subtitleTv.isVisible = true
+                    subtitleTv.text = context.getString(
+                        R.string.Perpetual_Amount_Percent_Format,
+                        formatSignedUsd(subtitleValue),
+                        subtitlePercent.toDouble()
+                    )
+                    subtitleTv.setTextColor(
+                        if (isProfit) {
+                            gainColor
+                        } else {
+                            lossColor
+                        }
+                    )
+                }
             } else {
                 valueTv.setTextColor(resolveAttrColor(itemView, R.attr.text_primary))
                 if (subtitlePercent == null) {

app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/AllPositionsFragment.kt

@@ -252,8 +252,10 @@ class AllPositionsFragment : BaseFragment(R.layout.fragment_all_closed_positions
                     if (lastClosedTotalPnl != totalPnl || lastClosedTotalEntryValue != totalEntryValue) {
                         lastClosedTotalPnl = totalPnl
                         lastClosedTotalEntryValue = totalEntryValue
+                        val nowValue = totalEntryValue + totalPnl
+                        val percent = calculateClosedPercent(nowValue, totalEntryValue)
                         totalValueAdapter.submitTotal(BigDecimal.valueOf(totalPnl))
-                        totalValueAdapter.submitSubtitle(BigDecimal.valueOf(totalPnl), BigDecimal.ZERO)
+                        totalValueAdapter.submitSubtitle(BigDecimal.valueOf(totalPnl), BigDecimal.valueOf(percent))
                     }
                 }
             }
@@ -282,4 +284,11 @@ class AllPositionsFragment : BaseFragment(R.layout.fragment_all_closed_positions
         }
         return value / base * 100
     }
+
+    private fun calculateClosedPercent(nowValue: Double, entryValue: Double): Double {
+        if (entryValue == 0.0) {
+            return 0.0
+        }
+        return (nowValue / entryValue - 1.0) * 100
+    }
 }

app/src/main/java/one/mixin/android/ui/home/web3/trade/perps/PerpsMarketDetailPage.kt

@@ -633,7 +633,7 @@ private fun OpenPositionCard(
             verticalAlignment = Alignment.CenterVertically
         ) {
             Text(
-                text = stringResource(R.string.Order_Value),
+                text = stringResource(R.string.perps_position),
                 fontSize = 16.sp,
                 fontWeight = FontWeight.Medium,
                 color = MixinAppTheme.colors.textPrimary

app/src/main/res/values-zh-rCN/strings.xml

@@ -2323,6 +2323,7 @@
     <string name="Perpetual_Leverage_Format">%1$d倍</string>
     <string name="Open_Positions">持仓(%1$d)</string>
     <string name="perps_positions">持仓</string>
+    <string name="perps_position">持仓</string>
     <string name="perps_activity">历史记录</string>
     <string name="No_Positions">暂无持仓</string>
     <string name="No_Closed_Positions">暂无历史记录</string>

app/src/main/res/values/strings.xml

@@ -483,7 +483,7 @@
     <string name="error_invalid_quote_amount">ERROR 10614: The input amount is either too small or too large, please adjust the amount.</string>
     <string name="error_invalid_quote_amount_detailed">ERROR 10614: The amount exceeds the maximum allowable value of %1$s. Please adjust the amount. Try placing a limit order? No restrictions on amount or token.</string>
     <string name="error_no_available_quote">ERROR 10615: This trading pair is currently not supported, please try switching to a different token.</string>
-    <string name="error_perps_order_value_too_small">ERROR 10650: Order value is too small.</string>
+    <string name="error_perps_order_value_too_small">ERROR 10650: Size is too small.</string>
     <string name="error_perps_market_already_has_active_position">ERROR 10651: The current market already has an open position.</string>
     <string name="error_waiting_other_orders">The current market already has an open position.</string>
     <string name="error_phone_verification_code_expired">ERROR 20114: Expired phone verification code</string>
@@ -2333,7 +2333,7 @@
     <string name="Perpetual_Leverage_Impact_1">Leverage amplifies both gains and losses.</string>
     <string name="Perpetual_Leverage_Impact_2">Higher leverage means greater P&amp;L fluctuation with price movements.</string>
     <string name="Perpetual_Leverage_Risk">Please choose leverage reasonably, with high leverage, even small price movements can lead to significant losses.</string>
-    <string name="Perpetual_Position_Desc">The order value of current contract is calculated by "Margin × Leverage", representing the asset size controlled in this transaction.</string>
+    <string name="Perpetual_Position_Desc">The size of current contract is calculated by "Margin × Leverage", representing the asset size controlled in this transaction.</string>
     <string name="Perpetual_Position_Usage">Usage</string>
     <string name="Perpetual_Position_Usage_Desc_1">Determines the market exposure size of this transaction.</string>
     <string name="Perpetual_Position_Usage_Desc_2">Affects the amplification factor of profit and loss changes.</string>
@@ -2346,7 +2346,7 @@
     <string name="Leverage">Leverage</string>
     <string name="Select_Token">Select Token</string>
     <string name="Select_Leverage">Select Leverage</string>
-    <string name="Order_Value">Order Value</string>
+    <string name="Order_Value">Size</string>
     <string name="Liquidation_Price">Liquidation Price</string>
     <string name="Price_Change_Profit">Price %1$s %2$s%% → Profit %3$s%4$s%% (%5$s%6$s)</string>
     <string name="Long">Long</string>
@@ -2383,14 +2383,15 @@
     <string name="Perpetual_Closed_Long_Title">Close Long</string>
     <string name="Perpetual_Closed_Short_Title">Close Short</string>
     <string name="Estimated_Liquidation_Price">Estimated Liquidation Price</string>
-    <string name="Total_Position_Value">Total Order Value</string>
+    <string name="Total_Position_Value">Total Size</string>
     <string name="Perpetual_Side_Symbol_Title">%1$s %2$s</string>
     <string name="Perpetual_Leverage_Format">%1$dx</string>
     <string name="Perpetual_Usd_Amount" translatable="false">$%1$f</string>
     <string name="Perpetual_Usd_Amount_Signed" translatable="false">%1$s$%2$f</string>
     <string name="Perpetual_Amount_Percent_Format" translatable="false">%1$s(%2$.2f%%)</string>
     <string name="Open_Positions">Positions(%1$d)</string>
     <string name="perps_positions">Positions</string>
+    <string name="perps_position">Position</string>
     <string name="perps_activity">Activity</string>
     <string name="No_Positions">No Positions</string>
     <string name="No_Closed_Positions">No Activities</string>