[공통][Common] 클래스 이름 변경: BookmarkModelHelper -> BookmarkManager

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

@@ -14,7 +14,7 @@ import kr.co.zumo.app.lifeplus.supervisor.ActivityDeliveryResultHelper;
 import kr.co.zumo.app.lifeplus.supervisor.ActivityScreenIDDeliveryHelper;
 import kr.co.zumo.app.lifeplus.supervisor.AnimatorManager;
 import kr.co.zumo.app.lifeplus.supervisor.ContentsFlagHelper;
-import kr.co.zumo.app.lifeplus.view.screen.my.bookmark.BookmarkModelHelper;
+import kr.co.zumo.app.lifeplus.view.screen.my.bookmark.BookmarkManager;
 import kr.co.zumo.app.lifeplus.view.screen.my.bucketlist.BucketListModelHelper;
 import kr.co.zumo.app.lifeplus.view.screen.my.coin.CoinModelHelper;
 import kr.co.zumo.app.lifeplus.view.screen.setting.MemberInfoModelHelper;
@@ -70,7 +70,7 @@ public class AppInitializer {
     FirebaseHelper.getInstance().dispose();
     CoinModelHelper.getInstance().dispose();
     BucketListModelHelper.getInstance().dispose();
-    BookmarkModelHelper.getInstance().dispose();
+    BookmarkManager.getInstance().dispose();
     SignUpModelHelper.getInstance().dispose();
 
     ActivityDeliveryHelper.getInstance().dispose();

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsBaseModel.java

@@ -26,7 +26,7 @@ import kr.co.zumo.app.lifeplus.tool.Share;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.dialog.ShareDialog;
-import kr.co.zumo.app.lifeplus.view.screen.my.bookmark.BookmarkModelHelper;
+import kr.co.zumo.app.lifeplus.view.screen.my.bookmark.BookmarkManager;
 
 /**
  * ContentsBaseModel
@@ -256,10 +256,10 @@ public abstract class ContentsBaseModel extends CoinModel {
 
         updateItemBookmarked(toChecked);
         if (toChecked) {
-          BookmarkModelHelper.getInstance().addBookmark(bookmarkBean);
+          BookmarkManager.getInstance().addBookmark(bookmarkBean);
         }
         else {
-          BookmarkModelHelper.getInstance().removeBookmark(bean.getItemNo(), bean.getListItemNo());
+          BookmarkManager.getInstance().removeBookmark(bean.getItemNo(), bean.getListItemNo());
         }
 
         Log.i("APP# ContentsBaseModel | onApiSuccess", "|" + bookmarkBean.toPrettyJson());

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsModel.java

@@ -30,7 +30,7 @@ import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
 import kr.co.zumo.app.lifeplus.view.dialog.ShareDialog;
-import kr.co.zumo.app.lifeplus.view.screen.my.bookmark.BookmarkModelHelper;
+import kr.co.zumo.app.lifeplus.view.screen.my.bookmark.BookmarkManager;
 import kr.co.zumo.app.lifeplus.view.screen.setting.MemberInfoModelHelper;
 
 /**
@@ -265,10 +265,10 @@ public class ContentsModel extends ContentsBaseModel {
       public void onApiSuccess(LifeplusAPIBean resultBean) {
         selectedSeriesItemBean.setBookmarked(toChecked);
         if (toChecked) {
-          BookmarkModelHelper.getInstance().addBookmark(new BookmarkBean(selectedSeriesItemBean));
+          BookmarkManager.getInstance().addBookmark(new BookmarkBean(selectedSeriesItemBean));
         }
         else {
-          BookmarkModelHelper.getInstance().removeBookmark(selectedSeriesItemBean.getItemNo(), selectedSeriesItemBean.getItemNo());
+          BookmarkManager.getInstance().removeBookmark(selectedSeriesItemBean.getItemNo(), selectedSeriesItemBean.getItemNo());
         }
 
         onResult(new Event.Builder(Event.SUCCESS).integer(Event.SERIES_BOOKMARK).bool(toChecked).build());

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

@@ -51,7 +51,7 @@ import kr.co.zumo.app.lifeplus.model.module.APIPopupLoadModule;
 import kr.co.zumo.app.lifeplus.model.module.coop.APIWeatherModule;
 import kr.co.zumo.app.lifeplus.util.Formatter;
 import kr.co.zumo.app.lifeplus.view.Event;
-import kr.co.zumo.app.lifeplus.view.screen.my.bookmark.BookmarkModelHelper;
+import kr.co.zumo.app.lifeplus.view.screen.my.bookmark.BookmarkManager;
 import kr.co.zumo.app.lifeplus.view.screen.my.bucketlist.BucketListModelHelper;
 import kr.co.zumo.app.lifeplus.view.screen.setting.SettingViewHolder;
 
@@ -102,7 +102,7 @@ public class MainModel extends CoinModel {
      * 마이 화면은 여러 번 중복 호출되어 한 곳에서 dispose() 시킬 수 없으므로 main 화면에 표시될 때 처리해준다.
      */
     BucketListModelHelper.getInstance().dispose();
-    BookmarkModelHelper.getInstance().dispose();
+    BookmarkManager.getInstance().dispose();
 
     watchLocation();
   }

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

