From c30a2ea1375b56b5127a43cb13a780b359805b4f Mon Sep 17 00:00:00 2001 From: Nik Clayton Date: Thu, 26 Sep 2024 22:54:42 +0200 Subject: [PATCH] refactor: Implement AppTheme with PreferenceEnum (#951) Provde an `appTheme` property in `SharedPreferenceRepository` to manage read access, simplifying calling code. Update `PreferenceEnum.from` to check the `value` property of the enum first. Fixes #950 --- app/lint-baseline.xml | 178 +++++++++--------- .../main/java/app/pachli/PachliApplication.kt | 4 +- .../components/account/AccountActivity.kt | 5 +- .../components/compose/ComposeActivity.kt | 3 +- .../preference/PreferencesActivity.kt | 3 +- .../preference/PreferencesFragment.kt | 10 +- app/src/main/res/values-ar/strings.xml | 5 - app/src/main/res/values-be/strings.xml | 5 - app/src/main/res/values-bg/strings.xml | 7 +- app/src/main/res/values-bn-rBD/strings.xml | 7 +- app/src/main/res/values-bn-rIN/strings.xml | 7 +- app/src/main/res/values-ca/strings.xml | 5 - app/src/main/res/values-ckb/strings.xml | 7 +- app/src/main/res/values-cs/strings.xml | 5 - app/src/main/res/values-cy/strings.xml | 5 - app/src/main/res/values-de/strings.xml | 5 - app/src/main/res/values-eo/strings.xml | 5 - app/src/main/res/values-es/strings.xml | 7 +- app/src/main/res/values-eu/strings.xml | 7 +- app/src/main/res/values-fa/strings.xml | 5 - app/src/main/res/values-fi/strings.xml | 5 - app/src/main/res/values-fr/strings.xml | 5 - app/src/main/res/values-fy/strings.xml | 7 +- app/src/main/res/values-ga/strings.xml | 5 - app/src/main/res/values-gd/strings.xml | 5 - app/src/main/res/values-gl/strings.xml | 7 +- app/src/main/res/values-hi/strings.xml | 7 +- app/src/main/res/values-hu/strings.xml | 5 - app/src/main/res/values-in/strings.xml | 3 - app/src/main/res/values-is/strings.xml | 5 - app/src/main/res/values-it/strings.xml | 5 - app/src/main/res/values-ja/strings.xml | 5 - app/src/main/res/values-kab/strings.xml | 6 +- app/src/main/res/values-ko/strings.xml | 7 +- app/src/main/res/values-lv/strings.xml | 5 - app/src/main/res/values-ml/strings.xml | 3 +- app/src/main/res/values-nb-rNO/strings.xml | 7 +- app/src/main/res/values-nl/strings.xml | 5 - app/src/main/res/values-oc/strings.xml | 5 - app/src/main/res/values-pl/strings.xml | 5 - app/src/main/res/values-pt-rBR/strings.xml | 5 - app/src/main/res/values-pt-rPT/strings.xml | 5 - app/src/main/res/values-ru/strings.xml | 7 +- app/src/main/res/values-sa/strings.xml | 5 - app/src/main/res/values-si/strings.xml | 4 - app/src/main/res/values-sl/strings.xml | 7 +- app/src/main/res/values-sv/strings.xml | 5 - app/src/main/res/values-ta/strings.xml | 6 +- app/src/main/res/values-th/strings.xml | 7 +- app/src/main/res/values-tr/strings.xml | 5 - app/src/main/res/values-uk/strings.xml | 5 - app/src/main/res/values-vi/strings.xml | 5 - app/src/main/res/values-zh-rCN/strings.xml | 5 - app/src/main/res/values-zh-rHK/strings.xml | 7 +- app/src/main/res/values-zh-rMO/strings.xml | 7 +- app/src/main/res/values-zh-rSG/strings.xml | 7 +- app/src/main/res/values-zh-rTW/strings.xml | 5 - app/src/main/res/values/string-arrays.xml | 11 -- app/src/main/res/values/strings.xml | 5 - .../app/pachli/core/activity/BaseActivity.kt | 2 +- .../app/pachli/core/preferences/AppTheme.kt | 27 +++ .../pachli/core/preferences/PreferenceEnum.kt | 17 +- .../core/preferences/SettingsConstants.kt | 28 --- .../SharedPreferencesExtensions.kt | 11 +- .../SharedPreferencesRepository.kt | 4 + .../src/main/res/values-ar/strings.xml | 8 + .../src/main/res/values-be/strings.xml | 8 + .../src/main/res/values-bg/strings.xml | 8 + .../src/main/res/values-bn-rBD/strings.xml | 8 + .../src/main/res/values-bn-rIN/strings.xml | 8 + .../src/main/res/values-ca/strings.xml | 8 + .../src/main/res/values-ckb/strings.xml | 8 + .../src/main/res/values-cs/strings.xml | 8 + .../src/main/res/values-cy/strings.xml | 8 + .../src/main/res/values-de/strings.xml | 8 + .../src/main/res/values-eo/strings.xml | 8 + .../src/main/res/values-es/strings.xml | 8 + .../src/main/res/values-eu/strings.xml | 8 + .../src/main/res/values-fa/strings.xml | 8 + .../src/main/res/values-fi/strings.xml | 8 + .../src/main/res/values-fr/strings.xml | 8 + .../src/main/res/values-fy/strings.xml | 8 + .../src/main/res/values-ga/strings.xml | 8 + .../src/main/res/values-gd/strings.xml | 8 + .../src/main/res/values-gl/strings.xml | 8 + .../src/main/res/values-hi/strings.xml | 8 + .../src/main/res/values-hu/strings.xml | 8 + .../src/main/res/values-in/strings.xml | 6 + .../src/main/res/values-is/strings.xml | 8 + .../src/main/res/values-it/strings.xml | 8 + .../src/main/res/values-ja/strings.xml | 8 + .../src/main/res/values-kab/strings.xml | 7 + .../src/main/res/values-ko/strings.xml | 8 + .../src/main/res/values-lv/strings.xml | 8 + .../src/main/res/values-ml/strings.xml | 4 + .../src/main/res/values-nb-rNO/strings.xml | 8 + .../src/main/res/values-nl/strings.xml | 8 + .../src/main/res/values-oc/strings.xml | 8 + .../src/main/res/values-pl/strings.xml | 8 + .../src/main/res/values-pt-rBR/strings.xml | 8 + .../src/main/res/values-pt-rPT/strings.xml | 8 + .../src/main/res/values-ru/strings.xml | 8 + .../src/main/res/values-sa/strings.xml | 8 + .../src/main/res/values-si/strings.xml | 7 + .../src/main/res/values-sl/strings.xml | 8 + .../src/main/res/values-sv/strings.xml | 8 + .../src/main/res/values-ta/strings.xml | 7 + .../src/main/res/values-th/strings.xml | 8 + .../src/main/res/values-tr/strings.xml | 8 + .../src/main/res/values-uk/strings.xml | 8 + .../src/main/res/values-vi/strings.xml | 8 + .../src/main/res/values-zh-rCN/strings.xml | 8 + .../src/main/res/values-zh-rHK/strings.xml | 8 + .../src/main/res/values-zh-rMO/strings.xml | 8 + .../src/main/res/values-zh-rSG/strings.xml | 8 + .../src/main/res/values-zh-rTW/strings.xml | 8 + .../src/main/res/values/strings.xml | 5 + feature/login/lint-baseline.xml | 6 +- 118 files changed, 574 insertions(+), 430 deletions(-) create mode 100644 core/preferences/src/main/kotlin/app/pachli/core/preferences/AppTheme.kt create mode 100644 core/preferences/src/main/res/values-ar/strings.xml create mode 100644 core/preferences/src/main/res/values-be/strings.xml create mode 100644 core/preferences/src/main/res/values-bg/strings.xml create mode 100644 core/preferences/src/main/res/values-bn-rBD/strings.xml create mode 100644 core/preferences/src/main/res/values-bn-rIN/strings.xml create mode 100644 core/preferences/src/main/res/values-ca/strings.xml create mode 100644 core/preferences/src/main/res/values-ckb/strings.xml create mode 100644 core/preferences/src/main/res/values-cs/strings.xml create mode 100644 core/preferences/src/main/res/values-cy/strings.xml create mode 100644 core/preferences/src/main/res/values-de/strings.xml create mode 100644 core/preferences/src/main/res/values-eo/strings.xml create mode 100644 core/preferences/src/main/res/values-es/strings.xml create mode 100644 core/preferences/src/main/res/values-eu/strings.xml create mode 100644 core/preferences/src/main/res/values-fa/strings.xml create mode 100644 core/preferences/src/main/res/values-fi/strings.xml create mode 100644 core/preferences/src/main/res/values-fr/strings.xml create mode 100644 core/preferences/src/main/res/values-fy/strings.xml create mode 100644 core/preferences/src/main/res/values-ga/strings.xml create mode 100644 core/preferences/src/main/res/values-gd/strings.xml create mode 100644 core/preferences/src/main/res/values-gl/strings.xml create mode 100644 core/preferences/src/main/res/values-hi/strings.xml create mode 100644 core/preferences/src/main/res/values-hu/strings.xml create mode 100644 core/preferences/src/main/res/values-in/strings.xml create mode 100644 core/preferences/src/main/res/values-is/strings.xml create mode 100644 core/preferences/src/main/res/values-it/strings.xml create mode 100644 core/preferences/src/main/res/values-ja/strings.xml create mode 100644 core/preferences/src/main/res/values-kab/strings.xml create mode 100644 core/preferences/src/main/res/values-ko/strings.xml create mode 100644 core/preferences/src/main/res/values-lv/strings.xml create mode 100644 core/preferences/src/main/res/values-ml/strings.xml create mode 100644 core/preferences/src/main/res/values-nb-rNO/strings.xml create mode 100644 core/preferences/src/main/res/values-nl/strings.xml create mode 100644 core/preferences/src/main/res/values-oc/strings.xml create mode 100644 core/preferences/src/main/res/values-pl/strings.xml create mode 100644 core/preferences/src/main/res/values-pt-rBR/strings.xml create mode 100644 core/preferences/src/main/res/values-pt-rPT/strings.xml create mode 100644 core/preferences/src/main/res/values-ru/strings.xml create mode 100644 core/preferences/src/main/res/values-sa/strings.xml create mode 100644 core/preferences/src/main/res/values-si/strings.xml create mode 100644 core/preferences/src/main/res/values-sl/strings.xml create mode 100644 core/preferences/src/main/res/values-sv/strings.xml create mode 100644 core/preferences/src/main/res/values-ta/strings.xml create mode 100644 core/preferences/src/main/res/values-th/strings.xml create mode 100644 core/preferences/src/main/res/values-tr/strings.xml create mode 100644 core/preferences/src/main/res/values-uk/strings.xml create mode 100644 core/preferences/src/main/res/values-vi/strings.xml create mode 100644 core/preferences/src/main/res/values-zh-rCN/strings.xml create mode 100644 core/preferences/src/main/res/values-zh-rHK/strings.xml create mode 100644 core/preferences/src/main/res/values-zh-rMO/strings.xml create mode 100644 core/preferences/src/main/res/values-zh-rSG/strings.xml create mode 100644 core/preferences/src/main/res/values-zh-rTW/strings.xml diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml index ea239b6d2..a8799fdc8 100644 --- a/app/lint-baseline.xml +++ b/app/lint-baseline.xml @@ -151,7 +151,18 @@ errorLine2=" ^"> + + + + @@ -166,17 +177,6 @@ column="5"/> - - - - @@ -206,7 +206,7 @@ errorLine2=" ^"> @@ -217,7 +217,7 @@ errorLine2=" ^"> @@ -239,7 +239,7 @@ errorLine2=" ^"> @@ -250,7 +250,7 @@ errorLine2=" ^"> @@ -261,7 +261,7 @@ errorLine2=" ^"> @@ -272,7 +272,7 @@ errorLine2=" ^"> @@ -283,7 +283,7 @@ errorLine2=" ^"> @@ -294,7 +294,7 @@ errorLine2=" ^"> @@ -305,7 +305,7 @@ errorLine2=" ^"> @@ -314,23 +314,23 @@ message="For locale "cs" (Czech) the following quantity should also be defined: `many` (e.g. "10.0 dne")" errorLine1=" <plurals name="favs">" errorLine2=" ^"> + + + + - - - - @@ -349,7 +349,7 @@ errorLine2=" ^"> @@ -358,23 +358,23 @@ message="For locale "cs" (Czech) the following quantity should also be defined: `many` (e.g. "10.0 dne")" errorLine1=" <plurals name="poll_timespan_days">" errorLine2=" ^"> + + + + - - - - @@ -393,7 +393,7 @@ errorLine2=" ^"> @@ -404,7 +404,7 @@ errorLine2=" ^"> @@ -415,7 +415,7 @@ errorLine2=" ^"> @@ -426,7 +426,7 @@ errorLine2=" ^"> @@ -437,7 +437,7 @@ errorLine2=" ^"> @@ -448,7 +448,7 @@ errorLine2=" ^"> @@ -459,7 +459,7 @@ errorLine2=" ^"> @@ -470,7 +470,7 @@ errorLine2=" ^"> @@ -481,7 +481,7 @@ errorLine2=" ^"> @@ -492,7 +492,7 @@ errorLine2=" ^"> @@ -690,7 +690,7 @@ errorLine2=" ^"> @@ -701,7 +701,7 @@ errorLine2=" ^"> @@ -712,7 +712,7 @@ errorLine2=" ^"> @@ -723,7 +723,7 @@ errorLine2=" ^"> @@ -734,7 +734,7 @@ errorLine2=" ^"> @@ -745,7 +745,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -756,7 +756,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -778,7 +778,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -789,7 +789,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -800,7 +800,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -811,7 +811,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1350,7 +1350,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1361,7 +1361,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1372,7 +1372,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1383,7 +1383,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~"> @@ -1394,7 +1394,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1405,7 +1405,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1416,7 +1416,7 @@ errorLine2=" ~~~~~~~~~~~~"> @@ -1427,7 +1427,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~"> @@ -1438,7 +1438,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1449,7 +1449,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~"> @@ -1460,7 +1460,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1471,7 +1471,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1482,7 +1482,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~"> @@ -1493,7 +1493,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1504,7 +1504,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1515,7 +1515,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1526,7 +1526,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> @@ -1537,7 +1537,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1548,7 +1548,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1559,7 +1559,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> @@ -1570,7 +1570,7 @@ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~"> diff --git a/app/src/main/java/app/pachli/PachliApplication.kt b/app/src/main/java/app/pachli/PachliApplication.kt index a3749e720..0e89a9fda 100644 --- a/app/src/main/java/app/pachli/PachliApplication.kt +++ b/app/src/main/java/app/pachli/PachliApplication.kt @@ -28,7 +28,6 @@ import app.pachli.components.notifications.createWorkerNotificationChannel import app.pachli.core.activity.LogEntryTree import app.pachli.core.activity.TreeRing import app.pachli.core.activity.initCrashReporter -import app.pachli.core.preferences.AppTheme import app.pachli.core.preferences.NEW_INSTALL_SCHEMA_VERSION import app.pachli.core.preferences.PrefKeys import app.pachli.core.preferences.SCHEMA_VERSION @@ -101,8 +100,7 @@ class PachliApplication : Application() { EmojiPackHelper.init(this, DefaultEmojiPackList.get(this), allowPackImports = false) // init night mode - val theme = AppTheme.from(sharedPreferencesRepository) - setAppNightMode(theme) + setAppNightMode(sharedPreferencesRepository.appTheme) localeManager.setLocale() diff --git a/app/src/main/java/app/pachli/components/account/AccountActivity.kt b/app/src/main/java/app/pachli/components/account/AccountActivity.kt index 4abe795ef..00015c873 100644 --- a/app/src/main/java/app/pachli/components/account/AccountActivity.kt +++ b/app/src/main/java/app/pachli/components/account/AccountActivity.kt @@ -690,7 +690,8 @@ class AccountActivity : // because subscribing is Pleroma extension, enable it __only__ when we have non-null subscribing field // it's also now supported in Mastodon 3.3.0rc but called notifying and use different API call - if (!viewModel.isSelf && followState == FollowState.FOLLOWING && + if (!viewModel.isSelf && + followState == FollowState.FOLLOWING && (relation.subscribing != null || relation.notifying != null) ) { binding.accountSubscribeButton.show() @@ -788,7 +789,7 @@ class AccountActivity : private fun updateBadges() { binding.accountBadgeContainer.removeAllViews() - val isLight = when (AppTheme.from(sharedPreferencesRepository)) { + val isLight = when (sharedPreferencesRepository.appTheme) { AppTheme.DAY -> true AppTheme.NIGHT, AppTheme.BLACK -> false AppTheme.AUTO, AppTheme.AUTO_SYSTEM -> { diff --git a/app/src/main/java/app/pachli/components/compose/ComposeActivity.kt b/app/src/main/java/app/pachli/components/compose/ComposeActivity.kt index c34eaab63..a06de0588 100644 --- a/app/src/main/java/app/pachli/components/compose/ComposeActivity.kt +++ b/app/src/main/java/app/pachli/components/compose/ComposeActivity.kt @@ -241,8 +241,7 @@ class ComposeActivity : activeAccount = accountManager.activeAccount ?: return - val theme = AppTheme.from(sharedPreferencesRepository) - if (theme == AppTheme.BLACK) { + if (sharedPreferencesRepository.appTheme == AppTheme.BLACK) { setTheme(DR.style.AppDialogActivityBlackTheme) } setContentView(binding.root) diff --git a/app/src/main/java/app/pachli/components/preference/PreferencesActivity.kt b/app/src/main/java/app/pachli/components/preference/PreferencesActivity.kt index 7588f424b..9f7785c69 100644 --- a/app/src/main/java/app/pachli/components/preference/PreferencesActivity.kt +++ b/app/src/main/java/app/pachli/components/preference/PreferencesActivity.kt @@ -33,7 +33,6 @@ import app.pachli.core.activity.extensions.startActivityWithDefaultTransition import app.pachli.core.navigation.MainActivityIntent import app.pachli.core.navigation.PreferencesActivityIntent import app.pachli.core.navigation.PreferencesActivityIntent.PreferenceScreen -import app.pachli.core.preferences.AppTheme import app.pachli.core.preferences.PrefKeys import app.pachli.core.preferences.PrefKeys.APP_THEME import app.pachli.databinding.ActivityPreferencesBinding @@ -104,7 +103,7 @@ class PreferencesActivity : sharedPreferencesRepository.changes.filterNotNull().collect { key -> when (key) { APP_THEME -> { - val theme = AppTheme.from(sharedPreferencesRepository) + val theme = sharedPreferencesRepository.appTheme Timber.d("activeTheme: %s", theme) setAppNightMode(theme) diff --git a/app/src/main/java/app/pachli/components/preference/PreferencesFragment.kt b/app/src/main/java/app/pachli/components/preference/PreferencesFragment.kt index 1c0751a45..d364becab 100644 --- a/app/src/main/java/app/pachli/components/preference/PreferencesFragment.kt +++ b/app/src/main/java/app/pachli/components/preference/PreferencesFragment.kt @@ -51,7 +51,6 @@ import app.pachli.core.database.model.AccountEntity import app.pachli.core.designsystem.R as DR import app.pachli.core.network.model.Notification import app.pachli.core.preferences.AppTheme -import app.pachli.core.preferences.AppTheme.Companion.APP_THEME_DEFAULT import app.pachli.core.preferences.DownloadLocation import app.pachli.core.preferences.PrefKeys import app.pachli.core.preferences.SharedPreferencesRepository @@ -140,13 +139,10 @@ class PreferencesFragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { makePreferenceScreen { preferenceCategory(R.string.pref_title_appearance_settings) { - listPreference { - setDefaultValue(APP_THEME_DEFAULT.value) - setEntries(R.array.app_theme_names) - entryValues = AppTheme.stringValues() - key = PrefKeys.APP_THEME - setSummaryProvider { entry } + enumListPreference { + setDefaultValue(AppTheme.AUTO_SYSTEM) setTitle(R.string.pref_title_app_theme) + key = PrefKeys.APP_THEME icon = makeIcon(GoogleMaterial.Icon.gmd_palette) } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 786d42b4e..8f125ab5e 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -137,11 +137,6 @@ مظهر التطبيق الخيوط الزمنية عوامل التصفية - داكنة - فاتحة - سوداء - تلقائي عند غروب الشمس - استخدم مظهر النظام المتصفح إخفاء زر المتابعة أثناء تمرير الصفحة إخفاء زر التحرير عند التمرير diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index ad9510fdd..75448795c 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -108,11 +108,6 @@ згадалі падпісаліся Фільтры - Цёмная - Светлая - Чорная - Аўтаматычна па захадзе сонца - Выкарыстоўваць сістэмную тэму Браўзер Выкарыстоўваць укладкі браўзера Chrome Анімаваць GIF-аватаркі diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 36c4c66ee..27dd86e5c 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -184,11 +184,6 @@ Скриване на бутона за композиране, при превъртане Използване на персонализирани раздели чрез Chrome Браузър - Използване на системния дизайн - Автоматично при залез - Черно - Светло - Тъмно Филтри Емисии Тема на приложение @@ -424,4 +419,4 @@ Показване на отговори Показване на споделяния Тази снимка не може да абъде редактирана. - \ No newline at end of file + diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml index 5939d39e2..c348e6719 100644 --- a/app/src/main/res/values-bn-rBD/strings.xml +++ b/app/src/main/res/values-bn-rBD/strings.xml @@ -114,11 +114,6 @@ স্ক্রোল করার সময় রচনা বোতাম লুকান ক্রোম কাস্টম ট্যাব ব্যবহার করুন ব্রাউজার - সিস্টেম ডিজাইন ব্যবহার করুন - সূর্যাস্ত স্বয়ংক্রিয় - কালো - আলো - অন্ধকার ফিল্টার টাইমলাইন এপ্লিকেশন এর থিম @@ -429,4 +424,4 @@ %1$s আর %2$s %1$s, %2$s, আর %3$s %s তোমাকে উল্লেখ করেছে - \ No newline at end of file + diff --git a/app/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml index 5a6347bdc..d5c2b86ee 100644 --- a/app/src/main/res/values-bn-rIN/strings.xml +++ b/app/src/main/res/values-bn-rIN/strings.xml @@ -144,11 +144,6 @@ এপ্লিকেশন এর থিম টাইমলাইন ফিল্টার - অন্ধকার - আলো - কালো - সূর্যাস্ত স্বয়ংক্রিয় - সিস্টেম ডিজাইন ব্যবহার করুন ব্রাউজার ক্রোম কাস্টম ট্যাব ব্যবহার করুন স্ক্রোল করার সময় রচনা বোতাম লুকান @@ -399,4 +394,4 @@ তোমার কোনো খসড়া নেই। মাস্টোডনের সর্বনিম্ন ৫ মিনিটের সময়সূচীর বিরতি আছে। শীর্ষস্থানীয় সরঞ্জামদণ্ডের শিরোনামটি লুকান - \ 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 6846b57d0..71292dbc6 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -195,11 +195,6 @@ Tema Cronologia Filtres - Fosc - Clar - Negre - Brillantor automàtica - Utilitzar el tema del sistema Idioma Proxy HTTP proxy diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml index 4bab8d9f8..a5ba938a1 100644 --- a/app/src/main/res/values-ckb/strings.xml +++ b/app/src/main/res/values-ckb/strings.xml @@ -145,11 +145,6 @@ دوگمەی ئاوازدانان بشارەوە لەکاتی خشاندن بەکارهێنانی خشتەبەندەکانی دڵخواز وێبگەڕ - دیزاینی سیستەم بەکاربهێنە - خۆکار لە کاتی خۆرئاوابووندا - ڕەش - ڕووناکی - تاریک فلتەرەکان ڕووکاری ئەپ تایملاین @@ -407,4 +402,4 @@ سەرکەوتوو نەبوو لە هاودەمکردنی ڕێکبەندەکان بڵاوکردنەوە (هاوکاتکراوە لەگەڵ سێرڤەر) هەمیشە میدیا وەک هەستیار نیشان بکە - \ No newline at end of file + diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 0baee5825..6b0c5c203 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -141,11 +141,6 @@ Motiv aplikace Časové osy Filtry - Tmavý - Světlý - Černý - Automaticky při západu slunce - Použít systémový design Prohlížeč Používat Vlastní karty Chrome Skrýt tlačítko pro psaní při rolování diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index 289f8e0af..e2eb58f08 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -124,10 +124,6 @@ mae fy negeseuon yn cael eu hoffi Gwedd Thema\'r ap - Tywyll - Golau - Du - Awtomatig wrth iddi nosi Porwr Defnyddio Tabiau Cyfaddas Chrome Cuddio\'r botwm creu wrth sgrolio @@ -379,7 +375,6 @@ Parhau Nôl Sylwadau ychwanegol - Defnyddio arddull y system Prif lleoliad y panel llywio Animeiddio lluniau proffil GIF Nodi cyfryngau yn sensitif bob tro diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b56536f3a..383cdd537 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -141,11 +141,6 @@ App-Design Timelines Filter - Dunkel - Hell - Schwarz - Automatisch bei Sonnenuntergang - Systemdesign verwenden Browser Links in der App öffnen (Chrome Custom Tabs) »Verfassen«-Schaltfläche beim Scrollen ausblenden diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 95656349e..313b78bc4 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -141,11 +141,6 @@ Temo de la apo Tempolinioj Filtriloj - Malhela - Hela - Nigra - Aŭtomata laŭ la horo - Uzi sisteman etoson Retumilo Uzi la integritan retumilon Kaŝi butonon de verko dum rulumado diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 144c1c40a..cf4f9d400 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -130,10 +130,6 @@ Apariencia Tema de la app Cronologia - Oscuro - Claro - Negro - Automático Navegador Usar pestañas de Chrome Ocultar botón de redacción al bajar @@ -265,7 +261,6 @@ Mostrar favoritos Menciones Descargar multimedia - Usar tema del sistema Idioma Dejar de impulsar Eliminar favorito @@ -801,4 +796,4 @@ Esto borrará la elección de distribuidor Unified Push y reiniciará Pachli. \n \nSi hay varios distribuidores Unified Push instalados, se te pedirá que elijas uno. - \ No newline at end of file + diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 1f01157ee..424fd706a 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -126,10 +126,6 @@ Interfazea Gaia Denbora-lerroak - Iluna - Argia - Beltza - Automatikoa Nabigatzailea Chromeko fitxak erabili Tut berria idazteko botoia ezkutatu beherantz joan einean @@ -264,7 +260,6 @@ Domeinu osoa ezkutatu Galdeketak bukatu dira Iragazkiak - Erabili sistemaren diseinua Hizkuntza Botentzako erakuslea erakutsi GIF abatarrak animatu @@ -465,4 +460,4 @@ %s editatua %s-(e)k izena eman du Akatsa zerbitzaritik egoeraren iturria kargatzean. - \ No newline at end of file + diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index fbf805c54..39e6978d0 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -125,10 +125,6 @@ ظاهر زمینهٔ کاره خط‌ زمانی‌ها - تاریک - روشن - سیاه - خودکار در غروب مرورگر استفاده از زبانه‌های سفارشی کروم نهفتن دکمهٔ ایجاد، هنگام پیمایش @@ -257,7 +253,6 @@ نهفتن تمام دامنه پایان نظرسنجی‌ها پالایه‌ها - استفاده از طراحی سامانه زبان نمایش نشانگر برای بات‌ها پویانمایی آواتارهای جیف diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 518d8df1a..869e5cc3b 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2,7 +2,6 @@ Animoi mukautetut emojit Animoi GIF-avatarit - Seuraa laitteen teemaa Lopeta tilin seuraaminen\? Poista tuuttaus\? Kopioi linkki @@ -92,9 +91,6 @@ Välilehdet Kieli Selain - Musta - Vaalea - Tumma Suodattimet Aikajanat seurasi @@ -371,7 +367,6 @@ Seuraamista pyydetty Poista luonnos? Ilmoituksia haetaan… - Automaattisesti auringonlaskun aikaan tykätyt julkaisut Julkaisujen tekstikoko Julkaisuja lähetetään diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 544bd39f8..99332e682 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -141,11 +141,6 @@ Thème de l’application Fils chronologiques Filtres - Sombre - Clair - Noir - Basé sur le coucher du soleil - Utiliser le thème système Navigateur Utiliser le navigateur intégré Masquer le bouton de composition lors du défilement diff --git a/app/src/main/res/values-fy/strings.xml b/app/src/main/res/values-fy/strings.xml index c52d86543..47e711953 100644 --- a/app/src/main/res/values-fy/strings.xml +++ b/app/src/main/res/values-fy/strings.xml @@ -65,11 +65,6 @@ Ljepblêden Taal Webblêder - Systeem Opmaak Brûke - Automatysk as de sinne ûnder giet - Swart - Ljocht - Tsjuster Filters Applikaasje Tema Uterlik @@ -226,4 +221,4 @@ Boost %s hat dyn toot boost Oankundigingen - \ No newline at end of file + diff --git a/app/src/main/res/values-ga/strings.xml b/app/src/main/res/values-ga/strings.xml index 93d9ddb4c..6146eab3f 100644 --- a/app/src/main/res/values-ga/strings.xml +++ b/app/src/main/res/values-ga/strings.xml @@ -33,11 +33,6 @@ Folaigh an cnaipe cum agus tú ag scrollaigh Úsáid Chrome Custom Tabs Brabhsálaí - Úsáid Dearadh Córais - Uathoibríoch ag luí na gréine - Dubh - Éadrom - Dorcha Scagairí Amlínte Téama an Aip diff --git a/app/src/main/res/values-gd/strings.xml b/app/src/main/res/values-gd/strings.xml index 9a5c03efa..70dd5ad13 100644 --- a/app/src/main/res/values-gd/strings.xml +++ b/app/src/main/res/values-gd/strings.xml @@ -328,11 +328,6 @@ Falaich am putan sgrìobhaidh fhad ’s a bhios mi ri sgroladh Cleachd tabaichean Chrome gnàthaichte Brabhsair - Cleachd co-dhealbhachd an t-siostaim - Gu fèin-obrachail aig beul na h-oidhche - Dubh - Soilleir - Dorcha Criathragan Loidhnichean-ama Ùrlar na h-aplacaid diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 942b9b287..3d0cd9532 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -318,11 +318,6 @@ Agochar o botón redactar ao desprazar Usar lapelas personalizadas de Chrome Navegador - Usar deseño do sistema - Automático ao solpor - Negro - Claro - Escuro Filtros Cronoloxías Decorado da app @@ -783,4 +778,4 @@ ✔ hai %1$s @ %2$s ✖ hai %1$s @ %2$s A conta non ten o método «push». Pechar a sesión e volver acceder podería arranxalo. - \ No newline at end of file + diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 626e17e7e..65c262958 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -76,10 +76,6 @@ स्क्रॉल करते समय कंपोज बटन को छिपाएं क्रोम कस्टम टैब का उपयोग करें ब्राउज़र - सिस्टम डिज़ाइन का उपयोग करें - सूर्यास्त के समय स्वचालित - Black - अंधकार फिल्टर दिखावट उल्लेख किया @@ -296,7 +292,6 @@ एच टी टी पी प्रॉक्सी प्रॉक्सी टाइमलाइन छानने का काम - प्रकाश टाइमलाइन एप्लिकेशन थीम मेरे पोस्ट पसंद किए गए @@ -345,4 +340,4 @@ पोस्ट बहुत लंबा है! फोटो संपादित नहीं किया जा सका। फोटो और वीडियो दोनों को एक ही पोस्ट से अटैच नहीं किया जा सकता है। - \ No newline at end of file + diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index cfa9eeed1..cf195c747 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -131,10 +131,6 @@ bejegyzésemet kedvencnek jelölték Megjelenés Idővonalak - Sötét - Világos - Fekete - Automatikus naplementekor Böngésző Linkek megnyitása applikáción belül Szerkesztés gomb elrejtése görgetés közben @@ -236,7 +232,6 @@ Törlöd és újraírod ezt a bejegyzést\? befejeződött egy szavazás Szűrők - Rendszer téma használata Nyelv Közzététel (szerverrel szinkronizált) Szavazások diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 806c07e29..688e72247 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -82,9 +82,6 @@ Beri tahu dengan suara Beri tahu dengan getaran Beri tahu dengan lampu - Gelap - Terang - Hitam Linimasa Tema Aplikasi Peramban diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index d80802bb7..5810e62e1 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -159,11 +159,6 @@ Þema forrits Tímalínur Síur - Dökkt - Ljóst - Svart - Sjálfvirkt við sólarlag - Nota kerfishönnun Vafri Nota sérsniðna flipa Chrome Fela \'Semja skilaboð\" hnapp sjálfvirkt við skrun diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d85bd4269..0e6dd972e 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -148,11 +148,6 @@ Tema dell\'app Timeline Filtri - Scuro - Chiaro - Nero - Automatico al tramonto - Usa tema di sistema Browser Usa schede personalizzate di Chrome Nascondi il pulsante Componi mentre scorri diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 7aa69d16a..8d15e7730 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -133,10 +133,6 @@ アプリテーマ タイムライン フィルター - ダーク - ライト - ブラック - 日没による自動設定 ブラウザ Chrome Custom Tabsを使用する スクロール中は投稿ボタンを隠す @@ -268,7 +264,6 @@ ブーストを表示 メディアをダウンロード メディアをダウンロード中 - システムの設定を利用 通知を削除 フィルター すべての通知を完全に削除してよろしいですか？ diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml index bc043eb1d..81f7cc9de 100644 --- a/app/src/main/res/values-kab/strings.xml +++ b/app/src/main/res/values-kab/strings.xml @@ -61,8 +61,6 @@ Kkes tijewwiqt-a\? Ẓreg tilɣa Agrudem - Aceɛlal - Aberkan Tutlayt Iccaren Apṛuksi @@ -120,7 +118,6 @@ Issalay… fukken kran n wadɣaren Imzizdigen - Awurman akken yella yiṭij Iminig Sken-d tiririyin Apṛuksi HTTP @@ -276,7 +273,6 @@ Werǧin ALT Zgel - Ubrik Yensa Afella Adda @@ -290,4 +286,4 @@ Tugna Azwel Rnu - \ No newline at end of file + diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index c360bb244..9ce0ada50 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -150,11 +150,6 @@ 어플리케이션 테마 타임라인 필터 - 어두움 - 밝음 - 검정 - 시간에 따라 자동으로 변경 - 시스템 기본값 웹 브라우저 Chrome 커스텀 탭 사용 스크롤 중에 글쓰기 버튼 감추기 @@ -357,4 +352,4 @@ 수정 해시태그 팔로우 요청 - \ No newline at end of file + diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 3047d4af3..dfa6f2318 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -244,9 +244,6 @@ pieminēja sāka sekot kāds ir reģistrējies - Melna - Automātiski saulrietā - Izmantot sistēmas dizainu Jauni pieminējumi Jauni sekotāji Pastiprinājumi @@ -277,8 +274,6 @@ Vai pārtraukt sekot šim kontam\? Izskats Laika līnijas - Tumša - Gaiša Lietotnes tēma aptaujas ir noslēgušās Augšā diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index dff246d40..b15e8b0e9 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -115,7 +115,6 @@ സംഭാഷണങ്ങൾ മറുപടി… നിരസിക്കുക - കറുപ്പ് തുടരുക സമയരേഖകൾ പ്രോക്സി @@ -135,4 +134,4 @@ വിഡിയോ സൂചിപ്പിക്കുക നീക്കം ചെയ്യുക - \ No newline at end of file + diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index d326c8935..3fe66d73b 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -286,11 +286,6 @@ avsluttes %s stengt Stem - Mørk - Lys - Svart - Automatisk ved solnedgang - Bruk systeminnstillinger Offentlig Ikke listet Kun følgere @@ -785,4 +780,4 @@ Alle innlegg Dine egne innlegg, fremhevinger, favoritmerker, bokmerker, og innlegg som @nevner deg Fødererte innlegg - \ No newline at end of file + diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 9fe4fb304..c3ffec36d 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -138,11 +138,6 @@ Uiterlijk Thema Tijdlijnen - Donker - Licht - Zwart - Automatisch tijdens zonsop- en ondergang - Systeemthema gebruiken Webbrowser Aangepaste tabbladen gebruiken Verberg zwevende knop om een bericht te schrijven tijdens het scrollen diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml index 337bf7018..b86a5c6c5 100644 --- a/app/src/main/res/values-oc/strings.xml +++ b/app/src/main/res/values-oc/strings.xml @@ -122,10 +122,6 @@ òm met mos tuts en favorit Aparéncia Tèma de l’app - Escur - Luminós - Negre - Alba automatica Navegador Onglets personalizats de Chrome Amagar lo boton de redaccion en desplaçament @@ -290,7 +286,6 @@ Redactar Suprimir e reformular Suprimir e reformular aqueste tut \? - Utilizar lo tèma sistèma Netejar Filtrar Aplicar diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index af2f26506..1c8a52140 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -120,10 +120,6 @@ moje posty zostaną dodane do ulubionych Wygląd Motyw - Ciemny - Jasny - Czarny - Zmieniaj automatycznie po zachodzie słońca Przeglądarka Używaj niestandardowych kart Chrome Ukryj przycisk nowego wpisu podczas przewijania @@ -255,7 +251,6 @@ głosowania zostały zakończone Osi czasu Filtry - Użyj motywu systemu Język Pokaż oznaczenie dla botów Animuj avatary GIF diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 7f479cb15..5c8ade347 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -132,11 +132,6 @@ Aparência Tema do aplicativo Linhas do tempo - Escuro - Claro - AMOLED - Automático no ocaso - Usar o tema do sistema Navegador Usar abas personalizadas do Chrome Ocultar botão de compor ao rolar a tela diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 87f7adbdb..192ccb869 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -190,11 +190,6 @@ Tema da Aplicação Timelines Filtros - Escuro - Claro - AMOLED - Automático ao pôr-do-sol - Usar o Tema do Sistema Navegador Usar Separadores Personalizados do Chrome Esconder o botão de criação de toots ao fazer scroll diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 1bfb4674c..01433c7b7 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -143,11 +143,6 @@ Тема Ленты Фильтры - Тёмная - Светлая - Чёрная - Автоматическая (от заката до восхода солнца) - Как в системе Браузер Используйте пользовательские вкладки Chrome Скрывать кнопку композиционирования гудка при прокрутке ленты @@ -462,4 +457,4 @@ Правки %1$s отредактировали %1$s создали - \ No newline at end of file + diff --git a/app/src/main/res/values-sa/strings.xml b/app/src/main/res/values-sa/strings.xml index d8a652ef2..94b601bdc 100644 --- a/app/src/main/res/values-sa/strings.xml +++ b/app/src/main/res/values-sa/strings.xml @@ -244,11 +244,6 @@ सारणक्रमे लेखनगण्डः छाद्यताम् क्रोमस्वीयानुकूलपीठिकाः प्रयुज्यन्ताम् जालसञ्चारकम् - प्रणाल्याः परिकल्पना प्रयुज्यताम् - सूर्यास्तसमये स्वचालितम् - कृष्णः - ज्योतिपूर्णः - अन्धकारः शोधकम् समयतालिकाः अनुप्रयोगप्रबन्धाः diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml index 502764de8..2033917c9 100644 --- a/app/src/main/res/values-si/strings.xml +++ b/app/src/main/res/values-si/strings.xml @@ -68,11 +68,9 @@ අතිරේක අදහස්\? සඳහන් කළ වෙත ටූට් ඒ.ස.නි. බෙදාගන්න… - දීප්ත කටුපිටපත සුරකින්නද\? සංවේදී අන්තර්ගතයකි පොත්යොමුව - ස්වයංක්‍රීව ඉර බැසීමේදී වාර්තා කිරීමට අසමත් විය අවු. %d ප්‍රියතමයන් පෙන්වන්න @@ -135,7 +133,6 @@ සැමවිටම මාධ්‍ය සංවේදී ලෙස සලකුණු කරන්න යෙදුම යළි ඇරඹීම ඇවැසිය යළි අරඹන්න - කළු වර්. %d කින් මෙම වෙනස්කම් යෙදීමට ඔබ ටුස්කි නැවත ඇරඹිය යුතුය සංස්කරණය @@ -230,7 +227,6 @@ දෘශ්‍යකය පසුව සංස්කරණය - අඳුරු ටූට් යැවෙමින්… පද්ධති පෙරනිමිය සඳැහුම diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 2c79edfa0..283e48030 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -283,11 +283,6 @@ zaprto Glasovanje ankete so se končala - Temna - Svetla - Črna - Samodejno ob sončnem zahodu - Uporabi sistemsko temo Javno Ni prikazano Samo za sledilce @@ -374,4 +369,4 @@ %1$s Priljubljene %1$s Priljubljenih - \ No newline at end of file + diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 7102d67b4..7c6281a73 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -139,11 +139,6 @@ Apptema Tidslinjer Filter - Mörkt - Ljust - Svart - Automatiskt vid solnedgång - Använd system-tema Webbläsare Använd Chrome-anpassade flikar Dölj skriv-knappen vid skrollning diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 6b3468bd3..8d00c3458 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -116,10 +116,6 @@ என் பதிவுகள் பிடித்தவையானால் தோற்றம் செயலியின் தீம் - கருமை - வெளிச்சம் - பிளாக் - தானியங்கி உலாவி Chrome தனிப்பயன் கீற்றை பயன்படுத்து உருளலின் போது எழுது பொத்தானை மறை @@ -237,4 +233,4 @@ பட்டியலிடப்படாதவர்களுக்கு அனைவருக்கும் எழுது - \ No newline at end of file + diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index bfe7511e7..2831fc0ed 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -198,11 +198,6 @@ ซ่อนปุ่มเขียนเมื่อกำลังเลื่อนจอ ใช้ Chrome Custom Tabs เบราว์เซอร์ - ใช้ตามแบบระบบ - ปรับตามเวลา - ดำ - สว่าง - มืด คัดกรอง ไทม์ไลน์ ธีมแอป @@ -416,4 +411,4 @@ %s เพิ่งโพสต์ ประกาศ ลบการสนทนา - \ No newline at end of file + diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 326340d4a..2a9ba65d4 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -131,10 +131,6 @@ Görünüş Uygulama teması Ağ akışı - Koyu - Açık - Siyah - Gün batımında otomatik Tarayıcı Chrome Özel Sekmelerini Kullan Kaydırırken gönderi oluşturma düğmesi gizlensin @@ -267,7 +263,6 @@ %s\? alan adından gelen her şeyi engellemek istediğinden emin misin\? Bu alan adından gelen içeriği herhangi bir genel zaman tünelinde veya bildirimlerinde göremezsiniz. Bu alan adındaki takipçilerin de kaldırılacak. anketler sona erdiğinde Süzgeçler - Sistem tasarımını kullan Dil Hareketli GIF görsellerini oynat Anketler diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index a3cac1349..d4d9e60c8 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -335,11 +335,6 @@ Ховати кнопку написати під час прокручування Вкладки вбудованого браузера Chrome Браузер - Тема системи - Автоматична від заходу сонця - Чорна - Світла - Темна Фільтри Стрічки Тема застосунку diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index cf5402a3b..ee58c12cc 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -171,11 +171,6 @@ Ẩn nút soạn tút Mở luôn trong app Trình duyệt - Mặc định của thiết bị - Tự động khi trời tối - Đen - Sáng - Tối Bộ lọc Bảng tin Chủ đề diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 06daded59..bb52fbe0c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -144,11 +144,6 @@ 应用主题 时间轴 过滤器 - 暗色 - 亮色 - 黑色 - 自动切换 - 跟随系统设定 浏览器 使用 Chrome Custom Tabs 浏览时自动隐藏发嘟按钮 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index a1a0c7be5..a53a674cc 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -144,11 +144,6 @@ 佈景主題 時間軸 過濾器 - 黑夜 - 白天 - 暗色 - 自動切換 - 跟隨系統 瀏覽器 使用 Chrome Custom Tabs 瀏覽時自動隱藏發嘟按鈕 @@ -426,4 +421,4 @@ 底端 頂端 主要導覽列的位置 - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rMO/strings.xml b/app/src/main/res/values-zh-rMO/strings.xml index 6bfcb2f00..ceb50f35c 100644 --- a/app/src/main/res/values-zh-rMO/strings.xml +++ b/app/src/main/res/values-zh-rMO/strings.xml @@ -144,11 +144,6 @@ 佈景主題 時間軸 過濾器 - 黑夜 - 白天 - 暗色 - 自動切換 - 跟隨系統 瀏覽器 使用 Chrome Custom Tabs 瀏覽時自動隱藏發嘟按鈕 @@ -337,4 +332,4 @@ 話題 編輯 編輯 - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rSG/strings.xml b/app/src/main/res/values-zh-rSG/strings.xml index be812bc00..8667667a1 100644 --- a/app/src/main/res/values-zh-rSG/strings.xml +++ b/app/src/main/res/values-zh-rSG/strings.xml @@ -144,11 +144,6 @@ 应用主题 时间轴 过滤器 - 黑夜 - 白天 - 暗色 - 自动切换 - 跟随系统设定 浏览器 使用 Chrome Custom Tabs 浏览时自动隐藏发嘟按钮 @@ -336,4 +331,4 @@ 编辑 编辑 关注请求 - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index fd198a2c9..dc54bae04 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -144,11 +144,6 @@ 佈景主題 時間軸 過濾器 - 黑夜 - 白天 - 暗色 - 自動切換 - 跟隨系統 瀏覽器 使用 Chrome Custom Tabs 瀏覽時自動隱藏發嘟按鈕 diff --git a/app/src/main/res/values/string-arrays.xml b/app/src/main/res/values/string-arrays.xml index c0ee4c89a..69a534cc0 100644 --- a/app/src/main/res/values/string-arrays.xml +++ b/app/src/main/res/values/string-arrays.xml @@ -1,16 +1,5 @@ - - - - @string/app_them_dark - @string/app_theme_light - @string/app_theme_black - @string/app_theme_auto - @string/app_theme_system - - @string/post_privacy_public @string/post_privacy_unlisted diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4f5d85988..b5897656b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -256,11 +256,6 @@ Timelines Filters Your server does not support filters - Dark - Light - Black - Automatic at sunset - Use system design Browser Use Chrome Custom Tabs Hide compose button while scrolling diff --git a/core/activity/src/main/kotlin/app/pachli/core/activity/BaseActivity.kt b/core/activity/src/main/kotlin/app/pachli/core/activity/BaseActivity.kt index 16de7f288..5a6147270 100644 --- a/core/activity/src/main/kotlin/app/pachli/core/activity/BaseActivity.kt +++ b/core/activity/src/main/kotlin/app/pachli/core/activity/BaseActivity.kt @@ -99,7 +99,7 @@ abstract class BaseActivity : AppCompatActivity(), MenuProvider { } // Set the theme from preferences - val theme = AppTheme.from(sharedPreferencesRepository) + val theme = sharedPreferencesRepository.appTheme Timber.d("activeTheme: %s", theme) if (theme == AppTheme.BLACK) { setTheme(DR.style.Theme_Pachli_Black) diff --git a/core/preferences/src/main/kotlin/app/pachli/core/preferences/AppTheme.kt b/core/preferences/src/main/kotlin/app/pachli/core/preferences/AppTheme.kt new file mode 100644 index 000000000..0d54e3298 --- /dev/null +++ b/core/preferences/src/main/kotlin/app/pachli/core/preferences/AppTheme.kt @@ -0,0 +1,27 @@ +/* + * Copyright 2024 Pachli Association + * + * This file is a part of Pachli. + * + * This program is free software; you can redistribute it and/or modify it under the terms of the + * GNU General Public License as published by the Free Software Foundation; either version 3 of the + * License, or (at your option) any later version. + * + * Pachli is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even + * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License along with Pachli; if not, + * see . + */ + +package app.pachli.core.preferences + +/** Application theme choices. */ +enum class AppTheme(override val displayResource: Int, override val value: String) : PreferenceEnum { + NIGHT(R.string.app_theme_dark, "night"), + DAY(R.string.app_theme_light, "day"), + BLACK(R.string.app_theme_black, "black"), + AUTO(R.string.app_theme_auto, "auto"), + AUTO_SYSTEM(R.string.app_theme_system, "auto_system"), +} diff --git a/core/preferences/src/main/kotlin/app/pachli/core/preferences/PreferenceEnum.kt b/core/preferences/src/main/kotlin/app/pachli/core/preferences/PreferenceEnum.kt index e289edae1..abac2d1c8 100644 --- a/core/preferences/src/main/kotlin/app/pachli/core/preferences/PreferenceEnum.kt +++ b/core/preferences/src/main/kotlin/app/pachli/core/preferences/PreferenceEnum.kt @@ -18,6 +18,7 @@ package app.pachli.core.preferences import androidx.annotation.StringRes +import kotlin.enums.enumEntries /** * Interface for enums that can be saved/restored from [SharedPreferencesRepository]. @@ -39,13 +40,15 @@ interface PreferenceEnum { * @return The enum identified by [s], or null if the enum does not have [s] as * a string representation. */ - inline fun > from(s: String?): T? { - s ?: return null - - return try { - enumValueOf(s) - } catch (_: IllegalArgumentException) { - null + inline fun from( + s: String?, + ): E? + where E : Enum, + E : PreferenceEnum { + // Can't use enumValueOf as the stored value might be the `value` + // property, not the enum name. + return s?.let { + enumEntries().associateBy { it.value ?: it.name }[s] } } } diff --git a/core/preferences/src/main/kotlin/app/pachli/core/preferences/SettingsConstants.kt b/core/preferences/src/main/kotlin/app/pachli/core/preferences/SettingsConstants.kt index 6f498ccdb..176cdb9e1 100644 --- a/core/preferences/src/main/kotlin/app/pachli/core/preferences/SettingsConstants.kt +++ b/core/preferences/src/main/kotlin/app/pachli/core/preferences/SettingsConstants.kt @@ -1,33 +1,5 @@ package app.pachli.core.preferences -/** - * Possible themes. - * - * The order of the values is important, and must be kept in sync with - * R.array.app_theme_names. - */ -enum class AppTheme(val value: String) { - NIGHT("night"), - DAY("day"), - BLACK("black"), - AUTO("auto"), - AUTO_SYSTEM("auto_system"), - ; - - companion object { - val APP_THEME_DEFAULT = AUTO_SYSTEM - - fun stringValues() = entries.map { it.value }.toTypedArray() - - fun from(sharedPreferencesRepository: SharedPreferencesRepository): AppTheme { - val pref = sharedPreferencesRepository.getString(PrefKeys.APP_THEME, null) - ?: return APP_THEME_DEFAULT - - return enumValueOf(pref.uppercase()) - } - } -} - /** * Current preferences schema version. Format is 4-digit year + 2 digit month (zero padded) + 2 * digit day (zero padded) + 2 digit counter (zero padded). diff --git a/core/preferences/src/main/kotlin/app/pachli/core/preferences/SharedPreferencesExtensions.kt b/core/preferences/src/main/kotlin/app/pachli/core/preferences/SharedPreferencesExtensions.kt index 523ed4128..5e9e06356 100644 --- a/core/preferences/src/main/kotlin/app/pachli/core/preferences/SharedPreferencesExtensions.kt +++ b/core/preferences/src/main/kotlin/app/pachli/core/preferences/SharedPreferencesExtensions.kt @@ -11,8 +11,11 @@ fun SharedPreferences.getNonNullString(key: String, defValue: String): String { * in preferences, or the value can not be converted to [E], then [defValue] is * returned. */ -inline fun > SharedPreferences.getEnum(key: String, defValue: E): E { - val enumVal = getString(key, null) ?: return defValue - - return PreferenceEnum.from(enumVal) ?: defValue +inline fun SharedPreferences.getEnum( + key: String, + defValue: E, +): E + where E : Enum, + E : PreferenceEnum { + return getString(key, null)?.let { PreferenceEnum.from(it) } ?: defValue } diff --git a/core/preferences/src/main/kotlin/app/pachli/core/preferences/SharedPreferencesRepository.kt b/core/preferences/src/main/kotlin/app/pachli/core/preferences/SharedPreferencesRepository.kt index d06e65298..557553776 100644 --- a/core/preferences/src/main/kotlin/app/pachli/core/preferences/SharedPreferencesRepository.kt +++ b/core/preferences/src/main/kotlin/app/pachli/core/preferences/SharedPreferencesRepository.kt @@ -45,6 +45,10 @@ class SharedPreferencesRepository @Inject constructor( */ val changes = MutableSharedFlow() + /** Application theme. */ + val appTheme: AppTheme + get() = getEnum(PrefKeys.APP_THEME, AppTheme.AUTO_SYSTEM) + /** Location of downloaded files. */ val downloadLocation: DownloadLocation get() = getEnum(PrefKeys.DOWNLOAD_LOCATION, DownloadLocation.DOWNLOADS) diff --git a/core/preferences/src/main/res/values-ar/strings.xml b/core/preferences/src/main/res/values-ar/strings.xml new file mode 100644 index 000000000..1b1ab7a93 --- /dev/null +++ b/core/preferences/src/main/res/values-ar/strings.xml @@ -0,0 +1,8 @@ + + + فاتحة + سوداء + تلقائي عند غروب الشمس + داكنة + استخدم مظهر النظام + diff --git a/core/preferences/src/main/res/values-be/strings.xml b/core/preferences/src/main/res/values-be/strings.xml new file mode 100644 index 000000000..2300d0037 --- /dev/null +++ b/core/preferences/src/main/res/values-be/strings.xml @@ -0,0 +1,8 @@ + + + Светлая + Чорная + Аўтаматычна па захадзе сонца + Цёмная + Выкарыстоўваць сістэмную тэму + diff --git a/core/preferences/src/main/res/values-bg/strings.xml b/core/preferences/src/main/res/values-bg/strings.xml new file mode 100644 index 000000000..a72413dda --- /dev/null +++ b/core/preferences/src/main/res/values-bg/strings.xml @@ -0,0 +1,8 @@ + + + Светло + Черно + Автоматично при залез + Тъмно + Използване на системния дизайн + diff --git a/core/preferences/src/main/res/values-bn-rBD/strings.xml b/core/preferences/src/main/res/values-bn-rBD/strings.xml new file mode 100644 index 000000000..9965edc8c --- /dev/null +++ b/core/preferences/src/main/res/values-bn-rBD/strings.xml @@ -0,0 +1,8 @@ + + + আলো + কালো + সূর্যাস্ত স্বয়ংক্রিয় + অন্ধকার + সিস্টেম ডিজাইন ব্যবহার করুন + diff --git a/core/preferences/src/main/res/values-bn-rIN/strings.xml b/core/preferences/src/main/res/values-bn-rIN/strings.xml new file mode 100644 index 000000000..9965edc8c --- /dev/null +++ b/core/preferences/src/main/res/values-bn-rIN/strings.xml @@ -0,0 +1,8 @@ + + + আলো + কালো + সূর্যাস্ত স্বয়ংক্রিয় + অন্ধকার + সিস্টেম ডিজাইন ব্যবহার করুন + diff --git a/core/preferences/src/main/res/values-ca/strings.xml b/core/preferences/src/main/res/values-ca/strings.xml new file mode 100644 index 000000000..3abbbf1c6 --- /dev/null +++ b/core/preferences/src/main/res/values-ca/strings.xml @@ -0,0 +1,8 @@ + + + Clar + Negre + Brillantor automàtica + Fosc + Utilitzar el tema del sistema + diff --git a/core/preferences/src/main/res/values-ckb/strings.xml b/core/preferences/src/main/res/values-ckb/strings.xml new file mode 100644 index 000000000..90ccedb6c --- /dev/null +++ b/core/preferences/src/main/res/values-ckb/strings.xml @@ -0,0 +1,8 @@ + + + ڕووناکی + ڕەش + خۆکار لە کاتی خۆرئاوابووندا + تاریک + دیزاینی سیستەم بەکاربهێنە + diff --git a/core/preferences/src/main/res/values-cs/strings.xml b/core/preferences/src/main/res/values-cs/strings.xml new file mode 100644 index 000000000..96901398d --- /dev/null +++ b/core/preferences/src/main/res/values-cs/strings.xml @@ -0,0 +1,8 @@ + + + Světlý + Černý + Automaticky při západu slunce + Tmavý + Použít systémový design + diff --git a/core/preferences/src/main/res/values-cy/strings.xml b/core/preferences/src/main/res/values-cy/strings.xml new file mode 100644 index 000000000..47e0f53e6 --- /dev/null +++ b/core/preferences/src/main/res/values-cy/strings.xml @@ -0,0 +1,8 @@ + + + Golau + Du + Awtomatig wrth iddi nosi + Tywyll + Defnyddio arddull y system + diff --git a/core/preferences/src/main/res/values-de/strings.xml b/core/preferences/src/main/res/values-de/strings.xml new file mode 100644 index 000000000..eeed2c889 --- /dev/null +++ b/core/preferences/src/main/res/values-de/strings.xml @@ -0,0 +1,8 @@ + + + Hell + Schwarz + Automatisch bei Sonnenuntergang + Dunkel + Systemdesign verwenden + diff --git a/core/preferences/src/main/res/values-eo/strings.xml b/core/preferences/src/main/res/values-eo/strings.xml new file mode 100644 index 000000000..51c86317b --- /dev/null +++ b/core/preferences/src/main/res/values-eo/strings.xml @@ -0,0 +1,8 @@ + + + Hela + Nigra + Aŭtomata laŭ la horo + Malhela + Uzi sisteman etoson + diff --git a/core/preferences/src/main/res/values-es/strings.xml b/core/preferences/src/main/res/values-es/strings.xml new file mode 100644 index 000000000..420d4b3f1 --- /dev/null +++ b/core/preferences/src/main/res/values-es/strings.xml @@ -0,0 +1,8 @@ + + + Claro + Negro + Automático + Oscuro + Usar tema del sistema + diff --git a/core/preferences/src/main/res/values-eu/strings.xml b/core/preferences/src/main/res/values-eu/strings.xml new file mode 100644 index 000000000..7b4b105eb --- /dev/null +++ b/core/preferences/src/main/res/values-eu/strings.xml @@ -0,0 +1,8 @@ + + + Argia + Beltza + Automatikoa + Iluna + Erabili sistemaren diseinua + diff --git a/core/preferences/src/main/res/values-fa/strings.xml b/core/preferences/src/main/res/values-fa/strings.xml new file mode 100644 index 000000000..63944b8a5 --- /dev/null +++ b/core/preferences/src/main/res/values-fa/strings.xml @@ -0,0 +1,8 @@ + + + روشن + سیاه + خودکار در غروب + تاریک + استفاده از طراحی سامانه + diff --git a/core/preferences/src/main/res/values-fi/strings.xml b/core/preferences/src/main/res/values-fi/strings.xml new file mode 100644 index 000000000..bf00a498e --- /dev/null +++ b/core/preferences/src/main/res/values-fi/strings.xml @@ -0,0 +1,8 @@ + + + Vaalea + Musta + Automaattisesti auringonlaskun aikaan + Tumma + Seuraa laitteen teemaa + diff --git a/core/preferences/src/main/res/values-fr/strings.xml b/core/preferences/src/main/res/values-fr/strings.xml new file mode 100644 index 000000000..f982a8f8a --- /dev/null +++ b/core/preferences/src/main/res/values-fr/strings.xml @@ -0,0 +1,8 @@ + + + Clair + Noir + Basé sur le coucher du soleil + Sombre + Utiliser le thème système + diff --git a/core/preferences/src/main/res/values-fy/strings.xml b/core/preferences/src/main/res/values-fy/strings.xml new file mode 100644 index 000000000..ae8a54d3f --- /dev/null +++ b/core/preferences/src/main/res/values-fy/strings.xml @@ -0,0 +1,8 @@ + + + Ljocht + Swart + Automatysk as de sinne ûnder giet + Tsjuster + Systeem Opmaak Brûke + diff --git a/core/preferences/src/main/res/values-ga/strings.xml b/core/preferences/src/main/res/values-ga/strings.xml new file mode 100644 index 000000000..0bf3e0bbe --- /dev/null +++ b/core/preferences/src/main/res/values-ga/strings.xml @@ -0,0 +1,8 @@ + + + Éadrom + Dubh + Uathoibríoch ag luí na gréine + Dorcha + Úsáid Dearadh Córais + diff --git a/core/preferences/src/main/res/values-gd/strings.xml b/core/preferences/src/main/res/values-gd/strings.xml new file mode 100644 index 000000000..d1e362554 --- /dev/null +++ b/core/preferences/src/main/res/values-gd/strings.xml @@ -0,0 +1,8 @@ + + + Soilleir + Dubh + Gu fèin-obrachail aig beul na h-oidhche + Dorcha + Cleachd co-dhealbhachd an t-siostaim + diff --git a/core/preferences/src/main/res/values-gl/strings.xml b/core/preferences/src/main/res/values-gl/strings.xml new file mode 100644 index 000000000..4a7bd97d1 --- /dev/null +++ b/core/preferences/src/main/res/values-gl/strings.xml @@ -0,0 +1,8 @@ + + + Claro + Negro + Automático ao solpor + Escuro + Usar deseño do sistema + diff --git a/core/preferences/src/main/res/values-hi/strings.xml b/core/preferences/src/main/res/values-hi/strings.xml new file mode 100644 index 000000000..8aadc9099 --- /dev/null +++ b/core/preferences/src/main/res/values-hi/strings.xml @@ -0,0 +1,8 @@ + + + प्रकाश + Black + सूर्यास्त के समय स्वचालित + अंधकार + सिस्टम डिज़ाइन का उपयोग करें + diff --git a/core/preferences/src/main/res/values-hu/strings.xml b/core/preferences/src/main/res/values-hu/strings.xml new file mode 100644 index 000000000..107534827 --- /dev/null +++ b/core/preferences/src/main/res/values-hu/strings.xml @@ -0,0 +1,8 @@ + + + Világos + Fekete + Automatikus naplementekor + Sötét + Rendszer téma használata + diff --git a/core/preferences/src/main/res/values-in/strings.xml b/core/preferences/src/main/res/values-in/strings.xml new file mode 100644 index 000000000..de47b3c55 --- /dev/null +++ b/core/preferences/src/main/res/values-in/strings.xml @@ -0,0 +1,6 @@ + + + Terang + Hitam + Gelap + diff --git a/core/preferences/src/main/res/values-is/strings.xml b/core/preferences/src/main/res/values-is/strings.xml new file mode 100644 index 000000000..4c0d6ec47 --- /dev/null +++ b/core/preferences/src/main/res/values-is/strings.xml @@ -0,0 +1,8 @@ + + + Ljóst + Svart + Sjálfvirkt við sólarlag + Dökkt + Nota kerfishönnun + diff --git a/core/preferences/src/main/res/values-it/strings.xml b/core/preferences/src/main/res/values-it/strings.xml new file mode 100644 index 000000000..93dc879ec --- /dev/null +++ b/core/preferences/src/main/res/values-it/strings.xml @@ -0,0 +1,8 @@ + + + Chiaro + Nero + Automatico al tramonto + Scuro + Usa tema di sistema + diff --git a/core/preferences/src/main/res/values-ja/strings.xml b/core/preferences/src/main/res/values-ja/strings.xml new file mode 100644 index 000000000..a70a26627 --- /dev/null +++ b/core/preferences/src/main/res/values-ja/strings.xml @@ -0,0 +1,8 @@ + + + ライト + ブラック + 日没による自動設定 + ダーク + システムの設定を利用 + diff --git a/core/preferences/src/main/res/values-kab/strings.xml b/core/preferences/src/main/res/values-kab/strings.xml new file mode 100644 index 000000000..780964152 --- /dev/null +++ b/core/preferences/src/main/res/values-kab/strings.xml @@ -0,0 +1,7 @@ + + + Aceɛlal + Aberkan + Awurman akken yella yiṭij + Ubrik + diff --git a/core/preferences/src/main/res/values-ko/strings.xml b/core/preferences/src/main/res/values-ko/strings.xml new file mode 100644 index 000000000..a800b7e4d --- /dev/null +++ b/core/preferences/src/main/res/values-ko/strings.xml @@ -0,0 +1,8 @@ + + + 밝음 + 검정 + 시간에 따라 자동으로 변경 + 어두움 + 시스템 기본값 + diff --git a/core/preferences/src/main/res/values-lv/strings.xml b/core/preferences/src/main/res/values-lv/strings.xml new file mode 100644 index 000000000..5799d3948 --- /dev/null +++ b/core/preferences/src/main/res/values-lv/strings.xml @@ -0,0 +1,8 @@ + + + Gaiša + Melna + Automātiski saulrietā + Tumša + Izmantot sistēmas dizainu + diff --git a/core/preferences/src/main/res/values-ml/strings.xml b/core/preferences/src/main/res/values-ml/strings.xml new file mode 100644 index 000000000..3138281bd --- /dev/null +++ b/core/preferences/src/main/res/values-ml/strings.xml @@ -0,0 +1,4 @@ + + + കറുപ്പ് + diff --git a/core/preferences/src/main/res/values-nb-rNO/strings.xml b/core/preferences/src/main/res/values-nb-rNO/strings.xml new file mode 100644 index 000000000..b464564ba --- /dev/null +++ b/core/preferences/src/main/res/values-nb-rNO/strings.xml @@ -0,0 +1,8 @@ + + + Lys + Svart + Automatisk ved solnedgang + Mørk + Bruk systeminnstillinger + diff --git a/core/preferences/src/main/res/values-nl/strings.xml b/core/preferences/src/main/res/values-nl/strings.xml new file mode 100644 index 000000000..66f0a67e0 --- /dev/null +++ b/core/preferences/src/main/res/values-nl/strings.xml @@ -0,0 +1,8 @@ + + + Licht + Zwart + Automatisch tijdens zonsop- en ondergang + Donker + Systeemthema gebruiken + diff --git a/core/preferences/src/main/res/values-oc/strings.xml b/core/preferences/src/main/res/values-oc/strings.xml new file mode 100644 index 000000000..c66c5207c --- /dev/null +++ b/core/preferences/src/main/res/values-oc/strings.xml @@ -0,0 +1,8 @@ + + + Luminós + Negre + Alba automatica + Escur + Utilizar lo tèma sistèma + diff --git a/core/preferences/src/main/res/values-pl/strings.xml b/core/preferences/src/main/res/values-pl/strings.xml new file mode 100644 index 000000000..a0adc3f8a --- /dev/null +++ b/core/preferences/src/main/res/values-pl/strings.xml @@ -0,0 +1,8 @@ + + + Jasny + Czarny + Zmieniaj automatycznie po zachodzie słońca + Ciemny + Użyj motywu systemu + diff --git a/core/preferences/src/main/res/values-pt-rBR/strings.xml b/core/preferences/src/main/res/values-pt-rBR/strings.xml new file mode 100644 index 000000000..58db2feaa --- /dev/null +++ b/core/preferences/src/main/res/values-pt-rBR/strings.xml @@ -0,0 +1,8 @@ + + + Claro + AMOLED + Automático no ocaso + Escuro + Usar o tema do sistema + diff --git a/core/preferences/src/main/res/values-pt-rPT/strings.xml b/core/preferences/src/main/res/values-pt-rPT/strings.xml new file mode 100644 index 000000000..b87faa7bd --- /dev/null +++ b/core/preferences/src/main/res/values-pt-rPT/strings.xml @@ -0,0 +1,8 @@ + + + Claro + AMOLED + Automático ao pôr-do-sol + Escuro + Usar o Tema do Sistema + diff --git a/core/preferences/src/main/res/values-ru/strings.xml b/core/preferences/src/main/res/values-ru/strings.xml new file mode 100644 index 000000000..a39f2e3e2 --- /dev/null +++ b/core/preferences/src/main/res/values-ru/strings.xml @@ -0,0 +1,8 @@ + + + Светлая + Чёрная + Автоматическая (от заката до восхода солнца) + Тёмная + Как в системе + diff --git a/core/preferences/src/main/res/values-sa/strings.xml b/core/preferences/src/main/res/values-sa/strings.xml new file mode 100644 index 000000000..46e5bbd28 --- /dev/null +++ b/core/preferences/src/main/res/values-sa/strings.xml @@ -0,0 +1,8 @@ + + + ज्योतिपूर्णः + कृष्णः + सूर्यास्तसमये स्वचालितम् + अन्धकारः + प्रणाल्याः परिकल्पना प्रयुज्यताम् + diff --git a/core/preferences/src/main/res/values-si/strings.xml b/core/preferences/src/main/res/values-si/strings.xml new file mode 100644 index 000000000..9976d1fa4 --- /dev/null +++ b/core/preferences/src/main/res/values-si/strings.xml @@ -0,0 +1,7 @@ + + + දීප්ත + කළු + ස්වයංක්‍රීව ඉර බැසීමේදී + අඳුරු + diff --git a/core/preferences/src/main/res/values-sl/strings.xml b/core/preferences/src/main/res/values-sl/strings.xml new file mode 100644 index 000000000..b775b10db --- /dev/null +++ b/core/preferences/src/main/res/values-sl/strings.xml @@ -0,0 +1,8 @@ + + + Svetla + Črna + Samodejno ob sončnem zahodu + Temna + Uporabi sistemsko temo + diff --git a/core/preferences/src/main/res/values-sv/strings.xml b/core/preferences/src/main/res/values-sv/strings.xml new file mode 100644 index 000000000..779b4731c --- /dev/null +++ b/core/preferences/src/main/res/values-sv/strings.xml @@ -0,0 +1,8 @@ + + + Ljust + Svart + Automatiskt vid solnedgång + Mörkt + Använd system-tema + diff --git a/core/preferences/src/main/res/values-ta/strings.xml b/core/preferences/src/main/res/values-ta/strings.xml new file mode 100644 index 000000000..4f5ebee6e --- /dev/null +++ b/core/preferences/src/main/res/values-ta/strings.xml @@ -0,0 +1,7 @@ + + + வெளிச்சம் + பிளாக் + தானியங்கி + கருமை + diff --git a/core/preferences/src/main/res/values-th/strings.xml b/core/preferences/src/main/res/values-th/strings.xml new file mode 100644 index 000000000..a4f458cfc --- /dev/null +++ b/core/preferences/src/main/res/values-th/strings.xml @@ -0,0 +1,8 @@ + + + สว่าง + ดำ + ปรับตามเวลา + มืด + ใช้ตามแบบระบบ + diff --git a/core/preferences/src/main/res/values-tr/strings.xml b/core/preferences/src/main/res/values-tr/strings.xml new file mode 100644 index 000000000..76044f8a0 --- /dev/null +++ b/core/preferences/src/main/res/values-tr/strings.xml @@ -0,0 +1,8 @@ + + + Açık + Siyah + Gün batımında otomatik + Koyu + Sistem tasarımını kullan + diff --git a/core/preferences/src/main/res/values-uk/strings.xml b/core/preferences/src/main/res/values-uk/strings.xml new file mode 100644 index 000000000..9910e04a6 --- /dev/null +++ b/core/preferences/src/main/res/values-uk/strings.xml @@ -0,0 +1,8 @@ + + + Світла + Чорна + Автоматична від заходу сонця + Темна + Тема системи + diff --git a/core/preferences/src/main/res/values-vi/strings.xml b/core/preferences/src/main/res/values-vi/strings.xml new file mode 100644 index 000000000..0e661dd5a --- /dev/null +++ b/core/preferences/src/main/res/values-vi/strings.xml @@ -0,0 +1,8 @@ + + + Sáng + Đen + Tự động khi trời tối + Tối + Mặc định của thiết bị + diff --git a/core/preferences/src/main/res/values-zh-rCN/strings.xml b/core/preferences/src/main/res/values-zh-rCN/strings.xml new file mode 100644 index 000000000..29541e389 --- /dev/null +++ b/core/preferences/src/main/res/values-zh-rCN/strings.xml @@ -0,0 +1,8 @@ + + + 亮色 + 黑色 + 自动切换 + 暗色 + 跟随系统设定 + diff --git a/core/preferences/src/main/res/values-zh-rHK/strings.xml b/core/preferences/src/main/res/values-zh-rHK/strings.xml new file mode 100644 index 000000000..b750f9130 --- /dev/null +++ b/core/preferences/src/main/res/values-zh-rHK/strings.xml @@ -0,0 +1,8 @@ + + + 白天 + 暗色 + 自動切換 + 黑夜 + 跟隨系統 + diff --git a/core/preferences/src/main/res/values-zh-rMO/strings.xml b/core/preferences/src/main/res/values-zh-rMO/strings.xml new file mode 100644 index 000000000..b750f9130 --- /dev/null +++ b/core/preferences/src/main/res/values-zh-rMO/strings.xml @@ -0,0 +1,8 @@ + + + 白天 + 暗色 + 自動切換 + 黑夜 + 跟隨系統 + diff --git a/core/preferences/src/main/res/values-zh-rSG/strings.xml b/core/preferences/src/main/res/values-zh-rSG/strings.xml new file mode 100644 index 000000000..fc67ccb91 --- /dev/null +++ b/core/preferences/src/main/res/values-zh-rSG/strings.xml @@ -0,0 +1,8 @@ + + + 白天 + 暗色 + 自动切换 + 黑夜 + 跟随系统设定 + diff --git a/core/preferences/src/main/res/values-zh-rTW/strings.xml b/core/preferences/src/main/res/values-zh-rTW/strings.xml new file mode 100644 index 000000000..b750f9130 --- /dev/null +++ b/core/preferences/src/main/res/values-zh-rTW/strings.xml @@ -0,0 +1,8 @@ + + + 白天 + 暗色 + 自動切換 + 黑夜 + 跟隨系統 + diff --git a/core/preferences/src/main/res/values/strings.xml b/core/preferences/src/main/res/values/strings.xml index 598ea61c6..dad3c0c3d 100644 --- a/core/preferences/src/main/res/values/strings.xml +++ b/core/preferences/src/main/res/values/strings.xml @@ -20,4 +20,9 @@ Download location Downloads folder Per-account folders, in Downloads folder + Light + Black + Automatic at sunset + Dark + Use system design diff --git a/feature/login/lint-baseline.xml b/feature/login/lint-baseline.xml index 048d39529..b3e37d65a 100644 --- a/feature/login/lint-baseline.xml +++ b/feature/login/lint-baseline.xml @@ -1,5 +1,5 @@ - + @@ -28,7 +28,7 @@ column="22"/>