Procházet zdrojové kódy

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

hyodong.min před 6 roky
rodič
revize
a11f2524f7

+ 6 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/BucketListWithTagDetailFragment.java

@@ -4,6 +4,7 @@ import android.graphics.Rect;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.constraint.ConstraintLayout;
 import android.support.design.widget.AppBarLayout;
 import android.support.design.widget.CoordinatorLayout;
 import android.support.v7.widget.LinearLayoutManager;
@@ -297,16 +298,21 @@ public class BucketListWithTagDetailFragment extends FragmentBase<BucketListWith
   }
 
   private void addAppbarLayoutScrollChange() {
+    ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) imageChecker.getLayoutParams();
+
+
     appBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
       @Override
       public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
         if (Math.abs(verticalOffset) > (appBarLayout.getTotalScrollRange() >> 1)) {
           // 줄어든 상태
           textBucketTitle.setTextSize(14);
+          params.topMargin = 0;
         }
         else {
           // 커진 상태
           textBucketTitle.setTextSize(21);
+          params.topMargin = ResourceUtil.dpToPx(6);
         }
       }
     });

+ 5 - 4
app/src/main/res/layout/fragment_bucket_list_with_tag_detail.xml

@@ -73,7 +73,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="80dp"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="6dp"
             app:layout_constraintEnd_toStartOf="@+id/text_view_select_bucket"
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintStart_toStartOf="parent"
@@ -91,6 +91,7 @@
             android:layout_marginBottom="20dp"
             android:ellipsize="end"
             android:gravity="center"
+            android:includeFontPadding="false"
             android:lineSpacingExtra="8sp"
             android:maxWidth="255dp"
             android:maxLines="3"
@@ -162,11 +163,10 @@
       android:layout_width="match_parent"
       android:layout_height="match_parent"
       android:orientation="vertical"
-      tools:visibility="gone"
-      app:layout_behavior="@string/appbar_scrolling_view_behavior">
+      app:layout_behavior="@string/appbar_scrolling_view_behavior"
+      tools:visibility="gone">
 
       <android.support.v7.widget.RecyclerView
-        tools:visibility="gone"
         android:id="@+id/recycler_view_bucket_list_detail"
         android:layout_width="match_parent"
         android:layout_height="0dp"
@@ -174,6 +174,7 @@
         android:layout_weight="1"
         android:clipToPadding="false"
         android:paddingTop="15dp"
+        tools:visibility="gone"
 
         />
     </LinearLayout>