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 a3d0aaabd41875e12c590cc21dd1e53093113e10..47b906eb2ec962431d10bad08472992b9c88fc52 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 622df8802413daf079e71ba17e07705b14c937a0..cfe5cc694597d020732b69119dbef08d332cfc71 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 c66433e9ce85ffeb36e8167317cbaad9dfa41843..7674e51c34172cfd6d10ca914f36f34cc1b61098 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 0000000000000000000000000000000000000000..4aefeb3df71e8888daf0c3aa08f04339864fa3dc --- /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; + } +}