Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Clean up colors definitions

Use system constants when possible; move the red color definition from `styles.xml` to `colors.xml` and tune it to match the [Material Design guidelines](http://www.google.com/design/spec/patterns/errors.html#errors-user-input-errors).

See merge request !121
This commit is contained in:
Daniel Martí 2015-08-17 17:23:07 +00:00
commit ca06edd797
5 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
F-Droid/res/drawable/swap_button_normal.xml
View File

@ -2,7 +2,7 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item> <item>
<shape> <shape>
<solid android:color="@color/white" /> <solid android:color="@android:color/white" />
<padding <padding
android:top="1dp"/> android:top="1dp"/>
</shape> </shape>

2
F-Droid/res/drawable/swap_button_pressed.xml
View File

@ -2,7 +2,7 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item> <item>
<shape> <shape>
<solid android:color="@color/white" /> <solid android:color="@android:color/white" />
<padding <padding
android:top="1dp"/> android:top="1dp"/>
</shape> </shape>

2
F-Droid/res/layout/install_app_details.xml
View File

@ -32,7 +32,7 @@ installation screens
android:layout_width="32dip" android:layout_width="32dip"
android:layout_height="32dip" android:layout_height="32dip"
android:layout_marginStart="8dip" android:layout_marginStart="8dip"
android:background="@color/transparent" android:background="@android:color/transparent"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:gravity="start" android:gravity="start"
android:scaleType="centerCrop"/> android:scaleType="centerCrop"/>

2
F-Droid/res/values/colors.xml
View File

@ -3,6 +3,7 @@
<color name="signed">#ffcccccc</color> <color name="signed">#ffcccccc</color>
<color name="unsigned">#ffCC0000</color> <color name="unsigned">#ffCC0000</color>
<color name="unverified">#ff999999</color> <color name="unverified">#ff999999</color>
<color name="red">#ffdd2c00</color>
<color name="fdroid_blue">#ff1976d2</color> <color name="fdroid_blue">#ff1976d2</color>
<color name="fdroid_blue_dark">#ff0d47a1</color> <color name="fdroid_blue_dark">#ff0d47a1</color>
@ -20,7 +21,6 @@
<color name="swap_wifi_likely_to_work">#00a14b</color> <color name="swap_wifi_likely_to_work">#00a14b</color>
<color name="shadow">#cc222222</color> <color name="shadow">#cc222222</color>
<color name="transparent">#00000000</color>
<color name="perms_costs_money">#fff4511e</color> <color name="perms_costs_money">#fff4511e</color>

6
F-Droid/res/values/styles.xml
View File

@ -20,10 +20,6 @@
<item name="alertDialogTheme">@style/AlertDialogThemeLight</item> <item name="alertDialogTheme">@style/AlertDialogThemeLight</item>
</style> </style>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<color name="red">#FFFF0000</color>
<style name="AppThemeDark" parent="AppBaseThemeDark"> <style name="AppThemeDark" parent="AppBaseThemeDark">
<!-- customizations that are not API-level specific go here. --> <!-- customizations that are not API-level specific go here. -->
</style> </style>
@ -49,7 +45,7 @@
</style> </style>
<style name="SwapTheme.StartSwap" parent="AppThemeLight"> <style name="SwapTheme.StartSwap" parent="AppThemeLight">
<item name="android:background">@color/white</item> <item name="android:background">@android:color/white</item>
</style> </style>
<style name="SwapTheme.AppList" parent="AppThemeLight"> <style name="SwapTheme.AppList" parent="AppThemeLight">