@@ -71,7 +71,7 @@ public class BookMarkListModel extends Model {
 
   @Override
   protected void stopInternal() {
-    BookmarkModelHelper.getInstance().commit();
+    BookmarkManager.getInstance().commit();
   }
 
   @Override
@@ -274,7 +274,7 @@ public class BookMarkListModel extends Model {
   }
 
   public void loadBookMarkList() {
-    disposableBookMarkList = BookmarkModelHelper.getInstance().loadMyBookmark(new PageRequestBean(), new APIModuleListener<BookmarkListResultBean>(waiterCaller) {
+    disposableBookMarkList = BookmarkManager.getInstance().loadMyBookmark(new PageRequestBean(), new APIModuleListener<BookmarkListResultBean>(waiterCaller) {
       @Override
       public void onApiSuccess(BookmarkListResultBean resultBean) {
         bookmarkBeans = resultBean.getData();
@@ -316,10 +316,10 @@ public class BookMarkListModel extends Model {
       public void onApiSuccess(LifeplusAPIBean resultBean) {
         contentsBean.setBookmarked(toChecked);
         if (toChecked) {
-          BookmarkModelHelper.getInstance().restoreBookmarkByNumber(contentsBean.getItemNo(), contentsBean.getListItemNo());
+          BookmarkManager.getInstance().restoreBookmarkByNumber(contentsBean.getItemNo(), contentsBean.getListItemNo());
         }
         else {
-          BookmarkModelHelper.getInstance().removeBookmarkByNumber(contentsBean.getItemNo(), contentsBean.getListItemNo());
+          BookmarkManager.getInstance().removeBookmarkByNumber(contentsBean.getItemNo(), contentsBean.getListItemNo());
         }
         onResult(new Event.Builder(Event.SUCCESS).integer(Event.CONTENTS_BOOKMARK).bool(toChecked).index(index).build());
       }

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

@@ -19,7 +19,7 @@ import kr.co.zumo.app.lifeplus.model.module.IAPIModuleListener;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
 
 /**
- * BookmarkModelHelper
+ * BookmarkManager
  * <pre>
  * </pre>
  *
@@ -28,19 +28,19 @@ import kr.co.zumo.app.lifeplus.util.StringUtil;
  * @history 민효동   [2018. 11. 19.]   [최초 작성]
  * @since 2018. 11. 19.
  */
-public class BookmarkModelHelper {
+public class BookmarkManager {
 
   /**
    * 여러 Activity 에서 사용 할 수 있으므로 싱글톤 유지
    */
 
-  private static BookmarkModelHelper ourInstance = new BookmarkModelHelper();
+  private static BookmarkManager ourInstance = new BookmarkManager();
 
-  public static BookmarkModelHelper getInstance() {
+  public static BookmarkManager getInstance() {
     return ourInstance;
   }
 
-  private BookmarkModelHelper() {
+  private BookmarkManager() {
   }
 
   private Disposable disposableBookMarkList;
@@ -106,10 +106,10 @@ public class BookmarkModelHelper {
   public void addBookmark(BookmarkBean bookmarkBean) {
     if (null != bookmarkBeans) {
       bookmarkBeans.add(0, bookmarkBean);
-      Log.i("APP# BookmarkModelHelper | addBookmark", "| size: " + bookmarkBeans.size() + ", bean: \n" + bookmarkBean.toPrettyJson());
+      Log.i("APP# BookmarkManager | addBookmark", "| size: " + bookmarkBeans.size() + ", bean: \n" + bookmarkBean.toPrettyJson());
     }
     else {
-      Log.e("APP#  BookmarkModelHelper | addBookmark", "|" + " not yet loading..");
+      Log.e("APP#  BookmarkManager | addBookmark", "|" + " not yet loading..");
     }
   }
 
@@ -126,23 +126,23 @@ public class BookmarkModelHelper {
       removeBookmarkInternal(bookmarkBeans, itemNo, listItemNo);
     }
     else {
-      Log.e("APP#  BookmarkModelHelper | removeBookmark", "|" + " not yet loading..");
+      Log.e("APP#  BookmarkManager | removeBookmark", "|" + " not yet loading..");
     }
   }
 
   private void removeBookmarkInternal(List<BookmarkBean> list, String itemNo, String listItemNo) {
 
     int len = list.size();
-    Log.i("APP# BookmarkModelHelper | removeBookmark", "|" + "bookmarkBeans.size => " + list.size());
+    Log.i("APP# BookmarkManager | removeBookmark", "|" + "bookmarkBeans.size => " + list.size());
     for (int k = 0; k < len; ++k) {
       BookmarkBean bean = list.get(k);
       if (bean.getItemNo().equals(itemNo) && bean.getListItemNo().equals(listItemNo)) {
         list.remove(k);
-        Log.i("APP# BookmarkModelHelper | removeBookmark", "|---> size: " + list.size() + ", removed: \n" + bean.toJson());
+        Log.i("APP# BookmarkManager | removeBookmark", "|---> size: " + list.size() + ", removed: \n" + bean.toJson());
         break;
       }
     }
-    Log.i("APP# BookmarkModelHelper | removeBookmark", "|" + "bookmarkBeans.size => " + list.size());
+    Log.i("APP# BookmarkManager | removeBookmark", "|" + "bookmarkBeans.size => " + list.size());
   }
 
   /**
@@ -264,7 +264,7 @@ public class BookmarkModelHelper {
    * dispose
    */
   public void dispose() {
-    Log.d("APP# BookmarkModelHelper | dispose", "|" + "======================================= dispose....");
+    Log.d("APP# BookmarkManager | dispose", "|" + "======================================= dispose....");
     stopLoading();
     itemNumberForRemoveList = null;
     bookmarkBeans = null;

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

@@ -38,7 +38,7 @@ import kr.co.zumo.app.lifeplus.model.module.coop.CoopCouponCountModule;
 import kr.co.zumo.app.lifeplus.supervisor.ContentsFlagHelper;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
-import kr.co.zumo.app.lifeplus.view.screen.my.bookmark.BookmarkModelHelper;
+import kr.co.zumo.app.lifeplus.view.screen.my.bookmark.BookmarkManager;
 import kr.co.zumo.app.lifeplus.view.screen.my.bucketlist.BucketListModelHelper;
 import kr.co.zumo.app.lifeplus.view.screen.my.coin.CoinModelHelper;
 import kr.co.zumo.app.lifeplus.view.screen.setting.MemberInfoModelHelper;
@@ -105,7 +105,7 @@ public class MyMainModel extends Model {
 
   @Override
   protected void stopInternal() {
-    BookmarkModelHelper.getInstance().commit();
+    BookmarkManager.getInstance().commit();
   }
 
   @Override
@@ -167,7 +167,7 @@ public class MyMainModel extends Model {
   }
 
   public void loadMyBookMarkList() {
-    disposableBookMarkList = BookmarkModelHelper.getInstance().loadMyBookmark(new PageRequestBean(), new APIModuleListener<BookmarkListResultBean>(waiterCaller) {
+    disposableBookMarkList = BookmarkManager.getInstance().loadMyBookmark(new PageRequestBean(), new APIModuleListener<BookmarkListResultBean>(waiterCaller) {
       @Override
       public void onApiSuccess(BookmarkListResultBean resultBean) {
         bookmarkBeans = resultBean.getData();
@@ -187,7 +187,7 @@ public class MyMainModel extends Model {
   }
 
   public int getMyBookmarkSize() {
-    return BookmarkModelHelper.getInstance().getCountOfBookmark();
+    return BookmarkManager.getInstance().getCountOfBookmark();
   }
 
   /**
@@ -195,7 +195,7 @@ public class MyMainModel extends Model {
    * - 화면 전환 이전에 북마크의 수로 처리해야 할 수 있다.
    */
   public int getExpectedMyBookmarkSize() {
-    return BookmarkModelHelper.getInstance().getExpectedCountAfterCommit();
+    return BookmarkManager.getInstance().getExpectedCountAfterCommit();
   }
 
   public void loadDefaultBookmarkList() {
@@ -343,10 +343,10 @@ public class MyMainModel extends Model {
       public void onApiSuccess(LifeplusAPIBean resultBean) {
         contentsBean.setBookmarked(toChecked);
         if (toChecked) {
-          BookmarkModelHelper.getInstance().restoreBookmarkByNumber(contentsBean.getItemNo(), contentsBean.getListItemNo());
+          BookmarkManager.getInstance().restoreBookmarkByNumber(contentsBean.getItemNo(), contentsBean.getListItemNo());
         }
         else {
-          BookmarkModelHelper.getInstance().removeBookmarkByNumber(contentsBean.getItemNo(), contentsBean.getListItemNo());
+          BookmarkManager.getInstance().removeBookmarkByNumber(contentsBean.getItemNo(), contentsBean.getListItemNo());
         }
         onResult(new Event.Builder(Event.SUCCESS).integer(Event.CONTENTS_BOOKMARK).bool(toChecked).index(index).build());
       }