From 049af45f42dce4f883af962a03bbe8f57577175f Mon Sep 17 00:00:00 2001
From: emanuele-f <black.silver@hotmail.it>
Date: Tue, 30 Mar 2021 12:24:12 +0200
Subject: [PATCH] Implement dark theme

Closes #46
---
 app/src/main/AndroidManifest.xml              |  1 +
 .../remote_capture/MyApplication.java         | 28 +++++++++++++++
 .../com/emanuelef/remote_capture/Utils.java   | 10 ++++++
 .../activities/SettingsActivity.java          |  9 +++++
 .../emanuelef/remote_capture/model/Prefs.java |  3 ++
 app/src/main/res/drawable/rounded_bg.xml      | 34 ++++++-------------
 app/src/main/res/layout/main_screen.xml       |  1 +
 app/src/main/res/values/arrays.xml            | 14 ++++++--
 app/src/main/res/values/colors.xml            |  1 +
 app/src/main/res/values/strings.xml           |  3 ++
 app/src/main/res/values/styles.xml            |  2 +-
 app/src/main/res/xml/root_preferences.xml     |  9 +++++
 12 files changed, 88 insertions(+), 27 deletions(-)
 create mode 100644 app/src/main/java/com/emanuelef/remote_capture/MyApplication.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d2e80d87..d8abb76d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
 
     <application
+        android:name=".MyApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/app/src/main/java/com/emanuelef/remote_capture/MyApplication.java b/app/src/main/java/com/emanuelef/remote_capture/MyApplication.java
new file mode 100644
index 00000000..4bcf7bd2
--- /dev/null
+++ b/app/src/main/java/com/emanuelef/remote_capture/MyApplication.java
@@ -0,0 +1,28 @@
+package com.emanuelef.remote_capture;
+
+import android.app.Application;
+import android.content.SharedPreferences;
+
+import androidx.preference.PreferenceManager;
+
+import com.emanuelef.remote_capture.model.Prefs;
+
+public class MyApplication extends Application {
+    public void onCreate() {
+        super.onCreate();
+
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        String theme = prefs.getString(Prefs.PREF_APP_THEME, "");
+
+        if("".equals(theme)) {
+            if(Utils.isTv(this)) {
+                // Use the dark theme by default on Android TV
+                theme = "dark";
+                prefs.edit().putString(Prefs.PREF_APP_THEME, theme).apply();
+            } else
+                theme = "system";
+        }
+
+        Utils.setAppTheme(theme);
+    }
+}
diff --git a/app/src/main/java/com/emanuelef/remote_capture/Utils.java b/app/src/main/java/com/emanuelef/remote_capture/Utils.java
index ccb685d4..1a14af56 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/Utils.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/Utils.java
@@ -56,6 +56,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.SearchView;
 import androidx.preference.PreferenceManager;
 
@@ -156,6 +157,15 @@ public class Utils {
         return config;
     }
 
