Browse Source

[튜토리얼][Bug] 레이아웃 분기처리 코드 주석 처리(API 19 버전 테스트시 잘 적용안됨)

Hasemi 6 years ago
parent
commit
b64a2e1d46

+ 24 - 15
app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/Tutorial.java

@@ -12,7 +12,6 @@ import android.widget.ImageView;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.util.AppUtil;
-import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
 
@@ -110,9 +109,13 @@ public class Tutorial {
     ConstraintLayout bubble1 = view.findViewById(R.id.tutorial_listicle_cover1);
     ConstraintLayout bubble2 = view.findViewById(R.id.tutorial_listicle_cover2);
 
+    /**
+     * API 23이하 버전 실행시 레이아웃 조정
+     * API 19 기기 테스트 결과 레이아웃에 잘 반영되지않아 주석처리
+     */
     if (false == AppUtil.isFullScreenVersion()) {
-      ConstraintLayout.LayoutParams bubble1Params = (ConstraintLayout.LayoutParams) bubble1.getLayoutParams();
-      bubble1Params.setMargins(bubble1Params.leftMargin, bubble1Params.topMargin - ResourceUtil.getStatusBarHeight(), bubble1Params.rightMargin, bubble1Params.bottomMargin);
+//      ConstraintLayout.LayoutParams bubble1Params = (ConstraintLayout.LayoutParams) bubble1.getLayoutParams();
+//      bubble1Params.setMargins(bubble1Params.leftMargin, bubble1Params.topMargin - ResourceUtil.getStatusBarHeight(), bubble1Params.rightMargin, bubble1Params.bottomMargin);
     }
 
     ObjectAnimator firstTutorial = fadeOut(bubble1);
@@ -153,13 +156,16 @@ public class Tutorial {
     view.setClickable(true);
     ConstraintLayout bubble1 = view.findViewById(R.id.tutorial_listicle_detail1);
     ConstraintLayout bubble2 = view.findViewById(R.id.tutorial_listicle_detail2);
-
+    /**
+     * API 23이하 버전 실행시 레이아웃 조정
+     * API 19 기기 테스트 결과 레이아웃에 잘 반영되지않아 주석처리
+     */
     if (false == AppUtil.isFullScreenVersion()) {
-      ConstraintLayout.LayoutParams bubble1Params = (ConstraintLayout.LayoutParams) bubble1.getLayoutParams();
-      bubble1Params.setMargins(bubble1Params.leftMargin, bubble1Params.topMargin - ResourceUtil.getStatusBarHeight(), bubble1Params.rightMargin, bubble1Params.bottomMargin);
-
-      ConstraintLayout.LayoutParams bubble2Params = (ConstraintLayout.LayoutParams) bubble2.getLayoutParams();
-      bubble2Params.setMargins(bubble2Params.leftMargin, bubble2Params.topMargin - ResourceUtil.getStatusBarHeight(), bubble2Params.rightMargin, bubble2Params.bottomMargin);
+//      ConstraintLayout.LayoutParams bubble1Params = (ConstraintLayout.LayoutParams) bubble1.getLayoutParams();
+//      bubble1Params.setMargins(bubble1Params.leftMargin, bubble1Params.topMargin - ResourceUtil.getStatusBarHeight(), bubble1Params.rightMargin, bubble1Params.bottomMargin);
+//
+//      ConstraintLayout.LayoutParams bubble2Params = (ConstraintLayout.LayoutParams) bubble2.getLayoutParams();
+//      bubble2Params.setMargins(bubble2Params.leftMargin, bubble2Params.topMargin - ResourceUtil.getStatusBarHeight(), bubble2Params.rightMargin, bubble2Params.bottomMargin);
     }
 
     ObjectAnimator firstTutorial = fadeOut(bubble1);
@@ -205,13 +211,16 @@ public class Tutorial {
     View secondView = inflater.inflate(R.layout.tutorial_bucket_list_update, null);
     ConstraintLayout bubble3 = secondView.findViewById(R.id.tutorial_bucket_list_success);
     ImageView trashIcon2 = secondView.findViewById(R.id.imageView7);
-
+    /**
+     * API 23이하 버전 실행시 레이아웃 조정
+     * API 19 기기 테스트 결과 레이아웃에 잘 반영되지않아 주석처리
+     */
     if (false == AppUtil.isFullScreenVersion()) {
-      ConstraintLayout.LayoutParams params1 = (ConstraintLayout.LayoutParams) trashIcon1.getLayoutParams();
-      params1.setMargins(params1.leftMargin, params1.topMargin - ResourceUtil.getStatusBarHeight(), params1.rightMargin, params1.bottomMargin);
-
-      ConstraintLayout.LayoutParams params2 = (ConstraintLayout.LayoutParams) trashIcon2.getLayoutParams();
-      params2.setMargins(params2.leftMargin, params2.topMargin - ResourceUtil.getStatusBarHeight(), params2.rightMargin, params2.bottomMargin);
+//      ConstraintLayout.LayoutParams params1 = (ConstraintLayout.LayoutParams) trashIcon1.getLayoutParams();
+//      params1.setMargins(params1.leftMargin, params1.topMargin - ResourceUtil.getStatusBarHeight(), params1.rightMargin, params1.bottomMargin);
+//
+//      ConstraintLayout.LayoutParams params2 = (ConstraintLayout.LayoutParams) trashIcon2.getLayoutParams();
+//      params2.setMargins(params2.leftMargin, params2.topMargin - ResourceUtil.getStatusBarHeight(), params2.rightMargin, params2.bottomMargin);
     }
 
     frameLayout.addView(firstView);

+ 5 - 5
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/OverviewTooltip.java

@@ -9,7 +9,6 @@ import android.widget.FrameLayout;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.util.AppUtil;
-import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
 
@@ -41,12 +40,13 @@ public class OverviewTooltip {
     frameLayout.addView(view);
 
     /**
-     * API 22 이하 부터 status bar로 인한 레이아웃 분기 처리
+     * API 23이하 버전 실행시 레이아웃 조정
+     * API 19 기기 테스트 결과 레이아웃에 잘 반영되지않아 주석처리
      */
     if (false == AppUtil.isFullScreenVersion()) {
-      ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) layoutTooltip.getLayoutParams();
-      layoutParams.setMargins(0, layoutParams.topMargin - ResourceUtil.getStatusBarHeight(), 0, 0);
-      layoutTooltip.setLayoutParams(layoutParams);
+//      ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) layoutTooltip.getLayoutParams();
+//      layoutParams.setMargins(0, layoutParams.topMargin - ResourceUtil.getStatusBarHeight(), 0, 0);
+//      layoutTooltip.setLayoutParams(layoutParams);
     }
 
     layoutTooltip.setOnClickListener(view1 -> {