From cba26eedb55d552b374ca69d11ddf5c01f46653b Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Mon, 30 Mar 2020 04:25:42 -0700
Subject: [PATCH] Move several stuffs out of shared

---
 app/src/main/AndroidManifest.xml                   |  6 +++++-
 app/src/main/java/a/stubs.kt                       |  3 +++
 .../res/drawable-anydpi-v23/ic_splash_activity.xml |  0
 .../main/res/drawable-anydpi-v26/ic_launcher.xml   |  0
 .../src/main/res/drawable/ic_magisk_padded.xml     |  0
 app/src/main/res/values/colors.xml                 |  3 +++
 app/src/main/res/values/styles_md2.xml             | 13 +++++++++++--
 shared/src/main/AndroidManifest.xml                |  6 +-----
 shared/src/main/java/a/r.java                      |  6 ------
 shared/src/main/res/values/colors.xml              |  6 ------
 shared/src/main/res/values/styles.xml              | 14 --------------
 11 files changed, 23 insertions(+), 34 deletions(-)
 rename {shared => app}/src/main/res/drawable-anydpi-v23/ic_splash_activity.xml (100%)
 rename {shared => app}/src/main/res/drawable-anydpi-v26/ic_launcher.xml (100%)
 rename {shared => app}/src/main/res/drawable/ic_magisk_padded.xml (100%)
 delete mode 100644 shared/src/main/java/a/r.java
 delete mode 100644 shared/src/main/res/values/colors.xml
 delete mode 100644 shared/src/main/res/values/styles.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b02053369..5a2f479c8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -35,7 +35,6 @@
             android:directBootAware="true"
             android:excludeFromRecents="true"
             android:exported="false"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"
             tools:ignore="AppLinkUrlError">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
@@ -43,6 +42,11 @@
             </intent-filter>
         </activity>
 
+        <!-- ProcessPhoenix -->
+        <activity
+            android:name="a.r"
+            android:process=":remote" />
+
         <!-- Receiver -->
         <receiver
             android:name="a.h"
diff --git a/app/src/main/java/a/stubs.kt b/app/src/main/java/a/stubs.kt
index 26b15aad1..b6d5771c6 100644
--- a/app/src/main/java/a/stubs.kt
+++ b/app/src/main/java/a/stubs.kt
@@ -1,5 +1,6 @@
 package a
 
+import com.topjohnwu.magisk.ProcessPhoenix
 import com.topjohnwu.magisk.core.App
 import com.topjohnwu.magisk.core.GeneralReceiver
 import com.topjohnwu.magisk.core.SplashActivity
@@ -21,3 +22,5 @@ class h : GeneralReceiver()
 class j : DownloadService()
 
 class m : SuRequestActivity()
+
+class r : ProcessPhoenix()
diff --git a/shared/src/main/res/drawable-anydpi-v23/ic_splash_activity.xml b/app/src/main/res/drawable-anydpi-v23/ic_splash_activity.xml
similarity index 100%
rename from shared/src/main/res/drawable-anydpi-v23/ic_splash_activity.xml
rename to app/src/main/res/drawable-anydpi-v23/ic_splash_activity.xml
diff --git a/shared/src/main/res/drawable-anydpi-v26/ic_launcher.xml b/app/src/main/res/drawable-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from shared/src/main/res/drawable-anydpi-v26/ic_launcher.xml
rename to app/src/main/res/drawable-anydpi-v26/ic_launcher.xml
diff --git a/shared/src/main/res/drawable/ic_magisk_padded.xml b/app/src/main/res/drawable/ic_magisk_padded.xml
similarity index 100%
rename from shared/src/main/res/drawable/ic_magisk_padded.xml
rename to app/src/main/res/drawable/ic_magisk_padded.xml
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7bc981fbe..826de7142 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="ic_launcher_background">#00AF9C</color>
+    <color name="dark">#00796B</color>
+    <color name="light">#e0e0e0</color>
     <color name="su_request_background">#e0e0e0</color>
     <color name="colorOverlay">#0D000000</color>
 </resources>
diff --git a/app/src/main/res/values/styles_md2.xml b/app/src/main/res/values/styles_md2.xml
index 304428c68..802999ad6 100644
--- a/app/src/main/res/values/styles_md2.xml
+++ b/app/src/main/res/values/styles_md2.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <style name="SplashThemeBase" parent="android:Theme.DeviceDefault.NoActionBar">
+        <item name="android:windowBackground">@drawable/ic_splash_activity</item>
+    </style>
+
+    <style name="SplashThemeBase.V19" parent="SplashThemeBase">
+        <item name="android:windowTranslucentStatus" tools:targetApi="19">true</item>
+        <item name="android:windowTranslucentNavigation" tools:targetApi="19">true</item>
+    </style>
 
     <style name="SplashTheme" parent="SplashThemeBase" />
 
@@ -52,4 +61,4 @@
         <item name="android:windowBackground">@android:color/transparent</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/shared/src/main/AndroidManifest.xml b/shared/src/main/AndroidManifest.xml
index ed324d3c5..abe5f41b1 100644
--- a/shared/src/main/AndroidManifest.xml
+++ b/shared/src/main/AndroidManifest.xml
@@ -12,13 +12,9 @@
         android:installLocation="internalOnly"
         android:usesCleartextTraffic="true"
         android:supportsRtl="true"
+        android:theme="@android:style/Theme.Translucent.NoTitleBar"
         tools:ignore="UnusedAttribute">
 
-        <activity
-            android:name="a.r"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"
-            android:process=":remote" />
-
         <provider
             android:name="a.p"
             android:authorities="${applicationId}.provider"
diff --git a/shared/src/main/java/a/r.java b/shared/src/main/java/a/r.java
deleted file mode 100644
index 3863eccb3..000000000
--- a/shared/src/main/java/a/r.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package a;
-
-import com.topjohnwu.magisk.ProcessPhoenix;
-
-public class r extends ProcessPhoenix {
-}
diff --git a/shared/src/main/res/values/colors.xml b/shared/src/main/res/values/colors.xml
deleted file mode 100644
index df6f5cef5..000000000
--- a/shared/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#00AF9C</color>
-    <color name="dark">#00796B</color>
-    <color name="light">#e0e0e0</color>
-</resources>
diff --git a/shared/src/main/res/values/styles.xml b/shared/src/main/res/values/styles.xml
deleted file mode 100644
index fd5837779..000000000
--- a/shared/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-
-    <style name="SplashThemeBase" parent="android:Theme.DeviceDefault.NoActionBar">
-        <item name="android:windowBackground">@drawable/ic_splash_activity</item>
-    </style>
-
-    <style name="SplashThemeBase.V19" parent="SplashThemeBase">
-        <item name="android:windowTranslucentStatus" tools:targetApi="19">true</item>
-        <item name="android:windowTranslucentNavigation" tools:targetApi="19">true</item>
-    </style>
-
-    <style name="SplashTheme" parent="android:Theme.Translucent.NoTitleBar" />
-</resources>