br0kenpixel/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-09-06 06:36:58 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'john/master' into feature/redesign

Browse Source 
# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt
#	app/src/main/java/com/topjohnwu/magisk/model/navigation/MagiskNavigationEvent.kt
#	app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt
#	app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
#	app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
#	app/src/main/res/layout/dialog_magisk_base.xml
This commit is contained in:
Viktor De Pasquale
2019-10-16 17:33:54 +02:00
parent 0eb28c3265 7342fc2307
commit 6ccbc272c6
208 changed files with 4215 additions and 1929 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/values/colors.xml
-4
View File
@@ -32,10 +32,6 @@
<color name="dark_secondary_text">#dedede</color>
<color name="su_request_background">#e0e0e0</color>
<!-- Flashing colors -->
<color name="ic_launcher_background">#00AF9C</color>
<!-- Card colors -->
<color name="card_background_color_dark">#ff424242</color>
<color name="card_background_color_light">#ffffffff</color>
app/src/main/res/values/styles.xml
+1 -3
View File
@@ -60,8 +60,6 @@
<item name="cardBackgroundColor">@color/card_background_color_light</item>
</style>
<style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
<item name="android:windowBackground">@drawable/ic_splash_activity</item>
</style>
<style name="SplashTheme" parent="SplashThemeBase"/>
</resources>