Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed colors

Browse source
This commit is contained in:
h4h13 2019-11-15 22:00:10 +05:30
commit 9672a8a23d
23 changed files with 101 additions and 290 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/res/values/colors.xml
View file

@ -5,10 +5,10 @@
<color name="app_shortcut_default_foreground">#607d8b</color>
<color name="app_shortcut_default_background">#f5f5f5</color>
<color name="md_indigo_A400">#3D5AFE</color>
<color name="dark_color">#212121</color>
<color name="dark_grey">#121212</color>
<color name="card_dark_color">#2C2D30</color>
<color name="black_color">#121212</color>
<color name="dark_color">#202124</color>
<color name="dark_grey">#17181a</color>
<color name="card_dark_color">#222326</color>
<color name="black_color">#202124</color>
<color name="lightColorPrimary">#FFFFFF</color>
<color name="lightColorOnPrimary">#202020</color>
@ -16,15 +16,17 @@
<color name="lightColorBackground">#FFFFFF</color>
<color name="lightColorSurface">#FEFEFE</color>
<color name="darkColorPrimary">#121212</color>
<color name="darkColorSecondary">#181818</color>
<color name="darkColorBackground">#333333</color>
<color name="darkColorSurface">#1F1F1F</color>
<color name="darkColorPrimary">#202124</color>
<color name="darkColorOnPrimary">#ffffff</color>
<color name="darkColorSecondary">#202124</color>
<color name="darkColorBackground">#121212</color>
<color name="darkColorSurface">#3C4043</color>
<color name="blackColorPrimary">#000000</color>
<color name="blackColorOnPrimary">#ffffff</color>
<color name="blackColorSecondary">#000000</color>
<color name="blackColorBackground">#000000</color>
<color name="blackColorSurface">#121212</color>
<color name="blackColorSurface">#17181a</color>
<color name="transparent">#00000000</color>
<!-- card colors -->

13
app/src/main/res/values/styles.xml
View file

@ -161,4 +161,17 @@
<item name="cornerSize">8dp</item>
</style>
<style name="TopCornerCardViewStyle" parent="@style/Widget.MaterialComponents.CardView">
<item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlayCardViewTopCorners</item>
</style>
<style name="ShapeAppearanceOverlayCardViewTopCorners" parent="">
<item name="cornerFamily">rounded</item>
<item name="cornerSizeTopRight">16dp</item>
<item name="cornerSizeTopLeft">16dp</item>
<item name="cornerSizeBottomRight">0dp</item>
<item name="cornerSizeBottomLeft">0dp</item>
</style>
</resources>

18
app/src/main/res/values/styles_parents.xml
View file

@ -27,7 +27,7 @@
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat</item>
<!-- just in case-->
<item name="android:windowBackground">@color/dark_color</item>
<item name="android:windowBackground">@color/md_red_500</item>
<!-- necessary to find the overflow button later in the layout-->
<item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
@ -40,6 +40,7 @@
<item name="windowActionBar">false</item>
<item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
<item name="materialButtonStyle">@style/MaterialButtonTheme</item>
<item name="colorPrimary">@color/darkColorPrimary</item>
<item name="colorSecondary">@color/darkColorSecondary</item>
@ -49,7 +50,7 @@
<item name="colorAccent">@color/md_deep_purple_A200</item>
<item name="android:colorBackground">@color/darkColorBackground</item>
<item name="android:colorBackground">@color/md_red_500</item>
<item name="colorSurface">@color/darkColorSurface</item>
<item name="colorOnSurface">@color/mi_text_color_primary_dark</item>
<item name="colorOnBackground">@color/mi_text_color_secondary_dark</item>
@ -124,8 +125,9 @@
<item name="android:fontFamily">@font/circular</item>
<item name="windowActionBar">false</item>
<item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
<!--<item name="android:textColorPrimary">@color/md_grey_900</item>-->
<item name="materialButtonStyle">@style/MaterialButtonTheme</item>
<item name="colorPrimary">@color/lightColorPrimary</item>
<item name="colorSecondary">@color/lightColorSecondary</item>
@ -167,4 +169,14 @@
<style name="MaterialAlertDialogTheme" parent="@style/ThemeOverlay.MaterialComponents.Dialog">
<item name="android:dialogCornerRadius" tools:targetApi="p">12dp</item>
</style>
<style name="MaterialButtonTheme" parent="Widget.MaterialComponents.Button">
<item name="cornerRadius">24dp</item>
<item name="android:textAppearance">@style/TextViewNormal</item>
<item name="android:textAllCaps">false</item>
<item name="android:paddingTop">@dimen/button_padding_vertical</item>
<item name="android:paddingBottom">@dimen/button_padding_vertical</item>
<item name="iconGravity">textStart</item>
<item name="backgroundTint">?colorSurface</item>
</style>
</resources>