Change texts in Transactions filter

horizontalsystems · Dec 11, 2023 · 43e22ce · 43e22ce
1 parent 7aeb50a
commit 43e22ce
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/...n/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionsFilterFragment.kt b/...n/java/io/horizontalsystems/bankwallet/modules/transactions/TransactionsFilterFragment.kt
@@ -18,6 +18,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
@@ -105,8 +106,9 @@ fun FilterScreen(
                 CellSingleLineLawrenceSection(
                     listOf {
                         FilterDropdownCell(
-                            title = stringResource(R.string.Market_Filter_Blockchains),
-                            value = filterBlockchain?.name,
+                            title = stringResource(R.string.Transactions_Filter_Blockchain),
+                            value = filterBlockchain?.name ?: stringResource(id = R.string.Transactions_Filter_AllBlockchains) ,
+                            valueColor = if (filterBlockchain != null) ComposeAppTheme.colors.leah else ComposeAppTheme.colors.grey,
                             onClick = {
                                 navController.slideFromRight(R.id.filterBlockchainFragment)
                             }
@@ -117,8 +119,9 @@ fun FilterScreen(
                 CellSingleLineLawrenceSection(
                     listOf {
                         FilterDropdownCell(
-                            title = stringResource(R.string.Transactions_Coins),
-                            value = selectedCoinFilterTitle,
+                            title = stringResource(R.string.Transactions_Filter_Coin),
+                            value = selectedCoinFilterTitle ?: stringResource(id = R.string.Transactions_Filter_AllCoins) ,
+                            valueColor = if (filterBlockchain != null) ComposeAppTheme.colors.leah else ComposeAppTheme.colors.grey,
                             onClick = {
                                 navController.slideFromRight(R.id.filterCoinFragment)
                             }
@@ -161,7 +164,8 @@ fun FilterScreen(
 @Composable
 private fun FilterDropdownCell(
     title: String,
-    value: String?,
+    value: String,
+    valueColor: Color,
     onClick: () -> Unit
 ) {
     Row(
@@ -187,7 +191,7 @@ private fun FilterDropdownCell(
                 text = value ?: stringResource(R.string.Any),
                 maxLines = 1,
                 style = ComposeAppTheme.typography.body,
-                color = if (value != null) ComposeAppTheme.colors.leah else ComposeAppTheme.colors.grey,
+                color = valueColor
             )
             Icon(
                 modifier = Modifier.padding(start = 4.dp),

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -710,7 +710,8 @@
     <string name="Transactions_From">from %s</string>
     <string name="Transaction_Unlimited">unlimited %s</string>
     <string name="Transactions_All">All</string>
-    <string name="Transactions_Filter_Blockchain">Filter by blockchain</string>
+    <string name="Transactions_Filter_Blockchain">Blockchain</string>
+    <string name="Transactions_Filter_Coin">Coin</string>
     <string name="Transactions_Filter_AllBlockchains">All Blockchains</string>
     <string name="Transactions_Filter_AllCoins">All Coins</string>
     <string name="Transactions_Filter_ChooseCoin">Choose Coin</string>
@@ -723,8 +724,7 @@
     <string name="Transactions_Unknown_Description">Transaction can not be parsed</string>
     <string name="Transactions_Multiple">Multiple</string>
     <string name="Transactions_Filter">Filter</string>
-    <string name="Transactions_Coins">Coins</string>
-    <string name="Transactions_Filter_HideSuspiciousTx">Hide Suspicious Txs</string>
+    <string name="Transactions_Filter_HideSuspiciousTx">Hide suspicious tx</string>
     <string name="Transactions_Filter_StablecoinDustAmount_Description">Hiding incoming transactions with the dust amount in stablecoins, this partially solves the  address poisoning attack problems.</string>
 
     <!--Transaction Info-->