diff options
Diffstat (limited to 'OpenKeychain/src/main/res/drawable')
| -rw-r--r-- | OpenKeychain/src/main/res/drawable/cardview_header.xml | 4 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable/divider.xml | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable/fab_label_background.xml | 5 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable/scrim_bottom.xml | 8 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable/section_header_dark.xml (renamed from OpenKeychain/src/main/res/drawable/section_header.xml) | 4 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable/section_header_light.xml | 11 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable/selector_transparent_button.xml | 7 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/drawable/yubikey_phone.png | bin | 352625 -> 347902 bytes |
8 files changed, 27 insertions, 14 deletions
diff --git a/OpenKeychain/src/main/res/drawable/cardview_header.xml b/OpenKeychain/src/main/res/drawable/cardview_header.xml index 9bab96ea9..213c78277 100644 --- a/OpenKeychain/src/main/res/drawable/cardview_header.xml +++ b/OpenKeychain/src/main/res/drawable/cardview_header.xml @@ -6,6 +6,6 @@ android:height="1dp" android:width="1000dp" /> - <solid android:color="@color/bg_gray" /> + <solid android:color="#808080" /> -</shape>
\ No newline at end of file +</shape> diff --git a/OpenKeychain/src/main/res/drawable/divider.xml b/OpenKeychain/src/main/res/drawable/divider.xml index b0695f89a..b3800c459 100644 --- a/OpenKeychain/src/main/res/drawable/divider.xml +++ b/OpenKeychain/src/main/res/drawable/divider.xml @@ -6,6 +6,6 @@ android:height="1px" android:width="1000dp" /> - <solid android:color="@color/bg_gray" /> + <solid android:color="#eeeeee" /> </shape>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/drawable/fab_label_background.xml b/OpenKeychain/src/main/res/drawable/fab_label_background.xml index 0d8c05b11..b2d5954d8 100644 --- a/OpenKeychain/src/main/res/drawable/fab_label_background.xml +++ b/OpenKeychain/src/main/res/drawable/fab_label_background.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android"> - <solid android:color="@color/black_semi_transparent"/> + <!-- using an attribute for color will crash on API <= 20. Refer to http://stackoverflow.com/a/13471695/3000919 --> + <solid android:color="#b2000000"/> <padding android:left="16dp" android:top="4dp" @@ -8,4 +9,4 @@ android:bottom="4dp"/> <corners android:radius="2dp"/> -</shape>
\ No newline at end of file +</shape> diff --git a/OpenKeychain/src/main/res/drawable/scrim_bottom.xml b/OpenKeychain/src/main/res/drawable/scrim_bottom.xml new file mode 100644 index 000000000..b0c203835 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable/scrim_bottom.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <gradient + android:angle="90" + android:startColor="@color/translucent_scrim_bottom" + android:centerColor="@color/translucent_scrim_bottom_center" + android:endColor="@android:color/transparent"/> +</shape>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/drawable/section_header.xml b/OpenKeychain/src/main/res/drawable/section_header_dark.xml index 04d3d4957..e60fc085d 100644 --- a/OpenKeychain/src/main/res/drawable/section_header.xml +++ b/OpenKeychain/src/main/res/drawable/section_header_dark.xml @@ -6,6 +6,6 @@ android:height="2dp" android:width="1000dp" /> - <solid android:color="@color/header_text" /> + <solid android:color="#d0d0d0" /> -</shape>
\ No newline at end of file +</shape> diff --git a/OpenKeychain/src/main/res/drawable/section_header_light.xml b/OpenKeychain/src/main/res/drawable/section_header_light.xml new file mode 100644 index 000000000..a47a57ce3 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable/section_header_light.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle" > + + <size + android:height="2dp" + android:width="1000dp" /> + + <solid android:color="#212121" /> + +</shape> diff --git a/OpenKeychain/src/main/res/drawable/selector_transparent_button.xml b/OpenKeychain/src/main/res/drawable/selector_transparent_button.xml deleted file mode 100644 index ed856f281..000000000 --- a/OpenKeychain/src/main/res/drawable/selector_transparent_button.xml +++ /dev/null @@ -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>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/drawable/yubikey_phone.png b/OpenKeychain/src/main/res/drawable/yubikey_phone.png Binary files differindex 6a03501c6..3cdfbba0f 100644 --- a/OpenKeychain/src/main/res/drawable/yubikey_phone.png +++ b/OpenKeychain/src/main/res/drawable/yubikey_phone.png |
