MODE_NIGHT_AUTO (deprecated) -> FOLLOW_SYSTEM (#463)

closes #457

Author: ligi

android/src/main/java/org/ligi/passandroid/model/AndroidSettings.kt

@@ -2,7 +2,7 @@ package org.ligi.passandroid.model
 
 import android.content.Context
 import androidx.preference.PreferenceManager
-import androidx.appcompat.app.AppCompatDelegate
+import androidx.appcompat.app.AppCompatDelegate.*
 import org.ligi.passandroid.R
 import org.ligi.passandroid.R.string.preference_key_autolight
 import org.ligi.passandroid.R.string.preference_key_condensed
@@ -33,10 +33,10 @@ class AndroidSettings(val context: Context) : Settings {
 
     override fun getNightMode(): Int {
         return when (sharedPreferences.getString(context.getString(R.string.preference_key_nightmode), "auto")) {
-            "day" -> AppCompatDelegate.MODE_NIGHT_NO
-            "night" -> AppCompatDelegate.MODE_NIGHT_YES
-            "auto" -> AppCompatDelegate.MODE_NIGHT_AUTO
-            else -> AppCompatDelegate.MODE_NIGHT_AUTO
+            "day" -> MODE_NIGHT_NO
+            "night" -> MODE_NIGHT_YES
+            "auto" -> MODE_NIGHT_FOLLOW_SYSTEM
+            else -> MODE_NIGHT_FOLLOW_SYSTEM
         }
     }
 

android/src/main/java/org/ligi/passandroid/ui/PrefsFragment.kt

@@ -30,10 +30,6 @@ class PrefsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedPref
         if (key == getString(R.string.preference_key_nightmode)) {
             @AppCompatDelegate.NightMode val nightMode = settings.getNightMode()
 
-            if (nightMode == MODE_NIGHT_AUTO) {
-                constructPermissionsRequest(Manifest.permission.ACCESS_COARSE_LOCATION) {}.launch()
-            }
-
             AppCompatDelegate.setDefaultNightMode(nightMode)
             activity?.let { ActivityCompat.recreate(it) }
         }

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

@@ -161,7 +161,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS
   </string-array>
   <string name="night_mode_night">Nacht</string>
   <string name="night_mode_day">Tag</string>
-  <string name="night_mode_auto">Automatisch</string>
+  <string name="night_mode_auto">Wie System</string>
   <string name="preference_autolight_title">Automatische Helligkeit</string>
   <string name="preference_autolight_summary">Soll ich die Helligkeit des Bildschirmes erhöhen, wenn ein Barcode gezeigt wird?</string>
   <string name="preference_condensed_title">Kompakt-Modus</string>

android/src/main/res/values/strings.xml

@@ -178,7 +178,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS
 
     <string name="night_mode_night">Night</string>
     <string name="night_mode_day">Day</string>
-    <string name="night_mode_auto">Auto</string>
+    <string name="night_mode_auto">Follow System</string>
 
     <string name="preference_autolight_title">Automatic light</string>
     <string name="preference_autolight_summary">Should I increase brightness when showing barcode?</string>