Bläddra i källkod

[공통][New] 스태이터스 바 높이 구하는 메서드를 2개로 구분
- 항상 반환하는 것, 수동으로 0으로 설정하는 것
- 화면 상황에 따라서 0 또는 높이를 필요로 하여 수동 설정이 가능하도록 추가

hyodong.min 7 år sedan
förälder
incheckning
a842914920

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

@@ -88,7 +88,7 @@ public abstract class ActivityBase extends AppCompatActivity {
 //      if(hasNavBar(this , ((CoordinatorLayout)findViewById(R.id.layout_container)))){
 //        findViewById(R.id.layout_container).setPadding(0, 0, 0, ResourceUtil.getSoftKeyHeight());
 //      }
-      findViewById(R.id.layout_app_bar).setPadding(0, ResourceUtil.getStatusBarHeight(), 0, 0);
+      findViewById(R.id.layout_app_bar).setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);
 
       StatusBarCompat.setStatusBarColor(this, getResources().getColor(R.color.C80FFFFFF));
 

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/helper/ActionBarHelper.java

@@ -255,7 +255,7 @@ public class ActionBarHelper extends Helper {
           View child = container.getChildAt(0);
           ViewGroup.LayoutParams layoutParams = child.getLayoutParams();
           if (layoutParams instanceof ViewGroup.MarginLayoutParams) {
-            ((ViewGroup.MarginLayoutParams) layoutParams).topMargin += ResourceUtil.getDimension(R.dimen.action_bar_height) + ResourceUtil.getStatusBarHeight();
+            ((ViewGroup.MarginLayoutParams) layoutParams).topMargin += ResourceUtil.getDimension(R.dimen.action_bar_height) + ResourceUtil.getStatusBarHeightManual();
           }
         }
       }

+ 16 - 4
app/src/main/java/kr/co/zumo/app/lifeplus/util/ResourceUtil.java

@@ -147,6 +147,18 @@ public class ResourceUtil {
     return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, App.getInstance().getContext().getResources().getDisplayMetrics());
   }
 
+  /**
+   * 스테이터스바 높이 (px)
+   * - 수동으로 0이 설정 될 수 있음.
+   *
+   * @return
+   */
+  public static int getStatusBarHeightManual() {
+    int statusBarHeight = 0;
+//    statusBarHeight = getStatusBarHeight();
+    return statusBarHeight;
+  }
+
   /**
    * 스테이터스바 높이 (px)
    *
@@ -154,10 +166,10 @@ public class ResourceUtil {
    */
   public static int getStatusBarHeight() {
     int statusBarHeight = 0;
-//    int resId = App.getInstance().getContext().getResources().getIdentifier("status_bar_height", "dimen", "android");
-//    if (resId > 0) {
-//      statusBarHeight = App.getInstance().getContext().getResources().getDimensionPixelSize(resId);
-//    }
+    int resId = App.getInstance().getContext().getResources().getIdentifier("status_bar_height", "dimen", "android");
+    if (resId > 0) {
+      statusBarHeight = App.getInstance().getContext().getResources().getDimensionPixelSize(resId);
+    }
     return statusBarHeight;
   }
 

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/pin/CustomPinView.java

@@ -83,7 +83,7 @@ public class CustomPinView extends ConstraintLayout implements IPinContract.View
 
     View view = this;
 
-    view.setPadding(0, ResourceUtil.getStatusBarHeight(), 0,0);
+    view.setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0,0);
 
     buttonShuffle = view.findViewById(R.id.button_shuffle);
     buttonDelete = view.findViewById(R.id.button_delete);

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/CategoryFirstMainFilterDialog.java

@@ -47,7 +47,7 @@ public class CategoryFirstMainFilterDialog extends DialogBase<ICustomFilterListe
     applyFullScreen();
 
     init();
-    getView().setPadding(0, ResourceUtil.getStatusBarHeight(), 0, 0);
+    getView().setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);
 
     getView().findViewById(R.id.image_view_cancel_main).setOnClickListener(view -> {
       if (null != getCustomListener()) {

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/CategorySecondMainFilterDialog.java

@@ -46,7 +46,7 @@ public class CategorySecondMainFilterDialog extends DialogBase<ICustomFilterList
     applyFullScreen();
 
     init();
-    getView().setPadding(0, ResourceUtil.getStatusBarHeight(), 0, 0);
+    getView().setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);
 
 
     getView().findViewById(R.id.image_view_cancel_main).setOnClickListener(view -> {

+ 0 - 5
app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/TooltipDialog.java

@@ -30,11 +30,9 @@ public class TooltipDialog extends DialogBase<ICustomDialogListener<TooltipDialo
   @Nullable
   @Override
   public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-
     return inflater.inflate(R.layout.dialog_tool_tip, container, false);
   }
 
-
   @Override
   protected void onActivityCreatedInternal() {
 
@@ -58,8 +56,5 @@ public class TooltipDialog extends DialogBase<ICustomDialogListener<TooltipDialo
         getCustomListener().onDialogCanceled(TooltipDialog.this);
       }
     });
-
   }
-
-
 }

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/MainFragment.java

@@ -61,7 +61,7 @@ public class MainFragment extends FragmentBase<MainPresenter> implements IMainVi
     contentsRecyclerView = findViewById(R.id.recycler_view_main);
 
     if (contentsRecyclerView.getOnFlingListener() == null) {
-      MainContentsSnapper snapper = new MainContentsSnapper(1000, ResourceUtil.getStatusBarHeight() - ResourceUtil.dpToPx(25));
+      MainContentsSnapper snapper = new MainContentsSnapper(1000, ResourceUtil.getStatusBarHeightManual() - ResourceUtil.dpToPx(25));
       snapper.attachToRecyclerView(contentsRecyclerView);
     }
 

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/onboarding/OnBoardingFragment.java

@@ -56,7 +56,7 @@ public class OnBoardingFragment extends FragmentBase<OnBoardingPresenter> implem
 //    buttonTutorial1 = (TextView) bottomBar.findViewById(R.id.button1_tutorial);
 //    buttonTutorial2 = (TextView) bottomBar.findViewById(R.id.button2_tutorial);
 
-    findViewById(R.id.main_content).setPadding(0, ResourceUtil.getStatusBarHeight(), 0, 0);
+    findViewById(R.id.main_content).setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);
 
     OnBoardingPagerAdapter onBoardingPagerAdapter = presenter.getPagerAdapter(getActivity());
     onBoardingPagerAdapter.setPresenter(presenter);