From 7238283362c02c3c94e7e31449b99126fa67f3ca Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 29 Aug 2017 12:36:21 -0700 Subject: [PATCH] added message bubbles in conversation --- .../java/com/moez/QKSMS/ui/view/AvatarView.kt | 2 +- ...ogress_drawable.xml => message_bubble.xml} | 5 ++++- qksms/src/main/res/layout/avatar_view.xml | 5 +++-- .../main/res/layout/message_list_item_in.xml | 19 +++++++++++++------ .../main/res/layout/message_list_item_out.xml | 19 +++++++++++++------ qksms/src/main/res/values/colors.xml | 2 ++ 6 files changed, 36 insertions(+), 16 deletions(-) rename qksms/src/main/res/drawable/{progress_drawable.xml => message_bubble.xml} (61%) 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 ea7ed74f..3f24bf8a 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.color.textSecondary) + setBackgroundResource(R.drawable.message_bubble) } private fun updateView() { diff --git a/qksms/src/main/res/drawable/progress_drawable.xml b/qksms/src/main/res/drawable/message_bubble.xml similarity index 61% rename from qksms/src/main/res/drawable/progress_drawable.xml rename to qksms/src/main/res/drawable/message_bubble.xml index f1e295c6..2beb1779 100644 --- a/qksms/src/main/res/drawable/progress_drawable.xml +++ b/qksms/src/main/res/drawable/message_bubble.xml @@ -1,5 +1,8 @@ - + + + + \ No newline at end of file diff --git a/qksms/src/main/res/layout/avatar_view.xml b/qksms/src/main/res/layout/avatar_view.xml index f4eae14f..76847efc 100644 --- a/qksms/src/main/res/layout/avatar_view.xml +++ b/qksms/src/main/res/layout/avatar_view.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:background="@color/textSecondary" + tools:background="@color/list_separator" tools:parentTag="com.moez.QKSMS.ui.view.AvatarView"> \ No newline at end of file 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 6d03f9ab..9bdd191c 100644 --- a/qksms/src/main/res/layout/message_list_item_in.xml +++ b/qksms/src/main/res/layout/message_list_item_in.xml @@ -6,15 +6,15 @@ android:gravity="start|bottom" android:orientation="horizontal" android:paddingBottom="8dp" - android:paddingEnd="56dp" - android:paddingStart="16dp" + android:paddingEnd="60dp" + android:paddingStart="12dp" android:paddingTop="8dp"> + android:layout_width="36dp" + android:layout_height="36dp" + android:layout_marginEnd="12dp" /> 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 dbbbb92a..693838a6 100644 --- a/qksms/src/main/res/layout/message_list_item_out.xml +++ b/qksms/src/main/res/layout/message_list_item_out.xml @@ -6,8 +6,8 @@ android:gravity="end|bottom" android:orientation="horizontal" android:paddingBottom="8dp" - android:paddingEnd="16dp" - android:paddingStart="56dp" + android:paddingEnd="12dp" + android:paddingStart="60dp" android:paddingTop="8dp"> + android:layout_width="36dp" + android:layout_height="36dp" + android:layout_marginStart="12dp" /> \ No newline at end of file diff --git a/qksms/src/main/res/values/colors.xml b/qksms/src/main/res/values/colors.xml index c2e69f66..609bdf0b 100644 --- a/qksms/src/main/res/values/colors.xml +++ b/qksms/src/main/res/values/colors.xml @@ -6,4 +6,6 @@ #2C3236 #898989 + + #F2F2F2