From 3489dca202b8e1829dfe7043e08378ca48af547f Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Fri, 24 May 2019 12:25:14 +0200 Subject: [PATCH] Add new strings --- .../pokeranalytics/android/model/LiveData.kt | 19 +++++++++++++------ .../ui/fragment/data/EditableDataFragment.kt | 4 +--- app/src/main/res/values/strings.xml | 2 ++ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt b/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt index c4863212..7819c9b0 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/LiveData.kt @@ -19,9 +19,9 @@ enum class LiveData : Localizable { TOURNAMENT_FEATURE, TRANSACTION, TRANSACTION_TYPE, - FILTER, - CUSTOM_FIELD, - REPORT_SETUP; + FILTER, + CUSTOM_FIELD, + REPORT_SETUP; val relatedEntity: Class get() { @@ -33,7 +33,7 @@ enum class LiveData : Localizable { TOURNAMENT_FEATURE -> TournamentFeature::class.java TRANSACTION -> Transaction::class.java TRANSACTION_TYPE -> TransactionType::class.java - FILTER -> Filter::class.java + FILTER -> Filter::class.java CUSTOM_FIELD -> CustomField::class.java REPORT_SETUP -> ReportSetup::class.java } @@ -48,7 +48,7 @@ enum class LiveData : Localizable { } } - private fun newEntity(): RealmModel{ + private fun newEntity(): RealmModel { return this.relatedEntity.newInstance() } @@ -73,7 +73,7 @@ enum class LiveData : Localizable { TOURNAMENT_FEATURE -> R.string.tournament_feature TRANSACTION -> R.string.operations TRANSACTION_TYPE -> R.string.operation_types - FILTER -> R.string.filter + FILTER -> R.string.filter CUSTOM_FIELD -> R.string.custom_fields REPORT_SETUP -> R.string.custom } @@ -86,4 +86,11 @@ enum class LiveData : Localizable { return "${context.getString(R.string.new_str)} ${this.localizedTitle(context).toLowerCase()}" } + /** + * Return the update entity titleResId + */ + fun updateEntityLocalizedTitle(context: Context): String { + return "${context.getString(R.string.update_entity)} ${this.localizedTitle(context).toLowerCase()}" + } + } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/EditableDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/EditableDataFragment.kt index 7c1a4c72..abe4a9e5 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/EditableDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/EditableDataFragment.kt @@ -65,11 +65,9 @@ open class EditableDataFragment : DataManagerFragment(), RowRepresentableDelegat val proxyItem: RealmModel? = this.liveDataType.getData(this.getRealm(), primaryKey) proxyItem?.let { - //TODO: Localize - this.appBar.toolbar.title = "Update ${this.liveDataType.localizedTitle(requireContext()).toLowerCase().capitalize()}" + this.appBar.toolbar.title = this.liveDataType.updateEntityLocalizedTitle(requireContext()) deleteButtonShouldAppear = true } ?: run { - //TODO: Localize this.appBar.toolbar.title = this.liveDataType.newEntityLocalizedTitle(requireContext()) } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 294ae6ba..80ab8030 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -31,6 +31,8 @@ Launch Report Progress Save Report + Update %s + Comparison chart Address Naming suggestions