From 5117b9730c23eac98b7eef2a9a52b17be95f053b Mon Sep 17 00:00:00 2001 From: Krocks Date: Mon, 7 Aug 2017 11:11:53 +0300 Subject: [PATCH 1/2] added date format for chat, can't test --- .../ui/adapters/viewholders/BaseChatVh.java | 5 +++++ .../adapters/viewholders/ChatMyMessageVh.java | 9 +++------ .../viewholders/ChatOtherMessageVh.java | 7 ++----- .../mobile/communicator/utils/DateUtils.java | 18 ++++++++++++++++++ 4 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 app/src/main/java/com/ninja/mobile/communicator/utils/DateUtils.java diff --git a/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/BaseChatVh.java b/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/BaseChatVh.java index a3d0aaabd4..47b906eb2e 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/BaseChatVh.java +++ b/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/BaseChatVh.java @@ -6,6 +6,7 @@ import android.view.ViewGroup; import com.ninja.mobile.communicator.data.models.mqtt.Message; import com.ninja.mobile.communicator.intetfaces.OnItemClickListener; import com.ninja.mobile.communicator.ui.base.BaseViewHolder; +import com.ninja.mobile.communicator.utils.DateUtils; /** * Created by dmitro.boiko on 27/07/2017. @@ -20,4 +21,8 @@ public abstract class BaseChatVh extends BaseViewHolder { public BaseChatVh(ViewGroup parent, @LayoutRes int layoutId, OnItemClickListener onItemClickListener) { super(parent, layoutId, onItemClickListener); } + + protected String getTime(long time) { + return DateUtils.convertDate(time); + } } \ No newline at end of file diff --git a/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/ChatMyMessageVh.java b/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/ChatMyMessageVh.java index 622df88024..cfe5cc6945 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/ChatMyMessageVh.java +++ b/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/ChatMyMessageVh.java @@ -7,15 +7,13 @@ import com.ninja.mobile.communicator.R; import com.ninja.mobile.communicator.data.models.mqtt.Message; import com.ninja.mobile.communicator.intetfaces.OnItemClickListener; -import java.util.Date; - import butterknife.BindView; /** * Created by dmitro.boiko on 27/07/2017. */ -public class ChatMyMessageVh extends BaseChatVh{ +public class ChatMyMessageVh extends BaseChatVh { @BindView(R.id.li_chat_my_message) TextView mMessage; @BindView(R.id.li_chat_my_time) TextView mTime; @@ -30,8 +28,7 @@ public class ChatMyMessageVh extends BaseChatVh{ @Override public void setData(Message item) { mMessage.setText(item.payload); - 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/ChatOtherMessageVh.java b/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/ChatOtherMessageVh.java index c66433e9ce..7674e51c34 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/ChatOtherMessageVh.java +++ b/app/src/main/java/com/ninja/mobile/communicator/ui/adapters/viewholders/ChatOtherMessageVh.java @@ -9,8 +9,6 @@ import com.ninja.mobile.communicator.R; import com.ninja.mobile.communicator.data.models.mqtt.Message; import com.ninja.mobile.communicator.intetfaces.OnItemClickListener; -import java.util.Date; - import butterknife.BindView; /** @@ -34,9 +32,8 @@ public class ChatOtherMessageVh extends BaseChatVh { @Override public void setData(Message item) { mMessage.setText(item.payload); - 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)); avatar.setVisibility(View.GONE); mUserName.setVisibility(View.GONE); } diff --git a/app/src/main/java/com/ninja/mobile/communicator/utils/DateUtils.java b/app/src/main/java/com/ninja/mobile/communicator/utils/DateUtils.java new file mode 100644 index 0000000000..97d5e53a54 --- /dev/null +++ b/app/src/main/java/com/ninja/mobile/communicator/utils/DateUtils.java @@ -0,0 +1,18 @@ +package com.ninja.mobile.communicator.utils; + +import android.support.annotation.NonNull; + +import java.text.SimpleDateFormat; +import java.util.Date; + +public abstract class DateUtils { + private static final String DATE_FORMAT_NEEDED = "HH mm"; + + public static String convertDate(@NonNull Long time) { + String edited; + SimpleDateFormat to = new SimpleDateFormat(DATE_FORMAT_NEEDED); + Date date = new Date(time); + edited = to.format(date); + return edited; + } +} -- GitLab From c64aab7e08161e4918386a3965abccdafc5e91df Mon Sep 17 00:00:00 2001 From: Krocks Date: Mon, 7 Aug 2017 23:20:41 +0300 Subject: [PATCH 2/2] added dot, tested --- .../java/com/ninja/mobile/communicator/utils/DateUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/ninja/mobile/communicator/utils/DateUtils.java b/app/src/main/java/com/ninja/mobile/communicator/utils/DateUtils.java index 97d5e53a54..4aefeb3df7 100644 --- a/app/src/main/java/com/ninja/mobile/communicator/utils/DateUtils.java +++ b/app/src/main/java/com/ninja/mobile/communicator/utils/DateUtils.java @@ -6,7 +6,7 @@ import java.text.SimpleDateFormat; import java.util.Date; public abstract class DateUtils { - private static final String DATE_FORMAT_NEEDED = "HH mm"; + private static final String DATE_FORMAT_NEEDED = "HH:mm"; public static String convertDate(@NonNull Long time) { String edited; -- GitLab