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

app/src/main/java/kr/co/zumo/app/lifeplus/model/LifeplusPreferences.java

@@ -35,7 +35,6 @@ public class LifeplusPreferences {
   public final static String GUEST_LIKED_LIST = "guest_liked_list";
   public final static String DEBUG_TARGET = "debug_target";
   public final static String TUTORIAL_LISTICLE_DONE = "tutorial_listicle_done";
-  public final static String TUTORIAL_LISTICLE_DETAIL_DONE = "tutorial_listicle_detail_done";
   public final static String TUTORIAL_BUCKET_LIST_DETAIL_DONE = "tutorial_bucket_list_detail_done";
 
 
@@ -271,14 +270,6 @@ public class LifeplusPreferences {
     return preferences.get(TUTORIAL_LISTICLE_DONE, false);
   }
 
-  public void setTutorialListicleDetailDone(boolean isDone) {
-    preferences.put(TUTORIAL_LISTICLE_DETAIL_DONE, isDone);
-  }
-
-  public boolean isTutorialListicleDetailDone() {
-    return preferences.get(TUTORIAL_LISTICLE_DETAIL_DONE, false);
-  }
-
   public void setTutorialBucketListDone(boolean isDone) {
     preferences.put(TUTORIAL_BUCKET_LIST_DETAIL_DONE, isDone);
   }

app/src/main/java/kr/co/zumo/app/lifeplus/model/SuperModel.java

@@ -105,7 +105,6 @@ public final class SuperModel implements IMemberStatus {
     getPreferences().setPushEnabled(false);
     getPreferences().setPushMarketingEnabled(false);
     getPreferences().setLocationServiceEnabled(false);
-    getPreferences().setTutorialListicleDetailDone(false);
     getPreferences().setTutorialListicleDone(false);
     getPreferences().setTutorialBucketListDone(false);
 

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

@@ -188,7 +188,6 @@ public class ContentsPresenter extends ContentsBasePresenter<ContentsModel, ICon
       case Event.TUTORIAL:
         if (false == SuperModel.getInstance().getPreferences().isTutorialListicleDone()) {
           view.showTutorialListicle();
-          SuperModel.getInstance().getPreferences().setTutorialListicleDone(true);
         }
         break;
       case Event.LAST:
@@ -403,10 +402,10 @@ public class ContentsPresenter extends ContentsBasePresenter<ContentsModel, ICon
      * 리스티클형 최초진입 인덱스 1일 때 튜토리얼 표시 한다.
      */
     if (model.getContentsType().equals(ContentsDetailBean.TYPE_LISTICLE) && model.getCurrentPageIndex() == 1) {
-      if (false == SuperModel.getInstance().getPreferences().isTutorialListicleDetailDone()) {
+      if (false == SuperModel.getInstance().getPreferences().isTutorialListicleDone()) {
         // TODO: 앱 배포시 튜토리얼 미표시
          view.showTutorialListicleDetail();
-        SuperModel.getInstance().getPreferences().setTutorialListicleDetailDone(true);
+        SuperModel.getInstance().getPreferences().setTutorialListicleDone(true);
       }
     }