From 0118f2efa7eab2f5e15650e907e8f45f4cfc500b Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Mon, 9 Sep 2019 19:58:19 -0400
Subject: [PATCH] Merge styles

---
 .../{styles_new.xml => styles.xml}            |  0
 app/src/main/res/values/styles.xml            | 52 ++++++++++++++++++
 app/src/main/res/values/styles_new.xml        | 55 -------------------
 3 files changed, 52 insertions(+), 55 deletions(-)
 rename app/src/main/res/values-night/{styles_new.xml => styles.xml} (100%)
 delete mode 100644 app/src/main/res/values/styles_new.xml

diff --git a/app/src/main/res/values-night/styles_new.xml b/app/src/main/res/values-night/styles.xml
similarity index 100%
rename from app/src/main/res/values-night/styles_new.xml
rename to app/src/main/res/values-night/styles.xml
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3d04f2dfc..88d6d4759 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,5 +1,57 @@
 <resources>
 
+    <style name="ThemeFoundation" parent="Theme.MaterialComponents.Light.NoActionBar" />
+
+    <style name="ThemeFoundation.Colored">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorPrimaryVariant">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorSecondary</item>
+        <item name="colorSecondary">@color/colorSecondary</item>
+        <item name="colorSecondaryVariant">@color/colorSecondaryDark</item>
+        <item name="android:windowBackground">@android:color/white</item>
+    </style>
+
+    <style name="ThemeFoundation.Colored.ExtraProps" />
+
+    <style name="MagiskTheme" parent="ThemeFoundation.Colored.ExtraProps">
+        <!--All of these attributes are deprecated and will be removed-->
+        <item name="cardStyle">@style/CardViewStyle.Light</item>
+        <item name="imageColorTint">@color/icon_grey</item>
+        <item name="colorControl">?android:attr/textColorSecondary</item>
+        <item name="colorAccentFallback">@color/accentFallback</item>
+    </style>
+
+    <style name="MagiskTheme.Flashing" parent="Theme.MaterialComponents.NoActionBar">
+        <item name="colorPrimary">@android:color/black</item>
+        <item name="colorPrimaryDark">@android:color/black</item>
+        <item name="colorAccent">@color/colorSecondary</item>
+        <item name="colorSecondary">@color/colorSecondary</item>
+        <item name="colorSecondaryVariant">@color/colorSecondaryDark</item>
+        <item name="android:windowBackground">@android:color/black</item>
+    </style>
+
+    <style name="MagiskTheme.SUFoundation" parent="Theme.MaterialComponents.Light.Dialog" />
+
+    <style name="MagiskTheme.SU" parent="MagiskTheme.SUFoundation">
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <!--Overlays-->
+
+    <style name="AppBarLayoutTheme" parent="ThemeOverlay.AppCompat.Dark" />
+
+    <style name="AppBarLayoutTheme.Flashing" parent="ThemeOverlay.AppCompat.Dark" />
+
+    <style name="ToolbarPopupTheme" parent="ThemeOverlay.AppCompat.Light" />
+
+    <style name="ToolbarPopupTheme.Flashing" parent="ThemeOverlay.AppCompat.Dark" />
+
+    <!--CardView-->
+
     <style name="CardViewStyle.Dark" parent="CardView">
         <item name="cardBackgroundColor">@color/card_background_color_dark</item>
     </style>
diff --git a/app/src/main/res/values/styles_new.xml b/app/src/main/res/values/styles_new.xml
deleted file mode 100644
index 133d30192..000000000
--- a/app/src/main/res/values/styles_new.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="ThemeFoundation" parent="Theme.MaterialComponents.Light.NoActionBar" />
-
-    <style name="ThemeFoundation.Colored">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorPrimaryVariant">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorSecondary</item>
-        <item name="colorSecondary">@color/colorSecondary</item>
-        <item name="colorSecondaryVariant">@color/colorSecondaryDark</item>
-        <item name="android:windowBackground">@android:color/white</item>
-    </style>
-
-    <style name="ThemeFoundation.Colored.ExtraProps" />
-
-    <style name="MagiskTheme" parent="ThemeFoundation.Colored.ExtraProps">
-        <!--All of these attributes are deprecated and will be removed-->
-        <item name="cardStyle">@style/CardViewStyle.Light</item>
-        <item name="imageColorTint">@color/icon_grey</item>
-        <item name="colorControl">?android:attr/textColorSecondary</item>
-        <item name="colorAccentFallback">@color/accentFallback</item>
-    </style>
-
-    <style name="MagiskTheme.Flashing" parent="Theme.MaterialComponents.NoActionBar">
-        <item name="colorPrimary">@android:color/black</item>
-        <item name="colorPrimaryDark">@android:color/black</item>
-        <item name="colorAccent">@color/colorSecondary</item>
-        <item name="colorSecondary">@color/colorSecondary</item>
-        <item name="colorSecondaryVariant">@color/colorSecondaryDark</item>
-        <item name="android:windowBackground">@android:color/black</item>
-    </style>
-
-    <style name="MagiskTheme.SUFoundation" parent="Theme.MaterialComponents.Light.Dialog" />
-
-    <style name="MagiskTheme.SU" parent="MagiskTheme.SUFoundation">
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <!--Overlays-->
-
-    <style name="AppBarLayoutTheme" parent="ThemeOverlay.AppCompat.Dark" />
-
-    <style name="AppBarLayoutTheme.Flashing" parent="ThemeOverlay.AppCompat.Dark" />
-
-    <style name="ToolbarPopupTheme" parent="ThemeOverlay.AppCompat.Light" />
-
-    <style name="ToolbarPopupTheme.Flashing" parent="ThemeOverlay.AppCompat.Dark" />
-
-
-</resources>