Skip to content

Commit c202c86

Browse files
Remove theme colour support
This simplifies the codebase and new Compose implementation. If this feature is really wanted by the community, it could possibly be reimplemented in a much more flexible way (choosing the exact colour) after all UIs are migrated to Compose, as Compose can generate a theme based on just a primary colour.
1 parent c4132d2 commit c202c86

File tree

55 files changed

+1
-927
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1
-927
lines changed

app/src/main/java/protect/card_locker/Utils.java

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -963,31 +963,9 @@ public static int getComplementaryColor(int color) {
963963
// replace colors in the current theme
964964
public static void patchColors(AppCompatActivity activity) {
965965
Settings settings = new Settings(activity);
966-
String color = settings.getColor();
967966

968967
Resources.Theme theme = activity.getTheme();
969-
Resources resources = activity.getResources();
970-
if (color.equals(resources.getString(R.string.settings_key_pink_theme))) {
971-
theme.applyStyle(R.style.pink, true);
972-
} else if (color.equals(resources.getString(R.string.settings_key_magenta_theme))) {
973-
theme.applyStyle(R.style.magenta, true);
974-
} else if (color.equals(resources.getString(R.string.settings_key_violet_theme))) {
975-
theme.applyStyle(R.style.violet, true);
976-
} else if (color.equals(resources.getString(R.string.settings_key_blue_theme))) {
977-
theme.applyStyle(R.style.blue, true);
978-
} else if (color.equals(resources.getString(R.string.settings_key_sky_blue_theme))) {
979-
theme.applyStyle(R.style.skyblue, true);
980-
} else if (color.equals(resources.getString(R.string.settings_key_green_theme))) {
981-
theme.applyStyle(R.style.green, true);
982-
} else if (color.equals(resources.getString(R.string.settings_key_brown_theme))) {
983-
theme.applyStyle(R.style.brown, true);
984-
} else if (color.equals(resources.getString(R.string.settings_key_catima_theme))) {
985-
// catima theme is AppTheme itself, no dynamic colors nor applyStyle
986-
} else {
987-
// final catch all in case of invalid theme value from older versions
988-
// also handles R.string.settings_key_system_theme
989-
DynamicColors.applyToActivityIfAvailable(activity);
990-
}
968+
DynamicColors.applyToActivityIfAvailable(activity);
991969

992970
if (isDarkModeEnabled(activity) && settings.getOledDark()) {
993971
theme.applyStyle(R.style.DarkBackground, true);

app/src/main/java/protect/card_locker/preferences/Settings.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,6 @@ public boolean getOledDark() {
9090
return getBoolean(R.string.settings_key_oled_dark, false);
9191
}
9292

93-
public String getColor() {
94-
return getString(R.string.setting_key_theme_color, mContext.getResources().getString(R.string.settings_key_system_theme));
95-
}
96-
9793
public int getPreferredColumnCount() {
9894
var defaultSymbol = mContext.getResources().getString(R.string.settings_key_automatic_column_count);
9995
var defaultColumnCount = mContext.getResources().getInteger(R.integer.main_view_card_columns);

app/src/main/java/protect/card_locker/preferences/SettingsActivity.kt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import androidx.core.os.LocaleListCompat
1111
import androidx.preference.ListPreference
1212
import androidx.preference.Preference
1313
import androidx.preference.PreferenceFragmentCompat
14-
import com.google.android.material.color.DynamicColors
1514
import protect.card_locker.BuildConfig
1615
import protect.card_locker.CatimaAppCompatActivity
1716
import protect.card_locker.MainActivity
@@ -103,16 +102,6 @@ class SettingsActivity : CatimaAppCompatActivity() {
103102
true
104103
}
105104

106-
val themeColorPreference = findPreference<ListPreference>(getString(R.string.setting_key_theme_color))
107-
themeColorPreference!!.setOnPreferenceChangeListener { _, _ ->
108-
refreshActivity(true)
109-
true
110-
}
111-
if (!DynamicColors.isDynamicColorAvailable()) {
112-
themeColorPreference.setEntryValues(R.array.color_values_no_dynamic)
113-
themeColorPreference.setEntries(R.array.color_value_strings_no_dynamic)
114-
}
115-
116105
val oledDarkPreference = findPreference<Preference>(getString(R.string.settings_key_oled_dark))
117106
oledDarkPreference!!.setOnPreferenceChangeListener { _, _ ->
118107
refreshActivity(true)

app/src/main/res/values-ar/strings.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,6 @@
101101
<string name="settings_locale">لغة</string>
102102
<string name="settings_system_locale">النظام</string>
103103
<string name="setIcon">تعيين الصورة المصغرة</string>
104-
<string name="settings_catima_theme">Catima</string>
105-
<string name="settings_pink_theme">زهري</string>
106-
<string name="settings_magenta_theme">أرجواني</string>
107-
<string name="settings_violet_theme">البنفسجي</string>
108-
<string name="settings_blue_theme">أزرق</string>
109-
<string name="settings_sky_blue_theme">أزرق سماوي</string>
110-
<string name="settings_green_theme">أخضر</string>
111-
<string name="settings_brown_theme">بني</string>
112104
<string name="app_contributors">أصبح ممكنًا بواسطة: <xliff:g id="app_contributors">%s</xliff:g></string>
113105
<string name="sort">فرز</string>
114106
<string name="showMoreInfo">اظهر المعلومات</string>
@@ -225,7 +217,6 @@
225217
<string name="failedGeneratingShareURL">تعذر إنشاء عنوان URL قابل للمشاركة</string>
226218
<string name="help_translate_this_app">ساعد في ترجمة هذا التطبيق</string>
227219
<string name="on_google_play">على Google Play</string>
228-
<string name="settings_theme_color">لون المظهر</string>
229220
<string name="previousCard">السابق</string>
230221
<string name="nextCard">التالي</string>
231222
<string name="failedToRetrieveImageFile">فشل في استخراج ملف الصورة</string>

app/src/main/res/values-be/strings.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,6 @@
158158
<string name="settings_oled_dark">Чысты чорны фон для цёмнай тэмы</string>
159159
<string name="selectColor">Выбраць колер</string>
160160
<string name="setIcon">Задаць мініяцюру</string>
161-
<string name="settings_theme_color">Колер тэмы</string>
162-
<string name="settings_catima_theme">Catima</string>
163-
<string name="settings_magenta_theme">Пурпурны</string>
164161
<string name="app_contributors">Стала магчымым дзякуючы: <xliff:g id="app_contributors">%s</xliff:g></string>
165162
<string name="sort">Сартаваць</string>
166163
<string name="showMoreInfo">Паказаць інфармацыю</string>
@@ -275,8 +272,6 @@
275272
<string name="switchToBackImage">Пераключыцца на задні відарыс</string>
276273
<string name="importFidmeMessage">Каб імпартаваць, выберыце файл <i>fidme-export-request-xxxxxx.zip</i> з FidMe, а потым уручную выберыце тыпы штрыхкодаў. \nСтварыце яго з вашага профілю FidMe, выбраўшы \"Абарону даных\", а затым націснуўшы \"Выняць мае даныя\".</string>
277274
<string name="importCatimaMessage">Каб імпартаваць, выберыце файл <i>catima.zip</i> з Catima. \nСтварыце яго з меню \"Імпарт/Экспарт\" іншай праграмы Catima, спачатку націснуўшы там \"Экспарт\".</string>
278-
<string name="settings_sky_blue_theme">Нябесна-блакітны</string>
279-
<string name="settings_brown_theme">Карычневы</string>
280275
<string name="switchToBarcode">Пераключыцца на штрыхкод</string>
281276
<string name="settings_locale">Мова</string>
282277
<plurals name="groupCardCountWithArchived">
@@ -288,12 +283,8 @@
288283
<string name="unarchived">Карта разархівавана</string>
289284
<string name="updateBarcodeQuestionText">Вы змянілі ID. Вы хочаце таксама абнавіць штрыхкод, каб выкарыстоўваць тое ж значэнне?</string>
290285
<string name="no">Не</string>
291-
<string name="settings_pink_theme">Ружовы</string>
292286
<string name="settings_system_locale">Сістэма</string>
293-
<string name="settings_violet_theme">Фіялетавы</string>
294287
<string name="multipleBarcodesFoundPleaseChooseOne">Які са знойдзеных штрыхкодаў вы хочаце выкарыстоўваць?</string>
295-
<string name="settings_blue_theme">Сіні</string>
296-
<string name="settings_green_theme">Зялёны</string>
297288
<string name="report_error">Паведаміць пра памылку</string>
298289
<string name="failedLaunchingPhotoPicker">Не атрымалася знайсці праграму для галерэі, якая падтрымліваецца</string>
299290
<string name="unsupportedFile">Гэты файл не падтрымліваецца</string>

app/src/main/res/values-bg/strings.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,15 +143,6 @@
143143
<item quantity="other">Желаете ли тези <xliff:g>%d</xliff:g> карти да бъдат премахнати\?</item>
144144
</plurals>
145145
<string name="app_contributors">Осъществено от: <xliff:g id="app_contributors">%s</xliff:g></string>
146-
<string name="settings_brown_theme">Кафяво</string>
147-
<string name="settings_green_theme">Зелено</string>
148-
<string name="settings_sky_blue_theme">Небесносиньо</string>
149-
<string name="settings_blue_theme">Синьо</string>
150-
<string name="settings_violet_theme">Виолетово</string>
151-
<string name="settings_magenta_theme">Цикламено</string>
152-
<string name="settings_pink_theme">Розово</string>
153-
<string name="settings_catima_theme">Catima</string>
154-
<string name="settings_theme_color">Цвят на темата</string>
155146
<string name="settings_system_locale">Система</string>
156147
<string name="settings_locale">Език</string>
157148
<string name="noGroupCards">Групата е празна</string>

app/src/main/res/values-bn-rIN/strings.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,6 @@
5050
<string name="turn_flashlight_off">টর্চলাইট বন্ধ করুন</string>
5151
<string name="settings_locale">লোকেল</string>
5252
<string name="settings_system_locale">সিস্টেম লোকেল</string>
53-
<string name="settings_theme_color">থিম রঙ</string>
54-
<string name="settings_catima_theme">কটিমা থিম</string>
55-
<string name="settings_pink_theme">গোলাপী থিম</string>
56-
<string name="settings_magenta_theme">ম্যাজেন্টা থিম</string>
57-
<string name="settings_violet_theme">ভায়োলেট থিম</string>
58-
<string name="settings_blue_theme">নীল থিম</string>
59-
<string name="settings_sky_blue_theme">আকাশী নীল থিম</string>
60-
<string name="settings_green_theme">সবুজ থিম</string>
61-
<string name="settings_brown_theme">বাদামী থিম</string>
6253
<string name="sort">সাজান</string>
6354
<string name="sort_by_name">নামের দ্বারা সাজান</string>
6455
<string name="sort_by_most_recently_used">সর্বাধিক সম্প্রতি ব্যবহৃত দ্বারা সাজান</string>

app/src/main/res/values-bn/strings.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
33
<string name="settings_locale">ভাষা</string>
44
<string name="action_search">খুঁজুন</string>
5-
<string name="settings_pink_theme">গুলাপি</string>
6-
<string name="settings_blue_theme">নীল</string>
7-
<string name="settings_green_theme">সবুজ</string>
8-
<string name="settings_brown_theme">বাদামি</string>
95
<string name="save">সংরক্ষণ</string>
106
<string name="cardId">কার্ড আইডি</string>
117
<string name="barcodeType">বারকোডের ধরন</string>
@@ -19,7 +15,6 @@
1915
<string name="all">সকল</string>
2016
<string name="never">কখনো না</string>
2117
<string name="currency">মুদ্রা</string>
22-
<string name="settings_violet_theme">বেগুনি</string>
2318
<string name="no">না</string>
2419
<string name="nextCard">পরবর্তী</string>
2520
<string name="action_add">যুক্ত করুন</string>

app/src/main/res/values-bs/strings.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,6 @@
5050
<string name="turn_flashlight_off">Ugasi lampu</string>
5151
<string name="settings_locale">Jezik</string>
5252
<string name="settings_system_locale">Sistem</string>
53-
<string name="settings_theme_color">Boja teme</string>
54-
<string name="settings_catima_theme">Catima</string>
55-
<string name="settings_pink_theme">Ružičasto</string>
56-
<string name="settings_magenta_theme">Ljubičasto</string>
57-
<string name="settings_violet_theme">Ljubičasto</string>
58-
<string name="settings_blue_theme">Plavo</string>
59-
<string name="settings_sky_blue_theme">Nebo plavo</string>
60-
<string name="settings_green_theme">Zeleno</string>
61-
<string name="settings_brown_theme">Braun</string>
6253
<string name="sort">Poništi sortiranje</string>
6354
<string name="sort_by_name">Ime</string>
6455
<string name="sort_by_most_recently_used">Nedavno Korišten</string>

app/src/main/res/values-ca/strings.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@
4242
<string name="leaveWithoutSaveConfirmation">Vols sortir sense grabar?</string>
4343
<string name="passwordRequired">Introdueixi el password</string>
4444
<string name="turn_flashlight_on">Encendre el llum flash</string>
45-
<string name="settings_magenta_theme">Magenta</string>
46-
<string name="settings_violet_theme">Violeta</string>
47-
<string name="settings_blue_theme">Blau</string>
48-
<string name="settings_green_theme">Verd</string>
4945
<string name="translate_platform">a la Pàgina Web</string>
5046
<string name="report_error">Informar un Error</string>
5147
<string name="archived">Targeta arxivada</string>
@@ -74,7 +70,6 @@
7470
</plurals>
7571
<string name="importOptionFilesystemExplanation">Escull un fitxer especific del sistema de fitxers</string>
7672
<string name="no">No</string>
77-
<string name="settings_pink_theme">Rosa</string>
7873
<string name="sort">Ordenar</string>
7974
<string name="failedToRetrieveImageFile">Ha fallat l\'obtenció del fitxer d\'imatge</string>
8075
<string name="barcodeLongPressMessage">Les imatges només es poden obrir desde la app galeria</string>
@@ -146,7 +141,6 @@
146141
<string name="settings_oled_dark">Negre pur en el tema fosc</string>
147142
<string name="selectColor">Sel•leccioni el color</string>
148143
<string name="setIcon">Setegi la miniatura</string>
149-
<string name="settings_theme_color">Color del tema</string>
150144
<string name="app_contributors">Fet possible per: <xliff:g id="app_contributors">%s</xliff:g></string>
151145
<string name="updateBalance">Actualitzar el balanç</string>
152146
<string name="sort_by_name">Nom</string>
@@ -176,13 +170,11 @@
176170
<string name="openFrontImageInGalleryApp">Obrir la imatge frontal a l\'app de galeria</string>
177171
<string name="settings_use_volume_keys_navigation_summary">Utilitza els botons de volum per canviar la targeta que es mostra</string>
178172
<string name="updateBarcodeQuestionText">Ha canviat el valor ID. Vol actualitzar també el codi de barres per uter utilitzar el mateix valor?</string>
179-
<string name="settings_sky_blue_theme">Blau fluix</string>
180173
<string name="starred">Preferides</string>
181174
<string name="deleteConfirmationGroup">Vols eliminar aquest grup?</string>
182175
<string name="removeImage">Eliminar imatge</string>
183176
<string name="app_libraries">Llibreries de tercers: <xliff:g id="app_libraries_list">%s</xliff:g></string>
184177
<string name="settings_display_barcode_max_brightness">Màxima iluminació</string>
185-
<string name="settings_brown_theme">Marró</string>
186178
<string name="manually_enter_barcode_instructions">Introdueixi el ID de la targeta manualment i trii un codi de barres que s\'assembli al de la seva targeta.</string>
187179
<string name="rate_this_app">Valora aquesta app</string>
188180
<string name="exportPasswordHint">Introdueixi el password</string>
@@ -236,7 +228,6 @@
236228
<string name="turn_flashlight_off">Apagar el llum Flash</string>
237229
<string name="settings_oled_dark_summary">Redueix l\'ús de la bateria en pantalles OLED</string>
238230
<string name="settings_system_locale">Idioma del sistema</string>
239-
<string name="settings_catima_theme">Catima</string>
240231
<string name="spend">Gastar</string>
241232
<string name="importExportHelp">Fer una còpia de seguretat de les dades permet moure-les a un altre dispositiu</string>
242233
<string name="importSuccessfulTitle">Importat</string>

0 commit comments

Comments
 (0)