PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Make bright toolbar themeable

Browse source 
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.
This commit is contained in:
Thialfihar 2015-06-26 13:57:40 +02:00
parent 7fab951175
commit 1c3fbe9bbe
6 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
OpenKeychain/src/main/res/layout/drawer_custom_header.xml
View file

@ -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>

2
OpenKeychain/src/main/res/layout/toolbar_result_decrypt.xml
View file

@ -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">

2
OpenKeychain/src/main/res/layout/toolbar_standalone_white.xml
View file

@ -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">

1
OpenKeychain/src/main/res/values/attrs.xml
View file

@ -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>

2
OpenKeychain/src/main/res/values/colors.xml
View file

@ -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

2
OpenKeychain/src/main/res/values/themes.xml
View file

@ -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>