From 3ac70d4b868df47d14aedc104d1691b8597c5e1f Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Tue, 8 Jul 2014 11:41:19 +0200 Subject: [PATCH] uniformed colors. made colors a little material --- res/drawable/es_slidingpane_shadow.xml | 4 +-- res/drawable/message_border.xml | 2 +- res/drawable/section_header.xml | 4 +-- .../fragment_conversations_overview.xml | 7 +++-- .../fragment_conversations_overview.xml | 7 +++-- .../fragment_conversations_overview.xml | 7 +++-- .../fragment_conversations_overview.xml | 7 +++-- .../fragment_conversations_overview.xml | 7 +++-- res/layout/account_row.xml | 5 ++-- res/layout/activity_contact_details.xml | 26 ++++++++++-------- res/layout/activity_muc_details.xml | 27 ++++++++++--------- res/layout/contact.xml | 6 ++--- res/layout/contact_key.xml | 4 +-- res/layout/conversation_list_row.xml | 11 ++++---- res/layout/dialog_verify_otr.xml | 21 ++++++++------- res/layout/edit_contact_name.xml | 2 +- res/layout/fragment_conversation.xml | 11 ++++---- res/layout/manage_accounts.xml | 3 ++- res/layout/message_recieved.xml | 12 ++++----- res/layout/message_sent.xml | 12 ++++----- res/values-fr/styles.xml | 19 ------------- res/values/colors.xml | 9 +++++++ res/values/strings.xml | 2 ++ 23 files changed, 107 insertions(+), 108 deletions(-) delete mode 100644 res/values-fr/styles.xml create mode 100644 res/values/colors.xml diff --git a/res/drawable/es_slidingpane_shadow.xml b/res/drawable/es_slidingpane_shadow.xml index 8c2cefc2..5b6037f7 100644 --- a/res/drawable/es_slidingpane_shadow.xml +++ b/res/drawable/es_slidingpane_shadow.xml @@ -1,7 +1,7 @@ + android:endColor="@color/divider" + android:startColor="@android:color/transparent" /> \ No newline at end of file diff --git a/res/drawable/message_border.xml b/res/drawable/message_border.xml index 1477fbe8..4a581e7d 100644 --- a/res/drawable/message_border.xml +++ b/res/drawable/message_border.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/res/drawable/section_header.xml b/res/drawable/section_header.xml index 25f148ce..e4cb9742 100644 --- a/res/drawable/section_header.xml +++ b/res/drawable/section_header.xml @@ -4,7 +4,7 @@ + android:width="2000dp" /> - + \ No newline at end of file diff --git a/res/layout-sw320dp/fragment_conversations_overview.xml b/res/layout-sw320dp/fragment_conversations_overview.xml index fcb1949c..b85f1116 100644 --- a/res/layout-sw320dp/fragment_conversations_overview.xml +++ b/res/layout-sw320dp/fragment_conversations_overview.xml @@ -7,16 +7,16 @@ android:layout_width="288dp" android:layout_height="match_parent" android:orientation="vertical" - android:background="#eeeeee" + android:background="@color/primarybackground" > @@ -25,7 +25,6 @@ android:layout_width="fill_parent" android:layout_height="match_parent" android:layout_weight="1" - android:background="#e5e5e5" android:orientation="vertical"> \ No newline at end of file diff --git a/res/layout-sw360dp/fragment_conversations_overview.xml b/res/layout-sw360dp/fragment_conversations_overview.xml index 939950c2..ceb3b5fa 100644 --- a/res/layout-sw360dp/fragment_conversations_overview.xml +++ b/res/layout-sw360dp/fragment_conversations_overview.xml @@ -7,16 +7,16 @@ android:layout_width="324dp" android:layout_height="match_parent" android:orientation="vertical" - android:background="#eeeeee" + android:background="@color/primarybackground" > @@ -25,7 +25,6 @@ android:layout_width="fill_parent" android:layout_height="match_parent" android:layout_weight="1" - android:background="#e5e5e5" android:orientation="vertical"> \ No newline at end of file diff --git a/res/layout-sw384dp/fragment_conversations_overview.xml b/res/layout-sw384dp/fragment_conversations_overview.xml index e48cf9ec..26d79d23 100644 --- a/res/layout-sw384dp/fragment_conversations_overview.xml +++ b/res/layout-sw384dp/fragment_conversations_overview.xml @@ -7,16 +7,16 @@ android:layout_width="345dp" android:layout_height="match_parent" android:orientation="vertical" - android:background="#eeeeee" + android:background="@color/primarybackground" > @@ -25,7 +25,6 @@ android:layout_width="fill_parent" android:layout_height="match_parent" android:layout_weight="1" - android:background="#e5e5e5" android:orientation="vertical"> \ No newline at end of file diff --git a/res/layout-sw600dp/fragment_conversations_overview.xml b/res/layout-sw600dp/fragment_conversations_overview.xml index fac95f9c..f26c840b 100644 --- a/res/layout-sw600dp/fragment_conversations_overview.xml +++ b/res/layout-sw600dp/fragment_conversations_overview.xml @@ -7,16 +7,16 @@ android:layout_width="240dp" android:layout_height="match_parent" android:orientation="vertical" - android:background="#eeeeee" + android:background="@color/primarybackground" > @@ -25,7 +25,6 @@ android:layout_width="fill_parent" android:layout_height="match_parent" android:layout_weight="1" - android:background="#e5e5e5" android:orientation="vertical"> \ No newline at end of file diff --git a/res/layout-sw720dp/fragment_conversations_overview.xml b/res/layout-sw720dp/fragment_conversations_overview.xml index fcb1949c..b85f1116 100644 --- a/res/layout-sw720dp/fragment_conversations_overview.xml +++ b/res/layout-sw720dp/fragment_conversations_overview.xml @@ -7,16 +7,16 @@ android:layout_width="288dp" android:layout_height="match_parent" android:orientation="vertical" - android:background="#eeeeee" + android:background="@color/primarybackground" > @@ -25,7 +25,6 @@ android:layout_width="fill_parent" android:layout_height="match_parent" android:layout_weight="1" - android:background="#e5e5e5" android:orientation="vertical"> \ No newline at end of file diff --git a/res/layout/account_row.xml b/res/layout/account_row.xml index 248b17f7..0c18d9b2 100644 --- a/res/layout/account_row.xml +++ b/res/layout/account_row.xml @@ -20,6 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="18sp" + android:textColor="@color/primarytext" android:singleLine="true" android:scrollHorizontally="false"/> @@ -35,14 +36,14 @@ android:layout_height="wrap_content" android:text="@string/account_status" android:textStyle="bold" - android:textSize="14sp" /> + android:textSize="14sp" + android:textColor="@color/primarytext"/> diff --git a/res/layout/activity_contact_details.xml b/res/layout/activity_contact_details.xml index ae3aaf7c..d55dcc9c 100644 --- a/res/layout/activity_contact_details.xml +++ b/res/layout/activity_contact_details.xml @@ -2,7 +2,7 @@ + android:background="@color/primarybackground"> + android:text="@string/action_contact_details" + android:textColor="@color/primarytext"/> + android:textSize="14sp" + android:textColor="@color/primarytext"/> + android:textSize="14sp" + android:textColor="@color/primarytext"/> @@ -71,20 +73,22 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="8dp" - android:text="@string/your_account" /> + android:text="@string/your_account" + android:textColor="@color/primarytext"/> + android:textColor="@color/primarytext" /> + android:text="@string/subscriptions" + android:textColor="@color/primarytext"/> + android:textColor="@color/primarytext" /> + android:textColor="@color/primarytext" /> + android:background="@color/secondarybackground"> + android:text="@string/muc_details_conference" + android:textColor="@color/primarytext"/> + android:background="@color/primarybackground" > + android:textSize="14sp" + android:textColor="@color/primarytext"/> + android:text="@string/muc_details_your_nickname" + android:textColor="@color/primarytext"/> + android:background="@color/primarybackground" > + android:textColor="@color/primarytext"/> + android:text="@string/muc_details_other_members" + android:textColor="@color/primarytext"/> diff --git a/res/layout/contact_key.xml b/res/layout/contact_key.xml index dcac42e9..0c457c25 100644 --- a/res/layout/contact_key.xml +++ b/res/layout/contact_key.xml @@ -10,13 +10,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="18sp" - android:textColor="#5b5b5b" + android:textColor="@color/primarytext" android:typeface="monospace" /> \ No newline at end of file diff --git a/res/layout/conversation_list_row.xml b/res/layout/conversation_list_row.xml index 8b9c461d..97985737 100644 --- a/res/layout/conversation_list_row.xml +++ b/res/layout/conversation_list_row.xml @@ -25,8 +25,8 @@ android:layout_alignLeft="@+id/conversation_lastwrapper" android:layout_toLeftOf="@+id/conversation_lastupdate" android:singleLine="true" - android:textColor="#636363" android:textSize="18sp" + android:textColor="@color/primarytext" android:typeface="sans" /> @@ -52,7 +51,7 @@ android:id="@+id/conversation_lastimage" android:layout_width="fill_parent" android:layout_height="36dp" - android:background="#333333" + android:background="@color/primarytext" android:scaleType="centerCrop" /> @@ -63,8 +62,8 @@ android:layout_alignBaseline="@+id/conversation_name" android:layout_alignParentRight="true" android:gravity="right" - android:textColor="#636363" - android:textSize="12sp" /> + android:textSize="12sp" + android:textColor="@color/secondarytext"/> diff --git a/res/layout/dialog_verify_otr.xml b/res/layout/dialog_verify_otr.xml index a55dce01..c518c647 100644 --- a/res/layout/dialog_verify_otr.xml +++ b/res/layout/dialog_verify_otr.xml @@ -12,7 +12,7 @@ android:layout_height="wrap_content" android:paddingTop="8dp" android:text="Jabber ID" - android:textColor="#33B5E5" + android:textColor="@color/primarytext" android:textSize="18sp"/> + android:textSize="14sp" + android:textColor="@color/secondarytext"/> + android:typeface="monospace" + android:textColor="@color/secondarytext"/> + android:text="@string/your_fingerprint" + android:textSize="18sp" + android:textColor="@color/primarytext"/> + android:typeface="monospace" + android:textColor="@color/secondarytext"/> diff --git a/res/layout/edit_contact_name.xml b/res/layout/edit_contact_name.xml index 206c7432..42f0fb88 100644 --- a/res/layout/edit_contact_name.xml +++ b/res/layout/edit_contact_name.xml @@ -10,7 +10,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/enter_new_name" - android:textColor="#5b5b5b" + android:textColor="@color/primarytext" android:textSize="18sp" /> + android:background="@color/primarybackground" > + android:background="@color/primarybackground" > + android:paddingTop="12dp" + android:textColor="@color/primarytext"> @@ -49,7 +50,7 @@ android:layout_above="@+id/textsend" android:layout_alignParentLeft="true" android:layout_below="@+id/info_box" - android:background="#e5e5e5" + android:background="@color/secondarybackground" android:divider="@null" android:dividerHeight="0dp" android:listSelector="@android:color/transparent" diff --git a/res/layout/manage_accounts.xml b/res/layout/manage_accounts.xml index 0866477a..a2a01bf1 100644 --- a/res/layout/manage_accounts.xml +++ b/res/layout/manage_accounts.xml @@ -8,7 +8,8 @@ android:id="@+id/account_list" android:layout_width="fill_parent" android:layout_height="wrap_content" - tools:listitem="@layout/account_row"> + android:divider="@color/divider" + android:dividerHeight="1dp"> \ No newline at end of file diff --git a/res/layout/message_recieved.xml b/res/layout/message_recieved.xml index 7949f2e1..563d730d 100644 --- a/res/layout/message_recieved.xml +++ b/res/layout/message_recieved.xml @@ -20,7 +20,7 @@ + android:textSize="14sp" + android:textColor="@color/primarytext"/>