Skip to content

Commit fc3c8c4

Browse files
SeniorZhaiSeniorZhai
committed
Update strings
1 parent 78b49eb commit fc3c8c4

File tree

6 files changed

+87
-32
lines changed

6 files changed

+87
-32
lines changed

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

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,11 @@ class AllPositionsFragment : BaseFragment(R.layout.fragment_all_closed_positions
111111
private var openPositionsLiveData: LiveData<PagedList<PerpsPositionItem>>? = null
112112
private var closedPositionsLiveData: LiveData<PagedList<PerpsPositionHistoryItem>>? = null
113113
private var totalValueJob: Job? = null
114+
115+
private var lastOpenTotalValue: Double = 0.0
116+
private var lastOpenTotalPnl: Double = 0.0
117+
private var lastClosedTotalPnl: Double = 0.0
118+
private var lastClosedTotalEntryValue: Double = 0.0
114119

115120
private val openPositionsObserver = Observer<PagedList<PerpsPositionItem>> { pagedList ->
116121
binding.progressBar.isVisible = false
@@ -172,6 +177,11 @@ class AllPositionsFragment : BaseFragment(R.layout.fragment_all_closed_positions
172177
openPositionsLiveData?.removeObservers(viewLifecycleOwner)
173178
closedPositionsLiveData?.removeObservers(viewLifecycleOwner)
174179
totalValueJob?.cancel()
180+
181+
lastOpenTotalValue = 0.0
182+
lastOpenTotalPnl = 0.0
183+
lastClosedTotalPnl = 0.0
184+
lastClosedTotalEntryValue = 0.0
175185

176186
if (currentTab == PositionTab.OPEN) {
177187
binding.titleView.setSubTitle(getString(R.string.Open_Positions_Simple), "")
@@ -228,9 +238,13 @@ class AllPositionsFragment : BaseFragment(R.layout.fragment_all_closed_positions
228238
) { totalPositionValue, totalPnl ->
229239
totalPositionValue to totalPnl
230240
}.collect { (totalPositionValue, totalPnl) ->
231-
val percent = calculatePercent(totalPnl, totalPositionValue)
232-
totalValueAdapter.submitTotal(BigDecimal.valueOf(totalPositionValue))
233-
totalValueAdapter.submitSubtitle(BigDecimal.valueOf(totalPnl), BigDecimal.valueOf(percent))
241+
if (lastOpenTotalValue != totalPositionValue || lastOpenTotalPnl != totalPnl) {
242+
lastOpenTotalValue = totalPositionValue
243+
lastOpenTotalPnl = totalPnl
244+
val percent = calculatePercent(totalPnl, totalPositionValue)
245+
totalValueAdapter.submitTotal(BigDecimal.valueOf(totalPositionValue))
246+
totalValueAdapter.submitSubtitle(BigDecimal.valueOf(totalPnl), BigDecimal.valueOf(percent))
247+
}
234248
}
235249
}
236250
}
@@ -246,9 +260,13 @@ class AllPositionsFragment : BaseFragment(R.layout.fragment_all_closed_positions
246260
) { totalPnl, totalEntryValue ->
247261
totalPnl to totalEntryValue
248262
}.collect { (totalPnl, totalEntryValue) ->
249-
val percent = calculatePercent(totalPnl, totalEntryValue)
250-
totalValueAdapter.submitTotal(BigDecimal.valueOf(totalPnl))
251-
totalValueAdapter.submitSubtitle(BigDecimal.valueOf(totalPnl), BigDecimal.valueOf(percent))
263+
if (lastClosedTotalPnl != totalPnl || lastClosedTotalEntryValue != totalEntryValue) {
264+
lastClosedTotalPnl = totalPnl
265+
lastClosedTotalEntryValue = totalEntryValue
266+
val percent = calculatePercent(totalPnl, totalEntryValue)
267+
totalValueAdapter.submitTotal(BigDecimal.valueOf(totalPnl))
268+
totalValueAdapter.submitSubtitle(BigDecimal.valueOf(totalPnl), BigDecimal.valueOf(percent))
269+
}
252270
}
253271
}
254272
}

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

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,9 @@ fun PerpetualGuidePage(
130130
.padding(horizontal = 16.dp)
131131
) {
132132
Spacer(modifier = Modifier.height(16.dp))
133-
Row(modifier = Modifier.fillMaxWidth().horizontalScroll(rememberScrollState())) {
133+
Row(modifier = Modifier
134+
.fillMaxWidth()
135+
.horizontalScroll(rememberScrollState())) {
134136
tabs.forEachIndexed { index, tab ->
135137
OutlinedTab(
136138
text = tab,
@@ -351,8 +353,11 @@ private fun LeverageContent() {
351353
DescriptionWithInfoAndRiskCard(
352354
description = stringResource(R.string.Perpetual_Leverage_Desc),
353355
infoTitle = stringResource(R.string.Perpetual_PnL_Impact),
354-
infoContents = listOf(stringResource(R.string.Perpetual_Leverage_Impact)),
355-
riskContent = stringResource(R.string.Perpetual_Leverage_Risk)
356+
infoContents = listOf(
357+
stringResource(R.string.Perpetual_Leverage_Impact_1),
358+
stringResource(R.string.Perpetual_Leverage_Impact_2)
359+
),
360+
riskContents = listOf(stringResource(R.string.Perpetual_Leverage_Risk))
356361
)
357362
}
358363

@@ -439,10 +444,10 @@ private fun PositionContent() {
439444
description = stringResource(R.string.Perpetual_Position_Desc),
440445
infoTitle = stringResource(R.string.Perpetual_Position_Usage),
441446
infoContents = listOf(
442-
stringResource(R.string.Perpetual_Position_Usage_Support_Current_Position),
443-
stringResource(R.string.Perpetual_Position_Usage_Offset_Floating_Losses),
447+
stringResource(R.string.Perpetual_Position_Usage_Desc_1),
448+
stringResource(R.string.Perpetual_Position_Usage_Desc_2)
444449
),
445-
riskContent = stringResource(R.string.Perpetual_Position_Risk)
450+
riskContents = listOf(stringResource(R.string.Perpetual_Position_Risk_1) , stringResource(R.string.Perpetual_Position_Risk_2))
446451
)
447452
}
448453

@@ -603,7 +608,15 @@ private fun GuideSection(title: String, content: String) {
603608
)
604609
Spacer(modifier = Modifier.height(8.dp))
605610
DotText(
606-
text = stringResource(R.string.Perpetual_Risk_Warning_Content),
611+
text = stringResource(R.string.Perpetual_Risk_Warning_Content_1),
612+
color = MixinAppTheme.colors.textPrimary
613+
)
614+
DotText(
615+
text = stringResource(R.string.Perpetual_Risk_Warning_Content_2),
616+
color = MixinAppTheme.colors.textPrimary
617+
)
618+
DotText(
619+
text = stringResource(R.string.Perpetual_Risk_Warning_Content_3),
607620
color = MixinAppTheme.colors.textPrimary
608621
)
609622
}
@@ -996,7 +1009,7 @@ private fun DescriptionWithInfoAndRiskCard(
9961009
description: String,
9971010
infoTitle: String,
9981011
infoContents: List<String>,
999-
riskContent: String,
1012+
riskContents: List<String>,
10001013
) {
10011014
Column(
10021015
modifier = Modifier
@@ -1053,10 +1066,12 @@ private fun DescriptionWithInfoAndRiskCard(
10531066
color = MixinAppTheme.colors.textPrimary
10541067
)
10551068
Spacer(modifier = Modifier.height(6.dp))
1056-
DotText(
1057-
text = riskContent,
1058-
color = MixinAppTheme.colors.textPrimary
1059-
)
1069+
riskContents.forEach { riskContent ->
1070+
DotText(
1071+
text = riskContent,
1072+
color = MixinAppTheme.colors.textPrimary
1073+
)
1074+
}
10601075
}
10611076
}
10621077
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ private fun OpenPositionCard(
729729
Column(horizontalAlignment = Alignment.End) {
730730
Row(verticalAlignment = Alignment.CenterVertically) {
731731
Text(
732-
text = stringResource(R.string.Perpetual_Guide_Position),
732+
text = stringResource(R.string.Amount),
733733
fontSize = 12.sp,
734734
color = MixinAppTheme.colors.textAssist
735735
)

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

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2249,7 +2249,9 @@
22492249
<string name="Perpetual_Feature_4">支持逐仓模式，灵活控制风险</string>
22502250
<string name="Perpetual_Feature_5">延迟爆仓，防插针</string>
22512251
<string name="Perpetual_Risk_Warning">风险提示</string>
2252-
<string name="Perpetual_Risk_Warning_Content">杠杆交易可能放大收益，同时也会放大亏损。当保证金不足时，仓位可能被强制平仓。请合理控制杠杆倍数与仓位规模，谨慎交易。</string>
2252+
<string name="Perpetual_Risk_Warning_Content_1">杠杆交易可能放大收益，同时也会放大亏损。</string>
2253+
<string name="Perpetual_Risk_Warning_Content_2">当保证金不足时，仓位可能被强制平仓。</string>
2254+
<string name="Perpetual_Risk_Warning_Content_3">请合理控制杠杆倍数与仓位规模，谨慎交易。</string>
22532255
<string name="Perpetual_Example">举例说明</string>
22542256
<string name="Perpetual_Trading_Pair">交易对</string>
22552257
<string name="Perpetual_Direction">开仓方向</string>
@@ -2275,21 +2277,24 @@
22752277
<string name="Perpetual_PnL_Rules">盈亏规则</string>
22762278
<string name="Perpetual_Leverage_Desc">杠杆倍数用于放大交易规模，以较少的保证金控制更大的合约仓位。</string>
22772279
<string name="Perpetual_PnL_Impact">盈亏影响</string>
2278-
<string name="Perpetual_Leverage_Impact">杠杆会同时放大收益和亏损。杠杆倍数越高，盈亏随价格波动的变化越大。</string>
2280+
<string name="Perpetual_Leverage_Impact_1">杠杆会同时放大收益和亏损。</string>
2281+
<string name="Perpetual_Leverage_Impact_2">杠杆倍数越高，盈亏随价格波动的变化越大。</string>
22792282
<string name="Perpetual_Leverage_Risk">请合理选择杠杆倍数，高杠杆下，价格小幅波动也可能导致较大亏损。</string>
2280-
<string name="Perpetual_Position_Desc">当前合约订单价值，由「保证金 × 杠杆」决定。</string>
2283+
<string name="Perpetual_Position_Desc">当前合约的订单价值由「保证金 × 杠杆倍数」计算得出，表示本次交易所控制的资产规模。</string>
22812284
<string name="Perpetual_Position_Usage">用途</string>
2282-
<string name="Perpetual_Position_Usage_Desc">支撑当前仓位，抵扣浮动亏损。</string>
2285+
<string name="Perpetual_Position_Usage_Desc_1">决定本次交易的市场敞口规模。</string>
2286+
<string name="Perpetual_Position_Usage_Desc_2">影响盈亏变化的放大倍数。</string>
22832287
<string name="Perpetual_Position_Usage_Support_Current_Position">支撑当前仓位</string>
22842288
<string name="Perpetual_Position_Usage_Offset_Floating_Losses">抵扣浮动亏损</string>
2285-
<string name="Perpetual_Position_Risk">当投入资金不足以支撑当前仓位时，仓位将被系统强制平仓。价格剧烈波动可能会快速消耗投入资金。</string>
2289+
<string name="Perpetual_Position_Risk_1">当亏损接近已投入资金时，可能被系统强制平仓。</string>
2290+
<string name="Perpetual_Position_Risk_2">价格剧烈波动可能会快速消耗投入资金。</string>
22862291
<string name="Perpetual">永续合约</string>
22872292
<string name="Open_Position">开仓</string>
22882293
<string name="Leverage">杠杆</string>
22892294
<string name="Select_Token">选择代币</string>
22902295
<string name="Select_Leverage">选择杠杆</string>
22912296
<string name="Order_Value">订单价值</string>
2292-
<string name="Liquidation_Price">强平价格</string>
2297+
<string name="Liquidation_Price">清算价格</string>
22932298
<string name="Price_Change_Profit">价格%1$s %2$s%% → 盈利 %3$s%4$s%% (%5$s%6$s)</string>
22942299
<string name="Long">做多</string>
22952300
<string name="Short">做空</string>
@@ -2318,7 +2323,7 @@
23182323
<string name="Perpetual_Opened_Short_Title">开仓做空</string>
23192324
<string name="Perpetual_Closed_Long_Title">平仓做多</string>
23202325
<string name="Perpetual_Closed_Short_Title">平仓做空</string>
2321-
<string name="Estimated_Liquidation_Price">预估强平价格</string>
2326+
<string name="Estimated_Liquidation_Price">预估清算价格</string>
23222327
<string name="Total_Position_Value">订单总价值</string>
23232328
<string name="Perpetual_Side_Symbol_Title">%1$s %2$s</string>
23242329
<string name="Perpetual_Leverage_Format">%1$d倍</string>

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2308,7 +2308,9 @@
23082308
<string name="Perpetual_Feature_4">Support isolated margin mode for flexible risk control</string>
23092309
<string name="Perpetual_Feature_5">Delayed liquidation to prevent flash crashes</string>
23102310
<string name="Perpetual_Risk_Warning">Risk Warning</string>
2311-
<string name="Perpetual_Risk_Warning_Content">Leverage trading can amplify gains but also losses. When margin is insufficient, positions may be forcibly liquidated. Please control leverage and position size reasonably and trade cautiously.</string>
2311+
<string name="Perpetual_Risk_Warning_Content_1">Leverage trading can amplify gains but also losses.</string>
2312+
<string name="Perpetual_Risk_Warning_Content_2">When margin is insufficient, positions may be forcibly liquidated.</string>
2313+
<string name="Perpetual_Risk_Warning_Content_3">Please control leverage and position size reasonably and trade cautiously.</string>
23122314
<string name="Perpetual_Example">Example</string>
23132315
<string name="Perpetual_Trading_Pair">Trading Pair</string>
23142316
<string name="Perpetual_Direction">Direction</string>
@@ -2334,14 +2336,17 @@
23342336
<string name="Perpetual_PnL_Rules">P&amp;L Rules</string>
23352337
<string name="Perpetual_Leverage_Desc">Leverage multiplier is used to amplify trading size, controlling larger contract positions with less margin.</string>
23362338
<string name="Perpetual_PnL_Impact">P&amp;L Impact</string>
2337-
<string name="Perpetual_Leverage_Impact">Leverage amplifies both gains and losses. Higher leverage means greater P&amp;L fluctuation with price movements.</string>
2338-
<string name="Perpetual_Leverage_Risk">Please choose leverage reasonably. With high leverage, even small price movements can lead to significant losses.</string>
2339-
<string name="Perpetual_Position_Desc">The order value of current contract position, determined by "Margin × Leverage".</string>
2339+
<string name="Perpetual_Leverage_Impact_1">Leverage amplifies both gains and losses.</string>
2340+
<string name="Perpetual_Leverage_Impact_2">Higher leverage means greater P&amp;L fluctuation with price movements.</string>
2341+
<string name="Perpetual_Leverage_Risk">Please choose leverage reasonably, with high leverage, even small price movements can lead to significant losses.</string>
2342+
<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>
23402343
<string name="Perpetual_Position_Usage">Usage</string>
2341-
<string name="Perpetual_Position_Usage_Desc">Support current position and offset floating losses.</string>
2344+
<string name="Perpetual_Position_Usage_Desc_1">Determines the market exposure size of this transaction.</string>
2345+
<string name="Perpetual_Position_Usage_Desc_2">Affects the amplification factor of profit and loss changes.</string>
23422346
<string name="Perpetual_Position_Usage_Support_Current_Position">Support current position.</string>
23432347
<string name="Perpetual_Position_Usage_Offset_Floating_Losses">Offset floating losses.</string>
2344-
<string name="Perpetual_Position_Risk">When investment is insufficient to support current position, the position will be forcibly liquidated by the system. Severe price volatility may rapidly consume investment.</string>
2348+
<string name="Perpetual_Position_Risk_1">When losses approach the invested capital, a forced liquidation by the system may occur.</string>
2349+
<string name="Perpetual_Position_Risk_2">Severe price volatility may rapidly consume investment.</string>
23452350
<string name="Perpetual">Perpetual</string>
23462351
<string name="Open_Position">Open Position</string>
23472352
<string name="Leverage">Leverage</string>

‎gradle/gradle-daemon-jvm.properties‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#This file is generated by updateDaemonJvm
2+
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect
3+
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect
4+
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect
5+
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect
6+
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/73bcfb608d1fde9fb62e462f834a3299/redirect
7+
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/846ee0d876d26a26f37aa1ce8de73224/redirect
8+
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect
9+
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect
10+
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/9482ddec596298c84656d31d16652665/redirect
11+
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/39701d92e1756bb2f141eb67cd4c660e/redirect
12+
toolchainVersion=21

0 commit comments

Comments
 (0)