[튜토리얼][Common] 튜토리얼 내비게이션바에 따른 레이아웃 처리 공통클래스로 추가

app/src/main/java/kr/co/zumo/app/lifeplus/util/ScreenUtil.java

@@ -25,20 +25,18 @@ public class ScreenUtil {
 
 
   /**
-   *
    * @param view
    */
   public static void setPaddingTopStatusBarHeight(View view) {
-    view.setPadding(view.getPaddingStart(), ResourceUtil.getStatusBarHeightManual(), view.getPaddingEnd(), view.getPaddingBottom());
+    view.setPadding(view.getPaddingStart(), view.getPaddingTop() + ResourceUtil.getStatusBarHeightManual(), view.getPaddingEnd(), view.getPaddingBottom());
   }
 
 
   /**
-   *
    * @param view
    */
   public static void setPaddingBottomNavigationBarHeight(View view) {
-    view.setPadding(view.getPaddingStart(), view.getPaddingTop(), view.getPaddingEnd(), ResourceUtil.getNavBarHeight());
+    view.setPadding(view.getPaddingStart(), view.getPaddingTop(), view.getPaddingEnd(), view.getPaddingBottom() + ResourceUtil.getNavBarHeight());
   }
 
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/Tutorial.java

@@ -11,7 +11,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 
 import kr.co.zumo.app.R;
-import kr.co.zumo.app.lifeplus.util.ResourceUtil;
+import kr.co.zumo.app.lifeplus.util.ScreenUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
 
@@ -125,10 +125,11 @@ public class Tutorial {
     ConstraintLayout bubble1 = view.findViewById(R.id.tutorial_listicle_cover1);
     ConstraintLayout bubble2 = view.findViewById(R.id.tutorial_listicle_cover2);
 
+    //내비게이션바 있을 경우 하단 말풍선에 내비게이션바 높이만큼 패딩추가
+    ScreenUtil.setPaddingBottomNavigationBarHeight(bubble2);
 
-    ConstraintLayout.LayoutParams bubble2Params = (ConstraintLayout.LayoutParams) bubble2.getLayoutParams();
-    bubble2Params.setMargins(bubble2Params.leftMargin, bubble2Params.topMargin, bubble2Params.rightMargin, bubble2Params.bottomMargin + ResourceUtil.getNavBarHeight());
     bubble1.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+
     ObjectAnimator firstTutorial = fadeOut(bubble1);
     firstTutorial.setStartDelay(1000);
     firstTutorial.setDuration(1000);
@@ -174,17 +175,6 @@ 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);
-//   }
 
     bubble1.setLayerType(View.LAYER_TYPE_HARDWARE, null);
     ObjectAnimator firstTutorial = fadeOut(bubble1);
@@ -232,31 +222,14 @@ public class Tutorial {
     ConstraintLayout firstContainer = bucketFirstView.findViewById(R.id.container);
     ConstraintLayout bubble1 = bucketFirstView.findViewById(R.id.tutorial_bucket_list_tag1);
     ConstraintLayout bubble2 = bucketFirstView.findViewById(R.id.tutorial_bucket_list_tag2);
-    //ImageView trashIcon1 = firstView.findViewById(R.id.image_trash);
 
     bucketSecondView = inflater.inflate(R.layout.tutorial_bucket_list_update, null);
     ConstraintLayout bubble3 = bucketSecondView.findViewById(R.id.tutorial_bucket_list_success);
     ConstraintLayout secondContainer = bucketSecondView.findViewById(R.id.container_second);
-    // 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 bucketFirstViewParams = (ConstraintLayout.LayoutParams) firstContainer.getLayoutParams();
-    bucketFirstViewParams.setMargins(bucketFirstViewParams.leftMargin, bucketFirstViewParams.topMargin, bucketFirstViewParams.rightMargin, bucketFirstViewParams.bottomMargin + ResourceUtil.getNavBarHeight());
-
-
-    ConstraintLayout.LayoutParams bucketSecondViewParams = (ConstraintLayout.LayoutParams) secondContainer.getLayoutParams();
-    bucketSecondViewParams.setMargins(bucketSecondViewParams.leftMargin, bucketSecondViewParams.topMargin, bucketSecondViewParams.rightMargin, bucketSecondViewParams.bottomMargin + ResourceUtil.getNavBarHeight());
+
+    //튜토리얼 두장마다 내비게이션바 있는 경우 하단 패딩 추가 
+    ScreenUtil.setPaddingBottomNavigationBarHeight(firstContainer);
+    ScreenUtil.setPaddingBottomNavigationBarHeight(secondContainer);
 
     frameLayout.addView(bucketFirstView);
     bucketFirstView.setClickable(true);

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

@@ -268,7 +268,6 @@ public class BucketListWithTagDetailFragment extends FragmentBase<BucketListWith
     Log.e("APP#  BucketListWithTagDetailFragment | setVisibilityResultNothing, 268", "isVisible |" + isVisible);
     if (isVisible) {
       setTagTitle(0);
-      Log.e("APP#  BucketListWithTagDetailFragment | setVisibilityResultNothing, 271", "|" + "들어옴 ==>");
       layoutNothing.setVisibility(View.VISIBLE);
       layoutContainerRecyclerView.setVisibility(View.GONE);
       recyclerView.setVisibility(View.GONE);