diff --git a/briar-android/build.gradle b/briar-android/build.gradle index 152fe1708..564c6e6c4 100644 --- a/briar-android/build.gradle +++ b/briar-android/build.gradle @@ -155,7 +155,7 @@ task verifyTranslations { def folders = ["default", "en-US"] project.file("src/main/res").eachDir { dir -> - if (dir.name.startsWith("values-") && !dir.name.endsWith("night")) { + if (dir.name.startsWith("values-") && !dir.name.endsWith("night") && !dir.name.endsWith("v21")) { folders.add(dir.name.substring(7).replace("-r", "-")) } } diff --git a/briar-android/src/main/res/drawable-hdpi/msg_in.9.png b/briar-android/src/main/res/drawable-hdpi/msg_in.9.png deleted file mode 100644 index 9a8176354..000000000 Binary files a/briar-android/src/main/res/drawable-hdpi/msg_in.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-hdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-hdpi/msg_in_top.9.png deleted file mode 100644 index bcff2b787..000000000 Binary files a/briar-android/src/main/res/drawable-hdpi/msg_in_top.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-hdpi/msg_out.9.png b/briar-android/src/main/res/drawable-hdpi/msg_out.9.png deleted file mode 100644 index bd6a809ec..000000000 Binary files a/briar-android/src/main/res/drawable-hdpi/msg_out.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-hdpi/msg_out_top.9.png b/briar-android/src/main/res/drawable-hdpi/msg_out_top.9.png deleted file mode 100644 index b6898258a..000000000 Binary files a/briar-android/src/main/res/drawable-hdpi/msg_out_top.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-hdpi/notice_in.9.png b/briar-android/src/main/res/drawable-hdpi/notice_in.9.png deleted file mode 100644 index 1bc46ba17..000000000 Binary files a/briar-android/src/main/res/drawable-hdpi/notice_in.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-hdpi/notice_in_bottom.9.png b/briar-android/src/main/res/drawable-hdpi/notice_in_bottom.9.png deleted file mode 100644 index 9c5916e12..000000000 Binary files a/briar-android/src/main/res/drawable-hdpi/notice_in_bottom.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-hdpi/notice_out.9.png b/briar-android/src/main/res/drawable-hdpi/notice_out.9.png deleted file mode 100644 index 0d08d9e3e..000000000 Binary files a/briar-android/src/main/res/drawable-hdpi/notice_out.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-hdpi/notice_out_bottom.9.png b/briar-android/src/main/res/drawable-hdpi/notice_out_bottom.9.png deleted file mode 100644 index b94109764..000000000 Binary files a/briar-android/src/main/res/drawable-hdpi/notice_out_bottom.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-mdpi/msg_in.9.png b/briar-android/src/main/res/drawable-mdpi/msg_in.9.png deleted file mode 100644 index 8dcac8ebf..000000000 Binary files a/briar-android/src/main/res/drawable-mdpi/msg_in.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-mdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-mdpi/msg_in_top.9.png deleted file mode 100644 index 0307d2f68..000000000 Binary files a/briar-android/src/main/res/drawable-mdpi/msg_in_top.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-mdpi/msg_out.9.png b/briar-android/src/main/res/drawable-mdpi/msg_out.9.png deleted file mode 100644 index a971fa9ee..000000000 Binary files a/briar-android/src/main/res/drawable-mdpi/msg_out.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-mdpi/msg_out_top.9.png b/briar-android/src/main/res/drawable-mdpi/msg_out_top.9.png deleted file mode 100644 index 526edd212..000000000 Binary files a/briar-android/src/main/res/drawable-mdpi/msg_out_top.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-mdpi/notice_in.9.png b/briar-android/src/main/res/drawable-mdpi/notice_in.9.png deleted file mode 100644 index 17344215d..000000000 Binary files a/briar-android/src/main/res/drawable-mdpi/notice_in.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-mdpi/notice_in_bottom.9.png b/briar-android/src/main/res/drawable-mdpi/notice_in_bottom.9.png deleted file mode 100644 index f64d08347..000000000 Binary files a/briar-android/src/main/res/drawable-mdpi/notice_in_bottom.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-mdpi/notice_out.9.png b/briar-android/src/main/res/drawable-mdpi/notice_out.9.png deleted file mode 100644 index 600e2bcfa..000000000 Binary files a/briar-android/src/main/res/drawable-mdpi/notice_out.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-mdpi/notice_out_bottom.9.png b/briar-android/src/main/res/drawable-mdpi/notice_out_bottom.9.png deleted file mode 100644 index 674b59a31..000000000 Binary files a/briar-android/src/main/res/drawable-mdpi/notice_out_bottom.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-night-hdpi/msg_in.9.png b/briar-android/src/main/res/drawable-night-hdpi/msg_in.9.png deleted file mode 100644 index 008d7833b..000000000 Binary files a/briar-android/src/main/res/drawable-night-hdpi/msg_in.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-night-hdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-night-hdpi/msg_in_top.9.png deleted file mode 100644 index 4d34c5065..000000000 Binary files a/briar-android/src/main/res/drawable-night-hdpi/msg_in_top.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-night-mdpi/msg_in.9.png b/briar-android/src/main/res/drawable-night-mdpi/msg_in.9.png deleted file mode 100644 index 4b8904541..000000000 Binary files a/briar-android/src/main/res/drawable-night-mdpi/msg_in.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-night-mdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-night-mdpi/msg_in_top.9.png deleted file mode 100644 index ebad24e9f..000000000 Binary files a/briar-android/src/main/res/drawable-night-mdpi/msg_in_top.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-night-xhdpi/msg_in.9.png b/briar-android/src/main/res/drawable-night-xhdpi/msg_in.9.png deleted file mode 100644 index 13597cfa4..000000000 Binary files a/briar-android/src/main/res/drawable-night-xhdpi/msg_in.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-night-xhdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-night-xhdpi/msg_in_top.9.png deleted file mode 100644 index c3b950d4b..000000000 Binary files a/briar-android/src/main/res/drawable-night-xhdpi/msg_in_top.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-night-xxhdpi/msg_in.9.png b/briar-android/src/main/res/drawable-night-xxhdpi/msg_in.9.png deleted file mode 100644 index cef3f185e..000000000 Binary files a/briar-android/src/main/res/drawable-night-xxhdpi/msg_in.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-night-xxhdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-night-xxhdpi/msg_in_top.9.png deleted file mode 100644 index 60ea93838..000000000 Binary files a/briar-android/src/main/res/drawable-night-xxhdpi/msg_in_top.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-xhdpi/msg_in.9.png b/briar-android/src/main/res/drawable-xhdpi/msg_in.9.png deleted file mode 100644 index 35e4f5309..000000000 Binary files a/briar-android/src/main/res/drawable-xhdpi/msg_in.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-xhdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-xhdpi/msg_in_top.9.png deleted file mode 100644 index eba9138bc..000000000 Binary files a/briar-android/src/main/res/drawable-xhdpi/msg_in_top.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-xhdpi/msg_out.9.png b/briar-android/src/main/res/drawable-xhdpi/msg_out.9.png deleted file mode 100644 index 39ca327f4..000000000 Binary files a/briar-android/src/main/res/drawable-xhdpi/msg_out.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-xhdpi/msg_out_top.9.png b/briar-android/src/main/res/drawable-xhdpi/msg_out_top.9.png deleted file mode 100644 index f06ff20ba..000000000 Binary files a/briar-android/src/main/res/drawable-xhdpi/msg_out_top.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-xhdpi/notice_in.9.png b/briar-android/src/main/res/drawable-xhdpi/notice_in.9.png deleted file mode 100644 index 3b3af4683..000000000 Binary files a/briar-android/src/main/res/drawable-xhdpi/notice_in.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-xhdpi/notice_in_bottom.9.png b/briar-android/src/main/res/drawable-xhdpi/notice_in_bottom.9.png deleted file mode 100644 index 5d7ba38cc..000000000 Binary files a/briar-android/src/main/res/drawable-xhdpi/notice_in_bottom.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-xhdpi/notice_out.9.png b/briar-android/src/main/res/drawable-xhdpi/notice_out.9.png deleted file mode 100644 index 2a4c85db1..000000000 Binary files a/briar-android/src/main/res/drawable-xhdpi/notice_out.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-xhdpi/notice_out_bottom.9.png b/briar-android/src/main/res/drawable-xhdpi/notice_out_bottom.9.png deleted file mode 100644 index a9a19763d..000000000 Binary files a/briar-android/src/main/res/drawable-xhdpi/notice_out_bottom.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-xxhdpi/msg_in.9.png b/briar-android/src/main/res/drawable-xxhdpi/msg_in.9.png deleted file mode 100644 index cee5a53b0..000000000 Binary files a/briar-android/src/main/res/drawable-xxhdpi/msg_in.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-xxhdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-xxhdpi/msg_in_top.9.png deleted file mode 100644 index e9829962e..000000000 Binary files a/briar-android/src/main/res/drawable-xxhdpi/msg_in_top.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-xxhdpi/msg_out.9.png b/briar-android/src/main/res/drawable-xxhdpi/msg_out.9.png deleted file mode 100644 index 3f4603ad4..000000000 Binary files a/briar-android/src/main/res/drawable-xxhdpi/msg_out.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-xxhdpi/msg_out_top.9.png b/briar-android/src/main/res/drawable-xxhdpi/msg_out_top.9.png deleted file mode 100644 index 054f45de3..000000000 Binary files a/briar-android/src/main/res/drawable-xxhdpi/msg_out_top.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-xxhdpi/notice_in.9.png b/briar-android/src/main/res/drawable-xxhdpi/notice_in.9.png deleted file mode 100644 index 8d001ab0b..000000000 Binary files a/briar-android/src/main/res/drawable-xxhdpi/notice_in.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-xxhdpi/notice_in_bottom.9.png b/briar-android/src/main/res/drawable-xxhdpi/notice_in_bottom.9.png deleted file mode 100644 index 1a9a07a5e..000000000 Binary files a/briar-android/src/main/res/drawable-xxhdpi/notice_in_bottom.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-xxhdpi/notice_out.9.png b/briar-android/src/main/res/drawable-xxhdpi/notice_out.9.png deleted file mode 100644 index 0b1e403dd..000000000 Binary files a/briar-android/src/main/res/drawable-xxhdpi/notice_out.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable-xxhdpi/notice_out_bottom.9.png b/briar-android/src/main/res/drawable-xxhdpi/notice_out_bottom.9.png deleted file mode 100644 index c23063319..000000000 Binary files a/briar-android/src/main/res/drawable-xxhdpi/notice_out_bottom.9.png and /dev/null differ diff --git a/briar-android/src/main/res/drawable/msg_in.xml b/briar-android/src/main/res/drawable/msg_in.xml new file mode 100644 index 000000000..14b8d7d83 --- /dev/null +++ b/briar-android/src/main/res/drawable/msg_in.xml @@ -0,0 +1,20 @@ + + + + + + + diff --git a/briar-android/src/main/res/drawable/msg_in_top.xml b/briar-android/src/main/res/drawable/msg_in_top.xml new file mode 100644 index 000000000..236c82b75 --- /dev/null +++ b/briar-android/src/main/res/drawable/msg_in_top.xml @@ -0,0 +1,20 @@ + + + + + + + diff --git a/briar-android/src/main/res/drawable/msg_out.xml b/briar-android/src/main/res/drawable/msg_out.xml new file mode 100644 index 000000000..35fa220ad --- /dev/null +++ b/briar-android/src/main/res/drawable/msg_out.xml @@ -0,0 +1,20 @@ + + + + + + + diff --git a/briar-android/src/main/res/drawable/msg_out_top.xml b/briar-android/src/main/res/drawable/msg_out_top.xml new file mode 100644 index 000000000..fe6299634 --- /dev/null +++ b/briar-android/src/main/res/drawable/msg_out_top.xml @@ -0,0 +1,20 @@ + + + + + + + diff --git a/briar-android/src/main/res/drawable/notice_in.xml b/briar-android/src/main/res/drawable/notice_in.xml new file mode 100644 index 000000000..fbfaa069b --- /dev/null +++ b/briar-android/src/main/res/drawable/notice_in.xml @@ -0,0 +1,20 @@ + + + + + + + diff --git a/briar-android/src/main/res/drawable/notice_in_bottom.xml b/briar-android/src/main/res/drawable/notice_in_bottom.xml new file mode 100644 index 000000000..5f6b29663 --- /dev/null +++ b/briar-android/src/main/res/drawable/notice_in_bottom.xml @@ -0,0 +1,20 @@ + + + + + + + diff --git a/briar-android/src/main/res/drawable/notice_out.xml b/briar-android/src/main/res/drawable/notice_out.xml new file mode 100644 index 000000000..8734935cf --- /dev/null +++ b/briar-android/src/main/res/drawable/notice_out.xml @@ -0,0 +1,20 @@ + + + + + + + diff --git a/briar-android/src/main/res/drawable/notice_out_bottom.xml b/briar-android/src/main/res/drawable/notice_out_bottom.xml new file mode 100644 index 000000000..6479a753e --- /dev/null +++ b/briar-android/src/main/res/drawable/notice_out_bottom.xml @@ -0,0 +1,20 @@ + + + + + + + diff --git a/briar-android/src/main/res/layout/list_item_conversation_msg_in.xml b/briar-android/src/main/res/layout/list_item_conversation_msg_in.xml index 3ef6f3a07..d2c83738c 100644 --- a/briar-android/src/main/res/layout/list_item_conversation_msg_in.xml +++ b/briar-android/src/main/res/layout/list_item_conversation_msg_in.xml @@ -5,9 +5,12 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/message_bubble_margin" android:layout_marginLeft="@dimen/message_bubble_margin_tail" android:layout_marginRight="@dimen/message_bubble_margin_non_tail" + android:layout_marginTop="@dimen/message_bubble_margin" android:background="@drawable/msg_in" + android:elevation="@dimen/message_bubble_elevation" android:orientation="vertical"> diff --git a/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml b/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml index ab0f325ed..58f9ad862 100644 --- a/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml +++ b/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml @@ -11,9 +11,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right|end" + android:layout_marginBottom="@dimen/message_bubble_margin" android:layout_marginLeft="@dimen/message_bubble_margin_non_tail" android:layout_marginRight="@dimen/message_bubble_margin_tail" - android:background="@drawable/msg_out"> + android:layout_marginTop="@dimen/message_bubble_margin" + android:background="@drawable/msg_out" + android:elevation="@dimen/message_bubble_elevation"> + android:background="@drawable/notice_in_bottom" + android:elevation="@dimen/message_bubble_elevation"> diff --git a/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml b/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml index a1aadd1df..50e369a77 100644 --- a/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml +++ b/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml @@ -5,6 +5,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/message_bubble_margin" android:orientation="vertical"> @@ -22,16 +24,18 @@ android:id="@+id/layout" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/message_bubble_margin" android:layout_marginLeft="@dimen/message_bubble_margin_non_tail" android:layout_marginRight="@dimen/message_bubble_margin_tail" - android:background="@drawable/notice_out_bottom"> + android:background="@drawable/notice_out_bottom" + android:elevation="@dimen/message_bubble_elevation"> diff --git a/briar-android/src/main/res/layout/list_item_conversation_request.xml b/briar-android/src/main/res/layout/list_item_conversation_request.xml index d84e1f16f..16c1f8649 100644 --- a/briar-android/src/main/res/layout/list_item_conversation_request.xml +++ b/briar-android/src/main/res/layout/list_item_conversation_request.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/message_bubble_margin" android:orientation="vertical"> @@ -21,16 +23,17 @@ android:id="@+id/layout" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/message_bubble_margin" android:layout_marginLeft="@dimen/message_bubble_margin_tail" android:layout_marginRight="@dimen/message_bubble_margin_non_tail" - android:background="@drawable/notice_in_bottom"> + android:background="@drawable/notice_in_bottom" + android:elevation="@dimen/message_bubble_elevation">