Merge branch 'develop' of https://github.com/swict/LifeplusAndroid into develop

app/src/main/java/kr/co/zumo/app/lifeplus/network/api/CustomGsonConverterFactory.java

@@ -3,6 +3,8 @@
  */
 package kr.co.zumo.app.lifeplus.network.api;
 
+import android.support.annotation.NonNull;
+
 import com.google.gson.Gson;
 import com.google.gson.TypeAdapter;
 import com.google.gson.reflect.TypeToken;
@@ -31,8 +33,8 @@ import retrofit2.Retrofit;
  * @since 2019. 1. 30.
  */
 public class CustomGsonConverterFactory extends Converter.Factory implements Interceptor, IHeadersProvider {
-  public static CustomGsonConverterFactory create(Gson gson) {
-    if (gson == null) { throw new NullPointerException("gson == null"); }
+  public static CustomGsonConverterFactory create(@NonNull Gson gson) {
+    // if (gson == null) { throw new NullPointerException("gson == null"); }
     return new CustomGsonConverterFactory(gson);
   }
 

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

@@ -64,7 +64,7 @@ public class EventListViewHolder extends RecyclerView.ViewHolder {
       textViewEventTitle.setText(bean.getTitle());
       textViewEventPresent.setText(bean.getSubTitle());
       layoutFlag.setVisibility(View.GONE);
-      imageViewThumbnail.setOnClickListener(view -> {listener.onEvent(new Event.Builder(Event.CLICK).index(getAdapterPosition()).build());});
+      itemView.setOnClickListener(view -> {listener.onEvent(new Event.Builder(Event.CLICK).index(getAdapterPosition()).build());});
       layoutFlag.setVisibility(APIData.isTrue(bean.getEntryCompleted()) ?View.VISIBLE : View.GONE);
     }
   }

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

@@ -7,7 +7,6 @@ import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.EventDeliveryBean;
 import kr.co.zumo.app.lifeplus.helper.NavigationBar;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
-import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.DoubleChecker;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.ToastProvider;
@@ -174,13 +173,14 @@ public class EventDetailSelectPresenter extends EventDetailPresenter<EventDetail
         break;
 
       case Event.TAG:
+        //3월 4일 삭제됨
         //표지에서 태그 클릭시 태그검색이동
-        String tag = model.getEventDetailBean().getTagList().get(index).getTagName();
-        tag = StringUtil.toTag(tag);
-        if (StringUtil.isFull(tag)) {
-          model.setDeliveryPackaging(tag);
-          go(ScreenID.SEARCH_RESULT);
-        }
+//        String tag = model.getEventDetailBean().getTagList().get(index).getTagName();
+//        tag = StringUtil.toTag(tag);
+//        if (StringUtil.isFull(tag)) {
+//          model.setDeliveryPackaging(tag);
+//          go(ScreenID.SEARCH_RESULT);
+//        }
 
         break;
       case Event.ENTRY:

app/src/main/res/layout/event_detail_cover.xml

@@ -123,6 +123,7 @@
     android:paddingBottom="10dp"
     android:textColor="@color/CFFFFFF"
     android:textSize="12dp"
+    android:visibility="invisible"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     tools:text="#카페"/>
@@ -139,6 +140,7 @@
     android:paddingBottom="10dp"
     android:textColor="@color/CFFFFFF"
     android:textSize="12sp"
+    android:visibility="invisible"
     app:layout_constraintStart_toEndOf="@+id/text_view_tag1"
     app:layout_constraintTop_toTopOf="@+id/text_view_tag1"
     tools:layout_editor_absoluteX="89dp"
@@ -156,6 +158,7 @@
     android:paddingBottom="10dp"
     android:textColor="@color/CFFFFFF"
     android:textSize="12sp"
+    android:visibility="invisible"
     app:layout_constraintStart_toEndOf="@+id/text_view_tag2"
     app:layout_constraintTop_toTopOf="@+id/text_view_tag2"
     tools:layout_editor_absoluteX="89dp"