From 9768da7c2916b1d7d6ded72e367a69f7c2384696 Mon Sep 17 00:00:00 2001 From: Jacob Kapitein Date: Wed, 3 Aug 2022 18:32:27 +0200 Subject: [PATCH] Replace small, medium, large strings with Simple Commons strings --- .../keyboard/activities/SettingsActivity.kt | 8 ++++---- app/src/main/res/layout/activity_settings.xml | 2 +- app/src/main/res/values-ar/strings.xml | 3 --- app/src/main/res/values-az/strings.xml | 3 --- app/src/main/res/values-be/strings.xml | 3 --- app/src/main/res/values-bg/strings.xml | 5 +---- app/src/main/res/values-ca/strings.xml | 3 --- app/src/main/res/values-cs/strings.xml | 5 +---- app/src/main/res/values-da/strings.xml | 3 --- app/src/main/res/values-de/strings.xml | 3 --- app/src/main/res/values-el/strings.xml | 5 +---- app/src/main/res/values-eo/strings.xml | 3 --- app/src/main/res/values-es/strings.xml | 3 --- app/src/main/res/values-et/strings.xml | 3 --- app/src/main/res/values-fi/strings.xml | 3 --- app/src/main/res/values-fr/strings.xml | 3 --- app/src/main/res/values-gl/strings.xml | 3 --- app/src/main/res/values-hr/strings.xml | 3 --- app/src/main/res/values-hu/strings.xml | 3 --- app/src/main/res/values-in/strings.xml | 3 --- app/src/main/res/values-it/strings.xml | 3 --- app/src/main/res/values-iw/strings.xml | 3 --- app/src/main/res/values-ja/strings.xml | 3 --- app/src/main/res/values-lt/strings.xml | 3 --- app/src/main/res/values-nb-rNO/strings.xml | 3 --- app/src/main/res/values-nl/strings.xml | 3 --- app/src/main/res/values-pl/strings.xml | 3 --- app/src/main/res/values-pt-rBR/strings.xml | 3 --- app/src/main/res/values-pt/strings.xml | 3 --- app/src/main/res/values-ro/strings.xml | 3 --- app/src/main/res/values-ru/strings.xml | 3 --- app/src/main/res/values-sk/strings.xml | 3 --- app/src/main/res/values-sv/strings.xml | 3 --- app/src/main/res/values-th/strings.xml | 3 --- app/src/main/res/values-tr/strings.xml | 3 --- app/src/main/res/values-uk/strings.xml | 3 --- app/src/main/res/values-zh-rCN/strings.xml | 3 --- app/src/main/res/values-zh-rTW/strings.xml | 3 --- app/src/main/res/values/strings.xml | 3 --- 39 files changed, 8 insertions(+), 119 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt index cb2c5a0..0a67b45 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/activities/SettingsActivity.kt @@ -157,11 +157,11 @@ class SettingsActivity : SimpleActivity() { private fun getKeyboardHeightMultiplierText(multiplier: Int): String { return when (multiplier) { - KEYBOARD_HEIGHT_MULTIPLIER_SMALL -> getString(R.string.settings_keyboard_height_multiplier_option_small) - KEYBOARD_HEIGHT_MULTIPLIER_MEDIUM -> getString(R.string.settings_keyboard_height_multiplier_option_medium) - KEYBOARD_HEIGHT_MULTIPLIER_BIG -> getString(R.string.settings_keyboard_height_multiplier_option_big) + KEYBOARD_HEIGHT_MULTIPLIER_SMALL -> getString(R.string.small) + KEYBOARD_HEIGHT_MULTIPLIER_MEDIUM -> getString(R.string.medium) + KEYBOARD_HEIGHT_MULTIPLIER_BIG -> getString(R.string.large) else -> { - getString(R.string.settings_keyboard_height_multiplier_option_small) + getString(R.string.small) } } } diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 3e7419e..7491e6b 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -206,7 +206,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/settings_keyboard_height_multiplier_label" - tools:text="@string/settings_keyboard_height_multiplier_option_small" /> + tools:text="@string/small" /> diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 8c47ecc..d49d3e4 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -28,9 +28,6 @@ Enter Keyboard height - Small - Medium - Large إظهار محتوى الحافظة إذا كان متوفرا إظهار نافذة منبثقة عند الضغط على المفاتيح يهتز عند ضغط الزر diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index dbc7da3..eb31032 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -32,9 +32,6 @@ Vibrate on keypress Keyboard language Keyboard height - Small - Medium - Large - \ No newline at end of file + diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 2cfc01c..c97e062 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -32,9 +32,6 @@ Vibra en prémer les tecles Idioma del teclat Keyboard height - Small - Medium - Large - \ No newline at end of file + diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 7be4daa..bc4242d 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -32,9 +32,6 @@ Vibrér ved tastetryk Tastatursprog Keyboard height - Small - Medium - Large - \ No newline at end of file + diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index dbc7da3..eb31032 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -32,9 +32,6 @@ Vibrate on keypress Keyboard language Keyboard height - Small - Medium - Large