From b61582031538e2b73ca6384224d70f6d1445adb7 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Sat, 20 Apr 2019 14:36:36 +0200 Subject: [PATCH] remove Comparator --- .../android/PokerAnalyticsApplication.kt | 2 +- .../android/calculus/Calculator.kt | 22 ++-- .../pokeranalytics/android/model/Criteria.kt | 13 +- .../android/model/comparison/Comparator.kt | 113 ------------------ .../android/model/filter/QueryCondition.kt | 20 +++- .../android/model/realm/ReportSetup.kt | 2 +- .../ui/fragment/CalendarDetailsFragment.kt | 10 +- .../android/ui/fragment/CalendarFragment.kt | 18 +-- .../android/ui/fragment/ReportsFragment.kt | 8 +- .../ui/view/rowrepresentable/ReportRow.kt | 18 +-- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-hi/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-zh/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 20 files changed, 73 insertions(+), 173 deletions(-) delete mode 100644 app/src/main/java/net/pokeranalytics/android/model/comparison/Comparator.kt diff --git a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt index 1c9b7d94..75c03014 100644 --- a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt +++ b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt @@ -52,7 +52,7 @@ class PokerAnalyticsApplication : Application() { if (BuildConfig.DEBUG) { Timber.d("UserPreferences.defaultCurrency: ${UserDefaults.currency.symbol}") - //this.createFakeSessions() + this.createFakeSessions() } Patcher.patchBreaks() diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt index 9146b446..94599723 100644 --- a/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt +++ b/app/src/main/java/net/pokeranalytics/android/calculus/Calculator.kt @@ -2,8 +2,8 @@ package net.pokeranalytics.android.calculus import io.realm.Realm import net.pokeranalytics.android.calculus.Stat.* -import net.pokeranalytics.android.model.comparison.Comparator -import net.pokeranalytics.android.model.comparison.combined +import net.pokeranalytics.android.model.Criteria +import net.pokeranalytics.android.model.combined import net.pokeranalytics.android.model.extensions.hourlyDuration import net.pokeranalytics.android.model.filter.QueryCondition import net.pokeranalytics.android.model.filter.filter @@ -116,26 +116,26 @@ class Calculator { return when (aggregationType) { AggregationType.SESSION, AggregationType.DURATION -> this.computeGroups(realm, listOf(group), options) AggregationType.MONTH -> { - val comparators: List = listOf(Comparator.MONTH_OF_YEAR, Comparator.YEAR) - this.computeStatsWithComparators(realm, comparators, group.conditions, options) + val criteria: List = listOf(Criteria.MonthsOfYear, Criteria.Years) + this.computeStatsWithComparators(realm, criteria, group.conditions, options) } AggregationType.YEAR -> { - val comparators: List = listOf(Comparator.YEAR) - this.computeStatsWithComparators(realm, comparators, group.conditions, options) + val criteria: List = listOf(Criteria.Years) + this.computeStatsWithComparators(realm, criteria, group.conditions, options) } } } fun computeStatsWithComparators( - realm: Realm, - comparators: List = listOf(), - conditions: List = listOf(), - options: Options + realm: Realm, + criteria: List = listOf(), + conditions: List = listOf(), + options: Options ): Report { val computableGroups: MutableList = mutableListOf() - comparators.combined().forEach { comparatorConditions -> + criteria.combined().forEach { comparatorConditions -> val allConditions = mutableListOf() allConditions.addAll(conditions) diff --git a/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt b/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt index 520c5f51..4310be90 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt @@ -3,7 +3,6 @@ package net.pokeranalytics.android.model import io.realm.Realm import io.realm.Sort import io.realm.kotlin.where -import net.pokeranalytics.android.calculus.Stat import net.pokeranalytics.android.exceptions.PokerAnalyticsException import net.pokeranalytics.android.model.filter.QueryCondition import net.pokeranalytics.android.model.interfaces.NameManageable @@ -54,11 +53,11 @@ fun getCombinations(lists: List>): List> { return combinations.toList() } - sealed class Criteria { abstract class RealmCriteria : Criteria() { inline fun comparison(): List { - return compare < QueryCondition.QueryDataCondition, T >().sorted() + return compare, T>() + .sorted() } } @@ -104,14 +103,16 @@ sealed class Criteria { object Years: ListCriteria() object Blinds: ListCriteria() object TournamentFees: ListCriteria() + object Cash: SimpleCriteria(listOf(QueryCondition.IsCash)) + object Tournament: SimpleCriteria(listOf(QueryCondition.IsTournament)) val queryConditions: List get() { return when (this) { is Bankrolls -> comparison() is Games -> comparison() - is TournamentFeatures-> comparison() - is TournamentNames-> comparison() + is TournamentFeatures -> comparison() + is TournamentNames -> comparison() is Locations -> comparison() is SimpleCriteria -> comparison() is Limits -> comparison() @@ -162,4 +163,4 @@ sealed class Criteria { return objects } } -} \ No newline at end of file +} diff --git a/app/src/main/java/net/pokeranalytics/android/model/comparison/Comparator.kt b/app/src/main/java/net/pokeranalytics/android/model/comparison/Comparator.kt deleted file mode 100644 index 975b250f..00000000 --- a/app/src/main/java/net/pokeranalytics/android/model/comparison/Comparator.kt +++ /dev/null @@ -1,113 +0,0 @@ -package net.pokeranalytics.android.model.comparison - -import io.realm.Realm -import io.realm.Sort -import io.realm.kotlin.where -import net.pokeranalytics.android.exceptions.PokerAnalyticsException -import net.pokeranalytics.android.model.Criteria -import net.pokeranalytics.android.model.filter.QueryCondition -import net.pokeranalytics.android.model.realm.* -import java.util.* -import kotlin.collections.ArrayList - -enum class Comparator { - DAY_OF_WEEK, - MONTH_OF_YEAR, - YEAR, - BLIND, - CASH, - TOURNAMENT, - LIVE, - ONLINE, - GAME, - BANKROLL, - LOCATION, - TOURNAMENT_FEATURE, - TOURNAMENT_NAME, - DAY_PERIOD, - LIMIT_TYPE, - TABLE_SIZE, - TOURNAMENT_TYPE, - TOURNAMENT_ENTRY_FEE, - ; - - val queryConditions: List - get() { - return when (this) { - TOURNAMENT_ENTRY_FEE -> { - val fees = arrayListOf() - val realm = Realm.getDefaultInstance() - val fieldName = Session.fieldNameForQueryType(QueryCondition.BetweenTournamentFee::class.java)!! - realm.where().distinct(fieldName).findAll().sort(fieldName, Sort.ASCENDING).map { - it.tournamentEntryFee?.let { fee -> - fees.add(QueryCondition.BetweenTournamentFee().apply { between(fee, fee) }) - } - } - realm.close() - fees - } - MONTH_OF_YEAR -> Criteria.MonthsOfYear.queryConditions - DAY_OF_WEEK -> Criteria.DaysOfWeek.queryConditions - YEAR -> Criteria.Years.queryConditions - DAY_PERIOD -> Criteria.DayPeriods.queryConditions - CASH -> listOf(QueryCondition.IsCash) - TOURNAMENT -> listOf(QueryCondition.IsTournament) - LIVE -> listOf(QueryCondition.IsLive) - ONLINE -> listOf(QueryCondition.IsOnline) - BLIND -> Criteria.Blinds.queryConditions - BANKROLL -> Criteria.Bankrolls.queryConditions - GAME -> Criteria.Games.queryConditions - TOURNAMENT_NAME-> Criteria.TournamentNames.queryConditions - TOURNAMENT_FEATURE-> Criteria.TournamentFeatures.queryConditions - LOCATION-> Criteria.Locations.queryConditions - LIMIT_TYPE -> Criteria.Limits.queryConditions - TABLE_SIZE -> Criteria.TableSizes.queryConditions - TOURNAMENT_TYPE -> Criteria.TournamentTypes.queryConditions - else -> throw PokerAnalyticsException.QueryTypeUnhandled - } - } - -} - -fun List.combined(): List> { - val comparatorList = ArrayList>() - this.forEach { - comparatorList.add(it.queryConditions) - } - return getCombinations(comparatorList) -} - -fun getCombinations(lists: List>): List> { - var combinations: MutableSet> = LinkedHashSet() - var newCombinations: MutableSet> - - var index = 0 - - // extract each of the integers in the first list - // and add each to ints as a new list - if (lists.isNotEmpty()) { - for (i in lists[0]) { - val newList = ArrayList() - newList.add(i) - combinations.add(newList) - } - index++ - } - while (index < lists.size) { - val nextList = lists[index] - newCombinations = LinkedHashSet() - for (first in combinations) { - for (second in nextList) { - val newList = ArrayList() - newList.addAll(first) - newList.add(second) - newCombinations.add(newList) - } - } - combinations = newCombinations - - index++ - } - - return combinations.toList() -} \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt index 4882bd93..452aa01d 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt @@ -219,10 +219,22 @@ sealed class QueryCondition : FilterElementRow { override val showTime: Boolean = true } - object IsLive : QueryCondition() - object IsCash : QueryCondition() - object IsOnline : QueryCondition() - object IsTournament : QueryCondition() + object IsLive : QueryCondition() { + override fun getDisplayName(): String { return "Live" } + } + + object IsCash : QueryCondition() { + override fun getDisplayName(): String { return "Cash" } + } + + object IsOnline : QueryCondition() { + override fun getDisplayName(): String { return "Online" } + } + + object IsTournament : QueryCondition() { + override fun getDisplayName(): String { return "Tournament" } + } + class AnyBankroll: QueryDataCondition() { override val entity: Class = Bankroll::class.java } class AnyGame: QueryDataCondition() { override val entity: Class = Game::class.java } class AnyTournamentName: QueryDataCondition() { override val entity: Class = TournamentName::class.java } diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/ReportSetup.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/ReportSetup.kt index 2edad050..9014a1b9 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/ReportSetup.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/ReportSetup.kt @@ -24,7 +24,7 @@ open class ReportSetup : RealmObject() { // @todo define the configuration options -// var comparators: List = listOf() +// var criteria: List = listOf() // var stats: List = listOf() // The filters associated with the report diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarDetailsFragment.kt index 11c66e02..93046b79 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarDetailsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarDetailsFragment.kt @@ -18,7 +18,7 @@ import net.pokeranalytics.android.R import net.pokeranalytics.android.calculus.Calculator import net.pokeranalytics.android.calculus.ComputedResults import net.pokeranalytics.android.calculus.Stat -import net.pokeranalytics.android.model.comparison.Comparator +import net.pokeranalytics.android.model.Criteria import net.pokeranalytics.android.model.filter.QueryCondition import net.pokeranalytics.android.ui.activity.StatisticDetailsActivity import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity @@ -162,12 +162,12 @@ class CalendarDetailsFragment : PokerAnalyticsFragment(), StaticRowRepresentable addAll(computedResults.group.conditions) // Remove session type conditions - removeAll(Comparator.CASH.queryConditions) - removeAll(Comparator.TOURNAMENT.queryConditions) + removeAll(Criteria.Cash.queryConditions) + removeAll(Criteria.Tournament.queryConditions) when (sessionTypeCondition) { - QueryCondition.IsCash -> addAll(Comparator.CASH.queryConditions) - QueryCondition.IsTournament -> addAll(Comparator.TOURNAMENT.queryConditions) + QueryCondition.IsCash -> addAll(Criteria.Cash.queryConditions) + QueryCondition.IsTournament -> addAll(Criteria.Tournament.queryConditions) } } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt index 76aeaf7e..bef2459d 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt @@ -16,8 +16,8 @@ import kotlinx.coroutines.launch import net.pokeranalytics.android.calculus.Calculator import net.pokeranalytics.android.calculus.ComputedResults import net.pokeranalytics.android.calculus.Stat -import net.pokeranalytics.android.model.comparison.Comparator -import net.pokeranalytics.android.model.comparison.combined +import net.pokeranalytics.android.model.Criteria +import net.pokeranalytics.android.model.combined import net.pokeranalytics.android.model.filter.QueryCondition import net.pokeranalytics.android.ui.activity.CalendarDetailsActivity import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter @@ -240,12 +240,12 @@ class CalendarFragment : SessionObserverFragment(), CoroutineScope, StaticRowRep // Compute data per AnyYear and AnyMonthOfYear - println(">>>> ${Comparator.MONTH_OF_YEAR.queryConditions.map { it.id }}") + println(">>>> ${Criteria.MonthsOfYear.queryConditions.map { it.id }}") val monthConditions = when (sessionTypeCondition) { - QueryCondition.IsCash -> listOf(Comparator.YEAR, Comparator.MONTH_OF_YEAR, Comparator.CASH).combined() - QueryCondition.IsTournament -> listOf(Comparator.YEAR, Comparator.MONTH_OF_YEAR, Comparator.TOURNAMENT).combined() - else -> listOf(Comparator.YEAR, Comparator.MONTH_OF_YEAR).combined() + QueryCondition.IsCash -> listOf(Criteria.Years, Criteria.MonthsOfYear, Criteria.Cash).combined() + QueryCondition.IsTournament -> listOf(Criteria.Years, Criteria.MonthsOfYear, Criteria.Tournament).combined() + else -> listOf(Criteria.Years, Criteria.MonthsOfYear).combined() } monthConditions.forEach { conditions -> @@ -270,9 +270,9 @@ class CalendarFragment : SessionObserverFragment(), CoroutineScope, StaticRowRep // Compute data per AnyYear val yearConditions = when (sessionTypeCondition) { - QueryCondition.IsCash -> listOf(Comparator.YEAR, Comparator.CASH).combined() - QueryCondition.IsTournament -> listOf(Comparator.YEAR, Comparator.TOURNAMENT).combined() - else -> listOf(Comparator.YEAR).combined() + QueryCondition.IsCash -> listOf(Criteria.Years, Criteria.Cash).combined() + QueryCondition.IsTournament -> listOf(Criteria.Years, Criteria.Tournament).combined() + else -> listOf(Criteria.Years).combined() } yearConditions.forEach { conditions -> diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportsFragment.kt index de07535b..ed50ecb4 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/ReportsFragment.kt @@ -13,7 +13,7 @@ import kotlinx.coroutines.launch import net.pokeranalytics.android.R import net.pokeranalytics.android.calculus.Calculator import net.pokeranalytics.android.calculus.Stat -import net.pokeranalytics.android.model.comparison.Comparator +import net.pokeranalytics.android.model.Criteria import net.pokeranalytics.android.ui.activity.ReportDetailsActivity import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate @@ -71,7 +71,7 @@ class ReportsFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataSour super.onRowSelected(position, row, fromAction) if (row is ReportRow) { val reportName = row.localizedTitle(requireContext()) - launchComputation(row.comparators, reportName) + launchComputation(row.criteria, reportName) } } @@ -103,7 +103,7 @@ class ReportsFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataSour /** * Launch computation */ - private fun launchComputation(comparators: List, reportName: String) { + private fun launchComputation(criteria: List, reportName: String) { showLoader() @@ -114,7 +114,7 @@ class ReportsFragment : PokerAnalyticsFragment(), StaticRowRepresentableDataSour val requiredStats: List = listOf(Stat.NET_RESULT) val options = Calculator.Options(evolutionValues = Calculator.Options.EvolutionValues.STANDARD, stats = requiredStats) - val report = Calculator.computeStatsWithComparators(realm, comparators = comparators, options = options) + val report = Calculator.computeStatsWithComparators(realm, criteria = criteria, options = options) Timber.d("launchComputation: ${System.currentTimeMillis() - startDate.time}ms") diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/ReportRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/ReportRow.kt index 15abef1c..0d10b538 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/ReportRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/ReportRow.kt @@ -1,7 +1,7 @@ package net.pokeranalytics.android.ui.view.rowrepresentable import net.pokeranalytics.android.R -import net.pokeranalytics.android.model.comparison.Comparator +import net.pokeranalytics.android.model.Criteria import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowViewType @@ -47,17 +47,17 @@ enum class ReportRow : RowRepresentable { override val viewType: Int = RowViewType.TITLE_ARROW.ordinal - val comparators: List + val criteria: List get() { return when (this) { - BLINDS -> listOf(Comparator.BLIND) - BUY_IN -> listOf(Comparator.TOURNAMENT_ENTRY_FEE) - DAY_OF_WEEKS -> listOf(Comparator.DAY_OF_WEEK) - GENERAL -> listOf(Comparator.CASH, Comparator.LIVE) - LOCATIONS -> listOf(Comparator.LOCATION) + BLINDS -> listOf(Criteria.Blinds) + BUY_IN -> listOf(Criteria.TournamentFees) + DAY_OF_WEEKS -> listOf(Criteria.DaysOfWeek) + GENERAL -> listOf(Criteria.SessionTypes, Criteria.BankrollTypes) + LOCATIONS -> listOf(Criteria.Locations) NUMBER_OF_TABLES -> listOf() //TODO - TOURNAMENT_TYPES -> listOf(Comparator.TOURNAMENT_TYPE) - GAME -> listOf(Comparator.GAME) + TOURNAMENT_TYPES -> listOf(Criteria.TournamentTypes) + GAME -> listOf(Criteria.Games) } } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e9db407a..aaee282c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -95,7 +95,7 @@ Leeren, um einen automatisch generierten Titel zu verwenden Pik ♣︎ – Klassisches Grün Kommentar - Vergleichselemente + Vergleichselemente Vergleich Die eingegrenzte Suche ergab keine Ergebnisse Bestätigung diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 72f518ef..9fb44600 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -95,7 +95,7 @@ Borrar para utilizar título generado automáticamente Trébol ♣︎: verde clásico Comentarios - Comparadores + Comparadores Comparación Los filtros aún no dieron ningún resultado. Confirmación diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f4c9a0be..d163091b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -112,7 +112,7 @@ Effacer pour utiliser un titre généré automatiquement Trèfle ♣︎ - Vert classique Commentaire - Comparateurs + Comparateurs Comparaison Le filtre ne retourne aucun résultat Confirmation diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index fd7ca81a..93db9b16 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -95,7 +95,7 @@ स्वतः उत्पन्न शीर्षक उपयोक करने के लिए साफ करें क्लोवर ♣︎ - क्लासिक हरा टिप्पणी - तुलनायंत्र + तुलनायंत्र तुलना फिल्टर से कोई परिणाम नहीं मिलेे पुष्टीकरण diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index b435206f..dc9d0d05 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -95,7 +95,7 @@ Cancella per usare un titolo generato automaticamente Fiori ♣︎ - Verde classico Commento - Comparatori + Comparatori Comparazione Il filtraggio non ha dato alcun risultato Conferma diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 7ef3ef1c..cf9028b1 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -95,7 +95,7 @@ クリアして自動生成されたタイトルを使用 クローバー ♣︎ - クラシック グリーン コメント - コンパレーター + コンパレーター 比較 フィルタリングでは結果が戻されませんでした 確認 diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index b00b78df..beb05ff8 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -95,7 +95,7 @@ Limpe para usar o título gerado automaticamente Trevo ♣︎ - Verde clássico Comentário - Comparadores + Comparadores Comparação O filtro não apresentou nenhum resultado Confirmação diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 8107607e..61afe97f 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -95,7 +95,7 @@ Очистите для автоматического именования Клевер ♣︎ - Классическое Комментарий - Разделители + Разделители Разделение Не найдено результатов после фильтрации Подтверждение diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 794da5e7..ef0a25ac 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -83,7 +83,7 @@ 清理 清理可使用自动生成标题 评论 - 比较器 + 比较器 比较 确认 联系我们 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 11fadf0a..a6a2e029 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -122,7 +122,7 @@ Clear to use automatically generated title Clover ♣︎ - Classic green Comment - Comparators + Comparators Comparison Filtering did not yield any results Confirmation