From 66a1f8585985fd3aa5473f431df81b97aa1485ab Mon Sep 17 00:00:00 2001 From: Torsten Grote <t@grobox.de> Date: Mon, 27 Jun 2016 12:55:05 -0300 Subject: [PATCH] Font Colors and Separate Themes Once applied this commit will change the font colors according to the design and move all themes into a dedicated file. Closes #333 --- .../res/layout/forum_discussion_cell.xml | 1 + .../res/layout/introduction_message.xml | 1 + ...invitation_bluetooth_confirmation_code.xml | 1 + .../invitation_bluetooth_invitation_code.xml | 1 + briar-android/res/layout/invitation_error.xml | 2 + .../res/layout/list_item_contact.xml | 4 +- briar-android/res/layout/list_item_crash.xml | 5 +- .../layout/list_item_forum_invitation_in.xml | 1 + .../layout/list_item_forum_invitation_out.xml | 1 + .../res/layout/list_item_introduction_in.xml | 1 + .../res/layout/list_item_introduction_out.xml | 1 + briar-android/res/layout/list_item_msg_in.xml | 1 + .../res/layout/list_item_notice_in.xml | 1 + .../res/layout/list_item_notice_out.xml | 1 + .../layout/list_item_selectable_contact.xml | 1 + .../res/layout/list_item_transport.xml | 2 +- .../res/layout/share_forum_message.xml | 1 + briar-android/res/values/color.xml | 11 ++-- briar-android/res/values/styles.xml | 46 ------------- briar-android/res/values/themes.xml | 64 +++++++++++++++++++ 20 files changed, 93 insertions(+), 54 deletions(-) create mode 100644 briar-android/res/values/themes.xml diff --git a/briar-android/res/layout/forum_discussion_cell.xml b/briar-android/res/layout/forum_discussion_cell.xml index ff70489729..c8dd79dd62 100644 --- a/briar-android/res/layout/forum_discussion_cell.xml +++ b/briar-android/res/layout/forum_discussion_cell.xml @@ -82,6 +82,7 @@ android:layout_marginTop="@dimen/margin_medium" android:textIsSelectable="true" android:textSize="@dimen/text_size_medium" + android:textColor="@color/briar_text_primary" tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."/> <de.hdodenhof.circleimageview.CircleImageView diff --git a/briar-android/res/layout/introduction_message.xml b/briar-android/res/layout/introduction_message.xml index 5f72954196..9438479911 100644 --- a/briar-android/res/layout/introduction_message.xml +++ b/briar-android/res/layout/introduction_message.xml @@ -73,6 +73,7 @@ android:layout_weight="1" android:gravity="top" android:textSize="@dimen/text_size_medium" + android:textColor="@color/briar_text_primary" tools:text="@string/introduction_message_text"/> <EditText diff --git a/briar-android/res/layout/invitation_bluetooth_confirmation_code.xml b/briar-android/res/layout/invitation_bluetooth_confirmation_code.xml index 25d04b4c5c..4ae967f280 100644 --- a/briar-android/res/layout/invitation_bluetooth_confirmation_code.xml +++ b/briar-android/res/layout/invitation_bluetooth_confirmation_code.xml @@ -47,6 +47,7 @@ android:layout_height="wrap_content" android:padding="@dimen/margin_medium" android:textSize="50sp" + android:textColor="@color/briar_text_secondary" android:layout_below="@+id/yourConfirmationCodeView" android:layout_centerHorizontal="true" tools:text="1337"/> diff --git a/briar-android/res/layout/invitation_bluetooth_invitation_code.xml b/briar-android/res/layout/invitation_bluetooth_invitation_code.xml index 1d167b27bc..c5f101d86f 100644 --- a/briar-android/res/layout/invitation_bluetooth_invitation_code.xml +++ b/briar-android/res/layout/invitation_bluetooth_invitation_code.xml @@ -33,6 +33,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/margin_medium" android:textSize="50sp" + android:textColor="@color/briar_text_secondary" android:layout_below="@+id/yourCodeView" android:layout_centerHorizontal="true" tools:text="1337"/> diff --git a/briar-android/res/layout/invitation_error.xml b/briar-android/res/layout/invitation_error.xml index d2928aa243..01fc51da70 100644 --- a/briar-android/res/layout/invitation_error.xml +++ b/briar-android/res/layout/invitation_error.xml @@ -16,6 +16,7 @@ android:text="@string/connection_failed" android:layout_gravity="center_horizontal" android:textSize="@dimen/text_size_large" + android:textColor="@color/briar_text_primary" android:drawableStart="@drawable/alerts_and_states_error" android:drawableLeft="@drawable/alerts_and_states_error" android:gravity="center_vertical" @@ -26,6 +27,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/interfering" + android:textColor="@color/briar_text_primary" android:layout_gravity="center_horizontal" android:padding="@dimen/margin_medium"/> diff --git a/briar-android/res/layout/list_item_contact.xml b/briar-android/res/layout/list_item_contact.xml index 989acb4392..9fefd9750e 100644 --- a/briar-android/res/layout/list_item_contact.xml +++ b/briar-android/res/layout/list_item_contact.xml @@ -65,7 +65,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxLines="2" - android:textColor="@android:color/primary_text_light" + android:textColor="@color/briar_text_primary" android:textSize="@dimen/text_size_medium" tools:text="This is a name of a contact"/> @@ -73,7 +73,7 @@ android:id="@+id/dateView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@android:color/secondary_text_light" + android:textColor="@color/briar_text_secondary" android:textSize="@dimen/text_size_small" tools:text="Dec 24"/> diff --git a/briar-android/res/layout/list_item_crash.xml b/briar-android/res/layout/list_item_crash.xml index 305bee5a9e..f7aa3d0eba 100644 --- a/briar-android/res/layout/list_item_crash.xml +++ b/briar-android/res/layout/list_item_crash.xml @@ -19,9 +19,11 @@ <TextView android:id="@+id/title" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:layout_marginBottom="@dimen/margin_small" + android:gravity="bottom" android:textSize="@dimen/text_size_large" + android:textColor="@color/briar_text_primary" tools:text="Crash log entry title"/> </LinearLayout> @@ -30,6 +32,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/margin_medium" + android:textColor="@color/briar_text_secondary" tools:text="Crash log entry value"/> </LinearLayout> \ No newline at end of file diff --git a/briar-android/res/layout/list_item_forum_invitation_in.xml b/briar-android/res/layout/list_item_forum_invitation_in.xml index c6881437b3..ad8d0bcfc6 100644 --- a/briar-android/res/layout/list_item_forum_invitation_in.xml +++ b/briar-android/res/layout/list_item_forum_invitation_in.xml @@ -27,6 +27,7 @@ android:textIsSelectable="true" android:textSize="@dimen/text_size_medium" android:textStyle="italic" + android:textColor="@color/briar_text_secondary" tools:text="@string/forum_invitation_received"/> <TextView diff --git a/briar-android/res/layout/list_item_forum_invitation_out.xml b/briar-android/res/layout/list_item_forum_invitation_out.xml index 88070ea669..9784a13911 100644 --- a/briar-android/res/layout/list_item_forum_invitation_out.xml +++ b/briar-android/res/layout/list_item_forum_invitation_out.xml @@ -26,6 +26,7 @@ android:textIsSelectable="true" android:textSize="@dimen/text_size_medium" android:textStyle="italic" + android:textColor="@color/briar_text_secondary" tools:text="@string/introduction_request_received"/> <TextView diff --git a/briar-android/res/layout/list_item_introduction_in.xml b/briar-android/res/layout/list_item_introduction_in.xml index 2f157fad66..d4b46a2f9f 100644 --- a/briar-android/res/layout/list_item_introduction_in.xml +++ b/briar-android/res/layout/list_item_introduction_in.xml @@ -27,6 +27,7 @@ android:textIsSelectable="true" android:textSize="@dimen/text_size_medium" android:textStyle="italic" + android:textColor="@color/briar_text_secondary" tools:text="@string/introduction_request_received"/> <TextView diff --git a/briar-android/res/layout/list_item_introduction_out.xml b/briar-android/res/layout/list_item_introduction_out.xml index 88070ea669..9784a13911 100644 --- a/briar-android/res/layout/list_item_introduction_out.xml +++ b/briar-android/res/layout/list_item_introduction_out.xml @@ -26,6 +26,7 @@ android:textIsSelectable="true" android:textSize="@dimen/text_size_medium" android:textStyle="italic" + android:textColor="@color/briar_text_secondary" tools:text="@string/introduction_request_received"/> <TextView diff --git a/briar-android/res/layout/list_item_msg_in.xml b/briar-android/res/layout/list_item_msg_in.xml index 9303ca2b05..e75ede0491 100644 --- a/briar-android/res/layout/list_item_msg_in.xml +++ b/briar-android/res/layout/list_item_msg_in.xml @@ -16,6 +16,7 @@ android:layout_height="wrap_content" android:textIsSelectable="true" android:textSize="@dimen/text_size_medium" + android:textColor="@color/briar_text_primary" tools:text="Short message"/> <TextView diff --git a/briar-android/res/layout/list_item_notice_in.xml b/briar-android/res/layout/list_item_notice_in.xml index 8f0daa0267..ea63d0a3f9 100644 --- a/briar-android/res/layout/list_item_notice_in.xml +++ b/briar-android/res/layout/list_item_notice_in.xml @@ -17,6 +17,7 @@ android:textIsSelectable="true" android:textSize="@dimen/text_size_medium" android:textStyle="italic" + android:textColor="@color/briar_text_secondary" tools:text="@string/introduction_response_accepted_received"/> <TextView diff --git a/briar-android/res/layout/list_item_notice_out.xml b/briar-android/res/layout/list_item_notice_out.xml index 499e1506fd..9b873d56f2 100644 --- a/briar-android/res/layout/list_item_notice_out.xml +++ b/briar-android/res/layout/list_item_notice_out.xml @@ -22,6 +22,7 @@ android:textIsSelectable="true" android:textSize="@dimen/text_size_medium" android:textStyle="italic" + android:textColor="@color/briar_text_secondary" tools:text="@string/introduction_response_accepted_sent"/> <TextView diff --git a/briar-android/res/layout/list_item_selectable_contact.xml b/briar-android/res/layout/list_item_selectable_contact.xml index 7977e42066..5642afc014 100644 --- a/briar-android/res/layout/list_item_selectable_contact.xml +++ b/briar-android/res/layout/list_item_selectable_contact.xml @@ -37,6 +37,7 @@ android:layout_toRightOf="@+id/avatarView" android:maxLines="2" android:textSize="@dimen/text_size_large" + android:textColor="@color/briar_text_primary" tools:text="This is a name of a contact"/> <CheckBox diff --git a/briar-android/res/layout/list_item_transport.xml b/briar-android/res/layout/list_item_transport.xml index af3f75cb16..ac362bdcbc 100644 --- a/briar-android/res/layout/list_item_transport.xml +++ b/briar-android/res/layout/list_item_transport.xml @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="@dimen/margin_small" - android:textColor="@android:color/tertiary_text_light" + android:textColor="@color/briar_text_secondary" tools:text="@string/transport_tor"/> </LinearLayout> \ No newline at end of file diff --git a/briar-android/res/layout/share_forum_message.xml b/briar-android/res/layout/share_forum_message.xml index 64a0279148..522a0472d7 100644 --- a/briar-android/res/layout/share_forum_message.xml +++ b/briar-android/res/layout/share_forum_message.xml @@ -19,6 +19,7 @@ android:layout_weight="1" android:gravity="top" android:textSize="@dimen/text_size_medium" + android:textColor="@color/briar_text_primary" android:text="@string/forum_share_message"/> <EditText diff --git a/briar-android/res/values/color.xml b/briar-android/res/values/color.xml index 8a44a58f3d..cb1b55840d 100644 --- a/briar-android/res/values/color.xml +++ b/briar-android/res/values/color.xml @@ -26,11 +26,14 @@ <color name="briar_accent">@color/briar_blue</color> <color name="briar_accent_dark">@color/briar_blue_dark</color> - <color name="briar_text_link">@color/briar_green_dark</color> - <color name="briar_text_primary">@color/briar_primary</color> + <!-- text colors --> + <color name="briar_text_link">#06b9ff</color> + <color name="briar_text_primary">#df000000</color> <color name="briar_text_primary_inverse">#ffffff</color> - <color name="briar_text_secondary">#333333</color> - <color name="briar_text_tertiary">#FF78909C</color> + <color name="briar_text_secondary">#8a000000</color> + <color name="briar_text_secondary_inverse">#b4ffffff</color> + <color name="briar_text_tertiary">#61000000</color> + <color name="briar_text_tertiary_inverse">#80ffffff</color> <color name="briar_button_positive">#06b9ff</color> <color name="briar_button_negative">#ff0000</color> diff --git a/briar-android/res/values/styles.xml b/briar-android/res/values/styles.xml index 61f0ce7370..9251475dad 100644 --- a/briar-android/res/values/styles.xml +++ b/briar-android/res/values/styles.xml @@ -1,32 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="BriarBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar"> - <item name="actionBarStyle">@style/BriarActionBar</item> - <item name="colorPrimary">@color/briar_primary</item> - <item name="colorPrimaryDark">@color/briar_primary_dark</item> - <item name="colorAccent">@color/briar_accent</item> - <item name="android:windowBackground">@color/window_background</item> - <item name="android:textColorPrimary">@color/briar_text_primary</item> - <item name="android:textColorPrimaryInverse">@color/briar_text_primary_inverse</item> - <item name="android:textColorSecondary">@color/briar_text_primary</item> - <item name="android:textColorLink">@color/briar_text_link</item> - </style> - - <style name="BriarThemeNoActionBar" parent="Theme.AppCompat.Light.NoActionBar"> - <item name="toolbarStyle">@style/BriarToolbar</item> - <item name="colorPrimary">@color/briar_primary</item> - <item name="colorPrimaryDark">@color/briar_primary_dark</item> - <item name="colorAccent">@color/briar_primary</item> - <item name="android:windowBackground">@color/window_background</item> - <item name="android:textColorPrimary">@color/briar_text_primary</item> - <item name="android:textColorPrimaryInverse">@color/briar_text_primary_inverse</item> - <item name="android:textColorSecondary">@color/briar_text_primary</item> - <item name="android:textColorLink">@color/briar_text_link</item> - </style> - - <style name="BriarThemeNoActionBar.Default" /> - <style name="BriarToolbar" parent="Widget.AppCompat.Toolbar"> <item name="android:background">?colorPrimary</item> <item name="android:textColorPrimary">@color/briar_text_primary_inverse</item> @@ -44,21 +18,10 @@ <item name="android:textColor">@color/briar_text_primary_inverse</item> </style> - <style name="BriarTheme" parent="BriarBaseTheme"> - <item name="preferenceTheme">@style/PreferenceThemeOverlay</item> - <item name="android:listSeparatorTextViewStyle">@style/BriarTheme.ListSeparatorTextView</item> - </style> - <style name="BriarActionBar" parent="Base.Widget.AppCompat.Light.ActionBar.Solid"> <item name="elevation">1dp</item> </style> - <style name="BriarDialogTheme" parent="Theme.AppCompat.Light.Dialog"> - <item name="colorPrimary">@color/briar_primary</item> - <item name="colorPrimaryDark">@color/briar_primary_dark</item> - <item name="colorAccent">@color/briar_accent</item> - </style> - <style name="BriarButton" parent="Widget.AppCompat.Button.Colored"> <item name="android:textSize">@dimen/text_size_medium</item> <item name="android:padding">@dimen/margin_large</item> @@ -131,15 +94,6 @@ <item name="android:paddingLeft">@dimen/margin_large</item> </style> - <!-- This fixes a UI bug in the support preference library --> - <style name="BriarTheme.ListSeparatorTextView"> - <item name="android:textSize">14sp</item> - <item name="android:textStyle">bold</item> - <item name="android:textColor">@color/briar_accent</item> - <item name="android:paddingTop">16dp</item> - <item name="android:layout_marginBottom">16dp</item> - </style> - <style name="DiscussionLevelIndicator"> <item name="android:layout_marginLeft">4dp</item> <item name="android:background">?android:attr/listDivider</item> diff --git a/briar-android/res/values/themes.xml b/briar-android/res/values/themes.xml new file mode 100644 index 0000000000..e87077f031 --- /dev/null +++ b/briar-android/res/values/themes.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <style name="BriarBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar"> + <item name="actionBarStyle">@style/BriarActionBar</item> + <item name="colorPrimary">@color/briar_primary</item> + <item name="colorPrimaryDark">@color/briar_primary_dark</item> + <item name="colorAccent">@color/briar_accent</item> + <item name="android:windowBackground">@color/window_background</item> + <item name="android:textColorPrimary">@color/briar_text_primary</item> + <item name="android:textColorPrimaryInverse">@color/briar_text_primary_inverse</item> + <item name="android:textColorSecondary">@color/briar_text_secondary</item> + <item name="android:textColorSecondaryInverse">@color/briar_text_secondary_inverse</item> + <item name="android:textColorTertiary">@color/briar_text_tertiary</item> + <item name="android:textColorTertiaryInverse">@color/briar_text_tertiary_inverse</item> + <item name="android:textColorLink">@color/briar_text_link</item> + </style> + + <style name="BriarThemeNoActionBar" parent="Theme.AppCompat.Light.NoActionBar"> + <item name="toolbarStyle">@style/BriarToolbar</item> + <item name="colorPrimary">@color/briar_primary</item> + <item name="colorPrimaryDark">@color/briar_primary_dark</item> + <item name="colorAccent">@color/briar_primary</item> + <item name="android:windowBackground">@color/window_background</item> + <item name="android:textColorPrimary">@color/briar_text_primary</item> + <item name="android:textColorPrimaryInverse">@color/briar_text_primary_inverse</item> + <item name="android:textColorSecondary">@color/briar_text_secondary</item> + <item name="android:textColorSecondaryInverse">@color/briar_text_secondary_inverse</item> + <item name="android:textColorTertiary">@color/briar_text_tertiary</item> + <item name="android:textColorTertiaryInverse">@color/briar_text_tertiary_inverse</item> + <item name="android:textColorLink">@color/briar_text_link</item> + </style> + + <style name="BriarThemeNoActionBar.Default"/> + + <style name="BriarTheme" parent="BriarBaseTheme"> + <item name="preferenceTheme">@style/PreferenceThemeOverlay</item> + <item name="android:listSeparatorTextViewStyle">@style/BriarTheme.ListSeparatorTextView</item> + </style> + + <style name="BriarDialogTheme" parent="Theme.AppCompat.Light.Dialog"> + <item name="colorPrimary">@color/briar_primary</item> + <item name="colorPrimaryDark">@color/briar_primary_dark</item> + <item name="colorAccent">@color/briar_accent</item> + <item name="android:textColorPrimary">@color/briar_text_primary</item> + <item name="android:textColorPrimaryInverse">@color/briar_text_primary_inverse</item> + <item name="android:textColorSecondary">@color/briar_text_secondary</item> + <item name="android:textColorSecondaryInverse">@color/briar_text_secondary_inverse</item> + <item name="android:textColorTertiary">@color/briar_text_tertiary</item> + <item name="android:textColorTertiaryInverse">@color/briar_text_tertiary_inverse</item> + <item name="android:textColorLink">@color/briar_text_link</item> + </style> + + <!-- This fixes a UI bug in the support preference library --> + <style name="BriarTheme.ListSeparatorTextView"> + <item name="android:textSize">14sp</item> + <item name="android:textStyle">bold</item> + <item name="android:textColor">@color/briar_accent</item> + <item name="android:paddingTop">16dp</item> + <item name="android:layout_marginBottom">16dp</item> + </style> + + +</resources> \ No newline at end of file -- GitLab