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

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

@@ -30,6 +30,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.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;
@@ -79,7 +80,7 @@ public abstract class ActivityBase extends AppCompatActivity {
     if (hasLayout()) {
       setContentView(R.layout.activity_main);
       //resize screen in full screen
-      //AndroidBug5497Workaround.assistActivity(this);
+      FullScreenWithKeyBoardLayout.assistActivity(this);
 
       // TODO: 소프트키 있을경우 판별하여 레이아웃 패딩 추가, 추후 수정예정 
       //소프트키 있을 경우 판별하여 레이아웃 조절

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/AndroidBug5497Workaround.java

@@ -6,6 +6,8 @@ import android.view.View;
 import android.view.ViewTreeObserver;
 import android.widget.FrameLayout;
 
+import kr.co.zumo.app.lifeplus.util.ResourceUtil;
+
 /**
  * AndroidBug5497Workaround
  * <pre>
@@ -16,17 +18,17 @@ import android.widget.FrameLayout;
  * @history 하세미   [2018-12-05]   [최초 작성]
  * @since 2018-12-05
  */
-public class AndroidBug5497Workaround {
+public class FullScreenWithKeyBoardLayout {
 
   public static void assistActivity(Activity activity) {
-    new AndroidBug5497Workaround(activity);
+    new FullScreenWithKeyBoardLayout(activity);
   }
 
   private View mChildOfContent;
   private int usableHeightPrevious;
   private FrameLayout.LayoutParams frameLayoutParams;
 
-  private AndroidBug5497Workaround(Activity activity) {
+  private FullScreenWithKeyBoardLayout(Activity activity) {
     FrameLayout content = (FrameLayout) activity.findViewById(android.R.id.content);
     mChildOfContent = content.getChildAt(0);
     mChildOfContent.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
@@ -42,6 +44,7 @@ public class AndroidBug5497Workaround {
       int heightDifference = usableHeightSansKeyboard - usableHeightNow;
       if (heightDifference > (usableHeightSansKeyboard / 4)) {
         // keyboard probably just became visible
+        heightDifference = heightDifference - ResourceUtil.getStatusBarHeightManual();
         frameLayoutParams.height = usableHeightSansKeyboard - heightDifference;
       }
       else {

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/category/banner/MainBannerAdapter.java

@@ -29,25 +29,33 @@ public class MainBannerAdapter extends RecyclerView.Adapter<MainBannerViewHolder
   private Context context;
   private List<CategoryBannerBean> textImageBeanList;
   private LayoutInflater inflater;
+  private boolean isDimLayerEnabled;
 
-  public MainBannerAdapter(Context context, LayoutInflater inflater, List<CategoryBannerBean> textImageBeanList, IEventListener listener) {
+  public MainBannerAdapter(Context context, LayoutInflater inflater, List<CategoryBannerBean> textImageBeanList, IEventListener listener, boolean isDimLayerEnabled) {
     this.context = context;
     this.inflater = inflater;
     this.textImageBeanList = textImageBeanList;
     this.listener = listener;
+    this.isDimLayerEnabled = isDimLayerEnabled;
   }
 
   @NonNull
   @Override
   public MainBannerViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-    View view = inflater.inflate(R.layout.main_banner_view_item, parent, false);
+    View view;
+    if (isDimLayerEnabled) {
+      view = inflater.inflate(R.layout.main_banner_view_item_is_dim, parent, false);
+    }
+    else {
+      view = inflater.inflate(R.layout.main_banner_view_item_default, parent, false);
+    }
     return new MainBannerViewHolder(view);
   }
 
   @Override
   public void onBindViewHolder(@NonNull MainBannerViewHolder holder, int position) {
     holder.bind(position, textImageBeanList.get(position), event -> {
-      if(null != listener) {
+      if (null != listener) {
         listener.onEvent(event);
       }
     });
@@ -55,7 +63,7 @@ public class MainBannerAdapter extends RecyclerView.Adapter<MainBannerViewHolder
 
   @Override
   public void onViewDetachedFromWindow(@NonNull MainBannerViewHolder holder) {
-  //  holder.dispose();
+    //  holder.dispose();
   }
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/category/banner/MainBannerView.java

@@ -30,7 +30,6 @@ public class MainBannerView extends ConstraintLayout {
 
   private MainBannerAdapter mainBannerAdapter;
   private RecyclerView recyclerView;
-  private boolean isDimed;
 
   public MainBannerView(Context context) {
     super(context);
@@ -44,8 +43,7 @@ public class MainBannerView extends ConstraintLayout {
     super(context, attrs, defStyleAttr);
   }
 
-  public void init(Context context, List<CategoryBannerBean> textImageBeanList, IEventListener listener) {
-    isDimed = true;
+  public void init(Context context, List<CategoryBannerBean> textImageBeanList, IEventListener listener, boolean isDimLayerEnabled) {
 
     LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
     inflater.inflate(R.layout.main_banner_view, this);
@@ -60,7 +58,7 @@ public class MainBannerView extends ConstraintLayout {
       if (null != listener) {
         listener.onEvent(event);
       }
-    });
+    }, isDimLayerEnabled);
     recyclerView.setOnFlingListener(null);
     snapHelper.attachToRecyclerView(recyclerView);
     recyclerView.setAdapter(mainBannerAdapter);
@@ -75,9 +73,4 @@ public class MainBannerView extends ConstraintLayout {
     recyclerView = null;
     mainBannerAdapter = null;
   }
-
-  public void isNotDimLayout() {
-    this.isDimed = false;
-  }
-
 }

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

@@ -62,7 +62,7 @@ public class PromotionDialog extends DialogBase {
       public void onEvent(Event event) {
         // todo event
       }
-    });
+    }, true);
   }
 
   public void doDataSetting() {

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type1/FirstCategoryMainBannerViewHolder.java

@@ -38,7 +38,7 @@ public class FirstCategoryMainBannerViewHolder extends CategoryMainViewHolder<Ca
         if (null != listener) {
           listener.onEvent(event);
         }
-      });
+      }, true);
     }
 
   }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type3/ThirdCategoryMainBannerViewHolder.java

@@ -38,7 +38,7 @@ public class ThirdCategoryMainBannerViewHolder extends CategoryMainViewHolder<Ca
         if (null != listener) {
           listener.onEvent(event);
         }
-      });
+      }, true);
     }
 
   }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/type4/FourthCategoryMainBannerViewHolder.java

