From 738f943a686de0026db79cd41b362e0cf8aa70dc Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Fri, 26 May 2017 18:20:53 +0800
Subject: [PATCH] Several UI tweaks

---
 app/src/main/java/com/topjohnwu/magisk/AboutActivity.java | 6 ++----
 .../main/java/com/topjohnwu/magisk/SettingsActivity.java  | 4 ++--
 .../{activity_container.xml => activity_settings.xml}     | 0
 app/src/main/res/layout/fragment_magisk.xml               | 3 ++-
 app/src/main/res/values-sw600dp/styles.xml                | 8 ++++++++
 app/src/main/res/values/attrs.xml                         | 1 +
 app/src/main/res/values/colors.xml                        | 2 +-
 app/src/main/res/values/styles.xml                        | 6 ++++++
 8 files changed, 22 insertions(+), 8 deletions(-)
 rename app/src/main/res/layout/{activity_container.xml => activity_settings.xml} (100%)

diff --git a/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java b/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java
index 44d3298e6..104628119 100644
--- a/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/AboutActivity.java
@@ -28,7 +28,7 @@ import butterknife.ButterKnife;
 
 public class AboutActivity extends Activity {
 
-    private static final String DONATION_URL = "http://topjohnwu.github.io/donate";
+    private static final String DONATION_URL = "https://www.paypal.me/topjohnwu";
     private static final String XDA_THREAD = "http://forum.xda-developers.com/showthread.php?t=3432382";
     private static final String SOURCE_CODE_URL = "https://github.com/topjohnwu/MagiskManager";
 
@@ -44,10 +44,8 @@ public class AboutActivity extends Activity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        String theme = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("theme", "");
-        Logger.dev("AboutActivity: Theme is " + theme);
         if (getApplicationContext().isDarkTheme) {
-            setTheme(R.style.AppTheme_Dark);
+            setTheme(R.style.AppTheme_Transparent_Dark);
         }
         setContentView(R.layout.activity_about);
         ButterKnife.bind(this);
diff --git a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
index bc6fbe2bf..79581dced 100644
--- a/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
+++ b/app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
@@ -30,10 +30,10 @@ public class SettingsActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (getApplicationContext().isDarkTheme) {
-            setTheme(R.style.AppTheme_Dark);
+            setTheme(R.style.AppTheme_Transparent_Dark);
         }
 
-        setContentView(R.layout.activity_container);
+        setContentView(R.layout.activity_settings);
         ButterKnife.bind(this);
 
         setSupportActionBar(toolbar);
diff --git a/app/src/main/res/layout/activity_container.xml b/app/src/main/res/layout/activity_settings.xml
similarity index 100%
rename from app/src/main/res/layout/activity_container.xml
rename to app/src/main/res/layout/activity_settings.xml
diff --git a/app/src/main/res/layout/fragment_magisk.xml b/app/src/main/res/layout/fragment_magisk.xml
index 9592aa948..fe8dbc999 100644
--- a/app/src/main/res/layout/fragment_magisk.xml
+++ b/app/src/main/res/layout/fragment_magisk.xml
@@ -178,7 +178,8 @@
                             android:layout_centerVertical="true"
                             android:layout_margin="15dp"
                             android:layout_toStartOf="@+id/safetyNet_status"
-                            android:src="@drawable/ic_refresh" />
+                            android:src="@drawable/ic_refresh"
+                            android:tint="?attr/imageColorTint" />
 
                         <ProgressBar
                             android:id="@+id/safetyNet_check_progress"
diff --git a/app/src/main/res/values-sw600dp/styles.xml b/app/src/main/res/values-sw600dp/styles.xml
index 003c1247e..388ccf1bf 100644
--- a/app/src/main/res/values-sw600dp/styles.xml
+++ b/app/src/main/res/values-sw600dp/styles.xml
@@ -9,4 +9,12 @@
         <item name="android:windowNoTitle">true</item>
     </style>
 
+    <style name="AppTheme.Transparent.Dark" parent="AppTheme.Dark">
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowNoTitle">true</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 7327dc4c5..4b67ac85d 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -30,5 +30,6 @@
     </declare-styleable>
 
     <attr name="colorAccentFallback" format="reference" />
+    <attr name="imageColorTint" format="reference" />
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 68f9a017d..3aaf0ba5c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,7 +10,7 @@
     <color name="red500">#F44336</color>
     <color name="green500">#4CAF50</color>
     <color name="grey500">#9E9E9E</color>
-    <color name="blue500">#2196F3</color>
+    <color name="blue500">#2196f3</color>
     <color name="yellow500">#FFC107</color>
 
     <color name="dark_secondary_text">#dedede</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0fb273ef1..bb15ff547 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -12,6 +12,7 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="imageColorTint">@android:color/background_dark</item>
     </style>
 
     <style name="AppTheme.Dark" parent="Theme.AppCompat.NoActionBar">
@@ -24,6 +25,7 @@
         <item name="windowNoTitle">true</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:textColorSecondary">@color/dark_secondary_text</item>
+        <item name="imageColorTint">@android:color/background_light</item>
     </style>
 
     <style name="CardViewStyle.Dark" parent="CardView">
@@ -38,6 +40,10 @@
         <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
     </style>
 
+    <style name="AppTheme.Transparent.Dark" parent="AppTheme.Dark">
+        <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
+    </style>
+
     <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowBackground">@drawable/ic_splash_activity</item>
         <item name="android:windowTranslucentStatus">true</item>