diff --git a/briar-android/res/drawable-hdpi/alerts_and_states_error.png b/briar-android/res/drawable-hdpi/alerts_and_states_error.png deleted file mode 100644 index 4ae44491ee6d84319192b2dc299a2e327ab24392..0000000000000000000000000000000000000000 Binary files a/briar-android/res/drawable-hdpi/alerts_and_states_error.png and /dev/null differ diff --git a/briar-android/res/drawable-hdpi/message_notification_icon.png b/briar-android/res/drawable-hdpi/message_notification_icon.png deleted file mode 100644 index 082c1000ac6087199b68fd43f6e4851691199ee7..0000000000000000000000000000000000000000 Binary files a/briar-android/res/drawable-hdpi/message_notification_icon.png and /dev/null differ diff --git a/briar-android/res/drawable-hdpi/msg_in.9.png b/briar-android/res/drawable-hdpi/msg_in.9.png index 20202244fa3d456a7edb956718dbbafdc1a69139..9a81763546e95b6934b49f2abc1bd9b1781f8202 100644 Binary files a/briar-android/res/drawable-hdpi/msg_in.9.png and b/briar-android/res/drawable-hdpi/msg_in.9.png differ diff --git a/briar-android/res/drawable-hdpi/msg_out.9.png b/briar-android/res/drawable-hdpi/msg_out.9.png index f8cfdc72674df433a123725aa7cea9593a5cd172..bd6a809ec3d17c9bb49d25bfd9e7c4f6c7ee1aba 100644 Binary files a/briar-android/res/drawable-hdpi/msg_out.9.png and b/briar-android/res/drawable-hdpi/msg_out.9.png differ diff --git a/briar-android/res/drawable-hdpi/navigation_accept.png b/briar-android/res/drawable-hdpi/navigation_accept.png deleted file mode 100644 index 58bf972171f199c359dcdb3bc6233ac84c7853d3..0000000000000000000000000000000000000000 Binary files a/briar-android/res/drawable-hdpi/navigation_accept.png and /dev/null differ diff --git a/briar-android/res/drawable-hdpi/notice_in.9.png b/briar-android/res/drawable-hdpi/notice_in.9.png index 5b8dd92ec4b00adc062222f13b8a6545683ca6da..1bc46ba174fb2aa0584a66b2438a6abbca83e487 100644 Binary files a/briar-android/res/drawable-hdpi/notice_in.9.png and b/briar-android/res/drawable-hdpi/notice_in.9.png differ diff --git a/briar-android/res/drawable-hdpi/notice_out.9.png b/briar-android/res/drawable-hdpi/notice_out.9.png index 504fe64d660ae044bd04e325fe8726c139123cc2..0d08d9e3efd3a6b7c41fc059944cc6a97d8c930e 100644 Binary files a/briar-android/res/drawable-hdpi/notice_out.9.png and b/briar-android/res/drawable-hdpi/notice_out.9.png differ diff --git a/briar-android/res/drawable-ldpi/message_notification_icon.png b/briar-android/res/drawable-ldpi/message_notification_icon.png deleted file mode 100644 index a88b8f5611705e61713160235273b102a42850a4..0000000000000000000000000000000000000000 Binary files a/briar-android/res/drawable-ldpi/message_notification_icon.png and /dev/null differ diff --git a/briar-android/res/drawable-mdpi/alerts_and_states_error.png b/briar-android/res/drawable-mdpi/alerts_and_states_error.png deleted file mode 100644 index 097c3bc236a3e79a540011a9af65a88c89153ab0..0000000000000000000000000000000000000000 Binary files a/briar-android/res/drawable-mdpi/alerts_and_states_error.png and /dev/null differ diff --git a/briar-android/res/drawable-mdpi/message_notification_icon.png b/briar-android/res/drawable-mdpi/message_notification_icon.png deleted file mode 100644 index e2d666cc7241b8ade31d14e9bb5bbbad52b5bae2..0000000000000000000000000000000000000000 Binary files a/briar-android/res/drawable-mdpi/message_notification_icon.png and /dev/null differ diff --git a/briar-android/res/drawable-mdpi/msg_in.9.png b/briar-android/res/drawable-mdpi/msg_in.9.png index cedf69450c3d62696584cb416c5b1c8e98e8afd2..8dcac8ebf635798e78ffca26afbec5a659af5110 100644 Binary files a/briar-android/res/drawable-mdpi/msg_in.9.png and b/briar-android/res/drawable-mdpi/msg_in.9.png differ diff --git a/briar-android/res/drawable-mdpi/msg_out.9.png b/briar-android/res/drawable-mdpi/msg_out.9.png index bfca75665bd844e7c47cf8f275aa6e54e7b50ea2..a971fa9ee52a0afd90ed7c905bc1d21ed0801ce7 100644 Binary files a/briar-android/res/drawable-mdpi/msg_out.9.png and b/briar-android/res/drawable-mdpi/msg_out.9.png differ diff --git a/briar-android/res/drawable-mdpi/navigation_accept.png b/briar-android/res/drawable-mdpi/navigation_accept.png deleted file mode 100644 index cf5fab3adf243318d11ec95448c6deae3f52d9b1..0000000000000000000000000000000000000000 Binary files a/briar-android/res/drawable-mdpi/navigation_accept.png and /dev/null differ diff --git a/briar-android/res/drawable-mdpi/notice_in.9.png b/briar-android/res/drawable-mdpi/notice_in.9.png index afad3fe8655de3f8e46d8fe0ac32afbb07f111dc..17344215d96729aac28d52e837e1b1609340369e 100644 Binary files a/briar-android/res/drawable-mdpi/notice_in.9.png and b/briar-android/res/drawable-mdpi/notice_in.9.png differ diff --git a/briar-android/res/drawable-mdpi/notice_out.9.png b/briar-android/res/drawable-mdpi/notice_out.9.png index c84866764c4ef993f6179685adcb6a58dd7d84d8..600e2bcfac66c9d153d801962eb8ea5519fd14e6 100644 Binary files a/briar-android/res/drawable-mdpi/notice_out.9.png and b/briar-android/res/drawable-mdpi/notice_out.9.png differ diff --git a/briar-android/res/drawable-xhdpi/alerts_and_states_error.png b/briar-android/res/drawable-xhdpi/alerts_and_states_error.png deleted file mode 100644 index 3baea558712247ba9aac5c05410bc2d439799d99..0000000000000000000000000000000000000000 Binary files a/briar-android/res/drawable-xhdpi/alerts_and_states_error.png and /dev/null differ diff --git a/briar-android/res/drawable-xhdpi/message_notification_icon.png b/briar-android/res/drawable-xhdpi/message_notification_icon.png deleted file mode 100644 index b965d932070a7406007e746e9c5266f9de9031c1..0000000000000000000000000000000000000000 Binary files a/briar-android/res/drawable-xhdpi/message_notification_icon.png and /dev/null differ diff --git a/briar-android/res/drawable-xhdpi/msg_in.9.png b/briar-android/res/drawable-xhdpi/msg_in.9.png index 8bf845198fc2c05e65ecd032eedcbae5d706568c..35e4f5309ccaf730e48611430c9d2fcdee1bb710 100644 Binary files a/briar-android/res/drawable-xhdpi/msg_in.9.png and b/briar-android/res/drawable-xhdpi/msg_in.9.png differ diff --git a/briar-android/res/drawable-xhdpi/msg_out.9.png b/briar-android/res/drawable-xhdpi/msg_out.9.png index dd5521a5fcab3d213175fafc946f172ff22c412d..39ca327f4fb0ccc7810f296ae2a0ed36c5f7c2a4 100644 Binary files a/briar-android/res/drawable-xhdpi/msg_out.9.png and b/briar-android/res/drawable-xhdpi/msg_out.9.png differ diff --git a/briar-android/res/drawable-xhdpi/navigation_accept.png b/briar-android/res/drawable-xhdpi/navigation_accept.png deleted file mode 100644 index b8915716e06792d926f397a7b17346f656c86aa1..0000000000000000000000000000000000000000 Binary files a/briar-android/res/drawable-xhdpi/navigation_accept.png and /dev/null differ diff --git a/briar-android/res/drawable-xhdpi/notice_in.9.png b/briar-android/res/drawable-xhdpi/notice_in.9.png index 9af342757d22b3d1e0860f508895ba02d6eb4cdb..3b3af46839122a4c3473afd4b155e203b2e09077 100644 Binary files a/briar-android/res/drawable-xhdpi/notice_in.9.png and b/briar-android/res/drawable-xhdpi/notice_in.9.png differ diff --git a/briar-android/res/drawable-xhdpi/notice_out.9.png b/briar-android/res/drawable-xhdpi/notice_out.9.png index 3cd51f5900209c456ab2d48f3505603ba716c8d4..2a4c85db1244cc5b14e4b18378e72a3e3940961b 100644 Binary files a/briar-android/res/drawable-xhdpi/notice_out.9.png and b/briar-android/res/drawable-xhdpi/notice_out.9.png differ diff --git a/briar-android/res/drawable-xxhdpi/msg_in.9.png b/briar-android/res/drawable-xxhdpi/msg_in.9.png index 1330b80faccd4128c7efd9298323a1f0dba317e0..cee5a53b031ba82db68e6683c43e5f5c10b54762 100644 Binary files a/briar-android/res/drawable-xxhdpi/msg_in.9.png and b/briar-android/res/drawable-xxhdpi/msg_in.9.png differ diff --git a/briar-android/res/drawable-xxhdpi/msg_out.9.png b/briar-android/res/drawable-xxhdpi/msg_out.9.png index 866bc8c29dd37708cfba9ba592f4c6728fb2d177..3f4603ad4280357ad8ca3823c4db78c73dffd328 100644 Binary files a/briar-android/res/drawable-xxhdpi/msg_out.9.png and b/briar-android/res/drawable-xxhdpi/msg_out.9.png differ diff --git a/briar-android/res/drawable-xxhdpi/notice_in.9.png b/briar-android/res/drawable-xxhdpi/notice_in.9.png index 690bdd2994b21459c1d2b3b0ba2c89ddd3f7ef45..8d001ab0b6e20df77531fe1ca19a507a5fafb4a9 100644 Binary files a/briar-android/res/drawable-xxhdpi/notice_in.9.png and b/briar-android/res/drawable-xxhdpi/notice_in.9.png differ diff --git a/briar-android/res/drawable-xxhdpi/notice_out.9.png b/briar-android/res/drawable-xxhdpi/notice_out.9.png index d1a632b6ed1b0c86dc03f88513465d4068e509ad..0b1e403dd1c4f5c492123e380d4c8488d91d402f 100644 Binary files a/briar-android/res/drawable-xxhdpi/notice_out.9.png and b/briar-android/res/drawable-xxhdpi/notice_out.9.png differ diff --git a/briar-android/res/drawable/alerts_and_states_error.xml b/briar-android/res/drawable/alerts_and_states_error.xml new file mode 100644 index 0000000000000000000000000000000000000000..b84f896b671ff0b86f86635464621103e3ff0f78 --- /dev/null +++ b/briar-android/res/drawable/alerts_and_states_error.xml @@ -0,0 +1,5 @@ +<vector android:alpha="0.54" android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#FF000000" android:pathData="M15.73,3L8.27,3L3,8.27v7.46L8.27,21h7.46L21,15.73L21,8.27L15.73,3zM12,17.3c-0.72,0 -1.3,-0.58 -1.3,-1.3 0,-0.72 0.58,-1.3 1.3,-1.3 0.72,0 1.3,0.58 1.3,1.3 0,0.72 -0.58,1.3 -1.3,1.3zM13,13h-2L11,7h2v6z"/> +</vector> diff --git a/briar-android/res/drawable/message_notification_icon.xml b/briar-android/res/drawable/message_notification_icon.xml new file mode 100644 index 0000000000000000000000000000000000000000..c300537f64796324e4e6a104a7786a881750dc64 --- /dev/null +++ b/briar-android/res/drawable/message_notification_icon.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/> +</vector> diff --git a/briar-android/res/drawable/navigation_accept.xml b/briar-android/res/drawable/navigation_accept.xml new file mode 100644 index 0000000000000000000000000000000000000000..8dcd06dd6d808c2f5a00f243032c9aa9587a097b --- /dev/null +++ b/briar-android/res/drawable/navigation_accept.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:alpha="0.54" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + <path + android:fillColor="#FF000000" + android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/> +</vector> diff --git a/briar-android/res/layout/list_item_introduction_in.xml b/briar-android/res/layout/list_item_introduction_in.xml index 8d197e6eb8c160dce47d66f65a177ab40ea2a5a0..db40b47864c8f4407c55fcc61b248adc92be9011 100644 --- a/briar-android/res/layout/list_item_introduction_in.xml +++ b/briar-android/res/layout/list_item_introduction_in.xml @@ -14,29 +14,29 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="left|start" - android:background="@drawable/notice_in" android:layout_marginLeft="@dimen/message_bubble_margin_tail" - android:layout_marginRight="@dimen/message_bubble_margin_non_tail"> + android:layout_marginRight="@dimen/message_bubble_margin_non_tail" + android:background="@drawable/notice_in"> <TextView android:id="@+id/introductionText" android:layout_width="wrap_content" android:layout_height="wrap_content" android:minWidth="80dp" + android:textColor="@color/briar_text_secondary" 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 android:id="@+id/introductionTime" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/message_bubble_timestamp_margin" android:layout_alignEnd="@+id/introductionText" android:layout_alignRight="@+id/introductionText" android:layout_below="@+id/declineButton" + android:layout_marginTop="@dimen/message_bubble_timestamp_margin" android:textColor="@color/private_message_date" android:textSize="@dimen/text_size_tiny" tools:text="Dec 24, 13:37"/> @@ -56,8 +56,8 @@ style="@style/BriarButtonFlat.Negative" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="-15dp" android:layout_below="@+id/introductionText" + android:layout_marginBottom="-15dp" android:layout_toLeftOf="@+id/acceptButton" android:layout_toStartOf="@+id/acceptButton" android:text="@string/decline"/> diff --git a/briar-android/res/layout/list_item_msg_in.xml b/briar-android/res/layout/list_item_msg_in.xml index e75ede04917bf71801b7ac3594d0d3228865049e..1858c1cc8693786c933093d20379bcc5425d6b9f 100644 --- a/briar-android/res/layout/list_item_msg_in.xml +++ b/briar-android/res/layout/list_item_msg_in.xml @@ -14,9 +14,9 @@ android:id="@+id/msgBody" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:textColor="@color/briar_text_primary" 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_msg_out.xml b/briar-android/res/layout/list_item_msg_out.xml index 5902b7381e122a3791fa3e9e8843920020f20ce9..34de5a9dd240b30144d90f96dce0be5aa806b15e 100644 --- a/briar-android/res/layout/list_item_msg_out.xml +++ b/briar-android/res/layout/list_item_msg_out.xml @@ -11,9 +11,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right|end" - android:background="@drawable/msg_out" android:layout_marginLeft="@dimen/message_bubble_margin_non_tail" - android:layout_marginRight="@dimen/message_bubble_margin_tail"> + android:layout_marginRight="@dimen/message_bubble_margin_tail" + android:background="@drawable/msg_out"> <TextView android:id="@+id/msgBody" @@ -28,11 +28,11 @@ android:id="@+id/msgTime" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/message_bubble_timestamp_margin" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:layout_below="@+id/msgBody" - android:singleLine="true" + android:layout_marginTop="@dimen/message_bubble_timestamp_margin" + android:maxLines="1" android:textColor="@color/private_message_date_inverse" android:textSize="@dimen/text_size_tiny" tools:text="Dec 24, 13:37"/> diff --git a/briar-android/res/values/dimens.xml b/briar-android/res/values/dimens.xml index de80d0880e2f2fe40175f3c5544b570c40056966..7c676e61aee591c01dc4a36dee1c189dd59247b1 100644 --- a/briar-android/res/values/dimens.xml +++ b/briar-android/res/values/dimens.xml @@ -36,9 +36,9 @@ <dimen name="unread_bubble_padding_horizontal">6dp</dimen> <dimen name="unread_bubble_size">19dp</dimen> - <dimen name="message_bubble_margin_tail">14dp</dimen> - <dimen name="message_bubble_margin_non_tail">51dp</dimen> - <dimen name="message_bubble_timestamp_margin">15dp</dimen> + <dimen name="message_bubble_margin_tail">3dp</dimen> + <dimen name="message_bubble_margin_non_tail">30dp</dimen> + <dimen name="message_bubble_timestamp_margin">7dp</dimen> <dimen name="forum_nested_line_width">2dp</dimen> <dimen name="forum_nested_indicator">24dp</dimen> <dimen name="forum_avatar_size">20dp</dimen>