cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Give key flag colors their own color names

Browse Source 
This removes "bg_gray" and selector_transparent_button.xml, which is
unused and the last file to reference "bg_gray".
This commit is contained in:
Thialfihar
2015-06-26 12:05:15 +02:00
parent 6b8127ca94
commit dfe5a64fb0
11 changed files with 47 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenKeychain/src/main/res/drawable/selector_transparent_button.xml
View File

@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Borderless Buttons for API < 11, see http://stackoverflow.com/a/14663170 -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@color/bg_gray" />
<item android:drawable="@android:color/transparent" />
</selector>

4
OpenKeychain/src/main/res/layout/create_key_final_fragment.xml
View File

@@ -87,7 +87,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/create_key_rsa"
android:textColor="@color/android_green_light"
android:textColor="?attr/colorPrimary"
android:textAppearance="?android:attr/textAppearanceMedium"
android:minHeight="?android:attr/listPreferredItemHeight"
android:clickable="true"
@@ -129,7 +129,7 @@
android:layout_marginTop="16dp"
android:layout_marginBottom="8dp"
android:text="@string/create_key_final_robot_text"
android:textColor="@color/android_green_light"
android:textColor="?attr/colorPrimary"
android:textAppearance="?android:attr/textAppearanceMedium"
android:drawableLeft="@drawable/create_key_robot"
android:drawablePadding="8dp" />

9
OpenKeychain/src/main/res/values/colors.xml
View File

@@ -4,7 +4,10 @@
<color name="icons">#FFFFFF</color>
<color name="transparent">#00FFFFFF</color>
<color name="bg_gray">#00ff00</color>
<color name="key_flag_gray">#808080</color>
<color name="key_flag_red">#f44336</color>
<color name="key_flag_orange">#ff9800</color>
<color name="key_flag_green">#7bad45</color>
<!-- tabs -->
<color name="tab_text">#70FFFFFF</color>
@@ -27,8 +30,8 @@
<color name="android_red_dark">#b71c1c</color>
<color name="android_orange_light">#ff9800</color>
<color name="android_orange_dark">#e65100</color>
<color name="android_green_light">#00ff00</color>
<color name="android_green_dark">#008000</color>
<color name="android_green_light">#7bad45</color>
<color name="android_green_dark">#6c983d</color>
<color name="android_purple_light">#673ab7</color>
<color name="android_purple_dark">#311b92</color>