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

app/src/main/java/kr/co/zumo/app/lifeplus/activity/AllMenuDriver.java

@@ -161,7 +161,6 @@ public class AllMenuDriver implements PushMessageBroker.IPushMessageListener, ID
     LifeplusPreferences preferences = SuperModel.getInstance().getPreferences();
     if (preferences.getAppFirstOpened()) {
       navigationBar.setNotiMarker(true, true);
-      preferences.setAppFirstOpened(false);
     }
   }
 

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

@@ -148,7 +148,7 @@ public class BookMarkListFragment extends FragmentBase<BookMarkListPresenter> im
 
   @Override
   protected boolean isSkipScreenWhenBack() {
-    return false;
+    return true;
   }
 
   @Override

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

@@ -105,6 +105,10 @@ public class BookMarkListModel extends Model {
     this.categoryIndex = categoryIndex;
   }
 
+  public boolean hasBookmark() {
+    return null != bookmarkBeans && bookmarkBeans.size() > 0;
+  }
+
   /**
    * 최신순 정렬된 리스트 반환
    * - 데이터 변형 없이 로딩된 자체
@@ -254,7 +258,7 @@ public class BookMarkListModel extends Model {
   /**
    * 좋아요 갱신
    *
-   * @param index         data 의 index
+   * @param index data 의 index
    */
   public void updateLiked(int index) {
     BookmarkBean contentsBean = getCurrentBookmarkBean(index);
@@ -277,7 +281,7 @@ public class BookMarkListModel extends Model {
   /**
    * 북마크 갱신
    *
-   * @param index         data 의 index
+   * @param index data 의 index
    */
   public void updateBookmarked(int index) {
     BookmarkBean contentsBean = getCurrentBookmarkBean(index);

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

@@ -53,6 +53,11 @@ public class BookMarkListPresenter extends Presenter<BookMarkListModel, IBookMar
 
       // 변경 된 리스트
       view.updateContents();
+
+      if (false == model.hasBookmark()) {
+        // 북마크가 모두 제거되었다면 디폴트 북마크로 이동.
+        go(ScreenID.BOOK_MARK_DEFAULT, ScreenID.DIRECTION_NONE);
+      }
     }
   }
 

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

@@ -17,8 +17,6 @@ import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.BookmarkBean;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
 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;
 import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
 
@@ -75,16 +73,13 @@ public class DefaultBookMarkFragment extends FragmentBase<DefaultBookMarkPresent
 
   @Override
   protected boolean isSkipScreenWhenBack() {
-    return false;
+    return true;
   }
 
   @Override
   public void drawContents(List<BookmarkBean> bookmarkBeans) {
-    DefaultBookMarkAdapter defaultBookMarkAdapter = new DefaultBookMarkAdapter(bookmarkBeans, new IEventListener() {
-      @Override
-      public void onEvent(Event event) {
-        presenter.onEvent(event);
-      }
+    DefaultBookMarkAdapter defaultBookMarkAdapter = new DefaultBookMarkAdapter(bookmarkBeans, event -> {
+      presenter.onEvent(event);
     });
     recyclerViewDefaultBookMark.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
     recyclerViewDefaultBookMark.setAdapter(defaultBookMarkAdapter);

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

@@ -63,6 +63,10 @@ public class DefaultBookMarkModel extends Model {
 
   }
 
+  public boolean hasBookmark() {
+    return BookmarkManager.getInstance().getCountOfBookmark() > 0;
+  }
+
   public void loadDefaultBookmarkList() {
     disposableDefaultBookmarkList = new APIBookmarkBestModule().call(new PageRequestBean(), new APIModuleListener<BookmarkResultBean>(waiterCaller) {
       @Override

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

@@ -34,6 +34,7 @@ public class DefaultBookMarkPresenter extends Presenter<DefaultBookMarkModel, ID
   @Override
   protected void createViewInternal() {
   }
+
   @Override
   protected void destroyInternal() {
 
@@ -45,7 +46,10 @@ public class DefaultBookMarkPresenter extends Presenter<DefaultBookMarkModel, ID
 
   @Override
   protected void startInternal() {
-
+    if (model.hasBookmark()) {
+      // 북마크가 추가됐다면 리스트로 이동
+      go(ScreenID.BOOK_MARK_LIST, ScreenID.DIRECTION_NONE);
+    }
   }
 
   @Override

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

@@ -3,6 +3,7 @@ package kr.co.zumo.app.lifeplus.view.screen.notification;
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.PushBean;
 import kr.co.zumo.app.lifeplus.bean.api.NoticeBean;
+import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.supervisor.PushMessageLink;
 import kr.co.zumo.app.lifeplus.supervisor.PushMessageManager;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
@@ -57,7 +58,8 @@ public class NotiPresenter extends Presenter<NotiModel, INotiView> {
 
   @Override
   protected void startInternalOnce() {
-    this.model.loadNotification();
+    SuperModel.getInstance().getPreferences().setAppFirstOpened(false);
+    model.loadNotification();
   }
 
   @Override