mirror of
https://github.com/topjohnwu/Magisk.git
synced 2024-11-27 20:15:29 +00:00
Updated colors and styles
Namely added secondary button
This commit is contained in:
parent
b744bb0a5a
commit
59c5363933
@ -4,8 +4,8 @@
|
||||
<style name="Foundation.Default" parent="Foundation.Base">
|
||||
<item name="colorPrimary">#2196F3</item>
|
||||
<item name="colorPrimaryVariant">#802196F3</item>
|
||||
<item name="colorSecondary">#00C853</item>
|
||||
<item name="colorSecondaryVariant">#8000C853</item>
|
||||
<item name="colorSecondary">#63B9FF</item>
|
||||
<item name="colorSecondaryVariant">#8063B9FF</item>
|
||||
<item name="colorSurface">#0D0D0D</item>
|
||||
<item name="colorSurfaceVariant">#1F1F1F</item>
|
||||
<item name="colorSurfaceSurfaceVariant">?colorSurfaceVariant</item>
|
||||
|
@ -27,6 +27,7 @@
|
||||
<attr name="styleButtonFlat" format="reference" />
|
||||
<attr name="styleButtonFlatOnPrimary" format="reference" />
|
||||
<attr name="styleButtonText" format="reference" />
|
||||
<attr name="styleButtonTextSecondary" format="reference" />
|
||||
<attr name="styleButtonTextOnPrimary" format="reference" />
|
||||
<attr name="styleButtonError" format="reference" />
|
||||
|
||||
|
@ -39,6 +39,7 @@
|
||||
<item name="styleButtonFlat">@style/WidgetFoundation.Button.Flat</item>
|
||||
<item name="styleButtonFlatOnPrimary">@style/WidgetFoundation.Button.Flat.OnPrimary</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="styleButtonError">@style/WidgetFoundation.Button.Error</item>
|
||||
|
||||
@ -99,8 +100,8 @@
|
||||
<style name="Foundation.Default" parent="Foundation.Base">
|
||||
<item name="colorPrimary">#2196F3</item>
|
||||
<item name="colorPrimaryVariant">#802196F3</item>
|
||||
<item name="colorSecondary">#00C853</item>
|
||||
<item name="colorSecondaryVariant">#8000C853</item>
|
||||
<item name="colorSecondary">#1766A6</item>
|
||||
<item name="colorSecondaryVariant">#801766A6</item>
|
||||
<item name="colorSurface">#F2F2F2</item>
|
||||
<item name="colorSurfaceVariant">#E8E8E8</item>
|
||||
<item name="colorSurfaceSurfaceVariant">?colorSurface</item>
|
||||
|
@ -85,6 +85,11 @@ variant. Make sure to use style referenced by attribute defined it attrs.xml.
|
||||
<item name="iconPadding">@dimen/l1</item>
|
||||
</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">
|
||||
<item name="rippleColor">?colorOnPrimary</item>
|
||||
<item name="android:textColor">?colorOnPrimary</item>
|
||||
|
Loading…
Reference in New Issue
Block a user