MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated colors and styles

Browse Source 
Namely added secondary button
This commit is contained in:
Viktor De Pasquale 2019-11-16 20:07:35 +01:00
parent b744bb0a5a
commit 59c5363933
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/values-night/styles_md2.xml
View File

@ -4,8 +4,8 @@
<style name="Foundation.Default" parent="Foundation.Base"> <style name="Foundation.Default" parent="Foundation.Base">
<item name="colorPrimary">#2196F3</item> <item name="colorPrimary">#2196F3</item>
<item name="colorPrimaryVariant">#802196F3</item> <item name="colorPrimaryVariant">#802196F3</item>
<item name="colorSecondary">#00C853</item> <item name="colorSecondary">#63B9FF</item>
<item name="colorSecondaryVariant">#8000C853</item> <item name="colorSecondaryVariant">#8063B9FF</item>
<item name="colorSurface">#0D0D0D</item> <item name="colorSurface">#0D0D0D</item>
<item name="colorSurfaceVariant">#1F1F1F</item> <item name="colorSurfaceVariant">#1F1F1F</item>
<item name="colorSurfaceSurfaceVariant">?colorSurfaceVariant</item> <item name="colorSurfaceSurfaceVariant">?colorSurfaceVariant</item>

1
app/src/main/res/values/attrs.xml
View File

@ -27,6 +27,7 @@
<attr name="styleButtonFlat" format="reference" /> <attr name="styleButtonFlat" format="reference" />
<attr name="styleButtonFlatOnPrimary" format="reference" /> <attr name="styleButtonFlatOnPrimary" format="reference" />
<attr name="styleButtonText" format="reference" /> <attr name="styleButtonText" format="reference" />
<attr name="styleButtonTextSecondary" format="reference" />
<attr name="styleButtonTextOnPrimary" format="reference" /> <attr name="styleButtonTextOnPrimary" format="reference" />
<attr name="styleButtonError" format="reference" /> <attr name="styleButtonError" format="reference" />

5
app/src/main/res/values/styles_md2.xml
View File

@ -39,6 +39,7 @@
<item name="styleButtonFlat">@style/WidgetFoundation.Button.Flat</item> <item name="styleButtonFlat">@style/WidgetFoundation.Button.Flat</item>
<item name="styleButtonFlatOnPrimary">@style/WidgetFoundation.Button.Flat.OnPrimary</item> <item name="styleButtonFlatOnPrimary">@style/WidgetFoundation.Button.Flat.OnPrimary</item>
<item name="styleButtonText">@style/WidgetFoundation.Button.Text</item> <item name="styleButtonText">@style/WidgetFoundation.Button.Text</item>
<item name="styleButtonTextSecondary">@style/WidgetFoundation.Button.Text.Secondary</item>
<item name="styleButtonTextOnPrimary">@style/WidgetFoundation.Button.Text.OnPrimary</item> <item name="styleButtonTextOnPrimary">@style/WidgetFoundation.Button.Text.OnPrimary</item>
<item name="styleButtonError">@style/WidgetFoundation.Button.Error</item> <item name="styleButtonError">@style/WidgetFoundation.Button.Error</item>
@ -99,8 +100,8 @@
<style name="Foundation.Default" parent="Foundation.Base"> <style name="Foundation.Default" parent="Foundation.Base">
<item name="colorPrimary">#2196F3</item> <item name="colorPrimary">#2196F3</item>
<item name="colorPrimaryVariant">#802196F3</item> <item name="colorPrimaryVariant">#802196F3</item>
<item name="colorSecondary">#00C853</item> <item name="colorSecondary">#1766A6</item>
<item name="colorSecondaryVariant">#8000C853</item> <item name="colorSecondaryVariant">#801766A6</item>
<item name="colorSurface">#F2F2F2</item> <item name="colorSurface">#F2F2F2</item>
<item name="colorSurfaceVariant">#E8E8E8</item> <item name="colorSurfaceVariant">#E8E8E8</item>
<item name="colorSurfaceSurfaceVariant">?colorSurface</item> <item name="colorSurfaceSurfaceVariant">?colorSurface</item>

5
app/src/main/res/values/styles_md2_impl.xml
View File

@ -85,6 +85,11 @@ variant. Make sure to use style referenced by attribute defined it attrs.xml.
<item name="iconPadding">@dimen/l1</item> <item name="iconPadding">@dimen/l1</item>
</style> </style>
<style name="WidgetFoundation.Button.Text.Secondary">
<item name="android:textColor">?colorSecondary</item>
<item name="iconTint">?colorSecondary</item>
</style>
<style name="WidgetFoundation.Button.Text.OnPrimary"> <style name="WidgetFoundation.Button.Text.OnPrimary">
<item name="rippleColor">?colorOnPrimary</item> <item name="rippleColor">?colorOnPrimary</item>
<item name="android:textColor">?colorOnPrimary</item> <item name="android:textColor">?colorOnPrimary</item>