Przeglądaj źródła

[LP소개][Common] LP소개 디버그일 경우 전체 나오게 수정 및 애니메이션 수정

Hasemi 7 lat temu
rodzic
commit
56bb05c1c3

+ 1 - 3
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/introduction/LifeplusIntroductionPagerAdapter.java

@@ -4,7 +4,6 @@ import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
-import android.util.Log;
 
 import kr.co.zumo.app.lifeplus.view.IEventListener;
 import kr.co.zumo.app.lifeplus.view.screen.introduction.brand.LifeplusBrandFragment;
@@ -61,9 +60,8 @@ public class LifeplusIntroductionPagerAdapter extends FragmentStatePagerAdapter
     return tabs[position];
   }
 
-  public void setCurrentIndex(int index){
+  public void setCurrentIndex(int index) {
     this.index = index;
-    Log.e("APP#  LifeplusIntroductionPagerAdapter | setCurrentIndex", "|" + index);
     guideFragment.setIndex(index);
   }
 }

+ 10 - 4
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/introduction/guide/GuideAdapter.java

@@ -8,6 +8,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.util.AppUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
@@ -25,8 +26,6 @@ import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 public class GuideAdapter extends RecyclerView.Adapter<GuideView> {
 
   private static final int LIST_COUNT = 6;
-  // TODO: 2차 오픈: 준비중, 얼랏 처리
-  //private static final int LIST_COUNT = 4;
 
   private static final int APP_INTRO = 0;
   private static final int CATEGORY_MAIN_GUIDE = 1;
@@ -78,7 +77,6 @@ public class GuideAdapter extends RecyclerView.Adapter<GuideView> {
       case COIN_GUIDE:
         view = inflater.inflate(R.layout.app_guide_coin, parent, false);
         return new GuideCoinViewHolder(context, view);
-      // TODO: 2차 오픈: 준비중, 얼랏 처리
       case LAST_VIEW:
         view = inflater.inflate(R.layout.app_guide_last_view, parent, false);
         return new GuideLastViewHolder(context, view);
@@ -101,7 +99,15 @@ public class GuideAdapter extends RecyclerView.Adapter<GuideView> {
 
   @Override
   public int getItemCount() {
-    return LIST_COUNT;
+    int count;
+    // TODO: 2차 오픈: 준비중, 얼랏 처리
+    if (AppUtil.isDebug()) {
+      count = LIST_COUNT;
+    }
+    else {
+      count = 4;
+    }
+    return count;
   }
 
   @Override

+ 4 - 4
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/introduction/guide/GuideIntroViewHolder.java

@@ -51,13 +51,13 @@ public class GuideIntroViewHolder extends GuideView {
 
   @Override
   public void startAnimation() {
-    ObjectAnimator.ofFloat(layoutHeader, View.TRANSLATION_Y, layoutHeader.getTranslationY(), 20f).setDuration(1300).start();
-    ObjectAnimator.ofFloat(imageViewObject, View.TRANSLATION_Y, imageViewObject.getTranslationY(), 30f).setDuration(2000).start();
+    ObjectAnimator.ofFloat(layoutHeader, View.TRANSLATION_Y, layoutHeader.getTranslationY(), 0f).setDuration(1300).start();
+    ObjectAnimator.ofFloat(imageViewObject, View.TRANSLATION_Y, imageViewObject.getTranslationY(), 0f).setDuration(2000).start();
   }
 
   @Override
   public void setDefaultSetting() {
-    layoutHeader.setTranslationY(layoutHeader.getTranslationY() + 100f);
-    imageViewObject.setTranslationY(imageViewObject.getTranslationY() + 100f);
+    layoutHeader.setTranslationY(100f);
+    imageViewObject.setTranslationY(200f);
   }
 }