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

app/src/main/java/kr/co/zumo/app/lifeplus/view/Event.java

@@ -105,6 +105,7 @@ public class Event {
   public static final int CODE_COPY = 77;
   public static final int EVENT = 78;
   public static final int TAG = 79;
+  public static final int BOOK_MARK = 80;
 
 
   @Retention(RetentionPolicy.SOURCE)
@@ -116,7 +117,7 @@ public class Event {
     ACTION_BAR_HOME, ACTION_BAR_NOTIFICATION, ACTION_BAR_SETTING, ACTION_BAR_CLOSE, ACTION_BAR_BACK,
     ACTION_BAR_SEARCH, ACTION_BAR_MENU, ACTION_BAR_TITLE, FIRST_CATEGORY, SECOND_CATEGORY, THIRD_CATEGORY, FOURTH_CATEGORY, FIFTH_CATEGORY,
     SWITCH, BOOK_MARK_DEFAULT, BOOK_MARK_LIST, ADD, MY_COIN_MAIN, MY_PURCHASE_HISTORY, GUIDE, ADD_BUCKET, MY_MAIN_GUEST, COUPON_MALL, CATEGORY_CLICK,
-    MY_FAQ, UPDATE, FILTER, CLOSE, HELP, CONTENTS, MORE, BANNER, RECOMMEND, KAKAO_TALK, FACE_BOOK, CODE_COPY, EVENT, TAG
+    MY_FAQ, UPDATE, FILTER, CLOSE, HELP, CONTENTS, MORE, BANNER, RECOMMEND, KAKAO_TALK, FACE_BOOK, CODE_COPY, EVENT, TAG , BOOK_MARK
   })
   public @interface ID {}
 

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

@@ -58,12 +58,12 @@ public class BookMarkListFragment extends FragmentBase<BookMarkListPresenter> im
     customSpinnerBookmark.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
       @Override
       public void onItemSelected(AdapterView<?> adapterView, View view, int position, long id) {
-        if(customSpinnerBookmark.getItemAtPosition(position).equals("최근북마크순")){
-          layoutCategory.setVisibility(View.GONE);
-          textViewTitle.setVisibility(View.GONE);
-        }else{
+        if(customSpinnerBookmark.getItemAtPosition(position).equals("카테고리별")){
           layoutCategory.setVisibility(View.VISIBLE);
           textViewTitle.setVisibility(View.VISIBLE);
+        }else{
+          layoutCategory.setVisibility(View.GONE);
+          textViewTitle.setVisibility(View.GONE);
         }
       }
       @Override

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

@@ -134,17 +134,27 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
     textViewBookmarkCount.setText("북마크 " + size);
     textViewBookmarkRecommend.setVisibility(View.GONE);
     if (bookmarkBeans.size() == 1) {
-      textViewBookmark1.setText(bookmarkBeans.get(size - 1).getTitle());
+      textViewBookmark1.setText(bookmarkBeans.get(0).getTitle());
       layoutLikeBookmark1.setVisibility(View.VISIBLE);
-      Glide.with(imageViewBookmark1).load(bookmarkBeans.get(size - 1).getImageUrl()).into(imageViewBookmark1);
+      Glide.with(imageViewBookmark1).load(bookmarkBeans.get(0).getImageUrl()).into(imageViewBookmark1);
+      textViewBookmark1.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.BOOK_MARK).index(0).build()));
+      imageViewBookmark1.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.BOOK_MARK).index(0).build()));
+
+
     }
     else {
-      textViewBookmark1.setText(bookmarkBeans.get(size - 2).getTitle());
+      textViewBookmark1.setText(bookmarkBeans.get(0).getTitle());
       layoutLikeBookmark1.setVisibility(View.VISIBLE);
-      Glide.with(imageViewBookmark1).load(bookmarkBeans.get(size - 2).getImageUrl()).into(imageViewBookmark1);
-      textViewBookmark2.setText(bookmarkBeans.get(size - 1).getTitle());
+      Glide.with(imageViewBookmark1).load(bookmarkBeans.get(0).getImageUrl()).into(imageViewBookmark1);
+      textViewBookmark2.setText(bookmarkBeans.get(1).getTitle());
       layoutLikeBookmark2.setVisibility(View.VISIBLE);
-      Glide.with(imageViewBookmark2).load(bookmarkBeans.get(size - 1).getImageUrl()).into(imageViewBookmark2);
+      Glide.with(imageViewBookmark2).load(bookmarkBeans.get(1).getImageUrl()).into(imageViewBookmark2);
+
+      textViewBookmark1.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.BOOK_MARK).index(0).build()));
+      imageViewBookmark1.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.BOOK_MARK).index(0).build()));
+
+      textViewBookmark2.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.BOOK_MARK).index(1).build()));
+      imageViewBookmark2.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.BOOK_MARK).index(1).build()));
 
     }
   }
