From a4d4c369c082e8cd1cc76a56dacd18e077d35c92 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 20 Sep 2017 15:11:04 -0400 Subject: [PATCH] Add message bubble assets, colour sent messages --- .../main/java/com/moez/QKSMS/ui/view/AvatarView.kt | 2 +- qksms/src/main/res/drawable/message_first_in.xml | 12 ++++++++++++ qksms/src/main/res/drawable/message_first_out.xml | 12 ++++++++++++ qksms/src/main/res/drawable/message_last_in.xml | 12 ++++++++++++ qksms/src/main/res/drawable/message_last_out.xml | 12 ++++++++++++ qksms/src/main/res/drawable/message_middle_in.xml | 12 ++++++++++++ qksms/src/main/res/drawable/message_middle_out.xml | 12 ++++++++++++ .../{message_bubble.xml => message_only.xml} | 0 qksms/src/main/res/layout/message_list_item_in.xml | 2 +- qksms/src/main/res/layout/message_list_item_out.xml | 4 +++- qksms/src/main/res/values/colors.xml | 4 ++++ 11 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 qksms/src/main/res/drawable/message_first_in.xml create mode 100644 qksms/src/main/res/drawable/message_first_out.xml create mode 100644 qksms/src/main/res/drawable/message_last_in.xml create mode 100644 qksms/src/main/res/drawable/message_last_out.xml create mode 100644 qksms/src/main/res/drawable/message_middle_in.xml create mode 100644 qksms/src/main/res/drawable/message_middle_out.xml rename qksms/src/main/res/drawable/{message_bubble.xml => message_only.xml} (100%) diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/view/AvatarView.kt b/qksms/src/main/java/com/moez/QKSMS/ui/view/AvatarView.kt index 3f24bf8a..5fab550d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/view/AvatarView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/view/AvatarView.kt @@ -29,7 +29,7 @@ class AvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : Fr super.onFinishInflate() updateView() - setBackgroundResource(R.drawable.message_bubble) + setBackgroundResource(R.drawable.message_only) } private fun updateView() { diff --git a/qksms/src/main/res/drawable/message_first_in.xml b/qksms/src/main/res/drawable/message_first_in.xml new file mode 100644 index 00000000..4b845fa7 --- /dev/null +++ b/qksms/src/main/res/drawable/message_first_in.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/drawable/message_first_out.xml b/qksms/src/main/res/drawable/message_first_out.xml new file mode 100644 index 00000000..68dd87d3 --- /dev/null +++ b/qksms/src/main/res/drawable/message_first_out.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/drawable/message_last_in.xml b/qksms/src/main/res/drawable/message_last_in.xml new file mode 100644 index 00000000..2cf68e2b --- /dev/null +++ b/qksms/src/main/res/drawable/message_last_in.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/drawable/message_last_out.xml b/qksms/src/main/res/drawable/message_last_out.xml new file mode 100644 index 00000000..04a01e0d --- /dev/null +++ b/qksms/src/main/res/drawable/message_last_out.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/drawable/message_middle_in.xml b/qksms/src/main/res/drawable/message_middle_in.xml new file mode 100644 index 00000000..9e714b8b --- /dev/null +++ b/qksms/src/main/res/drawable/message_middle_in.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/drawable/message_middle_out.xml b/qksms/src/main/res/drawable/message_middle_out.xml new file mode 100644 index 00000000..58cf20c4 --- /dev/null +++ b/qksms/src/main/res/drawable/message_middle_out.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/drawable/message_bubble.xml b/qksms/src/main/res/drawable/message_only.xml similarity index 100% rename from qksms/src/main/res/drawable/message_bubble.xml rename to qksms/src/main/res/drawable/message_only.xml diff --git a/qksms/src/main/res/layout/message_list_item_in.xml b/qksms/src/main/res/layout/message_list_item_in.xml index 9bdd191c..a0469169 100644 --- a/qksms/src/main/res/layout/message_list_item_in.xml +++ b/qksms/src/main/res/layout/message_list_item_in.xml @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="start" - android:background="@drawable/message_bubble" + android:background="@drawable/message_only" android:gravity="start|center_vertical" android:minHeight="36dp" android:paddingBottom="8dp" diff --git a/qksms/src/main/res/layout/message_list_item_out.xml b/qksms/src/main/res/layout/message_list_item_out.xml index 693838a6..9605ce1a 100644 --- a/qksms/src/main/res/layout/message_list_item_out.xml +++ b/qksms/src/main/res/layout/message_list_item_out.xml @@ -21,8 +21,10 @@ style="@style/TextPrimary" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:textColor="@color/textPrimaryLight" android:layout_gravity="end" - android:background="@drawable/message_bubble" + android:background="@drawable/message_only" + android:backgroundTint="@color/colorPrimary" android:gravity="start|center_vertical" android:minHeight="36dp" android:paddingBottom="8dp" diff --git a/qksms/src/main/res/values/colors.xml b/qksms/src/main/res/values/colors.xml index a5a32a7b..bdb0de73 100644 --- a/qksms/src/main/res/values/colors.xml +++ b/qksms/src/main/res/values/colors.xml @@ -8,5 +8,9 @@ #70808D #B7B9C0 + #FFFFFFFF + #ccffffff + #80ffffff + #F2F2F2