Automatically follow night/dark mode on Android 10+

Fixes #358
julian-klode · Feb 28, 2020 · c4080db · c4080db
1 parent ceb49c3
commit c4080db
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/app/src/main/java/org/jak_linux/dns66/MainActivity.java b/app/src/main/java/org/jak_linux/dns66/MainActivity.java
@@ -16,16 +16,20 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
+
 import androidx.fragment.app.Fragment;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.viewpager.widget.ViewPager;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.Toolbar;
+
 import android.text.Html;
 import android.util.Log;
 import android.view.Menu;
@@ -78,7 +82,9 @@ protected void onCreate(Bundle savedInstanceState) {
             config = FileHelper.loadCurrentSettings(this);
         }
 
-        if (config.nightMode) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+        } else if (config.nightMode) {
             AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
         } else {
             AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
@@ -127,8 +133,11 @@ public boolean onCreateOptionsMenu(Menu menu) {
         menu.findItem(R.id.setting_show_notification).setChecked(config.showNotification);
         menu.findItem(R.id.setting_night_mode).setChecked(config.nightMode);
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            menu.findItem(R.id.setting_night_mode).setVisible(false);
+        }
         // On Android O, require users to configure notifications via notification channels.
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             menu.findItem(R.id.setting_show_notification).setVisible(false);
         }
         return true;
@@ -224,7 +233,7 @@ private void sendLogcat() {
 
             Intent eMailIntent = new Intent(Intent.ACTION_SEND);
             eMailIntent.setType("text/plain");
-            eMailIntent.putExtra(Intent.EXTRA_EMAIL, new String[] {"jak@jak-linux.org"});
+            eMailIntent.putExtra(Intent.EXTRA_EMAIL, new String[]{"jak@jak-linux.org"});
             eMailIntent.putExtra(Intent.EXTRA_SUBJECT, "DNS66 Logcat");
             eMailIntent.putExtra(Intent.EXTRA_TEXT, logcat.toString());
             eMailIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);