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

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/auth/IMobileAuthContract.java

@@ -140,6 +140,18 @@ public interface IMobileAuthContract {
      */
     void doAccordionAgreeList(boolean isVisible);
 
+    /**
+     * 성별체크시 마진 자동 조절
+     * @param isMale
+     */
+    void setGenderMargin(boolean isMale);
+
+    /**
+     * 성별체크시 마진 자동 조절
+     * @param isLocal
+     */
+    void setNationalityMargin(boolean isLocal);
+
     /**
      * 모든 포커스 제거
      */

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/auth/MobileAuthPresenter.java

@@ -202,9 +202,11 @@ public class MobileAuthPresenter implements IMobileAuthContract.Presenter {
   public void setOnGenderCheckedChanged(boolean isMale) {
     if (isMale) {
       userBean.setGender(MobileAuthBean.GENDER_MALE);
+      view.setGenderMargin(isMale);
     }
     else {
       userBean.setGender(MobileAuthBean.GENDER_FEMALE);
+      view.setGenderMargin(isMale);
     }
   }
 
@@ -216,9 +218,11 @@ public class MobileAuthPresenter implements IMobileAuthContract.Presenter {
   public void onNationalCheckedChanged(boolean isLocal) {
     if (isLocal) {
       userBean.setNationality(MobileAuthBean.NATIONALITY_DOMESTIC);
+      view.setNationalityMargin(isLocal);
     }
     else {
       userBean.setNationality(MobileAuthBean.NATIONALITY_FOREIGNER);
+      view.setNationalityMargin(isLocal);
     }
   }
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/auth/MobileAuthView.java

@@ -18,6 +18,7 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
+import android.widget.RadioGroup;
 import android.widget.RelativeLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
@@ -252,6 +253,11 @@ public class MobileAuthView extends ConstraintLayout implements IMobileAuthContr
 
     // 폰 국번
     spinnerFirstPhoneNumber.setSpinnerEventsListener(new CustomSpinner.OnSpinnerEventsListener() {
+
+      public void setGenderMargin(boolean isMale){
+
+      }
+
       @Override
       public void onSpinnerOpened(Spinner spin) {
         presenter.onFirstPhoneNumberOpenChanged(true);
@@ -439,6 +445,29 @@ public class MobileAuthView extends ConstraintLayout implements IMobileAuthContr
 
   }
 
+  @Override
+  public void setGenderMargin(boolean isMale) {
+    RadioGroup.LayoutParams params  = new RadioGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+    if(isMale){
+        params.setMarginStart(ResourceUtil.dpToPx(-23));
+        radioSelectFemale.setLayoutParams(params);
+    }else{
+      params.setMarginStart(-10);
+      radioSelectFemale.setLayoutParams(params);
+    }
+  }
+
+  @Override
+  public void setNationalityMargin(boolean isLocal) {
+    RadioGroup.LayoutParams params = new RadioGroup.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+    if (isLocal) {
+      params.setMarginStart(ResourceUtil.dpToPx(-25));
+      radioSelectForeign.setLayoutParams(params);
+    }else {
+      params.setMarginStart(-10);
+      radioSelectForeign.setLayoutParams(params);
+    }
+  }
   /**
    * 모든 UI disabled
    */

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/DefaultBookMarkAdapter.java

@@ -1,5 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.bookmark;
 
+import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -7,6 +8,8 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.view.Event;
+import kr.co.zumo.app.lifeplus.view.IEventListener;
 
 /**
  * DefaultBookMarkAdapter
@@ -18,15 +21,22 @@ import kr.co.zumo.app.R;
  * @history 하세미   [2018-10-26]   [최초 작성]
  * @since 2018-10-26
  */
-public class DefaultBookMarkAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public class DefaultBookMarkAdapter extends RecyclerView.Adapter<DefaultBookMarkView> {
 
   private static final int TYPE_TITLE = 0;
   private static final int TYPE_TEXT = 1;
   private static final int TYPE_IMAGE = 2;
+  private IEventListener listener;
+  private Context context;
+
+  public DefaultBookMarkAdapter(Context context, IEventListener listener) {
+    this.listener = listener;
+    this.context = context;
+  }
 
   @NonNull
   @Override
-  public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+  public DefaultBookMarkView onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
     View view;
     switch (viewType) {
       case TYPE_TITLE:
@@ -45,14 +55,25 @@ public class DefaultBookMarkAdapter extends RecyclerView.Adapter<RecyclerView.Vi
   }
 
   @Override
-  public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
-    switch (getItemViewType(position)){
+  public void onBindViewHolder(@NonNull DefaultBookMarkView holder, int position) {
+    switch (getItemViewType(position)) {
       case TYPE_TITLE:
+        holder.bind(new IEventListener() {
+          @Override
+          public void onEvent(Event event) {
+            listener.onEvent(event);
+          }
+        });
         break;
       case TYPE_TEXT:
         break;
       case TYPE_IMAGE:
-        ((DefaultBookMarkImageViewHolder)holder).doDataSetting();
+        holder.bind(new IEventListener() {
+          @Override
+          public void onEvent(Event event) {
+            listener.onEvent(event);
+          }
+        });
         break;
       default:
         break;

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/DefaultBookMarkFragment.java

@@ -14,6 +14,8 @@ import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
 import kr.co.zumo.app.lifeplus.model.BlankModel;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
+import kr.co.zumo.app.lifeplus.view.Event;
+import kr.co.zumo.app.lifeplus.view.IEventListener;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
 
 /**
@@ -38,7 +40,12 @@ public class DefaultBookMarkFragment extends FragmentBase<DefaultBookMarkPresent
   @Override
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
     recyclerViewDefaultBookMark = findViewById(R.id.recycler_view_default_book_mark);
-    DefaultBookMarkAdapter defaultBookMarkAdapter = new DefaultBookMarkAdapter();
+    DefaultBookMarkAdapter defaultBookMarkAdapter = new DefaultBookMarkAdapter(getActivity(), new IEventListener() {
+      @Override
+      public void onEvent(Event event) {
+        presenter.onEvent(event);
+      }
+    });
     recyclerViewDefaultBookMark.setLayoutManager( new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
     recyclerViewDefaultBookMark.setAdapter(defaultBookMarkAdapter);
     recyclerViewDefaultBookMark.addItemDecoration(new RecyclerView.ItemDecoration() {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/DefaultBookMarkImageViewHolder.java

@@ -1,11 +1,11 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.bookmark;
 
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.view.IEventListener;
 
 /**
  * DefaultBookMarkImageViewHolder
@@ -17,7 +17,7 @@ import kr.co.zumo.app.R;
  * @history 하세미   [2018-10-26]   [최초 작성]
  * @since 2018-10-26
  */
-public class DefaultBookMarkImageViewHolder extends RecyclerView.ViewHolder {
+public class DefaultBookMarkImageViewHolder extends DefaultBookMarkView {
   private ImageView imageViewDefaultBookMark;
   private TextView textViewDefaultBookMark;
 
@@ -27,7 +27,10 @@ public class DefaultBookMarkImageViewHolder extends RecyclerView.ViewHolder {
     textViewDefaultBookMark = itemView.findViewById(R.id.text_view_default_book_mark);
   }
 
-  public void doDataSetting() {
+
+  @Override
+  public void bind(IEventListener listener) {
+    super.bind(listener);
     imageViewDefaultBookMark.setImageDrawable(itemView.getResources().getDrawable(R.drawable.img_bookmark_default));
     textViewDefaultBookMark.setText(R.string.book_mark_default_text);
   }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/DefaultBookMarkPresenter.java

@@ -57,7 +57,25 @@ public class DefaultBookMarkPresenter extends Presenter<BlankModel, IView> {
 
   @Override
   protected void onEventInternal(Event event) {
-
+    switch (event.getEventId()) {
+      case Event.FIRST_CATEGORY:
+        go(ScreenID.FIRST_CATEGORY, ScreenID.DIRECTION_NEXT);
+        break;
+      case Event.SECOND_CATEGORY:
+        go(ScreenID.SECOND_CATEGORY, ScreenID.DIRECTION_NEXT);
+        break;
+      case Event.THIRD_CATEGORY:
+        go(ScreenID.THIRD_CATEGORY, ScreenID.DIRECTION_NEXT);
+        break;
+      case Event.FOURTH_CATEGORY:
+        go(ScreenID.FOURTH_CATEGORY, ScreenID.DIRECTION_NEXT);
+        break;
+      case Event.FIFTH_CATEGORY:
+        go(ScreenID.FIFTH_CATEGORY, ScreenID.DIRECTION_NEXT);
+        break;
+      default:
+        break;
+    }
   }
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/DefaultBookMarkTextViewHolder.java

@@ -1,6 +1,5 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.bookmark;
 
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.TextView;
 
@@ -16,7 +15,7 @@ import kr.co.zumo.app.R;
  * @history 하세미   [2018-10-26]   [최초 작성]
  * @since 2018-10-26
  */
-public class DefaultBookMarkTextViewHolder extends RecyclerView.ViewHolder {
+public class DefaultBookMarkTextViewHolder extends DefaultBookMarkView {
   private TextView textViewBookMarkRecommend;
 
   public DefaultBookMarkTextViewHolder(View itemView) {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/DefaultBookMarkTitleViewHolder.java

@@ -1,10 +1,11 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.bookmark;
 
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.TextView;
 
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.view.Event;
+import kr.co.zumo.app.lifeplus.view.IEventListener;
 
 /**
  * DefaultBookMarkTitleViewHolder
@@ -16,7 +17,7 @@ import kr.co.zumo.app.R;
  * @history 하세미   [2018-10-26]   [최초 작성]
  * @since 2018-10-26
  */
-public class DefaultBookMarkTitleViewHolder extends RecyclerView.ViewHolder {
+public class DefaultBookMarkTitleViewHolder extends DefaultBookMarkView {
 
   private TextView textViewBookMarkTitle;
   private TextView textViewBookHashTag1;
@@ -33,5 +34,37 @@ public class DefaultBookMarkTitleViewHolder extends RecyclerView.ViewHolder {
     textViewBookHashTag3 = itemView.findViewById(R.id.text_view_third_category);
     textViewBookHashTag4 = itemView.findViewById(R.id.text_view_fourth_category);
     textViewBookHashTag5 = itemView.findViewById(R.id.text_view_fifth_category);
+
+
+  }
+
+  @Override
+  public void bind(IEventListener listener) {
+    super.bind(listener);
+    textViewBookHashTag1.setOnClickListener(view -> {
+      if (null != listener) {
+        listener.onEvent(new Event.Builder(Event.FIRST_CATEGORY).build());
+      }
+    });
+    textViewBookHashTag2.setOnClickListener(view -> {
+      if (null != listener) {
+        listener.onEvent(new Event.Builder(Event.SECOND_CATEGORY).build());
+      }
+    });
+    textViewBookHashTag3.setOnClickListener(view -> {
+      if (null != listener) {
+        listener.onEvent(new Event.Builder(Event.THIRD_CATEGORY).build());
+      }
+    });
+    textViewBookHashTag4.setOnClickListener(view -> {
+      if (null != listener) {
+        listener.onEvent(new Event.Builder(Event.FOURTH_CATEGORY).build());
+      }
+    });
+    textViewBookHashTag5.setOnClickListener(view -> {
+      if (null != listener) {
+        listener.onEvent(new Event.Builder(Event.FIFTH_CATEGORY).build());
+      }
+    });
   }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bookmark/DefaultBookMarkView.java

@@ -0,0 +1,28 @@
+package kr.co.zumo.app.lifeplus.view.screen.my.bookmark;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+import kr.co.zumo.app.lifeplus.view.IEventListener;
+
+/**
+ * DefaultBookMarkView
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-11-12]   [최초 작성]
+ * @since 2018-11-12
+ */
+public class DefaultBookMarkView extends RecyclerView.ViewHolder {
+
+
+  public DefaultBookMarkView(View itemView) {
+    super(itemView);
+  }
+
+  public void bind(IEventListener listener){
+
+  }
+}

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

@@ -86,7 +86,7 @@
           android:id="@+id/radio_button_foreign"
           android:layout_width="wrap_content"
           android:layout_height="40dp"
-          android:layout_marginStart="-10dp"
+          android:layout_marginStart="-25dp"
           android:background="@null"
           android:button="@null"
           android:checked="false"
@@ -186,7 +186,7 @@
           android:id="@+id/radio_button_female"
           android:layout_width="wrap_content"
           android:layout_height="40dp"
-          android:layout_marginStart="-10dp"
+          android:layout_marginStart="-23dp"
           android:background="@null"
           android:button="@null"
           android:checked="false"