[이벤트][New] 날짜 표시 형식 통일

app/src/main/java/kr/co/zumo/app/lifeplus/bean/PushBean.java

@@ -30,7 +30,7 @@ public class PushBean extends JsonBeanBase {
   }
    */
 
-  public static final String DATE_FORMAT = Formatter.DATE_TIME_FORMAT;
+  public static final String DATE_FORMAT = Formatter.DATE_TIME_API_FORMAT;
 
   public static final String PUSH_TYPE_COIN = "COIN";
   public static final String PUSH_TYPE_EVENT = "EVENT";

app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/NoticeBean.java

@@ -21,7 +21,7 @@ import kr.co.zumo.app.lifeplus.util.StringUtil;
  */
 public class NoticeBean extends JsonBeanBase {
 
-  public static final String DATE_FORMAT = Formatter.DATE_TIME_FORMAT;
+  public static final String DATE_FORMAT = Formatter.DATE_TIME_API_FORMAT;
 
   public static final String CATEGORY_NOTICE = "0";
   public static final String CATEGORY_NEWS = "1";

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventDetailCoverHolder.java

@@ -14,7 +14,6 @@ import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.EventBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventPageBean;
 import kr.co.zumo.app.lifeplus.bean.api.TagBean;
-import kr.co.zumo.app.lifeplus.util.Formatter;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
@@ -68,11 +67,7 @@ public class EventDetailCoverHolder extends EventDetailView<EventPageBean> {
         //   .apply(new RequestOptions().placeholder(ResourceUtil.getDrawable(itemView.getContext(), R.drawable.image_loading_common)))
         .into(imageViewCoverImage);
 
-      StringBuilder builder = new StringBuilder();
-      builder.append(getTimeString(bean.getTimeFrom()))
-        .append(" ~ ")
-        .append(getTimeString(bean.getTimeTo()));
-      textViewEventDate.setText(builder.toString());
+      textViewEventDate.setText(EventBean.getTermString(bean));
       textViewEventPresent.setText(bean.getSubTitleWithTrim());
       textViewEventTitle.setText(bean.getTwoLineTitle());
 
@@ -101,10 +96,6 @@ public class EventDetailCoverHolder extends EventDetailView<EventPageBean> {
     }
   }
 
-  protected String getTimeString(String timeString) {
-    return Formatter.format(timeString, EventBean.DATE_FORMAT_SHORT, Formatter.DATE_FORMAT_DOT);
-  }
-
   @Override
   public void startAnimation(int index) {
   }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventListViewHolder.java

@@ -13,7 +13,6 @@ import com.bumptech.glide.request.RequestOptions;
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.APIData;
 import kr.co.zumo.app.lifeplus.bean.api.EventBean;
-import kr.co.zumo.app.lifeplus.util.Formatter;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
@@ -58,12 +57,7 @@ public class EventListViewHolder extends RecyclerView.ViewHolder {
         .load(bean.getImageUrl())
         .into(imageViewThumbnail);
 
-      StringBuilder builder = new StringBuilder();
-      builder.append(getTimeString(bean.getTimeFrom()))
-        .append(" ~ ")
-        .append(getTimeString(bean.getTimeTo()));
-
-      textViewEventDate.setText(builder.toString());
+      textViewEventDate.setText(EventBean.getTermString(bean));
       textViewEventTitle.setText(bean.getTitle());
       textViewEventPresent.setText(bean.getSubTitle());
       layoutFlag.setVisibility(View.GONE);
@@ -81,7 +75,4 @@ public class EventListViewHolder extends RecyclerView.ViewHolder {
     layoutFlag.setVisibility(APIData.isTrue(bean.getEntryCompleted()) ? View.VISIBLE : View.GONE);
   }
 
-  private String getTimeString(String timeString) {
-    return Formatter.format(timeString, EventBean.DATE_FORMAT_SHORT, Formatter.DATE_FORMAT_DOT);
-  }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventWinnerFragment.java

@@ -88,18 +88,13 @@ public class EventWinnerFragment extends FragmentBase<EventWinnerPresenter> impl
   public void render(EventWinnerListBean bean) {
     textViewTitle.setText(bean.getTitle());
 
-    StringBuilder builder = new StringBuilder();
-    builder.append(getTimeString(bean.getTimeFrom()))
-      .append(" ~ ")
-      .append(getTimeString(bean.getTimeTo()));
-
     long winnerDateMillis = Formatter.dateStringToMillis(Formatter.DATE_FORMAT_DASH, bean.getWinnerDate());
 
     Calendar winnerDateCalender = Calendar.getInstance();
     winnerDateCalender.setTimeInMillis(winnerDateMillis);
     String winnerDate = Formatter.format(winnerDateMillis, Formatter.DATE_FORMAT_DOT + "(E)");
 
-    textViewEventDate.setText(ResourceUtil.getString(R.string.event_period, builder.toString()));
+    textViewEventDate.setText(ResourceUtil.getString(R.string.event_period, EventBean.getTermString(bean)));
     textViewWinnerDate.setText(ResourceUtil.getString(R.string.event_announce, winnerDate));
 
     textViewAnnouncementNotice.setText(bean.getDescription());
@@ -161,10 +156,6 @@ public class EventWinnerFragment extends FragmentBase<EventWinnerPresenter> impl
     }
   }
 
-  protected String getTimeString(String timeString) {
-    return Formatter.format(timeString, EventBean.DATE_FORMAT_SHORT, Formatter.DATE_FORMAT_DOT);
-  }
-
   private void setTextStyle(TextView textView) {
     textView.setId(View.generateViewId());
     textView.setTextSize(12);

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/MyEventViewHolder.java

@@ -11,7 +11,6 @@ import com.bumptech.glide.request.RequestOptions;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.EventBean;
-import kr.co.zumo.app.lifeplus.util.Formatter;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
@@ -69,7 +68,7 @@ public class MyEventViewHolder extends RecyclerView.ViewHolder {
 
       // title
       textViewTitle.setText(bean.getTitle());
-      textViewDateInfo.setText(ResourceUtil.getString(R.string.event_date_to, Formatter.format(bean.getTimeTo(), EventBean.DATE_FORMAT_SHORT, Formatter.DATE_FORMAT_DOT)));
+      textViewDateInfo.setText(ResourceUtil.getString(R.string.event_date_to, EventBean.getTimeString(bean.getTimeTo())));
 
       textViewTitle.setOnClickListener(eventClickListener);
       textViewDateInfo.setOnClickListener(eventClickListener);

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/entry/EventQuestionFragment.java

@@ -35,7 +35,6 @@ import kr.co.zumo.app.lifeplus.bean.api.EventBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventDetailBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventQuestionBean;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
-import kr.co.zumo.app.lifeplus.util.Formatter;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.util.ViewUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
@@ -174,11 +173,7 @@ public class EventQuestionFragment extends FragmentBase<EventQuestionPresenter>
 
     ((TextView) titleView.findViewById(R.id.text_view_title)).setText(detailBean.getTitle());
 
-    StringBuilder builder = new StringBuilder();
-    builder.append(getTimeString(detailBean.getTimeFrom()))
-      .append(" ~ ")
-      .append(getTimeString(detailBean.getTimeTo()));
-    ((TextView) titleView.findViewById(R.id.text_view_sub_title)).setText(builder.toString());
+    ((TextView) titleView.findViewById(R.id.text_view_sub_title)).setText(EventBean.getTermString(detailBean));
     layoutContainer.addView(titleView);
 
     eventQuestionViewHolders = new ArrayList<>();
@@ -382,8 +377,4 @@ public class EventQuestionFragment extends FragmentBase<EventQuestionPresenter>
     }
   }
 
-  private String getTimeString(String timeString) {
-    return Formatter.format(timeString, EventBean.DATE_FORMAT_SHORT, Formatter.DATE_FORMAT_DOT);
-  }
-
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/notification/NotiExpandableViewHolder.java

@@ -51,7 +51,7 @@ public class NotiExpandableViewHolder extends NotiViewHolder {
     // Spanned contents = StringUtil.fromHtml(bean.getContents());
     textViewAlarmCategory.setText(bean.getFlagName());
     textViewAlarmTitle.setText(bean.getTitle());
-    textViewAlarmDate.setText(Formatter.format(bean.getOpeningDate(), Formatter.DATE_TIME_FORMAT, "yyyy-MM-dd HH:mm"));
+    textViewAlarmDate.setText(Formatter.format(bean.getOpeningDate(), NoticeBean.DATE_FORMAT, Formatter.DATE_TIME_SHORT_UI_FORMAT));
     //textViewAlarmContents.setText(contents);
     //textViewAlarmContents.setMovementMethod(LinkMovementMethod.getInstance());
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/notification/NotiModel.java

@@ -5,11 +5,8 @@ package kr.co.zumo.app.lifeplus.view.screen.notification;
 
 import android.os.Handler;
 import android.os.Looper;
-import android.util.Log;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/notification/NotiTextLinkViewHolder.java

@@ -41,7 +41,7 @@ public class NotiTextLinkViewHolder extends NotiViewHolder {
   @Override
   public void bind(NoticeBean bean, IEventListener listener) {
     textViewAlarmCategory.setText(bean.getFlagName());
-    textViewAlarmDate.setText(Formatter.format(bean.getOpeningDate(), Formatter.DATE_TIME_FORMAT, "yyyy-MM-dd HH:mm"));
+    textViewAlarmDate.setText(Formatter.format(bean.getOpeningDate(), NoticeBean.DATE_FORMAT, Formatter.DATE_TIME_SHORT_UI_FORMAT));
     textViewAlarmDetail.setText(StringUtil.fromHtml(bean.getContents()));
 
     setShortcutText(textViewLink, bean.getFlag());

app/src/test/java/kr/co/zumo/app/lifeplus/bean/api/EventBeanTest.java

@@ -52,6 +52,6 @@ public class EventBeanTest {
 //    assertEquals(false, EventBean.isEnd(EventBean.DATE_FORMAT, "2019-05-01 14:30:38", System.currentTimeMillis()));
 
     // 1553481301196 == 2019-03-25 11:35:01
-    assertEquals(false, EventBean.isEnd(EventBean.DATE_FORMAT_SHORT, "2019-03-25", 1553481301196L - Formatter.A_DAY_MILLIS));
+    assertEquals(false, EventBean.isEnd(EventBean.DATE_FORMAT, "2019-03-25", 1553481301196L - Formatter.A_DAY_MILLIS));
   }
 }