Revert "[공통][Common] 공통 클래스로 레이아웃 조정 코드 통일"

This reverts commit ada59ea8acf260ef3e021b4773c3ab7dcdca810c.

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

@@ -40,6 +40,7 @@ import kr.co.zumo.app.lifeplus.supervisor.ActivityScreenIDDeliveryHelper;
 import kr.co.zumo.app.lifeplus.supervisor.FragmentSkipBackChanger;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenChanger;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
+import kr.co.zumo.app.lifeplus.util.AppUtil;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.util.ScreenUtil;
 import kr.co.zumo.app.lifeplus.view.custom.FullScreenWithKeyBoardLayout;
@@ -107,12 +108,13 @@ public abstract class ActivityBase extends AppCompatActivity implements IHelperP
       });
 
       // 풀 스크린 아닌 버전은 상단에 스테이터스 바 높이의 패딩을 추가함
-      //findViewById(R.id.layout_container).setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);
-      ScreenUtil.setPaddingTopStatusBarHeight(findViewById(R.id.layout_container));
+      if (false == AppUtil.isFullScreenVersion()) {
+        findViewById(R.id.layout_container).setPadding(0, ResourceUtil.getStatusBarHeight(), 0, 0);
+      }
 
-
-      // 풀 스크린 version 상단 스테이터스바 높이 패딩 액션바에
+      // 풀 스크린 version 상단 스테이터스바 높이 패딩 액션바에 더해줌
       //findViewById(R.id.layout_app_bar).setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);
+      ScreenUtil.setPaddingTopStatusBarHeight(findViewById(R.id.layout_app_bar));
 
       /*
          setting helpers

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

@@ -170,7 +170,6 @@ public class ResourceUtil {
    *
    * @return
    */
-  //드로어사용
   public static int getStatusBarHeight() {
     int statusBarHeight = 0;
     int resId = App.getInstance().getContext().getResources().getIdentifier("status_bar_height", "dimen", "android");

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

@@ -23,17 +23,16 @@ public class ScreenUtil {
     view.setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, ResourceUtil.getNavBarHeight());
   }
 
+
   /**
-   *
-   *  스테이터스바 높이만큼 상단 패딩 추가
    * @param view
    */
   public static void setPaddingTopStatusBarHeight(View view) {
-      view.setPadding(view.getPaddingStart(), view.getPaddingTop() + 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) {

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

@@ -227,7 +227,7 @@ public class Tutorial {
     ConstraintLayout bubble3 = bucketSecondView.findViewById(R.id.tutorial_bucket_list_success);
     ConstraintLayout secondContainer = bucketSecondView.findViewById(R.id.container_second);
 
-    //튜토리얼 두장마다 내비게이션바 있는 경우 하단 패딩 추가
+    //튜토리얼 두장마다 내비게이션바 있는 경우 하단 패딩 추가 
     ScreenUtil.setPaddingBottomNavigationBarHeight(firstContainer);
     ScreenUtil.setPaddingBottomNavigationBarHeight(secondContainer);
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/FilterDetailDialog.java

@@ -98,9 +98,7 @@ public class FilterDetailDialog extends DialogBase<IFilterListener<FilterDetailD
      * navigationBar 있는 경우 하단 패딩 추가함, FullScreen에서 statusBarHeight 패딩 추가
      */
     //getView().setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, ResourceUtil.getNavBarHeight());
-    //ScreenUtil.setPaddingInFullScreen(getView());
-    ScreenUtil.setPaddingTopStatusBarHeight(getView());
-    ScreenUtil.setPaddingBottomNavigationBarHeight(getView());
+    ScreenUtil.setPaddingInFullScreen(getView());
 
     viewApply.setOnClickListener(v -> {
       applyFilter();

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/FilterDialog.java

@@ -120,10 +120,7 @@ public class FilterDialog extends DialogBase<IFilterListener<FilterDialog>> impl
      * navigationBar 있는 경우 하단 패딩 추가함, FullScreen에서 statusBarHeight 패딩 추가
      */
     //getView().setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, ResourceUtil.getNavBarHeight());
-    //ScreenUtil.setPaddingInFullScreen(getView());
-    ScreenUtil.setPaddingTopStatusBarHeight(getView());
-    ScreenUtil.setPaddingBottomNavigationBarHeight(getView());
-
+    ScreenUtil.setPaddingInFullScreen(getView());
 
     getView().findViewById(R.id.text_view_reset).setOnClickListener(view -> {
       reset();

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/PolicyDialog.java

@@ -46,9 +46,7 @@ public class PolicyDialog extends TextDialog<ICustomDialogListener<PolicyDialog>
      * navigationBar 있는 경우 하단 패딩 추가함, FullScreen에서 statusBarHeight 패딩 추가
      */
     //root.setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, ResourceUtil.getNavBarHeight());
-    //ScreenUtil.setPaddingInFullScreen(root);
-    ScreenUtil.setPaddingTopStatusBarHeight(root);
-    ScreenUtil.setPaddingBottomNavigationBarHeight(root);
+    ScreenUtil.setPaddingInFullScreen(root);
 
     ((ViewGroup) root.findViewById(R.id.container_navigation_bar))
       .addView(

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/PromotionFullScreenDialog.java

@@ -42,10 +42,8 @@ public class PromotionFullScreenDialog extends PromotionDialog {
     /**
      * navigationBar 있는 경우 하단 패딩 추가함, FullScreen에서 statusBarHeight 패딩 추가
      */
-    // getView().setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, ResourceUtil.getNavBarHeight());
-    //ScreenUtil.setPaddingInFullScreen(getView());
-    ScreenUtil.setPaddingTopStatusBarHeight(getView());
-    ScreenUtil.setPaddingBottomNavigationBarHeight(getView());
+   // getView().setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, ResourceUtil.getNavBarHeight());
+    ScreenUtil.setPaddingInFullScreen(getView());
 
     TextView textViewNotTodayShow = getView().findViewById(R.id.text_view_not_today_show);
     TextView textViewClose = getView().findViewById(R.id.text_view_close);