diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/filters/MarketFiltersBottomSheets.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/filters/MarketFiltersBottomSheets.kt new file mode 100644 index 0000000000..d15f9d2e32 --- /dev/null +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/filters/MarketFiltersBottomSheets.kt @@ -0,0 +1,203 @@ +package io.horizontalsystems.bankwallet.modules.market.filters + +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.material.Divider +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.ColorFilter +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import io.horizontalsystems.bankwallet.R +import io.horizontalsystems.bankwallet.ui.compose.ComposeAppTheme +import io.horizontalsystems.bankwallet.ui.compose.components.CellUniversalLawrenceSection +import io.horizontalsystems.bankwallet.ui.compose.components.RowUniversal +import io.horizontalsystems.bankwallet.ui.compose.components.VSpacer +import io.horizontalsystems.bankwallet.ui.compose.components.body_grey +import io.horizontalsystems.bankwallet.ui.compose.components.body_leah +import io.horizontalsystems.bankwallet.ui.compose.components.body_lucian +import io.horizontalsystems.bankwallet.ui.compose.components.body_remus +import io.horizontalsystems.bankwallet.ui.compose.components.caption_grey +import io.horizontalsystems.bankwallet.ui.extensions.BottomSheetHeader + +@Composable +fun SingleSelectBottomSheetContent( + title: Int, + headerIcon: Int, + items: List>, + selectedItem: FilterViewItemWrapper? = null, + onSelect: (FilterViewItemWrapper) -> Unit, + onClose: (() -> Unit), +) { + BottomSheetHeader( + iconPainter = painterResource(headerIcon), + title = stringResource(title), + onCloseClick = onClose, + iconTint = ColorFilter.tint(ComposeAppTheme.colors.jacob) + ) { + Spacer(Modifier.height(12.dp)) + CellUniversalLawrenceSection( + items = items, + showFrame = true + ) { itemWrapper -> + RowUniversal( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp), + onClick = { + onSelect(itemWrapper) + onClose() + } + ) { + if (itemWrapper.title != null && itemWrapper.item is PriceChange) { + when (itemWrapper.item.color) { + TextColor.Lucian -> body_lucian(text = itemWrapper.title) + TextColor.Remus -> body_remus(text = itemWrapper.title) + TextColor.Grey -> body_grey(text = itemWrapper.title) + TextColor.Leah -> body_leah(text = itemWrapper.title) + } + } else { + if (itemWrapper.title != null) { + body_leah(text = itemWrapper.title) + } else { + body_grey(text = stringResource(R.string.Any)) + } + } + Spacer(modifier = Modifier.weight(1f)) + if (itemWrapper == selectedItem) { + Image( + modifier = Modifier.padding(start = 5.dp), + painter = painterResource(id = R.drawable.ic_checkmark_20), + colorFilter = ColorFilter.tint(ComposeAppTheme.colors.jacob), + contentDescription = null + ) + } + } + } + Spacer(Modifier.height(44.dp)) + } +} + +@Composable +fun PriceCloseToBottomSheetContent( + items: List, + selectedItem: PriceCloseTo? = null, + onSelect: (PriceCloseTo?) -> Unit, + onClose: (() -> Unit), +) { + BottomSheetHeader( + iconPainter = painterResource(R.drawable.ic_usd_24), + title = stringResource(R.string.Market_Filter_PriceCloseTo), + onCloseClick = onClose, + iconTint = ColorFilter.tint(ComposeAppTheme.colors.jacob) + ) { + VSpacer(12.dp) + CellUniversalLawrenceSection(showFrame = true) { + Column { + RowUniversal( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp), + onClick = { + onSelect(null) + onClose() + } + ) { + body_grey( + text = stringResource(R.string.Any), + modifier = Modifier.weight(1f) + ) + if (selectedItem == null) { + Image( + modifier = Modifier.padding(start = 5.dp), + painter = painterResource(id = R.drawable.ic_checkmark_20), + colorFilter = ColorFilter.tint(ComposeAppTheme.colors.jacob), + contentDescription = null + ) + } + } + items.forEach { item -> + Divider( + thickness = 1.dp, + color = ComposeAppTheme.colors.steel10, + ) + RowUniversal( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp), + onClick = { + onSelect(item) + onClose() + } + ) { + body_leah( + text = stringResource(item.titleResId) + " " + stringResource(item.descriptionResId), + modifier = Modifier.weight(1f) + ) + if (item == selectedItem) { + Image( + modifier = Modifier.padding(start = 5.dp), + painter = painterResource(id = R.drawable.ic_checkmark_20), + colorFilter = ColorFilter.tint(ComposeAppTheme.colors.jacob), + contentDescription = null + ) + } + } + } + } + } + + VSpacer(44.dp) + } +} + +@Composable +fun CoinSetBottomSheetContent( + items: List, + selectedItem: CoinList, + onSelect: (CoinList) -> Unit, + onClose: (() -> Unit), +) { + BottomSheetHeader( + iconPainter = painterResource(R.drawable.ic_circle_coin_24), + title = stringResource(R.string.Market_Filter_ChooseSet), + onCloseClick = onClose, + iconTint = ColorFilter.tint(ComposeAppTheme.colors.jacob) + ) { + VSpacer(12.dp) + CellUniversalLawrenceSection( + items = items, + showFrame = true + ) { item -> + RowUniversal( + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp), + onClick = { + onSelect(item) + onClose() + } + ) { + Column(modifier = Modifier.weight(1f)) { + body_leah(text = stringResource(item.titleResId)) + caption_grey(text = stringResource(item.descriptionResId)) + } + + if (item == selectedItem) { + Image( + modifier = Modifier.padding(start = 5.dp), + painter = painterResource(id = R.drawable.ic_checkmark_20), + colorFilter = ColorFilter.tint(ComposeAppTheme.colors.jacob), + contentDescription = null + ) + } + } + } + Spacer(Modifier.height(44.dp)) + } +} \ No newline at end of file diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/filters/MarketFiltersFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/filters/MarketFiltersFragment.kt index 1af5e5e0a5..c8930eabff 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/filters/MarketFiltersFragment.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/filters/MarketFiltersFragment.kt @@ -1,7 +1,6 @@ package io.horizontalsystems.bankwallet.modules.market.filters import androidx.annotation.StringRes -import androidx.compose.foundation.Image import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Column @@ -9,11 +8,9 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material.Divider import androidx.compose.material.Icon import androidx.compose.material.Scaffold import androidx.compose.material3.ExperimentalMaterial3Api @@ -27,7 +24,6 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.platform.LocalView import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource @@ -40,17 +36,21 @@ import io.horizontalsystems.bankwallet.core.BaseComposeFragment import io.horizontalsystems.bankwallet.core.paidAction import io.horizontalsystems.bankwallet.core.slideFromRight import io.horizontalsystems.bankwallet.modules.evmfee.ButtonsGroupWithShade -import io.horizontalsystems.bankwallet.modules.market.filters.MarketFiltersModule.FilterDropdown.* +import io.horizontalsystems.bankwallet.modules.market.filters.MarketFiltersModule.FilterDropdown.CoinSet +import io.horizontalsystems.bankwallet.modules.market.filters.MarketFiltersModule.FilterDropdown.MarketCap +import io.horizontalsystems.bankwallet.modules.market.filters.MarketFiltersModule.FilterDropdown.PriceChange +import io.horizontalsystems.bankwallet.modules.market.filters.MarketFiltersModule.FilterDropdown.PriceCloseTo +import io.horizontalsystems.bankwallet.modules.market.filters.MarketFiltersModule.FilterDropdown.PricePeriod +import io.horizontalsystems.bankwallet.modules.market.filters.MarketFiltersModule.FilterDropdown.TradingSignals +import io.horizontalsystems.bankwallet.modules.market.filters.MarketFiltersModule.FilterDropdown.TradingVolume import io.horizontalsystems.bankwallet.ui.compose.ComposeAppTheme import io.horizontalsystems.bankwallet.ui.compose.TranslatableString import io.horizontalsystems.bankwallet.ui.compose.components.AppBar import io.horizontalsystems.bankwallet.ui.compose.components.ButtonPrimaryYellowWithSpinner -import io.horizontalsystems.bankwallet.ui.compose.components.CellUniversalLawrenceSection import io.horizontalsystems.bankwallet.ui.compose.components.HsBackButton import io.horizontalsystems.bankwallet.ui.compose.components.HsSwitch import io.horizontalsystems.bankwallet.ui.compose.components.MenuItem import io.horizontalsystems.bankwallet.ui.compose.components.PremiumHeader -import io.horizontalsystems.bankwallet.ui.compose.components.RowUniversal import io.horizontalsystems.bankwallet.ui.compose.components.VSpacer import io.horizontalsystems.bankwallet.ui.compose.components.body_grey import io.horizontalsystems.bankwallet.ui.compose.components.body_leah @@ -60,11 +60,9 @@ import io.horizontalsystems.bankwallet.ui.compose.components.cell.CellUniversal import io.horizontalsystems.bankwallet.ui.compose.components.cell.SectionPremiumUniversalLawrence import io.horizontalsystems.bankwallet.ui.compose.components.cell.SectionUniversalLawrence import io.horizontalsystems.bankwallet.ui.compose.components.subhead2_grey -import io.horizontalsystems.bankwallet.ui.extensions.BottomSheetHeader import io.horizontalsystems.core.helpers.HudHelper import io.horizontalsystems.subscriptions.core.AdvancedSearch import kotlinx.coroutines.launch -import io.horizontalsystems.bankwallet.modules.market.filters.PriceChange as FilterPriceChange class MarketFiltersFragment : BaseComposeFragment() { @@ -201,9 +199,7 @@ private fun BottomSheetContent( } CoinSet -> { - SingleSelectBottomSheetContent( - title = R.string.Market_Filter_ChooseSet, - headerIcon = R.drawable.ic_circle_coin_24, + CoinSetBottomSheetContent( items = viewModel.coinListsViewItemOptions, selectedItem = uiState.coinListSet, onSelect = { @@ -293,10 +289,10 @@ fun AdvancedSearchContent( SectionUniversalLawrence { AdvancedSearchDropdown( - title = R.string.Market_Filter_MarketCap, - value = uiState.marketCap.title, + title = R.string.Market_Filter_ChooseSet, + value = stringResource(uiState.coinListSet.titleResId), borderTop = false, - onDropdownClick = { showBottomSheet(MarketCap) } + onDropdownClick = { showBottomSheet(CoinSet) } ) AdvancedSearchDropdown( title = R.string.Market_Filter_Volume, @@ -499,134 +495,3 @@ private fun FilterMenu(title: String?, valueColor: TextColor, onClick: () -> Uni ) } } - -@Composable -private fun SingleSelectBottomSheetContent( - title: Int, - headerIcon: Int, - items: List>, - selectedItem: FilterViewItemWrapper? = null, - onSelect: (FilterViewItemWrapper) -> Unit, - onClose: (() -> Unit), -) { - BottomSheetHeader( - iconPainter = painterResource(headerIcon), - title = stringResource(title), - onCloseClick = onClose, - iconTint = ColorFilter.tint(ComposeAppTheme.colors.jacob) - ) { - Spacer(Modifier.height(12.dp)) - CellUniversalLawrenceSection( - items = items, - showFrame = true - ) { itemWrapper -> - RowUniversal( - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 16.dp), - onClick = { - onSelect(itemWrapper) - onClose() - } - ) { - if (itemWrapper.title != null && itemWrapper.item is FilterPriceChange) { - when (itemWrapper.item.color) { - TextColor.Lucian -> body_lucian(text = itemWrapper.title) - TextColor.Remus -> body_remus(text = itemWrapper.title) - TextColor.Grey -> body_grey(text = itemWrapper.title) - TextColor.Leah -> body_leah(text = itemWrapper.title) - } - } else { - if (itemWrapper.title != null) { - body_leah(text = itemWrapper.title) - } else { - body_grey(text = stringResource(R.string.Any)) - } - } - Spacer(modifier = Modifier.weight(1f)) - if (itemWrapper == selectedItem) { - Image( - modifier = Modifier.padding(start = 5.dp), - painter = painterResource(id = R.drawable.ic_checkmark_20), - colorFilter = ColorFilter.tint(ComposeAppTheme.colors.jacob), - contentDescription = null - ) - } - } - } - Spacer(Modifier.height(44.dp)) - } -} - -@Composable -private fun PriceCloseToBottomSheetContent( - items: List, - selectedItem: PriceCloseTo? = null, - onSelect: (PriceCloseTo?) -> Unit, - onClose: (() -> Unit), -) { - BottomSheetHeader( - iconPainter = painterResource(R.drawable.ic_usd_24), - title = stringResource(R.string.Market_Filter_PriceCloseTo), - onCloseClick = onClose, - iconTint = ColorFilter.tint(ComposeAppTheme.colors.jacob) - ) { - VSpacer(12.dp) - CellUniversalLawrenceSection(showFrame = true) { - Column { - RowUniversal( - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 16.dp), - onClick = { - onSelect(null) - onClose() - } - ) { - body_grey( - text = stringResource(R.string.Any), - modifier = Modifier.weight(1f) - ) - if (selectedItem == null) { - Image( - modifier = Modifier.padding(start = 5.dp), - painter = painterResource(id = R.drawable.ic_checkmark_20), - colorFilter = ColorFilter.tint(ComposeAppTheme.colors.jacob), - contentDescription = null - ) - } - } - items.forEach { item -> - Divider( - thickness = 1.dp, - color = ComposeAppTheme.colors.steel10, - ) - RowUniversal( - modifier = Modifier - .fillMaxWidth() - .padding(horizontal = 16.dp), - onClick = { - onSelect(item) - onClose() - } - ) { - body_leah( - text = stringResource(item.titleResId) + " " + stringResource(item.descriptionResId), - modifier = Modifier.weight(1f) - ) - if (item == selectedItem) { - Image( - modifier = Modifier.padding(start = 5.dp), - painter = painterResource(id = R.drawable.ic_checkmark_20), - colorFilter = ColorFilter.tint(ComposeAppTheme.colors.jacob), - contentDescription = null - ) - } - } - } - } - } - - VSpacer(44.dp) - } -} diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/filters/MarketFiltersModule.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/filters/MarketFiltersModule.kt index bc8f445f88..c2879c98e6 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/filters/MarketFiltersModule.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/filters/MarketFiltersModule.kt @@ -56,12 +56,16 @@ enum class FilterTradingSignal(@StringRes val titleResId: Int) { } } -enum class CoinList(val itemsCount: Int, @StringRes val titleResId: Int) { - Top100(100, R.string.Market_Filter_Top_100), - Top250(250, R.string.Market_Filter_Top_250), - Top500(500, R.string.Market_Filter_Top_500), - Top1000(1000, R.string.Market_Filter_Top_1000), - Top1500(1500, R.string.Market_Filter_Top_1500), +enum class CoinList( + val itemsCount: Int, + @StringRes val titleResId: Int, + @StringRes val descriptionResId: Int +) { + Top100(100, R.string.Market_Filter_Top_100, R.string.Market_Filter_Top_100_Description), + Top200(200, R.string.Market_Filter_Top_200, R.string.Market_Filter_Top_200_Description), + Top300(300, R.string.Market_Filter_Top_300, R.string.Market_Filter_Top_300_Description), + Top500(500, R.string.Market_Filter_Top_500, R.string.Market_Filter_Top_300_Description), + Top1000(1000, R.string.Market_Filter_Top_1000, R.string.Market_Filter_Top_1000_Description), } enum class Range(@StringRes val titleResId: Int, val values: Pair) { diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/filters/MarketFiltersService.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/filters/MarketFiltersService.kt index 9af5f39016..3b911ba01a 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/filters/MarketFiltersService.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/filters/MarketFiltersService.kt @@ -44,7 +44,7 @@ class MarketFiltersService( val blockchains = marketKit.blockchains(blockchainTypes.map { it.uid }) val currencyCode = baseCurrency.code - var coinCount = CoinList.Top250.itemsCount + var coinCount = CoinList.Top200.itemsCount var filterMarketCap: Pair? = null var filterVolume: Pair? = null var filterPeriod = TimePeriod.TimePeriod_1D diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/filters/MarketFiltersViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/filters/MarketFiltersViewModel.kt index 76dd94276c..14246d386d 100644 --- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/filters/MarketFiltersViewModel.kt +++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/market/filters/MarketFiltersViewModel.kt @@ -17,10 +17,7 @@ import java.net.UnknownHostException class MarketFiltersViewModel(val service: MarketFiltersService) : ViewModelUiState() { - private var coinListSet = FilterViewItemWrapper( - Translator.getString(CoinList.Top250.titleResId), - CoinList.Top250, - ) + private var coinListSet: CoinList = CoinList.Top200 private var period = FilterViewItemWrapper( Translator.getString(TimePeriod.TimePeriod_1D.titleResId), TimePeriod.TimePeriod_1D, @@ -47,9 +44,7 @@ class MarketFiltersViewModel(val service: MarketFiltersService) private var reloadDataJob: Job? = null - val coinListsViewItemOptions = CoinList.values().map { - FilterViewItemWrapper(Translator.getString(it.titleResId), it) - } + val coinListsViewItemOptions = CoinList.entries val marketCapViewItemOptions = getRanges(service.currencyCode) val volumeViewItemOptions = getRanges(service.currencyCode) val periodViewItemOptions = TimePeriod.values().map { @@ -96,12 +91,7 @@ class MarketFiltersViewModel(val service: MarketFiltersService) ) fun reset() { - updateCoinList( - FilterViewItemWrapper( - Translator.getString(CoinList.Top250.titleResId), - CoinList.Top250, - ) - ) + updateCoinList(CoinList.Top200) marketCap = rangeEmpty volume = rangeEmpty period = FilterViewItemWrapper( @@ -123,9 +113,9 @@ class MarketFiltersViewModel(val service: MarketFiltersService) reloadData() } - fun updateCoinList(value: FilterViewItemWrapper) { + fun updateCoinList(value: CoinList) { coinListSet = value - service.coinCount = value.item.itemsCount + service.coinCount = value.itemsCount service.clearCache() showSpinner = true emitState() @@ -292,7 +282,7 @@ fun getRanges(currencyCode: String): List> { } data class MarketFiltersUiState( - val coinListSet: FilterViewItemWrapper, + val coinListSet: CoinList, val period: FilterViewItemWrapper, val filterTradingSignal: FilterViewItemWrapper, val marketCap: FilterViewItemWrapper, diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 455b3b8ce4..843e4fc1f6 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -235,10 +235,10 @@ Verkaufen Riskant Top 100 - Top 250 + Top 200 + Top 300 Top 500 Top 1000 - Top 1500 Ergebnisse anzeigen Ergebnisse anzeigen: %d < 5M diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index d54373e73e..9a8e15446c 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -234,10 +234,10 @@ Vender Arriesgado Top 100 - Top 250 + Top 200 + Top 300 Top 500 Top 1000 - Top 1500 Mostrar Resultados Mostrar resultados: %d < 5M diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index b686756d09..930fb05df0 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -234,10 +234,10 @@ Vendre Risqué Top 100 - Top 250 + Top 200 + Top 300 Top 500 Top 1000 - Top 1500 Afficher les résultats Afficher les résultats : %d < 5mn diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 898b10c27c..84a86c4b4d 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -234,10 +234,10 @@ 매도 위험 상위 100 - 상위 250 + 상위 200 + 상위 300 상위 500 상위 1000 - 상위 1500 결과 보기 결과 표시: %d < 5백만 diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 7d7fd33ab1..45013b1588 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -231,10 +231,10 @@ Irá vender Arriscado Top 100 - Top 250 + Top 200 + Top 300 Top 500 Top 1000 - Top 1500 Mostrar Resultados Mostrar Resultados: %d < 5M diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 3585b06702..4481b14cf4 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -177,10 +177,10 @@ Preço próximo a ATH Preço próximo a ATL Top 100 - Top 250 + Top 200 + Top 300 Top 500 Top 1000 - Top 1500 Mostrar Resultados Mostrar Resultados: %d < 5M diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 67e7124637..6d1b4df9d0 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -236,10 +236,10 @@ Продавать Риски Топ 100 - Топ 250 + Топ 200 + Топ 300 Топ 500 Топ 1000 - Топ 1500 Показать результаты Показать результаты: %d < 5 млн diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index ef24a95dfa..d292524ecb 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -234,10 +234,10 @@ Sat Riskli Top 100 - Top 250 + Top 200 + Top 300 Top 500 Top 1000 - Top 1500 Sonuçları Göster Sonuçları Göster: %d < 5M diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 38d03f4d73..addd692097 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -234,10 +234,10 @@ 出售 有风险 前100名 - 前250名 + 前200名 + 前300名 前500名 前1000名 - 前1500名 显示结果 显示结果:%d < 5百万 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d032d2eff1..e4e27be510 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -278,10 +278,15 @@ (All Time Low) Top 100 - Top 250 + Top 200 + Top 300 Top 500 Top 1000 - Top 1500 + M.Cap > $1B + M.Cap > $500M + M.Cap > $250M + M.Cap > $100M + M.Cap > $25M Show Results Show Results: %d