From 0ed58b4a01b3c08d51d48205fe629719579aabc0 Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Fri, 11 May 2018 21:53:06 +0200
Subject: [PATCH] Provide a default implementation of setPreferredTheme

And only override it if needed
---
 app/src/main/java/me/impy/aegis/ui/AegisActivity.java |  9 ++++++++-
 app/src/main/java/me/impy/aegis/ui/AuthActivity.java  |  9 ---------
 app/src/main/java/me/impy/aegis/ui/MainActivity.java  |  9 ---------
 .../java/me/impy/aegis/ui/PreferencesActivity.java    | 11 -----------
 .../main/java/me/impy/aegis/ui/ScannerActivity.java   |  5 -----
 .../java/me/impy/aegis/ui/SlotManagerActivity.java    |  9 ---------
 6 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/app/src/main/java/me/impy/aegis/ui/AegisActivity.java b/app/src/main/java/me/impy/aegis/ui/AegisActivity.java
index 54a6d9f2..595d384a 100644
--- a/app/src/main/java/me/impy/aegis/ui/AegisActivity.java
+++ b/app/src/main/java/me/impy/aegis/ui/AegisActivity.java
@@ -6,6 +6,7 @@ import android.view.WindowManager;
 
 import me.impy.aegis.AegisApplication;
 import me.impy.aegis.Preferences;
+import me.impy.aegis.R;
 
 public abstract class AegisActivity extends AppCompatActivity {
     private AegisApplication _app;
@@ -32,5 +33,11 @@ public abstract class AegisActivity extends AppCompatActivity {
         return _app.getPreferences();
     }
 
-    protected abstract void setPreferredTheme(boolean darkMode);
+    protected void setPreferredTheme(boolean darkMode) {
+        if (darkMode) {
+            setTheme(R.style.AppTheme_Dark);
+        } else {
+            setTheme(R.style.AppTheme);
+        }
+    }
 }
diff --git a/app/src/main/java/me/impy/aegis/ui/AuthActivity.java b/app/src/main/java/me/impy/aegis/ui/AuthActivity.java
index acf06567..ab3311ff 100644
--- a/app/src/main/java/me/impy/aegis/ui/AuthActivity.java
+++ b/app/src/main/java/me/impy/aegis/ui/AuthActivity.java
@@ -102,15 +102,6 @@ public class AuthActivity extends AegisActivity implements FingerprintUiHelper.C
         });
     }
 
-    @Override
-    protected void setPreferredTheme(boolean darkMode) {
-        if (darkMode) {
-            setTheme(R.style.AppTheme_Dark);
-        } else {
-            setTheme(R.style.AppTheme);
-        }
-    }
-
     private void showError() {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle("Decryption error");
diff --git a/app/src/main/java/me/impy/aegis/ui/MainActivity.java b/app/src/main/java/me/impy/aegis/ui/MainActivity.java
index ed267c1c..66be160e 100644
--- a/app/src/main/java/me/impy/aegis/ui/MainActivity.java
+++ b/app/src/main/java/me/impy/aegis/ui/MainActivity.java
@@ -134,15 +134,6 @@ public class MainActivity extends AegisActivity implements KeyProfileView.Listen
         }
     }
 
-    @Override
-    protected void setPreferredTheme(boolean darkMode) {
-        if (darkMode) {
-            setTheme(R.style.AppTheme_Dark);
-        } else {
-            setTheme(R.style.AppTheme);
-        }
-    }
-
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) {
diff --git a/app/src/main/java/me/impy/aegis/ui/PreferencesActivity.java b/app/src/main/java/me/impy/aegis/ui/PreferencesActivity.java
index 94989a60..322795c2 100644
--- a/app/src/main/java/me/impy/aegis/ui/PreferencesActivity.java
+++ b/app/src/main/java/me/impy/aegis/ui/PreferencesActivity.java
@@ -2,8 +2,6 @@ package me.impy.aegis.ui;
 
 import android.os.Bundle;
 
-import me.impy.aegis.R;
-
 public class PreferencesActivity extends AegisActivity {
     private PreferencesFragment _fragment;
 
@@ -16,15 +14,6 @@ public class PreferencesActivity extends AegisActivity {
         getFragmentManager().beginTransaction().replace(android.R.id.content, _fragment).commit();
     }
 
-    @Override
-    protected void setPreferredTheme(boolean darkMode) {
-        if (darkMode) {
-            setTheme(R.style.AppTheme_Dark);
-        } else {
-            setTheme(R.style.AppTheme);
-        }
-    }
-
     @Override
     public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
         // pass permission request results to the fragment
diff --git a/app/src/main/java/me/impy/aegis/ui/ScannerActivity.java b/app/src/main/java/me/impy/aegis/ui/ScannerActivity.java
index 1530b980..7c582f34 100644
--- a/app/src/main/java/me/impy/aegis/ui/ScannerActivity.java
+++ b/app/src/main/java/me/impy/aegis/ui/ScannerActivity.java
@@ -87,11 +87,6 @@ public class ScannerActivity extends AegisActivity implements ZXingScannerView.R
         }
     }
 
-    @Override
-    protected void setPreferredTheme(boolean darkMode) {
-
-    }
-
     @Override
     public void onResume() {
         super.onResume();
diff --git a/app/src/main/java/me/impy/aegis/ui/SlotManagerActivity.java b/app/src/main/java/me/impy/aegis/ui/SlotManagerActivity.java
index cdbed184..b5a6cf6f 100644
--- a/app/src/main/java/me/impy/aegis/ui/SlotManagerActivity.java
+++ b/app/src/main/java/me/impy/aegis/ui/SlotManagerActivity.java
@@ -100,15 +100,6 @@ public class SlotManagerActivity extends AegisActivity implements SlotAdapter.Li
         return true;
     }
 
-    @Override
-    protected void setPreferredTheme(boolean darkMode) {
-        if (darkMode) {
-            setTheme(R.style.AppTheme_Dark);
-        } else {
-            setTheme(R.style.AppTheme);
-        }
-    }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {