From 62e37459bc2d2dd7b673a9517bc1ab82a82dff2a Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 23 Aug 2017 13:50:36 -0500 Subject: [PATCH] Remove LED notification color preference --- .../andlib/utility/AndroidUtilities.java | 7 +++-- .../astrid/reminders/ReminderPreferences.java | 29 +++-------------- .../org/tasks/dialogs/ColorPickerDialog.java | 8 ++--- .../notifications/NotificationManager.java | 8 ++--- .../org/tasks/preferences/Preferences.java | 6 ++-- .../main/java/org/tasks/themes/LEDColor.java | 31 ------------------- .../java/org/tasks/themes/ThemeCache.java | 15 --------- app/src/main/res/values-ar/strings.xml | 1 - app/src/main/res/values-bg-rBG/strings.xml | 2 -- app/src/main/res/values-ca/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 2 -- app/src/main/res/values-de/strings.xml | 2 -- app/src/main/res/values-es/strings.xml | 2 -- app/src/main/res/values-fa/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 2 -- app/src/main/res/values-fr/strings.xml | 2 -- app/src/main/res/values-gl/strings.xml | 2 -- app/src/main/res/values-hu/strings.xml | 2 -- app/src/main/res/values-it/strings.xml | 2 -- app/src/main/res/values-iw/strings.xml | 2 -- app/src/main/res/values-ja/strings.xml | 2 -- app/src/main/res/values-ko/strings.xml | 2 -- app/src/main/res/values-nl/strings.xml | 2 -- app/src/main/res/values-pl/strings.xml | 2 -- app/src/main/res/values-pt-rBR/strings.xml | 2 -- app/src/main/res/values-ro/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 2 -- app/src/main/res/values-sv/strings.xml | 2 -- app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 2 -- app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/arrays.xml | 10 ------ app/src/main/res/values/keys.xml | 1 - app/src/main/res/values/strings.xml | 2 -- .../main/res/xml/preferences_reminders.xml | 26 ++++------------ 35 files changed, 24 insertions(+), 161 deletions(-) delete mode 100644 app/src/main/java/org/tasks/themes/LEDColor.java diff --git a/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java b/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java index d2a3e218e..b5508ac06 100644 --- a/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java +++ b/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java @@ -6,7 +6,6 @@ package com.todoroo.andlib.utility; import android.app.Activity; -import android.content.BroadcastReceiver; import android.content.ContentValues; import android.content.Context; import android.os.Build; @@ -217,6 +216,10 @@ public class AndroidUtilities { return !atLeastJellybean(); } + public static boolean preOreo() { + return !atLeastOreo(); + } + public static boolean atLeastJellybeanMR1() { return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1; } @@ -237,7 +240,7 @@ public class AndroidUtilities { return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M; } - public static boolean atLeastO() { + public static boolean atLeastOreo() { return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O; } diff --git a/app/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java b/app/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java index 61d4e7764..b1dd106ca 100644 --- a/app/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java +++ b/app/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java @@ -18,9 +18,7 @@ import android.support.annotation.NonNull; import android.support.v4.app.JobIntentService; import org.tasks.R; -import org.tasks.activities.ColorPickerActivity; import org.tasks.activities.TimePickerActivity; -import org.tasks.dialogs.ColorPickerDialog; import org.tasks.injection.ActivityComponent; import org.tasks.injection.InjectingPreferenceActivity; import org.tasks.jobs.JobManager; @@ -31,7 +29,6 @@ import org.tasks.preferences.PermissionRequestor; import org.tasks.preferences.Preferences; import org.tasks.scheduling.GeofenceSchedulingIntentService; import org.tasks.scheduling.NotificationSchedulerIntentService; -import org.tasks.themes.LEDColor; import org.tasks.themes.ThemeCache; import org.tasks.time.DateTime; import org.tasks.ui.TimePreference; @@ -39,6 +36,8 @@ import org.tasks.ui.TimePreference; import javax.inject.Inject; import static com.todoroo.andlib.utility.AndroidUtilities.atLeastJellybean; +import static com.todoroo.andlib.utility.AndroidUtilities.atLeastOreo; +import static com.todoroo.andlib.utility.AndroidUtilities.preOreo; import static org.tasks.PermissionUtil.verifyPermissions; public class ReminderPreferences extends InjectingPreferenceActivity { @@ -46,7 +45,6 @@ public class ReminderPreferences extends InjectingPreferenceActivity { private static final int REQUEST_QUIET_START = 10001; private static final int REQUEST_QUIET_END = 10002; private static final int REQUEST_DEFAULT_REMIND = 10003; - private static final int REQUEST_LED_PICKER = 10004; @Inject Device device; @Inject ActivityPermissionRequestor permissionRequestor; @@ -80,17 +78,9 @@ public class ReminderPreferences extends InjectingPreferenceActivity { initializeTimePreference(getQuietStartPreference(), REQUEST_QUIET_START); initializeTimePreference(getQuietEndPreference(), REQUEST_QUIET_END); - findPreference(getString(R.string.p_led_color)).setOnPreferenceClickListener(preference -> { - Intent intent = new Intent(ReminderPreferences.this, ColorPickerActivity.class); - intent.putExtra(ColorPickerActivity.EXTRA_PALETTE, ColorPickerDialog.ColorPalette.LED); - startActivityForResult(intent, REQUEST_LED_PICKER); - return false; - }); - requires(R.string.notification_shade, atLeastJellybean(), R.string.p_notification_priority); requires(device.supportsLocationServices(), R.string.geolocation_reminders); - - updateLEDColor(); + requires(preOreo(), R.string.p_rmd_ringtone, R.string.p_led_notification); } private void rescheduleNotificationsOnChange(int... resIds) { @@ -153,12 +143,7 @@ public class ReminderPreferences extends InjectingPreferenceActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { - if (requestCode == REQUEST_LED_PICKER) { - if (resultCode == RESULT_OK) { - preferences.setInt(R.string.p_led_color, data.getIntExtra(ColorPickerActivity.EXTRA_THEME_INDEX, 4)); - updateLEDColor(); - } - } else if (requestCode == REQUEST_QUIET_START) { + if (requestCode == REQUEST_QUIET_START) { if (resultCode == RESULT_OK) { getQuietStartPreference().handleTimePickerActivityIntent(data); } @@ -195,10 +180,4 @@ public class ReminderPreferences extends InjectingPreferenceActivity { public void inject(ActivityComponent component) { component.inject(this); } - - private void updateLEDColor() { - int index = preferences.getInt(R.string.p_led_color, 4); - LEDColor ledColor = themeCache.getLEDColor(index); - findPreference(getString(R.string.p_led_color)).setSummary(ledColor.getName()); - } } diff --git a/app/src/main/java/org/tasks/dialogs/ColorPickerDialog.java b/app/src/main/java/org/tasks/dialogs/ColorPickerDialog.java index f915ddb79..6ccb572c2 100644 --- a/app/src/main/java/org/tasks/dialogs/ColorPickerDialog.java +++ b/app/src/main/java/org/tasks/dialogs/ColorPickerDialog.java @@ -34,7 +34,7 @@ public class ColorPickerDialog extends InjectingDialogFragment { private static final String EXTRA_PALETTE = "extra_palette"; private static final String EXTRA_SHOW_NONE = "extra_show_none"; - public enum ColorPalette {THEMES, COLORS, ACCENTS, WIDGET_BACKGROUND, LED} + public enum ColorPalette {THEMES, COLORS, ACCENTS, WIDGET_BACKGROUND} public interface ThemePickerCallback { void themePicked(ColorPalette palette, int index); @@ -155,8 +155,6 @@ public class ColorPickerDialog extends InjectingDialogFragment { return R.array.accents; case WIDGET_BACKGROUND: return R.array.widget_background; - case LED: - return R.array.led; default: return R.array.themes; } @@ -170,14 +168,12 @@ public class ColorPickerDialog extends InjectingDialogFragment { return themeCache.getThemeAccent(index).getAccentColor(); case WIDGET_BACKGROUND: return themeCache.getWidgetTheme(index).getBackgroundColor(); - case LED: - return themeCache.getLEDColor(index).getColor(); default: return themeCache.getThemeBase(index).getContentBackground(); } } private int getNumFree() { - return palette == ColorPalette.LED ? themeCache.getLEDColorCount() : 2; + return 2; } } diff --git a/app/src/main/java/org/tasks/notifications/NotificationManager.java b/app/src/main/java/org/tasks/notifications/NotificationManager.java index 1b4ae987d..94165b06c 100644 --- a/app/src/main/java/org/tasks/notifications/NotificationManager.java +++ b/app/src/main/java/org/tasks/notifications/NotificationManager.java @@ -10,7 +10,7 @@ import org.tasks.preferences.Preferences; import javax.inject.Inject; -import static com.todoroo.andlib.utility.AndroidUtilities.atLeastO; +import static com.todoroo.andlib.utility.AndroidUtilities.atLeastOreo; public class NotificationManager { @@ -23,11 +23,11 @@ public class NotificationManager { this.preferences = preferences; notificationManager = (android.app.NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); - if (atLeastO()) { + if (atLeastOreo()) { String channelName = context.getString(R.string.notifications); NotificationChannel notificationChannel = new NotificationChannel(DEFAULT_NOTIFICATION_CHANNEL, channelName, android.app.NotificationManager.IMPORTANCE_HIGH); - notificationChannel.enableLights(preferences.isLEDNotificationEnabled()); - notificationChannel.enableVibration(preferences.isVibrationEnabled()); + notificationChannel.enableLights(true); + notificationChannel.enableVibration(true); notificationChannel.setLightColor(preferences.getLEDColor()); notificationChannel.setVibrationPattern(preferences.getVibrationPattern()); notificationManager.createNotificationChannel(notificationChannel); diff --git a/app/src/main/java/org/tasks/preferences/Preferences.java b/app/src/main/java/org/tasks/preferences/Preferences.java index 02159c0a0..584eeca19 100644 --- a/app/src/main/java/org/tasks/preferences/Preferences.java +++ b/app/src/main/java/org/tasks/preferences/Preferences.java @@ -29,6 +29,7 @@ import javax.inject.Inject; import timber.log.Timber; import static android.content.SharedPreferences.Editor; +import static com.todoroo.andlib.utility.AndroidUtilities.atLeastOreo; public class Preferences { @@ -95,12 +96,11 @@ public class Preferences { } public boolean isLEDNotificationEnabled() { - return getBoolean(R.string.p_led_notification, true); + return atLeastOreo() || getBoolean(R.string.p_led_notification, true); } public int getLEDColor() { - int accent = getInt(R.string.p_led_color, 4); - return themeCache.getLEDColor(accent).getColor(); + return R.color.led_green; } public boolean quietHoursEnabled() { diff --git a/app/src/main/java/org/tasks/themes/LEDColor.java b/app/src/main/java/org/tasks/themes/LEDColor.java deleted file mode 100644 index cac2b8bb3..000000000 --- a/app/src/main/java/org/tasks/themes/LEDColor.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.tasks.themes; - -import org.tasks.R; - -public class LEDColor { - - public static final int[] LED_COLORS = new int[]{ - R.color.led_white, - R.color.led_red, - R.color.led_orange, - R.color.led_yellow, - R.color.led_green, - R.color.led_blue, - R.color.led_purple - }; - private final String name; - private final int color; - - public LEDColor(String name, int color) { - this.name = name; - this.color = color; - } - - public String getName() { - return name; - } - - public int getColor() { - return color; - } -} diff --git a/app/src/main/java/org/tasks/themes/ThemeCache.java b/app/src/main/java/org/tasks/themes/ThemeCache.java index d91528b7b..db0370f2e 100644 --- a/app/src/main/java/org/tasks/themes/ThemeCache.java +++ b/app/src/main/java/org/tasks/themes/ThemeCache.java @@ -24,7 +24,6 @@ public class ThemeCache { private final List colors = new ArrayList<>(); private final List accents = new ArrayList<>(); private final List widgetThemes = new ArrayList<>(); - private final List led = new ArrayList<>(); private final ThemeColor untaggedColor; @Inject @@ -64,12 +63,6 @@ public class ThemeCache { getColor(context, i == 0 ? R.color.black_87 : R.color.white_100), getColor(context, i == 0 ? R.color.black_54 : R.color.white_70))); } - String []ledNames = resources.getStringArray(R.array.led); - for (int i = 0 ; i < LEDColor.LED_COLORS.length ; i++) { - led.add(new LEDColor( - ledNames[i], - getColor(context, LEDColor.LED_COLORS[i]))); - } untaggedColor = new ThemeColor(null, 19, getColor(context, R.color.tag_color_none_background), 0, getColor(context, R.color.black_87), false); } @@ -93,14 +86,6 @@ public class ThemeCache { return untaggedColor; } - public LEDColor getLEDColor(int index) { - return led.get(index); - } - - public int getLEDColorCount() { - return led.size(); - } - private static int resolveAttribute(Resources.Theme theme, int attribute) { TypedValue typedValue = new TypedValue(); theme.resolveAttribute(attribute, typedValue, true); diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 1e034c6bd..cfa431451 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -185,7 +185,6 @@ التوقف أثناء الهزات تاسكس هو مشروع مفتوح المصدر مدموع من طرف مطور واحد. بعض الخيارات متوفرة عن الطريق الدفع من داخل التطبيق من أجل دعم التطوير التعتيم - أبيض المزامنة التلقائية معطلة الآن من طرف أندرويد تخصيص اللغة و الجهة إتجاه التنسيق diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml index 23ee6f29c..2c9808cc2 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -368,7 +368,6 @@ Синьо-сив Черен Тъмно сива - Бяла Светла Тъмна Тапет @@ -386,7 +385,6 @@ Отдясно наляво LED нотификация Изисква се хардуерна поддръжка - LED цвят Не са намерени календари Настройки на widget Настройки на заглавието diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 3c6891391..e6c9616aa 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -136,7 +136,6 @@ Alta Predeterminat Baix - Blanc Idioma Localització D\'esquerra a dreta diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 2a29d7180..ecc203d2f 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -314,7 +314,6 @@ Šedá Modrošedá Černá - Bílý Světlý Tmavý Tapeta @@ -330,7 +329,6 @@ Orientace Zleva do prava Zprava do leva - Barva LED Nenalezeny žádné kalendáře Nastavení widgetu \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 8aed86b13..ce65b485c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -356,7 +356,6 @@ Blaugrau Schwarz Dunkelgrau - Weiß Hell Dunkel Hintergrundbild @@ -374,7 +373,6 @@ Rechts nach links Benachrichtigungs-LED Hardware-Unterstützung benötigt - LED-Farbe Es wurden keine Kalender gefunden Widget-Einstellungen Kopf-Einstellungen diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c5a1e6e47..7f96e824d 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -363,7 +363,6 @@ Gris azulado Negro Gris oscuro - Blanco Claro Oscuro Fondo de pantalla @@ -380,7 +379,6 @@ De derecha a izquierda Notificación de la LED Apoyo de hardware requerido - Color de la LED No se han encontrado calendarios Configuración de widget Configuración de encabezado diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 66ac2d993..5ebcbd9fe 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -252,7 +252,6 @@ لیست پیش فرض Tasks پروژه‌ای متن‌باز است که عمدتاً توسط یک‌نفر توسعه داده می‌شود. برای حمایت از این تلاش، برخی ویژگی‌ها به‌صورت خریدهای داخل برنامه ارائه شده‌اند. شفافیت - سفید درحال‌حاضر هماهنگ‌سازی خودکار توسط اندروید غیرفعال است عمومی زبان diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 1114f73b1..aecc31ce5 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -366,7 +366,6 @@ Siniharmaa Musta Tumma harmaa - Valkoinen Vaalea Tumma Taustakuva @@ -384,7 +383,6 @@ Oikealta vasemmalle LED muistutus Laitetuki vaaditaan - LED väri Kalenteria ei löydy Widgetin asetukset Otsikon asetukset diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index db9e5fa66..e985fc5eb 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -354,7 +354,6 @@ Gris Bleu Noir Gris Noir - Blanc Lumière Noir Fond d\'écran @@ -372,7 +371,6 @@ Droite à gauche Notification de la LED Support matériel requis - Couleur de la LED Pas de calendriers trouvés Paramètres du Widget Paramètres de l\'en-tête diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index c2b4ffa6d..92b87826e 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -365,7 +365,6 @@ Gris azulado Negro Gris oscuro - Blanco Claro Oscuro Fondo de pantalla @@ -383,7 +382,6 @@ De derecha a izquierda Notificación de la LED Apoyo de hardware requerido - Color de la LED No se han encontrado calendarios Configuración de widget Configuración de encabezado diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index ee5026034..058b21760 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -368,7 +368,6 @@ Szürkéskék Fekete Sötétszürke - Fehér Világos Sötét Háttérkép @@ -386,7 +385,6 @@ Jobbról balra LED értesítés Hardveres támogatás szükséges - LED színe Naptár nem található Widget beállításai Fejléc beállításai diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 47b35153e..eb8edca93 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -364,7 +364,6 @@ Grigio-Blu Nero Grigio scuro - Bianco Chiaro Scuro Sfondo @@ -382,7 +381,6 @@ Da destra a sinistra LED di notifica E\' richiesto il supporto Hardware - Colore LED Nessun calendario Impostazioni widget Impostazioni intestazione diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 8b91dd10f..a9d526bbb 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -366,7 +366,6 @@ כחול אפור שחור אפור כהה - לבן בהיר כהה תמונת רקע @@ -384,7 +383,6 @@ מימין לשמאל תאורת התראות נדרשת חומרה תואמת - צבע תאורת התראות לא נמצאו לוחות שנה הגדרות ווידג\'ט הגדרות כותרת diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 73833fa14..347c3624e 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -366,7 +366,6 @@ 灰青 黒 ダークグレー - 白 ライト ダーク 壁紙 @@ -384,7 +383,6 @@ 右から左 LED 通知 ハードウェア サポートが必要です - LED の色 カレンダーが見つかりません ウィジェット設定 ヘッダー設定 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 2cba4557d..1d1e5c3c1 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -370,7 +370,6 @@ 회청색 검정 어두운 회색 - 흰색 밝게 어둡게 바탕화면 @@ -388,7 +387,6 @@ 오른쪽 정렬 LED 알림 하드웨어 지원을 필요로 합니다. - LED 색상 달력 없음 위젯 설정 헤더 설정 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index b09631c49..5b739ad9a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -357,7 +357,6 @@ Blauwgrijs Zwart Donker Groen - Wit Licht Donker Achtergrond @@ -374,7 +373,6 @@ Rechts naar links LED notificatie Hardware ondersteuning vereist - LED kleur Geen kalenders gevonden Widget instellingen Titel instellingen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 9138ede02..8a33f0dc9 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -364,7 +364,6 @@ Niebiesko Szary Czarny Ciemnoszary - Biały Jasny Ciemny Tapeta @@ -382,7 +381,6 @@ Od prawa do lewa Powiadomienie LED Wymagane wsparcie sprzętowe - Kolor LED Nie znaleziono kalendzarzy Ustawienie widgetu Ustawienia nagłówka diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index bd6dd87cd..c7f6959dd 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -358,7 +358,6 @@ Azul Acinzentado Preto Cinza escuro - Branco Claro Escuro Plano de fundo @@ -375,7 +374,6 @@ Esquerda para direita Direita para esquerda LED de notificações - Cor do LED Não foi encontrado nenhum calendário Configurações de Widget Config. cabeçalho diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index ea254a5c1..f938817ba 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -14,7 +14,6 @@ Sterge linia Fara categorie Filtre - Alb Stanga la dreapta Dreapta la stânga \ No newline at end of file diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 5d4ae8a00..763e96526 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -365,7 +365,6 @@ Серо-голубой Чёрная Тёмно-серый - Белый Светлая Тёмная Как обои @@ -383,7 +382,6 @@ Справа налево LED уведомления Необходима аппаратная поддержка - LED цвет Календарей не найдено Настройки виджета Настройки закоголовка diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index c6ffc088a..ebc885e97 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -357,7 +357,6 @@ Blågrå Svart Mörkgrå - Vit Ljust Mörkt Bakgrundsbild @@ -372,7 +371,6 @@ Höger till vänster LED Notifiering Hårdvarustöd krävs - LED färg Inga kalendrar hittades Inställningar för widget Skapar ny lista diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index eb139ebb0..61e941599 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -243,7 +243,6 @@ Etiket zaten var Tasks, bir geliştirici tarafından tutulan açık kaynaklı bir projedir. Bazı özellikleri, geliştirmeyi desteklemek için uygulama içi satın alma olarak sunulmaktadır. Şeffaflık - Beyaz Otomatik eşitleme şu anda Android tarafından devre dışı bırakıldı Genel Dil diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 9d1607218..d0685aa18 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -367,7 +367,6 @@ Сіро-синій Чорний Темно-сірий - Біла Світлий Темний Шпалери @@ -385,7 +384,6 @@ Зправа наліво LED-сповіщення Потрібна підтримка апартних засобів - LED колір Календарів не знайдено Налаштування віджету Налаштування заголовку diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index f717a596e..46573cdf4 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -238,5 +238,4 @@ 排版方向 由左至右 由右至左 - LED 顏色 \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 0a3bddb33..7ec2ba1cc 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -119,16 +119,6 @@ @string/theme_deep_orange - - @string/theme_white - @string/theme_red - @string/theme_orange - @string/theme_yellow - @string/theme_green - @string/theme_blue - @string/theme_purple - - @string/theme_light @string/theme_black diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml index 4f59c2fde..2a9c4c3f6 100644 --- a/app/src/main/res/values/keys.xml +++ b/app/src/main/res/values/keys.xml @@ -278,7 +278,6 @@ default_gtasks_list language layout_direction - led_color led_notificatiWCAon widget-id- diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 94a23de50..d3e061cb0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -761,7 +761,6 @@ File %1$s contained %2$s.\n\n Blue grey Black Dark grey - White Light Dark Wallpaper @@ -780,7 +779,6 @@ File %1$s contained %2$s.\n\n Right to left LED notification Hardware support required - LED color No calendars found Widget settings Header settings diff --git a/app/src/main/res/xml/preferences_reminders.xml b/app/src/main/res/xml/preferences_reminders.xml index d9f7d19f1..a8a2b90a5 100644 --- a/app/src/main/res/xml/preferences_reminders.xml +++ b/app/src/main/res/xml/preferences_reminders.xml @@ -20,6 +20,12 @@ android:showDefault="true" android:showSilent="true" android:title="@string/sound" /> + - - - - - - - - - -