Merge remote-tracking branch 'origin/develop' into develop

Alkitab/src/main/java/yuku/alkitab/base/IsiActivity.kt

@@ -11,6 +11,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.pm.PackageManager
+import android.content.res.Configuration
 import android.graphics.Point
 import android.net.Uri
 import android.nfc.NdefMessage
@@ -2113,6 +2114,18 @@ class IsiActivity : BaseLeftDrawerActivity(), LeftDrawer.Text.Listener {
 
         App.getLbm().sendBroadcast(Intent(ACTION_NIGHT_MODE_CHANGED))
     }
+    private fun setFollowSystemTheme(yes: Boolean, cNightMode: SwitchCompat) {
+        val previousValue = Preferences.getBoolean(Prefkey.follow_system_theme, true)
+        if (previousValue == yes) return
+
+        Preferences.setBoolean(Prefkey.follow_system_theme, yes)
+
+        if (yes) {
+            val systemTheme = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
+            cNightMode.isChecked = systemTheme == Configuration.UI_MODE_NIGHT_YES
+            setNightMode(systemTheme == Configuration.UI_MODE_NIGHT_YES)
+        }
+    }
 
     private fun openVersionsDialog() {
         // If there is no db versions, immediately open manage version screen.
@@ -2860,6 +2873,11 @@ class IsiActivity : BaseLeftDrawerActivity(), LeftDrawer.Text.Listener {
         Tracker.trackEvent("left_drawer_night_mode_click")
         setNightMode(isChecked)
     }
+    override fun cFollowSystemTheme_checkedChange(isChecked: Boolean, cNightMode: SwitchCompat) {
+        Tracker.trackEvent("left_drawer_follow_system_theme_click")
+        cNightMode.isEnabled = !isChecked
+        setFollowSystemTheme(isChecked, cNightMode)
+    }
 
     override fun cSplitVersion_checkedChange(cSplitVersion: SwitchCompat, isChecked: Boolean) {
         Tracker.trackEvent("left_drawer_split_click")

Alkitab/src/main/java/yuku/alkitab/base/storage/Prefkey.kt

@@ -35,6 +35,9 @@ enum class Prefkey {
     /** Night mode activated (boolean)  */
     is_night_mode,
 
+    /** Night mode follows system theme (boolean)  */
+    follow_system_theme,
+
     /** marker (bookmark) list selected sorting option  */
     marker_list_sort_column, marker_list_sort_ascending,
 

Alkitab/src/main/java/yuku/alkitab/base/widget/LeftDrawer.java

@@ -6,6 +6,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.res.Configuration;
 import android.graphics.Typeface;
 import androidx.annotation.NonNull;
 import androidx.core.content.res.ResourcesCompat;
@@ -237,6 +238,8 @@ public interface Listener {
 
 			void cNightMode_checkedChange(boolean isChecked);
 
+			void cFollowSystemTheme_checkedChange(boolean isChecked, final SwitchCompat cNightMode);
+
 			void cSplitVersion_checkedChange(final SwitchCompat cSplitVersion, boolean isChecked);
 
 			void bProgressMarkList_click();
@@ -258,6 +261,7 @@ public interface Handle {
 		View bDisplay;
 		SwitchCompat cFullScreen;
 		SwitchCompat cNightMode;
+		SwitchCompat cFollowSystemTheme;
 		SwitchCompat cSplitVersion;
 
 		View bProgressMarkList;
@@ -304,6 +308,7 @@ protected void onFinishInflate() {
 			bDisplay = findViewById(R.id.bDisplay);
 			cFullScreen = findViewById(R.id.cFullScreen);
 			cNightMode = findViewById(R.id.cNightMode);
+			cFollowSystemTheme = findViewById(R.id.cFollowSystemTheme);
 			cSplitVersion = findViewById(R.id.cSplitVersion);
 
 			bProgressMarkList = findViewById(R.id.bProgressMarkList);
@@ -317,7 +322,15 @@ protected void onFinishInflate() {
 			bCurrentReadingClose = findViewById(R.id.bCurrentReadingClose);
 			bCurrentReadingReference = findViewById(R.id.bCurrentReadingReference);
 
-			cNightMode.setChecked(!isInEditMode() && Preferences.getBoolean(Prefkey.is_night_mode, false));
+			final boolean followSystemTheme = Preferences.getBoolean(Prefkey.follow_system_theme, true);
+			if (followSystemTheme) {
+				final int systemTheme = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+				cNightMode.setChecked(!isInEditMode() && systemTheme == Configuration.UI_MODE_NIGHT_YES);
+			} else {
+				cNightMode.setChecked(!isInEditMode() && Preferences.getBoolean(Prefkey.is_night_mode, false));
+			}
+			cNightMode.setEnabled(!followSystemTheme);
+			cFollowSystemTheme.setChecked(followSystemTheme);
 
 			bProgressMarkList.setOnClickListener(v -> listener.bProgressMarkList_click());
 
@@ -355,6 +368,8 @@ protected void onFinishInflate() {
 
 			cNightMode.setOnCheckedChangeListener(cNightMode_checkedChange);
 
+			cFollowSystemTheme.setOnCheckedChangeListener(cFollowSystemTheme_checkedChange);
+
 			cSplitVersion.setOnCheckedChangeListener(cSplitVersion_checkedChange);
 
 			bCurrentReadingClose.setOnClickListener(v -> listener.bCurrentReadingClose_click());
@@ -414,6 +429,13 @@ public void onCheckedChanged(final CompoundButton buttonView, final boolean isCh
 			}
 		};
 
+		CompoundButton.OnCheckedChangeListener cFollowSystemTheme_checkedChange = new CompoundButton.OnCheckedChangeListener() {
+			@Override
+			public void onCheckedChanged(final CompoundButton buttonView, final boolean isChecked) {
+				listener.cFollowSystemTheme_checkedChange(isChecked, cNightMode);
+			}
+		};
+
 		CompoundButton.OnCheckedChangeListener cSplitVersion_checkedChange = new CompoundButton.OnCheckedChangeListener() {
 			@Override
 			public void onCheckedChanged(final CompoundButton buttonView, final boolean isChecked) {

Alkitab/src/main/res/layout/left_drawer_text.xml

@@ -193,6 +193,18 @@
 			android:textColor="#fff"
 			android:textSize="16sp" />
 
+		<androidx.appcompat.widget.SwitchCompat
+			android:id="@+id/cFollowSystemTheme"
+			android:layout_width="match_parent"
+			android:layout_height="48dp"
+			android:layout_marginEnd="16dp"
+			android:layout_marginStart="16dp"
+			android:fontFamily="sans-serif-regular"
+			android:gravity="start|center_vertical"
+			android:text="@string/menuFollowSystemTheme"
+			android:textColor="#fff"
+			android:textSize="16sp" />
+
 		<androidx.appcompat.widget.SwitchCompat
 			android:id="@+id/cSplitVersion"
 			android:layout_width="match_parent"

Alkitab/src/main/res/values-af/strings.xml

@@ -369,6 +369,7 @@
     <string name="version_download_network_error">Netwerk fout tydens aflaai van ^1.</string>
     <string name="version_download_server_error">Bediener fout tydens aflaai van ^1.</string>
     <string name="menuNightMode">Nag modus</string>
+    <string name="menuFollowSystemTheme">Volg stelsel tema</string>
     <string name="highlight_custom_color">Ander Kleure</string>
     <string name="menu_compare">Vergelyk</string>
     <string name="song_player_error_description">\'n Fout het ontstaan met die speel van die lied:%1$d, %2$d.</string>

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

@@ -371,6 +371,7 @@
     <string name="version_download_network_error">Мрежова грешка при изтегляне ^1.</string>
     <string name="version_download_server_error">Грешка в сървъра при изтегляне ^1.</string>
     <string name="menuNightMode">Нощен режим</string>
+    <string name="menuFollowSystemTheme">Следвайте темата на системата</string>
     <string name="highlight_custom_color">Други цветове</string>
     <string name="menu_compare">Сравни</string>
     <string name="song_player_error_description">Възникна грешка при възпроизвеждане на тази песен: %1$d, %2$d.</string>

Alkitab/src/main/res/values-ceb/strings.xml

@@ -368,6 +368,7 @@
     <string name="version_download_network_error">Kasamtangan nasayop ang network sa pag-download ^1.</string>
     <string name="version_download_server_error">Kasamtangan nasayop ang server sa pag-download ^1.</string>
     <string name="menuNightMode">Pang-gabie na mode</string>
+    <string name="menuFollowSystemTheme">Sunda ang tema sa sistema</string>
     <string name="highlight_custom_color">Ubang mga kolor</string>
     <string name="menu_compare">Itandi</string>
     <string name="song_player_error_description">Naai na sugatan na sayop samtang nag patukar ining kantaha: %1$d, %2$d.</string>

Alkitab/src/main/res/values-cs/strings.xml

@@ -372,6 +372,7 @@
     <string name="version_download_network_error">Chyba sítě při stahování ^1.</string>
     <string name="version_download_server_error">Chyba serveru při stahování ^1.</string>
     <string name="menuNightMode">Noční mód</string>
+    <string name="menuFollowSystemTheme">Sledování systémového tématu</string>
     <string name="highlight_custom_color">Jiné barvy</string>
     <string name="menu_compare">Porovnat</string>
     <string name="song_player_error_description">Chyba při přehrávání: %1$d, %2$d.</string>

Alkitab/src/main/res/values-da/strings.xml

@@ -369,6 +369,7 @@
     <string name="version_download_network_error">Netværksfejl under hentning af ^1.</string>
     <string name="version_download_server_error">Server fejl ved hentning af ^1.</string>
     <string name="menuNightMode">Natfunktion</string>
+    <string name="menuFollowSystemTheme">Følg systemtemaet</string>
     <string name="highlight_custom_color">Dine markørfarver</string>
     <string name="menu_compare">Sammenlign</string>
     <string name="song_player_error_description">Der opstår en fejl, når denne sang afspilles: %1$d, %2$d.</string>

Alkitab/src/main/res/values-de/strings.xml

@@ -374,6 +374,7 @@
     <string name="version_download_network_error">Netzwerkfehler beim Herunterladen von ^1.</string>
     <string name="version_download_server_error">Serverfehler beim Herunterladen von ^1.</string>
     <string name="menuNightMode">Nachtmodus</string>
+    <string name="menuFollowSystemTheme">Dem Systemthema folgen</string>
     <string name="highlight_custom_color">Weitere Farben</string>
     <string name="menu_compare">Vergleichen</string>
     <string name="song_player_error_description">Beim Abspielen dieses Liedes ist ein Fehler aufgetreten: %1$d, %2$d.</string>

Alkitab/src/main/res/values-el/strings.xml

@@ -369,6 +369,7 @@
     <string name="version_download_network_error">Σφάλμα στο διαδίκτυο στο άνοιγμα ^1.</string>
     <string name="version_download_server_error">Σφάλμα διακομιστή κατά το άνοιγμα του ^1.</string>
     <string name="menuNightMode">Νυχτερινή λειτουργία</string>
+    <string name="menuFollowSystemTheme">Ακολουθήστε το θέμα του συστήματος</string>
     <string name="highlight_custom_color">Άλλα χρώματα</string>
     <string name="menu_compare">Σύγκριση</string>
     <string name="song_player_error_description">Εντοπίστηκε σφάλμα κατά το παίξιμο αυτού του ύμνου: %1$d, %2$d.</string>

Alkitab/src/main/res/values-es/strings.xml

@@ -374,6 +374,7 @@
     <string name="version_download_network_error">Error de red al descargar ^1.</string>
     <string name="version_download_server_error">Error de servidor al descargar ^1.</string>
     <string name="menuNightMode">Modo nocturno</string>
+    <string name="menuFollowSystemTheme">Seguir el tema del sistema</string>
     <string name="highlight_custom_color">Otros colores</string>
     <string name="menu_compare">Comparar</string>
     <string name="song_player_error_description">Se encontró un error mientras se reproducía está canción: %1$d, %2$d.</string>

Alkitab/src/main/res/values-fr/strings.xml

@@ -374,6 +374,7 @@
     <string name="version_download_network_error">Erreur de réseau lors du téléchargement de ^1.</string>
     <string name="version_download_server_error">Erreur de serveur lors du téléchargement de ^1.</string>
     <string name="menuNightMode">Mode nuit</string>
+    <string name="menuFollowSystemTheme">Suivre le thème du système</string>
     <string name="highlight_custom_color">Autres couleurs</string>
     <string name="menu_compare">Comparer</string>
     <string name="song_player_error_description">Erreur lors de l\'écoute de ce chant : %1$d, %2$d.</string>

Alkitab/src/main/res/values-hu/strings.xml

@@ -369,6 +369,7 @@
     <string name="version_download_network_error">Hálózati hiba ^1 letöltése közben.</string>
     <string name="version_download_server_error">Szerverhiba ^1 letöltése közben.</string>
     <string name="menuNightMode">Éjszakai mód</string>
+    <string name="menuFollowSystemTheme">Kövesse a rendszer témáját</string>
     <string name="highlight_custom_color">Más színek</string>
     <string name="menu_compare">Összehasonlítás</string>
     <string name="song_player_error_description">Hiba történt a dal lejátszása során: %1$d, %2$d.</string>

Alkitab/src/main/res/values-in/strings.xml

@@ -381,6 +381,7 @@
     <string name="version_download_network_error">Kesalahan jaringan saat mengunduh ^1.</string>
     <string name="version_download_server_error">Kesalahan server saat mengunduh ^1.</string>
     <string name="menuNightMode">Mode gelap</string>
+    <string name="menuFollowSystemTheme">Ikuti tema sistem</string>
     <string name="highlight_custom_color">Warna lainnya</string>
     <string name="menu_compare">Bandingkan</string>
     <string name="song_player_error_description">Ada kesalahan ketika memainkan lagu ini: %1$d, %2$d.</string>

Alkitab/src/main/res/values-it/strings.xml

@@ -374,6 +374,7 @@
     <string name="version_download_network_error">Errore di rete durante il download ^1.</string>
     <string name="version_download_server_error">Errore del server durante il download ^1.</string>
     <string name="menuNightMode">Modalità notturna</string>
+    <string name="menuFollowSystemTheme">Seguire il tema del sistema</string>
     <string name="highlight_custom_color">Altri colori</string>
     <string name="menu_compare">Compara</string>
     <string name="song_player_error_description">Si è verificato un errore durante la riproduzione di questo brano: %1$d, %2$d.</string>

Alkitab/src/main/res/values-ja/strings.xml

@@ -371,6 +371,7 @@
     <string name="version_download_network_error">^1をダウンロードした時のネットワークエラー。</string>
     <string name="version_download_server_error">^1をダウンロードした時のサーバーエラー。</string>
     <string name="menuNightMode">夜間モード</string>
+    <string name="menuFollowSystemTheme">システムテーマに沿って</string>
     <string name="highlight_custom_color">その他の色</string>
     <string name="menu_compare">比較する</string>
     <string name="song_player_error_description">聖歌 %1$d %2$d 再生中にエラーになりました</string>

Alkitab/src/main/res/values-ko/strings.xml

@@ -371,6 +371,7 @@
     <string name="version_download_network_error">^1을(를) 다운로드하는 도중 네트워크 오류가 발생했습니다.</string>
     <string name="version_download_server_error">^1을(를) 다운로드하는 도중 서버 오류가 발생했습니다.</string>
     <string name="menuNightMode">야간모드</string>
+    <string name="menuFollowSystemTheme">시스템 테마 팔로우</string>
     <string name="highlight_custom_color">다른 색상</string>
     <string name="menu_compare">번역본 대조</string>
     <string name="song_player_error_description">찬양 재생 중 오류 발생: %1$d,%2$d</string>

Alkitab/src/main/res/values-lv/strings.xml

@@ -371,6 +371,7 @@
     <string name="version_download_network_error">Radās tīkla kļūda lejuplādējot ^1.</string>
     <string name="version_download_server_error">Servera kļūda lejuplādējot ^1.</string>
     <string name="menuNightMode">Nakts režīms</string>
+    <string name="menuFollowSystemTheme">Sekojiet sistēmas tēmai</string>
     <string name="highlight_custom_color">Citas krāsas</string>
     <string name="menu_compare">Salīdzināt</string>
     <string name="song_player_error_description">Atskaņojot šo dziesmu ir radusies kļūda: %1$d, %2$d.</string>

Alkitab/src/main/res/values-ms/strings.xml

@@ -369,6 +369,7 @@
     <string name="version_download_network_error">Talian bermasalah semasa muat turun ^1.</string>
     <string name="version_download_server_error">Pelayan bermasalah semasa muat turun ^1.</string>
     <string name="menuNightMode">Mod malam</string>
+    <string name="menuFollowSystemTheme">Ikut tema sistem</string>
     <string name="highlight_custom_color">Warna lain</string>
     <string name="menu_compare">Bandingkan</string>
     <string name="song_player_error_description">Ralat berlaku semasa bermain lagu ini: %1$d, %2$d.</string>

Alkitab/src/main/res/values-my/strings.xml

@@ -371,6 +371,7 @@
     <string name="version_download_network_error">^1 ကို ဒေါင်းလုဒ်ဆွဲရာတွင် ကွန်ယက်ချို့ယွင်းချက်ဖြင့် ကြုံရခြင်း။</string>
     <string name="version_download_server_error">^1 ကို ဒေါင်းလုဒ်ဆွဲရာတွင် ဆာဗာချို့ယွင်းချက်ဖြင့် ကြုံရခြင်း။</string>
     <string name="menuNightMode">ညကြည့် အသွင်</string>
+    <string name="menuFollowSystemTheme">စနစ်အပြင်အဆင်ကို လိုက်နာပါ။</string>
     <string name="highlight_custom_color">အခြားအရောင်များ</string>
     <string name="menu_compare">နှိုင်းယှဉ်ရန်</string>
     <string name="song_player_error_description">ဤသီချင်းကို ဖွင့်စဉ်မှာ အမှားကြုံတွေ့ရသည်- %1$d, %2$d။</string>

Alkitab/src/main/res/values-nl/strings.xml

@@ -373,6 +373,7 @@
     <string name="version_download_network_error">Netwerkfout tijdens het downloaden.</string>
     <string name="version_download_server_error">Serverfout tijdens het downloaden.</string>
     <string name="menuNightMode">Nachtmodus</string>
+    <string name="menuFollowSystemTheme">Volg het systeemthema</string>
     <string name="highlight_custom_color">Andere kleuren</string>
     <string name="menu_compare">Vergelijken</string>
     <string name="song_player_error_description">Er is een fout opgetreden bij het afspelen van dit lied: %1$d, %2$d.</string>

Alkitab/src/main/res/values-pl/strings.xml

@@ -374,6 +374,7 @@
     <string name="version_download_network_error">Błąd sieci podczas pobierania ^1.</string>
     <string name="version_download_server_error">Błąd serwera podczas pobierania ^1.</string>
     <string name="menuNightMode">Tryb nocny</string>
+    <string name="menuFollowSystemTheme">Postępuj zgodnie z tematem systemu</string>
     <string name="highlight_custom_color">Inne kolory</string>
     <string name="menu_compare">Porównaj</string>
     <string name="song_player_error_description">Wystąpił błąd podczas odtwarzania pieśni: %1$d, %2$d.</string>

Alkitab/src/main/res/values-pt-rBR/strings.xml

@@ -374,6 +374,7 @@
     <string name="version_download_network_error">Erro de rede ao fazer o download ^1.</string>
     <string name="version_download_server_error">Erro do Servidor ao realizar o download ^1.</string>
     <string name="menuNightMode">Modo noturno</string>
+    <string name="menuFollowSystemTheme">Seguir o tema do sistema</string>
     <string name="highlight_custom_color">Outras cores</string>
     <string name="menu_compare">Comparar</string>
     <string name="song_player_error_description">Ocorreu um erro ao reproduzir esta canção: %1$d, %2$d.</string>

Alkitab/src/main/res/values-pt/strings.xml

@@ -371,6 +371,7 @@
     <string name="version_download_network_error">Erro do network baixando ^1.</string>
     <string name="version_download_server_error">Erro do servidor baixando ^1.</string>
     <string name="menuNightMode">Modo de noite</string>
+    <string name="menuFollowSystemTheme">Seguir o tema do sistema</string>
     <string name="highlight_custom_color">Outras cores</string>
     <string name="menu_compare">Comparar</string>
     <string name="song_player_error_description">Um erro ocorre quando toca esta música: %1$d, %2$d.</string>

Alkitab/src/main/res/values-ro/strings.xml

@@ -374,6 +374,7 @@
     <string name="version_download_network_error">Erori de internet la descărcare ^1.</string>
     <string name="version_download_server_error">Eroare de server la descărcarea ^1.</string>
     <string name="menuNightMode">Mod nocturn</string>
+    <string name="menuFollowSystemTheme">Urmează tema sistemului</string>
     <string name="highlight_custom_color">Alte culori</string>
     <string name="menu_compare">Compară</string>
     <string name="song_player_error_description">O eroare a fost întâlnită în timpul redării acestui cântec: %1$d, %2$d.</string>