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

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

@@ -40,6 +40,7 @@ import kr.co.zumo.app.lifeplus.supervisor.ActivityScreenIDDeliveryHelper;
 import kr.co.zumo.app.lifeplus.supervisor.FragmentSkipBackChanger;
 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;
@@ -110,9 +111,10 @@ public abstract class ActivityBase extends AppCompatActivity implements IHelperP
 
       // todo 하위 버젼의 화면 조절을 위한 코드, 제대로 반영 안되고 있음.
       // 풀 스크린 아닌 버전은 상단에 스테이터스 바 높이의 패딩을 추가함
-//      if (false == AppUtil.isFullScreenVersion()) {
-//        findViewById(R.id.drawer_layout).setPadding(0, ResourceUtil.getStatusBarHeight(), 0, 0);
-//      }
+
+      if (false == AppUtil.isFullScreenVersion()) {
+        findViewById(R.id.layout_container).setPadding(0, ResourceUtil.getStatusBarHeight(), 0, 0);
+      }
 
       // 풀 스크린 version 상단 스테이터스바 높이 패딩 액션바에 더해줌
       findViewById(R.id.layout_app_bar).setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);

app/src/main/java/kr/co/zumo/app/lifeplus/activity/AllMenuDriver.java

@@ -66,7 +66,7 @@ public class AllMenuDriver implements PushMessageBroker.IPushMessageListener, ID
 
 //    ((ViewGroup.MarginLayoutParams) this.drawerView.getLayoutParams()).topMargin = ResourceUtil.getStatusBarHeightManual();
     // top margin 대신 padding 이용, 마진 영역 비어 다른 ui 들이 보여짐
-    this.drawerView.setPadding(0, ResourceUtil.getStatusBarHeightManual(), 0, 0);
+    this.drawerView.setPadding(0, ResourceUtil.getStatusBarHeight(), 0, 0);
     ((ViewGroup.MarginLayoutParams) menuContainer.getLayoutParams()).topMargin = ResourceUtil.getDimension(R.dimen.action_bar_height);
     this.drawerView.setClickable(true);
 

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

@@ -56,9 +56,9 @@ public class PromotionFullScreenDialog extends PromotionDialog {
       if (null != getCustomListener()) {
         getCustomListener().onDialogResult(PromotionFullScreenDialog.this, event);
       }
-    }).activeColor(R.color.CFFFFFF)
-      .inactiveColor(R.color.C4DFFFFFF)
-      .isDim(true)
+    }).activeColor(R.color.C000000)
+      .inactiveColor(R.color.C19000000)
+      .isDim(false)
       .placeholder(R.drawable.image_loading_full)
       .build(mainBannerView);
   }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/BucketListWithTagDetailFragment.java

@@ -31,7 +31,6 @@ import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
 import kr.co.zumo.app.lifeplus.helper.ScreenSizeHelper;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
-import kr.co.zumo.app.lifeplus.view.IEventListener;
 import kr.co.zumo.app.lifeplus.view.OverScrollDriver;
 import kr.co.zumo.app.lifeplus.view.custom.Tutorial;
 import kr.co.zumo.app.lifeplus.view.screen.FragmentBase;
@@ -266,15 +265,19 @@ public class BucketListWithTagDetailFragment extends FragmentBase<BucketListWith
 
   @Override
   public void setVisibilityResultNothing(boolean isVisible) {
-
+    Log.e("APP#  BucketListWithTagDetailFragment | setVisibilityResultNothing, 268", "isVisible |" + isVisible);
     if (isVisible) {
       setTagTitle(0);
+      Log.e("APP#  BucketListWithTagDetailFragment | setVisibilityResultNothing, 271", "|" + "들어옴 ==>");
       layoutNothing.setVisibility(View.VISIBLE);
       layoutContainerRecyclerView.setVisibility(View.GONE);
+      recyclerView.setVisibility(View.GONE);
+
     }
     else {
       layoutNothing.setVisibility(View.GONE);
       layoutContainerRecyclerView.setVisibility(View.VISIBLE);
+      recyclerView.setVisibility(View.VISIBLE);
     }
 
   }
@@ -295,11 +298,8 @@ public class BucketListWithTagDetailFragment extends FragmentBase<BucketListWith
   public void showTutorialBucketTag() {
     ScreenSizeHelper helper = getHelper(ScreenSizeHelper.class);
     tutorial = new Tutorial(helper.getScreenWidth());
-    tutorial.showTutorial(getActivity(), Tutorial.TUTORIAL_BUCKET, new IEventListener() {
-      @Override
-      public void onEvent(Event event) {
+    tutorial.showTutorial(getActivity(), Tutorial.TUTORIAL_BUCKET, event -> {
 
-      }
     });
   }
 

app/src/main/res/layout/contents_listicle_detail.xml

@@ -25,7 +25,7 @@
     android:layout_height="0dp"
     android:padding="25dp"
     android:orientation="vertical"
-    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintBottom_toTopOf="@+id/layout_more_info"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/custom_listicle_image_view">

app/src/main/res/layout/event_item_view.xml

@@ -54,7 +54,7 @@
     <android.support.constraint.ConstraintLayout
       android:id="@+id/bottom_view"
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"
+      android:layout_height="0dp"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@+id/image_view_thumbnail">
@@ -129,6 +129,7 @@
   </android.support.constraint.ConstraintLayout>
 
   <Space
+    android:id="@+id/space"
     android:layout_width="match_parent"
     android:layout_height="0dp"
     app:layout_constraintBottom_toBottomOf="parent"

app/src/main/res/layout/fragment_bucket_list_with_tag_detail.xml

@@ -165,7 +165,7 @@
       android:layout_height="match_parent"
       android:orientation="vertical"
       app:layout_behavior="@string/appbar_scrolling_view_behavior"
-      tools:visibility="gone">
+      android:visibility="gone">
 
       <android.support.v7.widget.RecyclerView
         android:id="@+id/recycler_view_bucket_list_detail"