[공통][Common] 클래스 이름 변경: BucketListModelHelper -> BucketListManager

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

@@ -15,7 +15,7 @@ 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.BookmarkManager;
-import kr.co.zumo.app.lifeplus.view.screen.my.bucketlist.BucketListModelHelper;
+import kr.co.zumo.app.lifeplus.view.screen.my.bucketlist.BucketListManager;
 import kr.co.zumo.app.lifeplus.view.screen.my.coin.CoinModelHelper;
 import kr.co.zumo.app.lifeplus.view.screen.setting.MemberInfoModelHelper;
 import kr.co.zumo.app.lifeplus.view.screen.signup.SignUpModelHelper;
@@ -69,7 +69,7 @@ public class AppInitializer {
     PushMessageBroker.getInstance().dispose();
     FirebaseHelper.getInstance().dispose();
     CoinModelHelper.getInstance().dispose();
-    BucketListModelHelper.getInstance().dispose();
+    BucketListManager.getInstance().dispose();
     BookmarkManager.getInstance().dispose();
     SignUpModelHelper.getInstance().dispose();
 

app/src/main/java/kr/co/zumo/app/lifeplus/model/Model.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.IWaiterCallable;
-import kr.co.zumo.app.lifeplus.view.screen.my.bucketlist.BucketListModelHelper;
+import kr.co.zumo.app.lifeplus.view.screen.my.bucketlist.BucketListManager;
 
 /**
  * Model
@@ -304,13 +304,18 @@ public abstract class Model extends ViewModel implements ILifeCycle, IHelperProv
     return new PinModuleParser().verify(pin);
   }
 
+  /**
+   * 버킷 리스트 수를 파악한다.
+   *
+   * @param listener
+   */
   public void loadMyBucketCount(IEventListener listener) {
-    disposableBucket = BucketListModelHelper.getInstance().loadMyBucketList(
+    disposableBucket = BucketListManager.getInstance().loadMyBucketList(
       new BucketListRequestBean(1, 1000, ""),
       new APIModuleListener<BucketListResultBean>(waiterCaller) {
         @Override
         public void onApiSuccess(BucketListResultBean resultBean) {
-          listener.onEvent(new Event.Builder(Event.RESULT).integer(BucketListModelHelper.getInstance().getBucketCount()).build());
+          listener.onEvent(new Event.Builder(Event.RESULT).integer(BucketListManager.getInstance().getBucketCount()).build());
         }
 
         @Override

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

@@ -52,7 +52,7 @@ 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.BookmarkManager;
-import kr.co.zumo.app.lifeplus.view.screen.my.bucketlist.BucketListModelHelper;
+import kr.co.zumo.app.lifeplus.view.screen.my.bucketlist.BucketListManager;
 import kr.co.zumo.app.lifeplus.view.screen.setting.SettingViewHolder;
 
 /**
@@ -101,7 +101,7 @@ public class MainModel extends CoinModel {
     /**
      * 마이 화면은 여러 번 중복 호출되어 한 곳에서 dispose() 시킬 수 없으므로 main 화면에 표시될 때 처리해준다.
      */
-    BucketListModelHelper.getInstance().dispose();
+    BucketListManager.getInstance().dispose();
     BookmarkManager.getInstance().dispose();
 
     watchLocation();

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

@@ -1,6 +1,5 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.bucketlist;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import io.reactivex.disposables.Disposable;
@@ -140,7 +139,7 @@ public class AddMyBucketListModel extends Model {
   }
 
   public int getBucketCount() {
-    return BucketListModelHelper.getInstance().getBucketCount();
+    return BucketListManager.getInstance().getBucketCount();
   }
 
   /**
@@ -189,7 +188,7 @@ public class AddMyBucketListModel extends Model {
           // fixme imageUrl 이 정상적이지 않아서 임시로 넣어줌.
           addedBucketMyBean.setImageUrl(backgroundImageBean.getImageUrl());
           // 버킷 추가
-          BucketListModelHelper.getInstance().addBucket(addedBucketMyBean);
+          BucketListManager.getInstance().addBucket(addedBucketMyBean);
           // 태그 추가
           tags = addedBucketMyBean.getTagList();
 
@@ -239,7 +238,7 @@ public class AddMyBucketListModel extends Model {
           // 태그 추가
           tags = bucketMyBeanForEditing.getTagList();
 
-          BucketListModelHelper.getInstance().updateBucket();
+          BucketListManager.getInstance().updateBucket();
           onResult(new Event.Builder(Event.SUCCESS).build());
         }
 
@@ -257,7 +256,7 @@ public class AddMyBucketListModel extends Model {
     // 달성 미달성 데이터 토글
     boolean bool = bucketMyBeanForEditing.isCompleted();
     String yn = APIData.valueOf(!bool);
-    disposableAchieve = BucketListModelHelper.getInstance().completeBucket(new BucketCompleteRequestBean(getUserName(), bucketMyBeanForEditing.getBucketNumber(), yn), new APIModuleListener<LifeplusAPIBean>(waiterCaller) {
+    disposableAchieve = BucketListManager.getInstance().completeBucket(new BucketCompleteRequestBean(getUserName(), bucketMyBeanForEditing.getBucketNumber(), yn), new APIModuleListener<LifeplusAPIBean>(waiterCaller) {
       @Override
       public void onApiSuccess(LifeplusAPIBean resultBean) {
 
@@ -280,7 +279,7 @@ public class AddMyBucketListModel extends Model {
     disposableDelete = new APIBucketDeleteModule().call(new BucketNumberRequestBean(getUserName(), bucketMyBeanForEditing.getBucketNumber()), new APIModuleListener<LifeplusAPIBean>(waiterCaller) {
       @Override
       public void onApiSuccess(LifeplusAPIBean resultBean) {
-        BucketListModelHelper.getInstance().removeBucketByNumber(bucketMyBeanForEditing.getBucketNumber());
+        BucketListManager.getInstance().removeBucketByNumber(bucketMyBeanForEditing.getBucketNumber());
 
         onResult(new Event.Builder(Event.DELETE).build());
       }

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

@@ -23,7 +23,7 @@ import kr.co.zumo.app.lifeplus.model.module.APIError;
 import kr.co.zumo.app.lifeplus.model.module.IAPIModuleListener;
 
 /**
- * BucketListModelHelper
+ * BucketListManager
  * <pre>
  * </pre>
  *
@@ -32,19 +32,19 @@ import kr.co.zumo.app.lifeplus.model.module.IAPIModuleListener;
  * @history 민효동   [2018. 11. 14.]   [최초 작성]
  * @since 2018. 11. 14.
  */
-public class BucketListModelHelper {
+public class BucketListManager {
 
   /**
    * 여러 Activity 에서 사용 할 수 있으므로 싱글톤 유지
    */
 
-  private static BucketListModelHelper ourInstance = new BucketListModelHelper();
+  private static BucketListManager ourInstance = new BucketListManager();
 
-  public static BucketListModelHelper getInstance() {
+  public static BucketListManager getInstance() {
     return ourInstance;
   }
 
-  private BucketListModelHelper() {
+  private BucketListManager() {
   }
 
   private Map<Integer, Boolean> observerMap;
@@ -81,7 +81,7 @@ public class BucketListModelHelper {
       bucketList.add(0, bean);
     }
     else {
-      Log.e("APP#  BucketListModelHelper | addBucket", "|" + "bean is null ~~~~~~~~ ");
+      Log.e("APP#  BucketListManager | addBucket", "|" + "bean is null ~~~~~~~~ ");
     }
   }
 
@@ -268,7 +268,7 @@ public class BucketListModelHelper {
    * dispose
    */
   public void dispose() {
-    Log.d("APP# BucketListModelHelper | dispose", "|" + "======================================= dispose....");
+    Log.d("APP# BucketListManager | dispose", "|" + "======================================= dispose....");
     stopLoading();
     bucketList = null;
   }
@@ -289,7 +289,7 @@ public class BucketListModelHelper {
   public boolean hasChanged(int hashCode) {
     defineMap();
     boolean isChanged = observerMap.get(hashCode);
-    Log.w("APP# BucketListModelHelper | hasChanged", "|" + "========================> hasChanged: " + isChanged);
+    Log.w("APP# BucketListManager | hasChanged", "|" + "========================> hasChanged: " + isChanged);
     return isChanged;
   }
 
@@ -298,7 +298,7 @@ public class BucketListModelHelper {
    */
   public void clearChanged(int hashCode) {
     defineMap();
-    Log.w("APP# BucketListModelHelper | hasChanged", "|" + "========================> clearChanged: ");
+    Log.w("APP# BucketListManager | hasChanged", "|" + "========================> clearChanged: ");
     observerMap.put(hashCode, false);
   }
 
@@ -314,7 +314,7 @@ public class BucketListModelHelper {
   public void registerChangedObserver(int hashCode) {
     defineMap();
     observerMap.put(hashCode, false);
-    Log.w("APP# BucketListModelHelper | registerChangedObserver", "|" + "========================> register: " + observerMap.size());
+    Log.w("APP# BucketListManager | registerChangedObserver", "|" + "========================> register: " + observerMap.size());
   }
 
   /**
@@ -325,7 +325,7 @@ public class BucketListModelHelper {
   public void unregisterChangedObserver(int hashCode) {
     defineMap();
     observerMap.remove(hashCode);
-    Log.w("APP# BucketListModelHelper | unregisterChangedObserver", "|" + "========================> unregister: " + observerMap.size());
+    Log.w("APP# BucketListManager | unregisterChangedObserver", "|" + "========================> unregister: " + observerMap.size());
   }
 
   private void defineMap() {

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

@@ -87,7 +87,7 @@ public class BucketListWithTagDetailModel extends Model {
   }
 
   public int getBucketCount() {
-    return BucketListModelHelper.getInstance().getBucketCount();
+    return BucketListManager.getInstance().getBucketCount();
   }
 
   public BucketWithTagBean getBucketWithTagBean() {
@@ -208,7 +208,7 @@ public class BucketListWithTagDetailModel extends Model {
     // 달성 미달성 데이터 토글
     boolean bool = bucketWithTagBean.isCompleted();
     String yn = APIData.valueOf(!bool);
-    disposableAchieve = BucketListModelHelper.getInstance().completeBucket(new BucketCompleteRequestBean(getUserName(), bucketWithTagBean.getBucketNumber(), yn), new APIModuleListener<LifeplusAPIBean>(waiterCaller) {
+    disposableAchieve = BucketListManager.getInstance().completeBucket(new BucketCompleteRequestBean(getUserName(), bucketWithTagBean.getBucketNumber(), yn), new APIModuleListener<LifeplusAPIBean>(waiterCaller) {
       @Override
       public void onApiSuccess(LifeplusAPIBean resultBean) {
 
@@ -231,7 +231,7 @@ public class BucketListWithTagDetailModel extends Model {
     disposableDelete = new APIBucketDeleteModule().call(new BucketNumberRequestBean(getUserName(), bucketWithTagBean.getBucketNumber()), new APIModuleListener<LifeplusAPIBean>(waiterCaller) {
       @Override
       public void onApiSuccess(LifeplusAPIBean resultBean) {
-        BucketListModelHelper.getInstance().removeBucketByNumber(bucketWithTagBean.getBucketNumber());
+        BucketListManager.getInstance().removeBucketByNumber(bucketWithTagBean.getBucketNumber());
 
         onResult(new Event.Builder(Event.DELETE).build());
       }

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

@@ -35,7 +35,7 @@ public class MyBucketListModel extends Model {
   private int hasCode = this.hashCode();
 
   public MyBucketListModel() {
-    BucketListModelHelper.getInstance().registerChangedObserver(hasCode);
+    BucketListManager.getInstance().registerChangedObserver(hasCode);
   }
 
   @Override
@@ -43,7 +43,7 @@ public class MyBucketListModel extends Model {
   }
   @Override
   protected void destroyInternal() {
-    BucketListModelHelper.getInstance().unregisterChangedObserver(hasCode);
+    BucketListManager.getInstance().unregisterChangedObserver(hasCode);
     stopLoading();
   }
 
@@ -103,7 +103,7 @@ public class MyBucketListModel extends Model {
 
 
   public void loadMyBucket() {
-    disposableBucket = BucketListModelHelper.getInstance().loadMyBucketList(new BucketListRequestBean(1, 1000, ""), new APIModuleListener<BucketListResultBean>(waiterCaller) {
+    disposableBucket = BucketListManager.getInstance().loadMyBucketList(new BucketListRequestBean(1, 1000, ""), new APIModuleListener<BucketListResultBean>(waiterCaller) {
 
       @Override
       public void onApiSuccess(BucketListResultBean resultBean) {
@@ -148,10 +148,10 @@ public class MyBucketListModel extends Model {
   }
 
   public boolean hasBucketChanged() {
-    return BucketListModelHelper.getInstance().hasChanged(hasCode);
+    return BucketListManager.getInstance().hasChanged(hasCode);
   }
 
   public void clearBucketChanged() {
-    BucketListModelHelper.getInstance().clearChanged(hasCode);
+    BucketListManager.getInstance().clearChanged(hasCode);
   }
 }

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

@@ -39,7 +39,7 @@ 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.BookmarkManager;
-import kr.co.zumo.app.lifeplus.view.screen.my.bucketlist.BucketListModelHelper;
+import kr.co.zumo.app.lifeplus.view.screen.my.bucketlist.BucketListManager;
 import kr.co.zumo.app.lifeplus.view.screen.my.coin.CoinModelHelper;
 import kr.co.zumo.app.lifeplus.view.screen.setting.MemberInfoModelHelper;
 
@@ -80,7 +80,7 @@ public class MyMainModel extends Model {
 
   public MyMainModel() {
     ContentsFlagHelper.getInstance().registerChangedObserver(hasCode);
-    BucketListModelHelper.getInstance().registerChangedObserver(hasCode);
+    BucketListManager.getInstance().registerChangedObserver(hasCode);
   }
 
   @Override
@@ -91,7 +91,7 @@ public class MyMainModel extends Model {
   protected void destroyInternal() {
     stopLoading();
     ContentsFlagHelper.getInstance().unregisterChangedObserver(hasCode);
-    BucketListModelHelper.getInstance().unregisterChangedObserver(hasCode);
+    BucketListManager.getInstance().unregisterChangedObserver(hasCode);
   }
 
   @Override
@@ -237,7 +237,7 @@ public class MyMainModel extends Model {
   }
 
   public void loadMyBucket() {
-    disposableBucket = BucketListModelHelper.getInstance().loadMyBucketList(new BucketListRequestBean(1, 1000, ""), new APIModuleListener<BucketListResultBean>(waiterCaller) {
+    disposableBucket = BucketListManager.getInstance().loadMyBucketList(new BucketListRequestBean(1, 1000, ""), new APIModuleListener<BucketListResultBean>(waiterCaller) {
       @Override
       public void onApiSuccess(BucketListResultBean resultBean) {
         bucketList = resultBean.getData().getBucketList();
@@ -436,11 +436,11 @@ public class MyMainModel extends Model {
 
 
   public boolean hasBucketChanged() {
-    return BucketListModelHelper.getInstance().hasChanged(hasCode);
+    return BucketListManager.getInstance().hasChanged(hasCode);
   }
 
   public void clearBucketChanged() {
-    BucketListModelHelper.getInstance().clearChanged(hasCode);
+    BucketListManager.getInstance().clearChanged(hasCode);
   }
 
 }