Skip to content

Commit 2752446

Browse files
sunilpaulmathewsunilpaulmathew
committed
App Theme: Add Auto-Mode
Signed-off-by: sunilpaulmathew <sunil.kde@gmail.com>
1 parent a7368c0 commit 2752446

8 files changed

Lines changed: 33 additions & 34 deletions

File tree

‎app/src/main/java/com/smartpack/busyboxinstaller/MainActivity.java‎

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,13 @@ protected void onCreate(Bundle savedInstanceState) {
109109
if (Utils.existFile("/system/xbin/bb_version")) {
110110
menu.add(Menu.NONE, 1, Menu.NONE, getString(R.string.remove));
111111
}
112-
menu.add(Menu.NONE, 2, Menu.NONE, getString(R.string.dark_theme)).setCheckable(true)
113-
.setChecked(Utils.getBoolean("dark_theme", true, this));
112+
SubMenu appTheme = menu.addSubMenu(Menu.NONE, 0, Menu.NONE, getString(R.string.dark_theme));
113+
appTheme.add(Menu.NONE, 18, Menu.NONE, getString(R.string.dark_theme_auto)).setCheckable(true)
114+
.setChecked(Utils.getBoolean("theme_auto", true, this));
115+
appTheme.add(Menu.NONE, 2, Menu.NONE, getString(R.string.dark_theme_enable)).setCheckable(true)
116+
.setChecked(Utils.getBoolean("dark_theme", false, this));
117+
appTheme.add(Menu.NONE, 19, Menu.NONE, getString(R.string.dark_theme_disable)).setCheckable(true)
118+
.setChecked(Utils.getBoolean("light_theme", false, this));
114119
SubMenu language = menu.addSubMenu(Menu.NONE, 0, Menu.NONE, getString(R.string.language, Utils.getLanguage(this)));
115120
language.add(Menu.NONE, 11, Menu.NONE, getString(R.string.language_default)).setCheckable(true)
116121
.setChecked(Utils.languageDefault(this));
@@ -147,7 +152,12 @@ protected void onCreate(Bundle savedInstanceState) {
147152
removeBusyBox();
148153
break;
149154
case 2:
150-
switchTheme();
155+
if (!Utils.getBoolean("dark_theme", false, this)) {
156+
Utils.saveBoolean("dark_theme", true, this);
157+
Utils.saveBoolean("light_theme", false, this);
158+
Utils.saveBoolean("theme_auto", false, this);
159+
restartApp();
160+
}
151161
break;
152162
case 3:
153163
new AlertDialog.Builder(this)
@@ -249,6 +259,22 @@ protected void onCreate(Bundle savedInstanceState) {
249259
restartApp();
250260
}
251261
break;
262+
case 18:
263+
if (!Utils.getBoolean("theme_auto", true, this)) {
264+
Utils.saveBoolean("dark_theme", false, this);
265+
Utils.saveBoolean("light_theme", false, this);
266+
Utils.saveBoolean("theme_auto", true, this);
267+
restartApp();
268+
}
269+
break;
270+
case 19:
271+
if (!Utils.getBoolean("light_theme", false, this)) {
272+
Utils.saveBoolean("dark_theme", false, this);
273+
Utils.saveBoolean("light_theme", true, this);
274+
Utils.saveBoolean("theme_auto", false, this);
275+
restartApp();
276+
}
277+
break;
252278
}
253279
return false;
254280
});
@@ -342,18 +368,6 @@ private void donateToMe() {
342368
.show();
343369
}
344370

345-
private void switchTheme() {
346-
if (Utils.getBoolean("dark_theme", true, this)) {
347-
Utils.saveBoolean("dark_theme", false, this);
348-
Utils.snackbar(mInstall, getString(R.string.switch_theme, getString(R.string.light)));
349-
} else {
350-
Utils.snackbar(mInstall, getString(R.string.switch_theme, getString(R.string.dark)));
351-
Utils.saveBoolean("dark_theme", true, this);
352-
}
353-
Utils.sleep(1);
354-
restartApp();
355-
}
356-
357371
private void restartApp() {
358372
Intent intent = new Intent(this, MainActivity.class);
359373
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);

‎app/src/main/java/com/smartpack/busyboxinstaller/utils/Utils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static boolean isNotDonated(Context context) {
6363
}
6464

