Forráskód Böngészése

[공통][New] R.id.content 배경 (검정) 설정

hyodong.min 6 éve
szülő
commit
bcaacf978b

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

@@ -42,7 +42,6 @@ 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.view.custom.FullScreenWithKeyBoardLayout;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
 import kr.co.zumo.app.lifeplus.view.screen.factory.BasicFragmentFactory;
 import kr.co.zumo.app.lifeplus.view.screen.factory.FragmentFactory;
@@ -100,26 +99,17 @@ public abstract class ActivityBase extends AppCompatActivity implements IHelperP
     if (hasLayout()) {
       setContentView(R.layout.activity_main);
 
+      findViewById(android.R.id.content).setBackgroundColor(ResourceUtil.getColor(R.color.C000000));
+
       //resize screen in full screen
-      FullScreenWithKeyBoardLayout.assistActivity(this);
-
-      //소프트키 있을 경우 판별하여 레이아웃 조절
-      Log.d("APP#  ActivityBase | onCreate", "|" + "AppUtil.hasNavBar(): " + AppUtil.hasNavBar());
-      Log.d("APP#  ActivityBase | onCreate", "|" + "ResourceUtil.getNavBarHeightValue(): " + ResourceUtil.getNavBarHeightValue());
-      Log.d("APP#  ActivityBase | onCreate", "|" + "ResourceUtil.getNavBarHeight(): " + ResourceUtil.getNavBarHeight());
-//      int paddingBottom = 0;
-//
-//      if (false == AppUtil.isFullScreenVersion()) {
-//        paddingBottom = paddingBottom + ResourceUtil.getStatusBarHeight();
-//      }
-//
-//      if (AppUtil.hasNavBar() || ResourceUtil.getNavBarHeight() > 0) {
-//        paddingBottom = paddingBottom + ResourceUtil.getNavBarHeight();
-//      }
-
-//      findViewById(R.id.layout_container).setPadding(0, 0, 0, paddingBottom);
-
-      // 상단 스테이터스바 높이 패딩 액션바에 더해줌
+//      FullScreenWithKeyBoardLayout.assistActivity(this);
+
+      // 풀 스크린 아닌 버전은 상단에 스테이터스 바 높이의 패딩을 추가함
+      if (false == AppUtil.isFullScreenVersion()) {
+        findViewById(R.id.drawer_layout).setPadding(0, ResourceUtil.getStatusBarHeight(), 0, 0);
+      }
+
+      // 풀 스크린 version 상단 스테이터스바 높이 패딩 액션바에 더해줌
       findViewById(R.id.layout_app_bar).setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);
 
       /*

+ 0 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/FullScreenWithKeyBoardLayout.java

@@ -5,7 +5,6 @@ import android.graphics.Rect;
 import android.view.View;
 import android.widget.FrameLayout;
 
-import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.util.AppUtil;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 
@@ -33,7 +32,6 @@ public class FullScreenWithKeyBoardLayout {
   private FullScreenWithKeyBoardLayout(Activity activity) {
     FrameLayout parentContent = activity.findViewById(android.R.id.content);
     childContent = parentContent.getChildAt(0);
-    parentContent.setBackgroundColor(ResourceUtil.getColor(R.color.C000000));
     childContent.getViewTreeObserver().addOnGlobalLayoutListener(this::possiblyResizeChildOfContent);
 
     frameLayoutParams = (FrameLayout.LayoutParams) childContent.getLayoutParams();