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

Redo styling

Browse Source
This commit is contained in:
topjohnwu
2017-02-14 16:35:03 +08:00
parent c4afa069df
commit df7a5bf149
8 changed files with 29 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/values/attrs.xml
+4 -1
View File
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2016 dvdandroid
~ Copyright 2017 topjohnwu
~ Copyright 2017 dvdandroid
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@@ -28,4 +29,6 @@
<attr name="ColorNeutral" format="reference"/>
</declare-styleable>
<attr name="colorAccentFallback" format="reference" />
</resources>
app/src/main/res/values/colors.xml
+4 -6
View File
@@ -4,6 +4,7 @@
<color name="primary">#009688</color>
<color name="primary_dark">#00796B</color>
<color name="accent">#FFC107</color>
<color name="accentFallback">#FBC02D</color>
<color name="icon_grey">#757575</color>
<color name="red500">#F44336</color>
@@ -12,13 +13,10 @@
<color name="blue500">#2196F3</color>
<color name="yellow500">#FFC107</color>
<color name="dh_primary">#3F51B5</color>
<color name="dh_primary_dark">#303F9F</color>
<color name="dh_accent">#448AFF</color>
<color name="dark_primary">#1a237e</color>
<color name="dark_primary_dark">#000000</color>
<color name="dh_primary_text">#dedede</color>
<color name="dh_icons">#dedede</color>
<color name="dh_divider">#313131</color>
<color name="dark_secondary_text">#dedede</color>
<color name="su_request_background">#e0e0e0</color>
app/src/main/res/values/styles.xml
+9 -85
View File
@@ -5,6 +5,7 @@
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>
<item name="colorAccentFallback">@color/accentFallback</item>
<item name="windowActionModeOverlay">true</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="cardStyle">@style/CardViewStyle.Light</item>
@@ -13,101 +14,24 @@
<item name="android:statusBarColor">@android:color/transparent</item>
</style>
<style name="AppTheme.dh" parent="ThemeOverlay.AppCompat.Dark">
<item name="colorPrimary">@color/dh_primary</item>
<item name="colorPrimaryDark">@color/dh_primary_dark</item>
<item name="colorAccent">@color/dh_accent</item>
<style name="AppTheme.Dark" parent="Theme.AppCompat.NoActionBar">
<item name="colorPrimary">@color/dark_primary</item>
<item name="colorPrimaryDark">@color/dark_primary_dark</item>
<item name="colorAccent">@color/accent</item>
<item name="colorAccentFallback">@color/accentFallback</item>
<item name="windowActionModeOverlay">true</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="cardBackgroundColor">@color/dh_accent</item>
<item name="cardStyle">@style/CardViewStyle.Dark</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="cardStyle">@style/CardViewStyle.Dark</item>
<item name="android:textColorPrimary">@color/dh_primary_text</item>
<item name="android:textColorSecondary">@color/dh_primary_text</item>
<item name="android:alertDialogTheme">@style/AlertDialog.dh</item>
<item name="android:dialogTheme">@style/AlertDialog.dh</item>
<item name="android:actionOverflowButtonStyle">@style/OverFlow</item>
<item name="colorControlNormal">@color/dh_primary_text</item>
<item name="colorControlActivated">@color/dh_accent</item>
<item name="colorControlHighlight">@color/dh_icons</item>
</style>
<style name="OverFlow" parent="@android:style/Widget.ActionBar">
<item name="android:backgroundTint">@color/dh_icons</item>
</style>
<style name="AppTheme.Toolbar.dh" parent="ThemeOverlay.AppCompat.Dark">
<item name="colorPrimary">@color/dh_primary</item>
<item name="android:elevation">4dp</item>
<item name="android:textColorPrimary">@color/dh_primary_text</item>
<item name="android:textColorSecondary">@color/dh_primary_text</item> <!-- force -->
<item name="actionMenuTextColor">@color/dh_icons</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:textColorSecondary">@color/dark_secondary_text</item>
</style>
<style name="CardViewStyle.Dark" parent="CardView">
<item name="cardBackgroundColor">@android:color/background_dark</item>
</style>
<style name="AlertDialog.dh" parent="ThemeOverlay.AppCompat.Dark">
<item name="android:textColor">@color/dh_primary_text</item>
<item name="android:textColorSecondary">@color/dh_primary_text</item>
<item name="colorAccent">@color/dh_accent</item>
<item name="android:textColorPrimary">@color/dh_primary_text</item>
<item name="android:background">@color/dh_divider</item>
<item name="android:textColorAlertDialogListItem">@color/dh_primary_text</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
<item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
<item name="android:windowTitleStyle">@style/MyTitleTextStyle</item>
<item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
<item name="android:alertDialogStyle">@style/ListPrefAlertDialogStyle</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:textAppearanceMedium">@style/MyAlertTextAppearance</item>
</style>
<style name="MyAlertTextAppearance">
<!-- Set text size and color of title and message here -->
<item name="android:textColor">@color/dh_primary_text</item>
</style>
<style name="ListPrefAlertDialogStyle">
<item name="android:fullDark" >@android:color/transparent</item>
<item name="android:topDark" >@android:color/transparent</item>
<item name="android:centerDark" >@android:color/transparent</item>
<item name="android:bottomDark" >@android:color/transparent</item>
<item name="android:fullBright" >@android:color/transparent</item>
<item name="android:topBright" >@android:color/transparent</item>
<item name="android:centerBright">@android:color/transparent</item>
<item name="android:bottomBright">@android:color/transparent</item>
<item name="android:bottomMedium">@android:color/transparent</item>
<item name="android:centerMedium">@android:color/transparent</item>
</style>
<style name="ListViewStyle.dh" parent="android:Widget.Material.PopupMenu">
<item name="android:divider">@color/dh_divider</item>
<item name="android:dividerHeight">1dp</item>
<item name="android:listSelector">@android:color/background_dark</item>
<item name="android:drawSelectorOnTop">true</item>
<item name="android:cacheColorHint">@color/dh_divider</item>
<item name="android:foregroundTint">@color/dh_primary_text</item>
</style>
<style name="TransparentListView" parent="@android:style/Widget.ListView">
<item name="android:cacheColorHint">@android:color/transparent</item>
<item name="android:background">#FFFF00</item>
<item name="android:listSelector">@android:color/transparent</item>
<item name="android:divider">#F78181</item>
<item name="android:dividerHeight">3dp</item>
</style>
<style name="MyTitleTextStyle">
<item name="android:textColor">@color/dh_primary_text</item>
<item name="android:textAppearance">@style/TextAppearance.AppCompat.Title</item>
</style>
<style name="CardViewStyle.Light" parent="CardView">
<item name="cardBackgroundColor">@android:color/background_light</item>
</style>