+    public static void setAppTheme(String theme) {
+        if(theme.equals("light"))
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+        else if(theme.equals("dark"))
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+        else
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+    }
+
     public static String proto2str(int proto) {
         switch(proto) {
             case 6:     return "TCP";
diff --git a/app/src/main/java/com/emanuelef/remote_capture/activities/SettingsActivity.java b/app/src/main/java/com/emanuelef/remote_capture/activities/SettingsActivity.java
index b06450e7..9e25ddae 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/activities/SettingsActivity.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/activities/SettingsActivity.java
@@ -34,6 +34,7 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 import androidx.preference.SwitchPreference;
 
+import com.emanuelef.remote_capture.Utils;
 import com.emanuelef.remote_capture.model.Prefs;
 import com.emanuelef.remote_capture.R;
 
@@ -176,6 +177,14 @@ public class SettingsActivity extends BaseActivity {
 
                 return false;
             });
+
+            DropDownPreference appTheme = findPreference(Prefs.PREF_APP_THEME);
+
+            appTheme.setOnPreferenceChangeListener((preference, newValue) -> {
+                Utils.setAppTheme(newValue.toString());
+
+                return true;
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/emanuelef/remote_capture/model/Prefs.java b/app/src/main/java/com/emanuelef/remote_capture/model/Prefs.java
index e2704867..5b691984 100644
--- a/app/src/main/java/com/emanuelef/remote_capture/model/Prefs.java
+++ b/app/src/main/java/com/emanuelef/remote_capture/model/Prefs.java
@@ -21,6 +21,8 @@ package com.emanuelef.remote_capture.model;
 
 import android.content.SharedPreferences;
 
+import com.emanuelef.remote_capture.Utils;
+
 public class Prefs {
     public static final String DUMP_HTTP_SERVER = "http_server";
     public static final String DUMP_UDP_EXPORTER = "udp_exporter";
@@ -37,6 +39,7 @@ public class Prefs {
     public static final String DEFAULT_DUMP_MODE = DUMP_HTTP_SERVER;
     public static final String PREF_IPV6_ENABLED = "ipv6_enabled";
     public static final String PREF_APP_LANGUAGE = "app_language";
+    public static final String PREF_APP_THEME = "app_theme";
 
     public enum DumpMode {
         NONE,
diff --git a/app/src/main/res/drawable/rounded_bg.xml b/app/src/main/res/drawable/rounded_bg.xml
index b749ea2d..2230b314 100644
--- a/app/src/main/res/drawable/rounded_bg.xml
+++ b/app/src/main/res/drawable/rounded_bg.xml
@@ -1,25 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item>
-        <shape android:shape="oval" >
-            <gradient
-                android:angle="360"
-                android:startColor="#543456"
-                android:endColor="#f800f0"
-                android:type="linear" />
-            <size android:width="24dp"
-                android:height="24dp"/>
-        </shape>
-    </item>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="ring"
+    android:innerRadiusRatio="2.1"
+    android:thickness="2dp"
+    android:useLevel="false" >
 
-    <item
-        android:bottom="2dp"
-        android:left="2dp"
-        android:right="2dp"
-        android:top="2dp">
-        <shape android:shape="oval" >
-            <solid android:color="#fff" />
-        </shape>
-    </item>
-
-</layer-list>
\ No newline at end of file
+    <gradient
+        android:angle="360"
+        android:startColor="#7E4382"
+        android:endColor="#f800f0"
+        android:type="linear" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/main_screen.xml b/app/src/main/res/layout/main_screen.xml
index 70ce566c..8bcea812 100644
--- a/app/src/main/res/layout/main_screen.xml
+++ b/app/src/main/res/layout/main_screen.xml
@@ -33,6 +33,7 @@
             android:id="@+id/tablayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:tabIndicatorColor="@color/colorTab"
             app:tabMaxWidth="0dp"
             app:tabGravity="fill" />
 
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index fbd32ccc..29b77085 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -6,14 +6,12 @@
         <item>pcap_file</item>
         <item>udp_exporter</item>
     </string-array>
-
     <string-array name="pcap_dump_modes_labels">
         <item>@string/no_dump</item>
         <item>@string/http_server</item>
         <item>@string/pcap_file</item>
         <item>@string/udp_exporter</item>
     </string-array>
-
     <string-array name="pcap_dump_modes_descriptions">
         <item>@string/no_dump_info</item>
         <item>@string/http_server_info</item>
@@ -25,9 +23,19 @@
         <item>system</item>
         <item>english</item>
     </string-array>
-
     <string-array name="app_languages_labels">
         <item>@string/lang_system_default</item>
         <item>@string/lang_english</item>
     </string-array>
+
+    <string-array name="app_theme">
+        <item>system</item>
+        <item>light</item>
+        <item>dark</item>
+    </string-array>
+    <string-array name="app_theme_labels">
+        <item>@string/lang_system_default</item>
+        <item>@string/theme_light</item>
+        <item>@string/theme_dark</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 13785f83..3eb3d099 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="colorTab">#7A5EBC</color>
     <color name="colorPrimary">#512da8</color>
     <color name="colorPrimaryDark">#361e73</color>
     <color name="colorAccent">#D81B60</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 47b0327b..58c8e908 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -118,5 +118,8 @@
     <string name="lang_system_default">System default</string>
     <string name="no_activity_file_selection">No app found to handle file selection</string>
     <string name="file_saved_with_name">File %1$s successfully saved</string>
+    <string name="theme_light">Light</string>
+    <string name="theme_dark">Dark</string>
+    <string name="app_theme">Theme</string>
 </resources>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index dff5fedb..5878de00 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index a07253aa..2a4847a6 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -82,6 +82,15 @@
             app:summary="@string/enable_ipv6_summary"
             app:defaultValue="false" />
 
+        <DropDownPreference
+            app:key="app_theme"
+            app:title="@string/app_theme"
+            android:entries="@array/app_theme_labels"
+            android:entryValues="@array/app_theme"
+            app:iconSpaceReserved="false"
+            app:defaultValue="system"
+            app:useSimpleSummaryProvider="true"/>
+
         <DropDownPreference
             app:key="app_language"
             app:title="@string/app_language"