Merge branch 'develop' of https://github.com/swict/LifeplusAndroid into develop

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

@@ -94,7 +94,7 @@ public class FilterDetailDialog extends DialogBase<IFilterListener<FilterDetailD
 
     init();
 
-    getView().setPadding(0, ResourceUtil.getStatusBarHeight(), 0, ResourceUtil.getNavBarHeight());
+    getView().setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, ResourceUtil.getNavBarHeight());
 
     viewApply.setOnClickListener(v -> {
       applyFilter();

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

@@ -106,7 +106,7 @@ public class FilterDialog extends DialogBase<IFilterListener<FilterDialog>> impl
 
     setContentsCount(filteredContentsCount);
 
-    getView().setPadding(0, ResourceUtil.getStatusBarHeight(), 0, ResourceUtil.getNavBarHeight());
+    getView().setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, ResourceUtil.getNavBarHeight());
 
     getView().findViewById(R.id.text_view_reset).setOnClickListener(view -> {
       reset();

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

@@ -70,7 +70,7 @@ public class PinConfirmDialog extends DialogBase<ICustomDialogListener<PinConfir
 
     applyFullScreen();
 
-    getView().setPadding(0, ResourceUtil.getStatusBarHeight(), 0, ResourceUtil.getNavBarHeight());
+    getView().setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, ResourceUtil.getNavBarHeight());
 
     customPinView = new CustomPinView(getContext());
     pinPresenter = new CustomPinInputPresenter(customPinView, isResetButtonVisible, new IPinContract.Listener() {

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

@@ -66,7 +66,7 @@ public class PinUnlockDialog extends DialogBase<ICustomDialogListener<PinUnlockD
 
     applyFullScreen();
 
-    getView().setPadding(0, ResourceUtil.getStatusBarHeight(), 0, ResourceUtil.getNavBarHeight());
+    getView().setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, ResourceUtil.getNavBarHeight());
 
     customPinView = new CustomPinView(getContext());
     pinPresenter = new CustomPinUnlockPresenter(customPinView, new IPinContract.Listener() {

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

@@ -53,7 +53,7 @@ public class PolicyDialog extends TextDialog<ICustomDialogListener<PolicyDialog>
 
     View root = getView();
 
-    int statusBarHeight = ResourceUtil.getStatusBarHeight();
+    int statusBarHeight = ResourceUtil.getStatusBarHeightManual();
     FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) getView().getLayoutParams();
     layoutParams.topMargin = layoutParams.topMargin + statusBarHeight;