1 files changed, 14 insertions, 0 deletions
diff --git a/app/src/main/java/com/wireguard/android/Application.java b/app/src/main/java/com/wireguard/android/Application.java
index 0066d930..b8562606 100644
--- a/app/src/main/java/com/wireguard/android/Application.java
+++ b/app/src/main/java/com/wireguard/android/Application.java
@@ -12,6 +12,7 @@ import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Looper;
 import android.preference.PreferenceManager;
+import android.support.v7.app.AppCompatDelegate;
 
 import com.wireguard.android.backend.Backend;
 import com.wireguard.android.backend.GoBackend;
@@ -22,6 +23,7 @@ import com.wireguard.android.model.TunnelManager;
 import com.wireguard.android.util.AsyncWorker;
 import com.wireguard.android.util.RootShell;
 import com.wireguard.android.util.ToolsInstaller;
+import com.wireguard.android.util.Topic;
 
 import java.io.File;
 import java.util.concurrent.Executor;
@@ -66,6 +68,8 @@ public class Application extends android.app.Application {
         ToolsInstaller getToolsInstaller();
 
         TunnelManager getTunnelManager();
+
+        Topic getThemeChangeTopic();
     }
 
     @Qualifier
@@ -86,6 +90,10 @@ public class Application extends android.app.Application {
 
         private ApplicationModule(final Application application) {
             context = application.getApplicationContext();
+
+            AppCompatDelegate.setDefaultNightMode(
+                    getPreferences(context).getBoolean("dark_theme", false) ?
+                          AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO);
         }
 
         @ApplicationScope
@@ -111,6 +119,12 @@ public class Application extends android.app.Application {
             return new FileConfigStore(context);
         }
 
+        @ApplicationScope
+        @Provides
+        public static Topic getThemeChangeTopic() {
+            return new Topic();
+        }
+
 
         @ApplicationScope
         @Provides