[공통][Common] 팝업 및 content 상하단 마진 패딩 공용 클래스 생성 중

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

@@ -0,0 +1,34 @@
+package kr.co.zumo.app.lifeplus.util;
+
+import android.view.View;
+
+/**
+ * PopupContentScreenSizer
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2019-04-01]   [최초 작성]
+ * @since 2019-04-01
+ */
+public class ScreenUtil {
+
+  /**
+   * 풀스크린 화면에서 status bar 높이와 navigation bar 높이만큼 아래 위로 패딩 추가
+   *
+   * @param view
+   */
+  public static void setPaddingInFullScreen(View view) {
+    view.setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, ResourceUtil.getNavBarHeight());
+  }
+
+  public static void setPaddingTopStatusBarHeight(View view) {
+    view.setPadding(view.getPaddingStart(), ResourceUtil.getStatusBarHeightManual(), view.getPaddingEnd(), view.getPaddingBottom());
+  }
+
+
+  public static void setPaddingBottomNavigationBarHeight(View view) {
+    view.setPadding(view.getPaddingStart(), view.getPaddingTop(), view.getPaddingEnd(), ResourceUtil.getNavBarHeight());
+  }
+}

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

@@ -22,6 +22,7 @@ import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.FilterTagBean;
 import kr.co.zumo.app.lifeplus.helper.NavigationBar;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
+import kr.co.zumo.app.lifeplus.util.ScreenUtil;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.IWaiterCallable;
 import kr.co.zumo.app.lifeplus.view.SingleSelector;
@@ -93,7 +94,11 @@ public class FilterDetailDialog extends DialogBase<IFilterListener<FilterDetailD
 
     init();
 
-    getView().setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, ResourceUtil.getNavBarHeight());
+    /**
+     * navigationBar 있는 경우 하단 패딩 추가함, FullScreen에서 statusBarHeight 패딩 추가
+     */
+    //getView().setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, ResourceUtil.getNavBarHeight());
+    ScreenUtil.setPaddingInFullScreen(getView());
 
     viewApply.setOnClickListener(v -> {
       applyFilter();

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

@@ -19,6 +19,7 @@ import kr.co.zumo.app.lifeplus.bean.api.APIData;
 import kr.co.zumo.app.lifeplus.bean.api.FilterBean;
 import kr.co.zumo.app.lifeplus.helper.NavigationBar;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
+import kr.co.zumo.app.lifeplus.util.ScreenUtil;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IWaiterCallable;
@@ -116,9 +117,10 @@ public class FilterDialog extends DialogBase<IFilterListener<FilterDialog>> impl
     setContentsCount(filteredContentsCount);
 
     /**
-     * navigationBar 있는 경우 하단 패딩 추가함
+     * navigationBar 있는 경우 하단 패딩 추가함, FullScreen에서 statusBarHeight 패딩 추가
      */
-    getView().setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, ResourceUtil.getNavBarHeight());
+    //getView().setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, ResourceUtil.getNavBarHeight());
+    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

@@ -15,7 +15,7 @@ import android.webkit.WebViewClient;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.helper.NavigationBar;
-import kr.co.zumo.app.lifeplus.util.ResourceUtil;
+import kr.co.zumo.app.lifeplus.util.ScreenUtil;
 
 /**
  * WebDialog
@@ -43,10 +43,10 @@ public class PolicyDialog extends TextDialog<ICustomDialogListener<PolicyDialog>
     View root = getView();
 
     /**
-     * navigationBar 있는 경우 하단 패딩 추가함
+     * navigationBar 있는 경우 하단 패딩 추가함, FullScreen에서 statusBarHeight 패딩 추가
      */
-    root.setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, ResourceUtil.getNavBarHeight());
-    
+    //root.setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, ResourceUtil.getNavBarHeight());
+    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

@@ -10,7 +10,7 @@ import android.view.Window;
 import android.widget.TextView;
 
 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.custom.category.banner.MainBannerView;
 
@@ -40,9 +40,10 @@ public class PromotionFullScreenDialog extends PromotionDialog {
     mainBannerView = getView().findViewById(R.id.promotion_banner_all);
 
     /**
-     * navigationBar 있는 경우 하단 패딩 추가함
+     * navigationBar 있는 경우 하단 패딩 추가함, FullScreen에서 statusBarHeight 패딩 추가
      */
-    getView().setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, ResourceUtil.getNavBarHeight());
+   // 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);