diff options
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> |