Browse Source

[공통][Bug] 코드 정리

hyodong.min 7 years ago
parent
commit
b866067c58

+ 52 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/CustomHeaderBehavior.java

@@ -0,0 +1,52 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.view;
+
+import android.support.design.widget.AppBarLayout;
+import android.support.design.widget.CoordinatorLayout;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * CustomHeaderBehavior
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 10. 22.]   [최초 작성]
+ * @since 2018. 10. 22.
+ */
+public class CustomHeaderBehavior extends AppBarLayout.Behavior {
+  @Override
+  public void onNestedPreScroll(CoordinatorLayout coordinatorLayout, AppBarLayout child, View target, int dx, int dy, int[] consumed, int type) {
+    super.onNestedPreScroll(coordinatorLayout, child, target, dx, dy, consumed, type);
+
+    consumed[1] = 0;
+  }
+
+  @Override
+  public void onNestedScroll(CoordinatorLayout coordinatorLayout, AppBarLayout child, View target, int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed, int type) {
+//    Log.i("APP# CustomHeaderBehavior | onNestedScroll", "|" + " dyConsumed: " + dyConsumed + ", dyUnconsumed: " + dyUnconsumed);
+    if (target instanceof RecyclerView) {
+      RecyclerView recyclerView = (RecyclerView) target;
+      RecyclerView.ViewHolder holder = recyclerView.findViewHolderForAdapterPosition(0);
+
+      if (null != holder) {
+        ViewGroup.MarginLayoutParams marginLayoutParams = (ViewGroup.MarginLayoutParams) holder.itemView.getLayoutParams();
+
+        float cy = holder.itemView.getY() - marginLayoutParams.topMargin - recyclerView.getPaddingTop();
+        float childY = child.getY();
+//        Log.i("APP# CustomHeaderBehavior | onNestedScroll", "|" + " holder.itemView.getY(): " + cy + ", child.y: " + childY);
+
+        if (cy < 0 && cy > childY) {
+          dyUnconsumed = (int) -(cy - childY);
+        }
+      }
+    }
+    super.onNestedScroll(coordinatorLayout, child, target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, type);
+  }
+
+}

+ 1 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/FragmentBase.java

@@ -43,6 +43,7 @@ public abstract class FragmentBase<P extends Presenter> extends Fragment impleme
   @Override
   public void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
+    Log.w("APP# FragmentBase | onCreate", "| >>>>>>>>>>>> " + this.getClass().getSimpleName());
 
     presenter = definePresenter();
     defineActionBar();

+ 1 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/bucketlist/MyBucketListRelatedTagFragment.java

@@ -14,7 +14,6 @@ import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.manager.ActionBarManager;
 import kr.co.zumo.app.lifeplus.model.BlankModel;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
-import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.fragment.FragmentBase;
 import kr.co.zumo.app.lifeplus.view.presenter.MyBucketListRelatedTagPresenter;
 
@@ -60,7 +59,7 @@ public class MyBucketListRelatedTagFragment extends FragmentBase<MyBucketListRel
   @Override
   protected void defineActionBar() {
     ActionBarManager.getInstance().begin()
-      .back(actionBar -> presenter.onEvent(new Event.Builder(Event.ACTION_BAR_BACK).build()))
+      .back(actionBar -> presenter.onClickBack(actionBar))
       .scroll()
       .transparent().white().show();
   }

+ 32 - 12
app/src/main/res/layout/fragment_my_bucket_list_related_tag.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<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"
@@ -7,17 +7,27 @@
   android:layout_height="match_parent"
   android:orientation="vertical">
 
-  <RelativeLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/img_bestbucket_banner_5">
+  <android.support.constraint.ConstraintLayout
+    android:id="@+id/relativeLayout2"
+    android:layout_width="0dp"
+    android:layout_height="0dp"
+    android:background="@drawable/img_bestbucket_banner_5"
+    app:layout_constraintDimensionRatio="H,2:1"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintHeight_max="250dp"
+    app:layout_constraintStart_toStartOf="parent">
 
     <ImageView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_centerVertical="true"
-      android:layout_marginEnd="5dp"
+      android:layout_marginTop="8dp"
+      android:layout_marginEnd="8dp"
+      android:layout_marginBottom="8dp"
       android:layout_toStartOf="@+id/text_view_select_bucket"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toStartOf="@+id/text_view_select_bucket"
+      app:layout_constraintTop_toTopOf="parent"
       app:srcCompat="@drawable/icon_bucket_complete_white"/>
 
     <TextView
@@ -25,17 +35,27 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_centerInParent="true"
+      android:layout_marginStart="8dp"
+      android:layout_marginTop="8dp"
+      android:layout_marginEnd="8dp"
+      android:layout_marginBottom="8dp"
       android:gravity="center_horizontal"
       android:lineSpacingExtra="8sp"
       android:text="@string/bucket_select_text10"
       android:textColor="#ffffff"
-      android:textSize="21sp"/>
+      android:textSize="21sp"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"/>
+
+  </android.support.constraint.ConstraintLayout>
 
-  </RelativeLayout>
   <android.support.v7.widget.RecyclerView
     android:id="@+id/recycler_view_related_tag_list"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="25dp"
-    />
-</LinearLayout>
+    android:layout_height="0dp"
+    android:paddingTop="25dp"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintTop_toBottomOf="@+id/relativeLayout2"/>
+</android.support.constraint.ConstraintLayout>