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

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/category/series/CustomImageTextViewHolder.java

@@ -10,6 +10,7 @@ import com.bumptech.glide.request.RequestOptions;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.CategoryRecommendBean;
+import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 
 /**
  * CustomImageTextViewHolder
@@ -45,7 +46,7 @@ public class CustomImageTextViewHolder extends RecyclerView.ViewHolder {
       Glide.with(imageViewMainCategory)
         .asBitmap()
         .load(bean.getImageUrl())
-        .apply(new RequestOptions().skipMemoryCache(true))
+        .apply(new RequestOptions().placeholder(ResourceUtil.getDrawable(imageViewMainCategory.getContext(), R.drawable.image_circle_loading)))
 //        .transition(new BitmapTransitionOptions().crossFade(100))
         .apply(RequestOptions.circleCropTransform())
         .into(imageViewMainCategory);

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/CustomIndicator.java

@@ -50,7 +50,8 @@ public class CustomIndicator extends View {
 
   private static final float DP = Resources.getSystem().getDisplayMetrics().density;
   private final int mIndicatorHeight = (int) (DP * 16);
-  private final float mIndicatorStrokeWidth = DP * 10;
+  //private final float mIndicatorStrokeWidth = DP * 10;
+  private final float mIndicatorStrokeWidth = DP * 5;
   private final float mIndicatorItemLength = DP * 4;
   private final float mIndicatorItemPadding = DP * 8;
   private final Paint mPaint = new Paint();

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/search/SearchResultFragment.java

@@ -7,6 +7,8 @@ import android.graphics.Rect;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.design.widget.AppBarLayout;
+import android.support.design.widget.CoordinatorLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -25,6 +27,7 @@ import kr.co.zumo.app.lifeplus.helper.NavigationBar;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.util.SoftKeyboardUtil;
 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;
 import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
 
@@ -45,6 +48,9 @@ public class SearchResultFragment extends FragmentBase<SearchResultPresenter> im
   private RecyclerView recyclerViewCategory;
   private View containerCategory;
   private ImageView imageFilter;
+  private AppBarLayout appBarLayout;
+  private OverScrollDriver overScrollDriver;
+
 
   @Override
   protected View onAfterCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -75,6 +81,7 @@ public class SearchResultFragment extends FragmentBase<SearchResultPresenter> im
       }
     });
 
+    appBarLayout = findViewById(R.id.app_bar_layout);
     containerCategory = findViewById(R.id.collapsing_tool_bar);
     recyclerViewCategory = findViewById(R.id.recycler_view_category);
     recyclerViewCategory.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
@@ -94,6 +101,31 @@ public class SearchResultFragment extends FragmentBase<SearchResultPresenter> im
     imageFilter.setOnClickListener(v -> {
       presenter.onEvent(new Event.Builder(Event.FILTER).build());
     });
+
+    if (appBarLayout.getLayoutParams() != null) {
+      CoordinatorLayout.LayoutParams layoutParams = (CoordinatorLayout.LayoutParams) appBarLayout.getLayoutParams();
+      AppBarLayout.Behavior appBarLayoutBehaviour = new AppBarLayout.Behavior();
+      appBarLayoutBehaviour.setDragCallback(new AppBarLayout.Behavior.DragCallback() {
+        @Override
+        public boolean canDrag(@NonNull AppBarLayout appBarLayout) {
+//          boolean isReturn;
+//
+//          if (AppUtil.isDebug()) {
+//            isReturn = true;
+//          }
+//          else {
+//            isReturn = false;
+//          }
+//          return isReturn;
+          return false;
+        }
+      });
+
+      layoutParams.setBehavior(appBarLayoutBehaviour);
+      overScrollDriver = new OverScrollDriver(recyclerViewResultContents, appBarLayout);
+    }
+
+
   }
 
   @Override
@@ -115,7 +147,7 @@ public class SearchResultFragment extends FragmentBase<SearchResultPresenter> im
 
   @Override
   protected void onAfterDestroy() {
-
+    overScrollDriver.dispose();
   }
 
   @Override

app/src/main/res/drawable/image_circle_bucket_loading.xml

@@ -11,11 +11,11 @@
     </shape>
   </item>
   <item
-    android:bottom="17dp"
-    android:drawable="@drawable/ic_bi_default_image_small_module"
+    android:bottom="15dp"
+    android:drawable="@drawable/ic_bi"
     android:gravity="center"
-    android:left="10dp"
-    android:right="10dp"
-    android:top="17dp">
+    android:left="15dp"
+    android:right="15dp"
+    android:top="15dp">
   </item>
 </layer-list>

app/src/main/res/drawable/image_circle_loading.xml

@@ -1,24 +1,21 @@
 <?xml version="1.0"
   encoding="utf-8"?>
-<selector
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
   <item>
-    <layer-list>
-      <item>
-        <shape android:shape="oval">
-          <size android:width="61dp" android:height="61dp"/>
-          <solid android:color="@color/CF6F6F6"/>
-        </shape>
-      </item>
-      <item
-        android:bottom="24dp"
-        android:drawable="@drawable/ic_bi_default_image_small_module"
-        android:gravity="center"
-        android:left="16dp"
-        android:right="16dp"
-        android:top="24dp">
-      </item>
-    </layer-list>
+    <shape android:shape="oval">
+      <size
+        android:width="61dp"
+        android:height="61dp"/>
+      <solid android:color="@color/CF6F6F6"/>
+    </shape>
   </item>
-</selector>
+  <item
+    android:bottom="15dp"
+    android:drawable="@drawable/ic_bi"
+    android:gravity="center"
+    android:left="15dp"
+    android:right="15dp"
+    android:top="15dp">
+  </item>
+</layer-list>

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

@@ -38,6 +38,7 @@
     app:layout_constraintTop_toBottomOf="@+id/container_top">
 
     <android.support.design.widget.AppBarLayout
+      android:id="@+id/app_bar_layout"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="@color/CFFFFFF"

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

@@ -15,7 +15,7 @@
     android:id="@+id/custom_indicator"
     android:layout_width="match_parent"
     android:layout_height="18dp"
-    android:layout_marginBottom="2dp"
+    android:layout_marginBottom="5dp"
     app:layout_constraintBottom_toBottomOf="@+id/recycler_view_main_banner_view"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"