diff options
| author | Thialfihar <thi@thialfihar.org> | 2015-06-26 13:57:40 +0200 |
|---|---|---|
| committer | Thialfihar <thi@thialfihar.org> | 2015-07-21 20:56:41 +0200 |
| commit | 1c3fbe9bbe28a9c55697fc34608c781cc095c984 (patch) | |
| tree | 2adc28bf1344fc93ba8b79994a1434b3c1121f8f | |
| parent | 7fab9511753f2e9f330448ade4e27e1653215a39 (diff) | |
| download | open-keychain-1c3fbe9bbe28a9c55697fc34608c781cc095c984.tar.gz open-keychain-1c3fbe9bbe28a9c55697fc34608c781cc095c984.tar.bz2 open-keychain-1c3fbe9bbe28a9c55697fc34608c781cc095c984.zip | |
Make bright toolbar themeable
Also remove a superfluous divider in the decrypt files fragment and the
unused drawer_custom_header.xml.
This changes the color of the toolbar in the light theme as well,
because its brightness didn't play well with the system status bar of
Android, drowning it in whiteness. Now it is still very light, but the
system bar is still faintly visible above it.
6 files changed, 5 insertions, 20 deletions
diff --git a/OpenKeychain/src/main/res/layout/drawer_custom_header.xml b/OpenKeychain/src/main/res/layout/drawer_custom_header.xml deleted file mode 100644 index 716ec2cd2..000000000 --- a/OpenKeychain/src/main/res/layout/drawer_custom_header.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="center" - android:background="?attr/colorPrimary"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/app_name" - android:textColor="@color/white" - android:layout_gravity="center_horizontal" /> -</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/toolbar_result_decrypt.xml b/OpenKeychain/src/main/res/layout/toolbar_result_decrypt.xml index 4f9b5d373..1afa76b60 100644 --- a/OpenKeychain/src/main/res/layout/toolbar_result_decrypt.xml +++ b/OpenKeychain/src/main/res/layout/toolbar_result_decrypt.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/toolbar_include" android:elevation="4dp" - android:background="@color/white" + android:background="?attr/colorBrightToolbar" android:layout_width="match_parent" android:layout_height="wrap_content"> diff --git a/OpenKeychain/src/main/res/layout/toolbar_standalone_white.xml b/OpenKeychain/src/main/res/layout/toolbar_standalone_white.xml index d4269c2ba..8fddfe4ba 100644 --- a/OpenKeychain/src/main/res/layout/toolbar_standalone_white.xml +++ b/OpenKeychain/src/main/res/layout/toolbar_standalone_white.xml @@ -2,7 +2,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/toolbar_include" android:elevation="4dp" - android:background="@color/white" + android:background="?attr/colorBrightToolbar" android:layout_width="match_parent" android:layout_height="wrap_content"> diff --git a/OpenKeychain/src/main/res/values/attrs.xml b/OpenKeychain/src/main/res/values/attrs.xml index 17035f4b4..7a3d2cfc6 100644 --- a/OpenKeychain/src/main/res/values/attrs.xml +++ b/OpenKeychain/src/main/res/values/attrs.xml @@ -12,5 +12,6 @@ <attr name="colorLogBackground" format="color" /> <attr name="colorCardViewHeaderDivider" format="color" /> <attr name="colorText" format="color" /> + <attr name="colorBrightToolbar" format="color" /> </declare-styleable> </resources> diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml index 3345ca80b..8870ffac7 100644 --- a/OpenKeychain/src/main/res/values/colors.xml +++ b/OpenKeychain/src/main/res/values/colors.xml @@ -18,8 +18,6 @@ <color name="password_strength_medium">#ff9800</color> <color name="password_strength_high">#7bad45</color> - <color name="white">#fafafa</color> - <!-- Standard Android colors: http://www.google.com/design/spec/style/color.html#color-color-palette diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index 28e9a429c..809ccd0b4 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -5,6 +5,7 @@ <item name="colorPrimary">#7bad45</item> <item name="colorPrimaryDark">#6c983d</item> <item name="colorAccent">#2196f3</item> + <item name="colorBrightToolbar">#dddddd</item> <item name="colorFab">#2196f3</item> <item name="colorFabPressed">#1976d2</item> @@ -32,6 +33,7 @@ <item name="colorPrimary">#268bd2</item> <item name="colorPrimaryDark">#166bb2</item> <item name="colorAccent">#2196f3</item> + <item name="colorBrightToolbar">#808080</item> <item name="colorFab">#2196f3</item> <item name="colorFabPressed">#1976d2</item> |