@@ -40,7 +40,7 @@ public class FourthCategoryMainBannerViewHolder extends CategoryMainViewHolder<C
         if (null != listener) {
           listener.onEvent(event);
         }
-      });
+      }, true);
     }
   }
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/coin/MyCoinMainFragment.java

@@ -59,7 +59,7 @@ public class MyCoinMainFragment extends FragmentBase<MyCoinMainPresenter> implem
       public void onEvent(Event event) {
 
       }
-    });
+    }, false);
 
     textViewMyCoinDetail.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_DETAIL).build());});
     imageViewArrowMyCoinDetail.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_DETAIL).build());});

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

@@ -7,16 +7,16 @@
   android:layout_height="match_parent">
 
   <LinearLayout
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <android.support.constraint.ConstraintLayout
       android:id="@+id/layout_container_my_coin"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      app:layout_constraintEnd_toEndOf="parent"
       android:background="@color/CF8F8F8"
+      app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent">
 
@@ -100,7 +100,7 @@
     <LinearLayout
       android:id="@+id/layout_coops_recommend"
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"
+      android:layout_height="421dp"
       android:orientation="vertical"
       app:layout_constraintBottom_toTopOf="@+id/coin_banner_view"
       app:layout_constraintEnd_toEndOf="parent"
@@ -113,7 +113,6 @@
       android:id="@+id/coin_banner_view"
       android:layout_width="match_parent"
       android:layout_height="151dp"
-      android:layout_marginTop="45dp"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"

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

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
+  <ImageView
+    android:id="@+id/image_view_banner_item"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:scaleType="centerCrop"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    tools:src="@drawable/img_bestbucket_banner_1"/>
+
+  <TextView
+    android:id="@+id/text_view_banner_item"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="8dp"
+    android:layout_marginEnd="8dp"
+    android:gravity="center_horizontal"
+    android:lineSpacingExtra="8sp"
+    android:textColor="@color/CFFFFFF"
+    android:textSize="19sp"
+    app:layout_constraintBottom_toBottomOf="@+id/image_view_banner_item"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="@+id/image_view_banner_item"
+    tools:text="베이징에서 접한
+신기한 문물 무인상점"/>
+</android.support.constraint.ConstraintLayout>