Переглянути джерело

[공통][Common] 레이아웃 처리 공통클래스로 처리중

Hasemi 6 роки тому
батько
коміт
0d6139a360

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

@@ -42,6 +42,7 @@ 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;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
 import kr.co.zumo.app.lifeplus.view.screen.factory.BasicFragmentFactory;
@@ -112,7 +113,8 @@ public abstract class ActivityBase extends AppCompatActivity implements IHelperP
       }
 
       // 풀 스크린 version 상단 스테이터스바 높이 패딩 액션바에 더해줌
-      findViewById(R.id.layout_app_bar).setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);
+      //findViewById(R.id.layout_app_bar).setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);
+      ScreenUtil.setPaddingTopStatusBarHeight(findViewById(R.id.layout_app_bar));
 
       /*
          setting helpers

+ 1 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/util/ScreenUtil.java

@@ -31,4 +31,5 @@ public class ScreenUtil {
   public static void setPaddingBottomNavigationBarHeight(View view) {
     view.setPadding(view.getPaddingStart(), view.getPaddingTop(), view.getPaddingEnd(), ResourceUtil.getNavBarHeight());
   }
+
 }

+ 3 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/recommend/EventRecommendTagFragment.java

@@ -27,6 +27,7 @@ import kr.co.zumo.app.lifeplus.bean.api.EventTagBean;
 import kr.co.zumo.app.lifeplus.bean.api.LifeplusContentsBean;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
 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.OverScrollDriver;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
@@ -85,7 +86,8 @@ public class EventRecommendTagFragment extends FragmentBase<EventRecommendTagPre
       }
     });
     recyclerView.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
-    layoutSelectBucket.setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);
+    //layoutSelectBucket.setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);
+    ScreenUtil.setPaddingBottomNavigationBarHeight(layoutSelectBucket);
     //.setUpOverScroll(recyclerView, OverScrollDecoratorHelper.ORIENTATION_VERTICAL);
 
 

+ 3 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/select/EventSelectPageCombinedHolder.java

@@ -17,6 +17,7 @@ import kr.co.zumo.app.lifeplus.bean.api.EventAnswerItemBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventPageBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventQuestionBean;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
+import kr.co.zumo.app.lifeplus.util.ScreenUtil;
 import kr.co.zumo.app.lifeplus.util.ViewUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
@@ -51,7 +52,8 @@ public class EventSelectPageCombinedHolder extends EventDetailView {
     imageViewIconConfirm = itemView.findViewById(R.id.icon_info);
     textViewConfirm = itemView.findViewById(R.id.text_view_confirm);
     buttonVote = itemView.findViewById(R.id.button_vote);
-    itemView.setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);
+    //itemView.setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);
+    ScreenUtil.setPaddingTopStatusBarHeight(itemView);
 
     recyclerView = itemView.findViewById(R.id.recycler_view_event_select_area);
     recyclerView.setNestedScrollingEnabled(false);

+ 3 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/select/EventSelectPageTextHolder.java

@@ -16,6 +16,7 @@ import kr.co.zumo.app.lifeplus.bean.api.EventAnswerItemBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventPageBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventQuestionBean;
 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.util.ViewUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
@@ -50,7 +51,8 @@ public class EventSelectPageTextHolder extends EventDetailView {
     imageViewBackground = itemView.findViewById(R.id.image_view_background);
     textViewConfirm = itemView.findViewById(R.id.text_view_confirm);
     layoutSelectArea = itemView.findViewById(R.id.layout_select_area);
-    itemView.setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);
+    // itemView.setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);
+    ScreenUtil.setPaddingTopStatusBarHeight(itemView);
   }
 
   @Override

+ 3 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/search/SearchFragment.java

@@ -25,7 +25,7 @@ import kr.co.zumo.app.lifeplus.bean.api.TagBean;
 import kr.co.zumo.app.lifeplus.bean.api.TagKeywordBean;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
 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.TextUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.custom.ClearEditText;
@@ -76,7 +76,8 @@ public class SearchFragment extends FragmentBase<SearchPresenter> implements ISe
   @Override
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
 
-    getView().setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);
+    //getView().setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);
+    ScreenUtil.setPaddingTopStatusBarHeight(getView());
 
     // navigation var setting
     ((ViewGroup) findViewById(R.id.container_navigation_bar))

+ 3 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/search/SearchResultFragment.java

@@ -25,6 +25,7 @@ import kr.co.zumo.app.lifeplus.bean.api.TagCheckBean;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
 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.SoftKeyboardUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.OverScrollDriver;
@@ -59,7 +60,8 @@ public class SearchResultFragment extends FragmentBase<SearchResultPresenter> im
   @Override
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
 
-    getView().setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);
+    // getView().setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);
+    ScreenUtil.setPaddingTopStatusBarHeight(getView());
 
     // navigation var setting
     ((ViewGroup) findViewById(R.id.container_navigation_bar))