@@ -156,17 +166,26 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
     textViewBookmarkRecommend.setVisibility(View.VISIBLE);
     if (defaultBookmarkBeans.size() == 1) {
       layoutLikeBookmark1.setVisibility(View.GONE);
-      textViewBookmark1.setText(defaultBookmarkBeans.get(size - 1).getTitle());
-      Glide.with(imageViewBookmark1).load(defaultBookmarkBeans.get(size - 1).getImageUrl()).into(imageViewBookmark1);
+      textViewBookmark1.setText(defaultBookmarkBeans.get(0).getTitle());
+      Glide.with(imageViewBookmark1).load(defaultBookmarkBeans.get(0).getImageUrl()).into(imageViewBookmark1);
+
+      textViewBookmark1.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.CONTENTS).index(0).build()));
+      imageViewBookmark1.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.CONTENTS).index(0).build()));
 
     }
     else {
-      textViewBookmark1.setText(defaultBookmarkBeans.get(size - 2).getTitle());
+      textViewBookmark1.setText(defaultBookmarkBeans.get(0).getTitle());
       layoutLikeBookmark1.setVisibility(View.GONE);
-      Glide.with(imageViewBookmark1).load(defaultBookmarkBeans.get(size - 2).getImageUrl()).into(imageViewBookmark1);
-      textViewBookmark2.setText(defaultBookmarkBeans.get(size - 1).getTitle());
+      Glide.with(imageViewBookmark1).load(defaultBookmarkBeans.get(0).getImageUrl()).into(imageViewBookmark1);
+      textViewBookmark2.setText(defaultBookmarkBeans.get(1).getTitle());
       layoutLikeBookmark2.setVisibility(View.GONE);
-      Glide.with(imageViewBookmark2).load(defaultBookmarkBeans.get(size - 1).getImageUrl()).into(imageViewBookmark2);
+      Glide.with(imageViewBookmark2).load(defaultBookmarkBeans.get(1).getImageUrl()).into(imageViewBookmark2);
+
+      textViewBookmark1.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.CONTENTS).index(0).build()));
+      imageViewBookmark1.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.CONTENTS).index(0).build()));
+
+      textViewBookmark2.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.CONTENTS).index(1).build()));
+      imageViewBookmark2.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.CONTENTS).index(1).build()));
     }
   }
 

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

@@ -1,5 +1,7 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.main;
 
+
+import kr.co.zumo.app.lifeplus.bean.ContentsBean;
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.helper.DeliveryHelper;
 import kr.co.zumo.app.lifeplus.helper.NavigationBar;
@@ -29,6 +31,8 @@ public class MyMainPresenter extends Presenter<MyMainModel, IMyMainView> {
   private DoubleChecker doubleCheckerDefaultBookmarkList;
   private DoubleChecker doubleCheckerBestBucket;
   private DoubleChecker doubleCheckerMyBucket;
+  private DeliveryHelper deliveryHelper = getHelper(DeliveryHelper.class);
+  private ContentsBean bean;
 
   public MyMainPresenter(MyMainModel model, IMyMainView view) {
     super(model, view);
@@ -136,6 +140,24 @@ public class MyMainPresenter extends Presenter<MyMainModel, IMyMainView> {
         break;
       case Event.SIGN_UP:
         go(ScreenID.SIGN_UP_START);
+        break;
+      case Event.BOOK_MARK:
+        //북마크 리스트 상세클릭시
+        bean = new ContentsBean();
+        bean.setItemNumber(model.getBookmarkList().get(event.getIndex()).getItemNumber());
+        bean.setImageUrl(model.getBookmarkList().get(event.getIndex()).getImageUrl());
+        deliveryHelper.setPackaging(bean);
+        go(ScreenID.CONTENTS);
+
+        break;
+      case Event.CONTENTS:
+        //북마크 추천리스트 상세클릭시
+        bean = new ContentsBean();
+        bean.setItemNumber(model.getDefaultBookmarkList().get(event.getIndex()).getItemNumber());
+        bean.setImageUrl(model.getDefaultBookmarkList().get(event.getIndex()).getImageUrl());
+        deliveryHelper.setPackaging(bean);
+        go(ScreenID.CONTENTS);
+
         break;
       default:
         break;

app/src/main/res/values/arrays.xml

@@ -33,8 +33,8 @@
   </string-array>
 
   <string-array name="book_mark_sort">
-    <item>최근북마크순</item>
     <item>카테고리별</item>
+    <item>최근북마크순</item>
   </string-array>
 
 </resources>