6565
public static void initializeAppTheme(Context context) {
66-
if (getBoolean("dark_theme", true, context)) {
66+
if (getBoolean("dark_theme", false, context)) {
6767
AppCompatDelegate.setDefaultNightMode(
6868
AppCompatDelegate.MODE_NIGHT_YES);
6969
} else {

‎app/src/main/res/values-am/strings.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<string name="about_summary">ቢዚቦክስ ጫኝ ለተለያዩ የ አንድሮይድ ሥነ ሕንፃዎች (አርምቪ7 / አርም64 እና x86) የ “ቢዚቦክስ” መጫኛ የአንድ ጊዜ ጠቅታ ነው።</string>
66
<string name="cancel">ይቅር</string>
77
<string name="credits_summary"><b><i> https://busybox.net/</i></b> - <i>ቢዚቦክስ ባይነሪዎች</i>\n<b><i>Grarak</i></b> - <i>መነሻ ኮድ</i>\n<b><i>SmgKhOaRn</i></b> - <i>የኮሪያኛ ትርጉም</i>\n<b><i>sajid_islam</i></b> - <i>የመተግበሪያ አዶ</i></string>
8-
<string name="dark">ጨለማ</string>
98
<string name="dark_theme">ጠቆር ያለ ገፅታ</string>
109
<string name="donations">ልገሳ</string>
1110
<string name="hide">ደብቅ</string>
@@ -23,7 +22,6 @@
2322
<string name="language_en">እንግሊዘኛ</string>
2423
<string name="language_default">ነባር</string>
2524
<string name="language_ko">ኮርያኛ</string>
26-
<string name="light">ብርሃን</string>
2725
<string name="list_applets">የአፕሌቶች ዝርዝር</string>
2826
<string name="list_applets_summary">የሚከተሉት አፕልቶች በዚህ ጥቅል ውስጥ ተካተዋል!\n\n - %s</string>
2927
<string name="no_permission_message">ቢዚቦክስ ጭነት ያለ ማከማቻ ይፃፋል ተደራሽነት የለውም! ውርጃ</string>
@@ -38,7 +36,6 @@
3836
<string name="share_app">ቢዚቦክስ ጫኝ%s ን ከ ያግኙ https://play.google.com/store/apps/details?id=com.smartpack.busyboxinstaller</string>
3937
<string name="source_code">ምንጭ ኮድ</string>
4038
<string name="support_group">የድጋፍ ቡድን</string>
41-
<string name="switch_theme">ወደ%s ጭብጥ በመቀየር ላይ!</string>
4239
<string name="update">አዘምን</string>
4340
<string name="update_busybox">ቢዚቦክስ ማዘመኛ አለ!</string>
4441
<string name="updated_message">እንኳን ደስ አለዎት! እርስዎ ወቅታዊ ናቸው!</string>

‎app/src/main/res/values-el/strings.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<string name="cancel">Ακύρωση</string>
88
<string name="credits">Ευχαριστίες</string>
99
<string name="credits_summary"><b><i>https://busybox.net/</i></b> - <i>BusyBox Binaries</i>\n<b><i>Grarak</i></b> - <i>Συνεισφορές Κώδικα</i>\n<b><i>Lennoard</i></b> - <i>Συνεργάτες Κώδικα/pt-Br Μετάφραση</i>\n<b><i>SmgKhOaRn</i></b> - <i>Κορεατική Μετάφραση</i>\n<b><i>Mikesew1320</i></b> - <i>Amharic &amp; Ρωσική Μετάφραση</i>\n<b><i>tsiflimagas</i></b> - <i>Ελληνική μετάφραση</i>\n<b><i>sajid_islam</i></b> - <i>Εικονίδιο Εφαρμογής</i></string>
10-
<string name="dark">Σκούρο</string>
1110
<string name="dark_theme">Σκούρο Θέμα</string>
1211
<string name="donations">Δωρεές</string>
1312
<string name="hide">Απόκρυψη</string>
@@ -27,7 +26,6 @@
2726
<string name="language_default">Προεπιλογή</string>
2827
<string name="language_ko">Κορεατικά</string>
2928
<string name="language_pt">Πορτογαλικά</string>
30-
<string name="light">Φωτεινό</string>
3129
<string name="list_applets">Λίστα Applets</string>
3230
<string name="list_applets_summary">Τα ακόλουθα applets συμπεριλαμβάνονται σε αυτό το πακέτο!\n\n - %s</string>
3331
<string name="no_permission_message">Η εγκατάσταση BusyBox δε θα λειτουργήσει χωρίς Πρόσβαση στον Αποθηκευτικό Χώρο! Διακοπή</string>
@@ -42,7 +40,6 @@
4240
<string name="share_app">Αποκτήστε το BusyBox Installer %s από https://play.google.com/store/apps/details?id=com.smartpack.busyboxinstaller</string>
4341
<string name="source_code">Πηγαίος Κώδικας</string>
4442
<string name="support_group">Ομάδα Υποστήριξης</string>
45-
<string name="switch_theme">Μετάβαση σε %s Θέμα!</string>
4643
<string name="update">Ενημέρωση</string>
4744
<string name="update_busybox">Ενημέρωση για το BusyBox διαθέσιμη!</string>
4845
<string name="updated_message">Συγχαρητήρια! Είσαστε ενημερωμένος!</string>

‎app/src/main/res/values-ko/strings.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<string name="change_log">변경사항</string>
99
<string name="credits">도움을 주신 분들</string>
1010
<string name="credits_summary"><b><i>https://busybox.net/</i></b> - BusyBox 바이너리\n<b><i>Grarak</i></b> - 코드 기여\n<b><i>topjohnwu</i></b> - libsu\n<b><i>Lennoard</i></b> - 코드 기여 &amp; 브라질 포르투갈어 번역\n<b><i>SmgKhOaRn</i></b> - 한국어 번역\n<b><i>Mikesew1320</i></b> - 에티오피아어 &amp; 러시아어 번역\n<b><i>tsiflimagas</i></b> - <i>그리스어 번역</i>\n<b><i>sajid_islam</i></b> - 앱 아이콘</string>
11-
<string name="dark">어두운 테마</string>
1211
<string name="dark_theme">테마</string>
1312
<string name="donations">후원</string>
1413
<string name="donation_app">후원 앱 구매</string>
@@ -30,7 +29,6 @@
3029
<string name="language_ko">한국어</string>
3130
<string name="language_pt">브라질 포어</string>
3231
<string name="language_ru">러시아어</string>
33-
<string name="light">밝은 테마</string>
3432
<string name="list_applets">애플릿 종류</string>
3533
<string name="list_applets_summary">다음과 같은 애플릿들이 이 패키지에 포함되어 있습니다!\n\n - %s</string>
3634
<string name="no_permission_message">이 기능은 저장공간 쓰기 권한 없이 작동하지 않습니다!</string>
@@ -49,7 +47,6 @@
4947
<string name="support_developer">개발자 후원하기</string>
5048
<string name="support_developer_message">제 프로젝트를 후원하고 싶다면, 플레이 스토어 (Play Store)에 있는 SmartPack Donation Package 앱을 구매하는 것을 고려해보세요. 제 프로젝트들을 더 활발히 이어나갈 때 매우 큰 도움이 됩니다. 물론 필수는 아닙니다.</string>
5149
<string name="support_group">지원 받기</string>
52-
<string name="switch_theme">%s를 적용하는 중…</string>
5350
<string name="update">업데이트</string>
5451
<string name="update_busybox">BusyBox 업데이트 가능!</string>
5552
<string name="updated_message">최신 버전의 BusyBox 사용 중!</string>

‎app/src/main/res/values-pt-rBR/strings.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<string name="cancel">Cancelar</string>
66
<string name="credits">Créditos</string>
77
<string name="credits_summary"><b><i>https://busybox.net/</i></b> - <i>Binários BusyBox</i>\n<b><i>Grarak</i></b> - Um monte de código\n<b><i>SmgKhOaRn</i></b> - <i>Tradução para Coreano</i>\n<b><i>sajid_islam</i></b> - <i>Ícone do App</i></string>
8-
<string name="dark">Escuro</string>
98
<string name="dark_theme">Tema escuro</string>
109
<string name="donations">Doações</string>
1110
<string name="hide">Esconder</string>
@@ -24,7 +23,6 @@
2423
<string name="language_en">Inglês</string>
2524
<string name="language_default">Padrão</string>
2625
<string name="language_ko">Coreano</string>
27-
<string name="light">Claro</string>
2826
<string name="no_permission_message">A instalação do BusyBox não funcionará sem o acesso à gravação no armazenamento! Abortando</string>
2927
<string name="no_root_message">A instalação do BusyBox não funcionará sem o Acesso Root! Abortando</string>
3028
<string name="press_back">Pressione voltar novamente para sair!</string>
@@ -34,7 +32,6 @@
3432
<string name="share_app">Obtenha o Instalador do BusyBox %s no https://play.google.com/store/apps/details?id=com.smartpack.busyboxinstaller</string>
3533
<string name="source_code">Código-fonte</string>
3634
<string name="support_group">Grupo de suporte</string>
37-
<string name="switch_theme">Mudando para o Tema %s!</string>
3835
<string name="update">Atualizar</string>
3936
<string name="update_busybox">Atualização do BusyBox disponível!</string>
4037
<string name="updated_message">Parabéns! Você está atualizado!</string>

‎app/src/main/res/values-ru/strings.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<string name="cancel">Отмена</string>
77
<string name="credits">Благодарности</string>
88
<string name="credits_summary"><b><i>https://busybox.net/</i></b> - <i>двоичные файлы BusyBox</i>\n<b><i>Grarak</i></b> - <i>A связка кода</i>>\n<b><i>SmgKhOaRn</i></b> - <i>корейские переводы</i>\n<b><i>sajid_islam </i></b> - <i>Значок приложения</i></string>
9-
<string name="dark">Тьма</string>
109
<string name="dark_theme">Тёмная тема</string>
1110
<string name="hide">Спрятать</string>
1211
<string name="install">устанавливать</string>
@@ -26,7 +25,6 @@
2625
<string name="language_ko">Корейский</string>
2726
<string name="language_pt">Португальский</string>
2827
<string name="language_ru">Русский</string>
29-
<string name="light">Светлый</string>
3028
<string name="list_applets">Список апплетов</string>
3129
<string name="remove_busybox_completed">BusyBox v%s успешно удален с вашего устройства. Вы хотите перезагрузить компьютер?</string>
3230
<string name="remove_busybox_message">Вы уверены, что удалили апплеты BusyBox (v%s) из \'/system/xbin\'?\n\nПожалуйста, обратите внимание: он удалит только те апплеты, которые установлены этим приложением на вашем устройстве!</string>
@@ -37,7 +35,6 @@
3735
<string name="share_app">Загрузите установщик BusyBox%s с https://play.google.com/store/apps/details?id=com.smartpack.busyboxinstaller</string>
3836
<string name="source_code">Исходный код</string>
3937
<string name="support_group">Группа поддержки</string>
40-
<string name="switch_theme">Переход на%s тему!</string>
4138
<string name="update">Обновить</string>
4239
<string name="update_busybox">Доступно обновление BusyBox!</string>
4340
<string name="updated_message">Congrats! Вы в курсе!</string>

‎app/src/main/res/values/strings.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
<string name="change_log">Change-logs</string>
99
<string name="credits">Credits</string>
1010
<string name="credits_summary"><b><i>https://busybox.net/</i></b> - <i>BusyBox Binaries</i>\n<b><i>Grarak</i></b> - <i>Code contributions</i>\n<b><i>topjohnwu</i></b> - <i>libsu</i>\n<b><i>Lennoard</i></b> - <i>Code contributions/pt-Br Translations</i>\n<b><i>SmgKhOaRn</i></b> - <i>Korean Translations</i>\n<b><i>Mikesew1320</i></b> - <i>Amharic &amp; Russian Translations</i>\n<b><i>tsiflimagas</i></b> - <i>Greek translations</i>\n<b><i>sajid_islam</i></b> - <i>App Icon</i></string>
11-
<string name="dark">Dark</string>
1211
<string name="dark_theme">Dark Theme</string>
12+
<string name="dark_theme_auto">Auto</string>
13+
<string name="dark_theme_disable">Disable</string>
14+
<string name="dark_theme_enable">Enable</string>
1315
<string name="developed_by">Developed By</string>
1416
<string name="donations">Donations</string>
1517
<string name="donation_app">Buy Donation App</string>
@@ -31,7 +33,6 @@
3133
<string name="language_ko">Korean</string>
3234
<string name="language_pt">Portuguese</string>
3335
<string name="language_ru">Russian</string>
34-
<string name="light">Light</string>
3536
<string name="list_applets">Applets List</string>
3637
<string name="list_applets_summary">The following applets are included in this package!\n\n - %s</string>
3738
<string name="no_permission_message">BusyBox installation won\'t work without Storage Write Access! Aborting</string>
@@ -50,7 +51,6 @@
5051
<string name="support_developer">Support Developer!</string>
5152
<string name="support_developer_message">If you like to appreciate my work, please consider buying SmartPack Donation Package from PlayStore as it is really helpful to continue my projects more active, although it is not at all necessary.</string>
5253
<string name="support_group">Support Group</string>
53-
<string name="switch_theme">Switching to %s Theme!</string>
5454
<string name="update">Update</string>
5555
<string name="update_busybox">BusyBox Update Available!</string>
5656
<string name="updated_message">Congrats! You\'re Up-to-date!</string>

0 commit comments

Comments
 (0)