From 9c929df58351fb0c84df7a5782077a9780d269cf Mon Sep 17 00:00:00 2001 From: Krocks Date: Wed, 9 Aug 2017 14:32:00 +0300 Subject: [PATCH 1/2] changed chat pics design --- .../viewholders/ChatMyImageMessage.java | 7 +-- .../viewholders/ChatOtherImageMessageVh.java | 7 +-- app/src/main/res/layout/fragment_chat.xml | 2 +- .../res/layout/li_chat_my_image_message.xml | 61 +++++++++++-------- .../layout/li_chat_other_image_message.xml | 27 ++++---- app/src/main/res/values/dimen.xml | 2 + 6 files changed, 60 insertions(+), 46 deletions(-) diff --git a/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/ChatMyImageMessage.java b/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/ChatMyImageMessage.java index 8438b0117a..ec65eaef09 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/ChatMyImageMessage.java +++ b/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/ChatMyImageMessage.java @@ -14,8 +14,6 @@ import com.ninja.mobile.communicator.data.models.mqtt.Desc; import com.ninja.mobile.communicator.data.models.mqtt.Message; import com.ninja.mobile.communicator.intetfaces.OnItemClickListener; -import java.util.Date; - import butterknife.BindView; public class ChatMyImageMessage extends BaseChatVh { @@ -34,8 +32,7 @@ public class ChatMyImageMessage extends BaseChatVh { @Override public void setData(Message item) { Desc desc = item.files.get(item.files.size() - 1); Glide.with(getContext()).load(desc.payload).into(mImage); - String time = - new Date(item.created == null ? System.currentTimeMillis() : item.created).toString(); - mTime.setText(time); + long time = item.created == null ? System.currentTimeMillis() : item.created; + mTime.setText(getTime(time)); } } diff --git a/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/ChatOtherImageMessageVh.java b/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/ChatOtherImageMessageVh.java index d0eea2a5e8..8f7d097bbb 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/ChatOtherImageMessageVh.java +++ b/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/ChatOtherImageMessageVh.java @@ -14,8 +14,6 @@ import com.ninja.mobile.communicator.data.models.mqtt.Desc; import com.ninja.mobile.communicator.data.models.mqtt.Message; import com.ninja.mobile.communicator.intetfaces.OnItemClickListener; -import java.util.Date; - import butterknife.BindView; public class ChatOtherImageMessageVh extends BaseChatVh { @@ -34,8 +32,7 @@ public class ChatOtherImageMessageVh extends BaseChatVh { @Override public void setData(Message item) { Desc desc = item.files.get(item.files.size() - 1); Glide.with(getContext()).load(desc.payload).into(mImage); - String time = - new Date(item.created == null ? System.currentTimeMillis() : item.created).toString(); - mTime.setText(time); + long time = item.created == null ? System.currentTimeMillis() : item.created; + mTime.setText(getTime(time)); } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_chat.xml b/app/src/main/res/layout/fragment_chat.xml index 712abbd4d9..112dccf848 100644 --- a/app/src/main/res/layout/fragment_chat.xml +++ b/app/src/main/res/layout/fragment_chat.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - tools:listitem="@layout/li_chat_other_message" /> + tools:listitem="@layout/li_chat_my_image_message" /> - - - + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="right" + android:orientation="horizontal"> - - \ No newline at end of file + android:background="@drawable/grey_chat_bubble" + android:paddingBottom="4dp" + android:paddingEnd="4dp" + android:paddingStart="4dp" + android:paddingTop="4dp" + app:layout_constraintRight_toRightOf="parent" + android:layout_marginEnd="24dp"> + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/li_chat_other_image_message.xml b/app/src/main/res/layout/li_chat_other_image_message.xml index 03c3fe6877..bd5d32f44a 100644 --- a/app/src/main/res/layout/li_chat_other_image_message.xml +++ b/app/src/main/res/layout/li_chat_other_image_message.xml @@ -1,28 +1,33 @@ + android:layout_marginStart="64dp" + android:background="@drawable/white_chat_bubble" + android:paddingBottom="4dp" + android:paddingEnd="4dp" + android:paddingStart="4dp" + android:paddingTop="4dp"> + android:layout_height="wrap_content" + android:adjustViewBounds="true" + android:maxHeight="@dimen/chat.img.max" + android:maxWidth="@dimen/chat.img.max" + android:scaleType="centerCrop" + tools:src="@drawable/actions" /> + android:textSize="8dp" + tools:text="11:20 am" /> \ No newline at end of file diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml index bf8980838f..459d254925 100644 --- a/app/src/main/res/values/dimen.xml +++ b/app/src/main/res/values/dimen.xml @@ -9,4 +9,6 @@ 60dp + + 240dp \ No newline at end of file -- GitLab From 2c2e1124bc8f19db8081f64ccb642416c612c2d9 Mon Sep 17 00:00:00 2001 From: Krocks Date: Wed, 9 Aug 2017 14:33:32 +0300 Subject: [PATCH 2/2] changed scaletype of income image --- app/src/main/res/layout/li_chat_other_image_message.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/li_chat_other_image_message.xml b/app/src/main/res/layout/li_chat_other_image_message.xml index bd5d32f44a..5904a56dae 100644 --- a/app/src/main/res/layout/li_chat_other_image_message.xml +++ b/app/src/main/res/layout/li_chat_other_image_message.xml @@ -18,7 +18,7 @@ android:adjustViewBounds="true" android:maxHeight="@dimen/chat.img.max" android:maxWidth="@dimen/chat.img.max" - android:scaleType="centerCrop" + android:scaleType="centerInside" tools:src="@drawable/actions" />