Explorar o código

Revert "[마이][Common] 버킷리스트 디테일 스크롤시 헤더영역 줄어들게 수정"

This reverts commit 64cdec7e2c2343e1031410788590975584419a89.
Hasemi %!s(int64=7) %!d(string=hai) anos
pai
achega
5c7a01474b

+ 3 - 5
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/BucketListDetailFragment.java

@@ -4,7 +4,6 @@ import android.graphics.Rect;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.design.widget.CollapsingToolbarLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -44,8 +43,7 @@ public class BucketListDetailFragment extends FragmentBase<BucketListDetailPrese
   private TextView textTagTitle;
   private ViewGroup layoutTagContents;
 
-  private CollapsingToolbarLayout bucketHeaderToolbar;
-
+  private TextView textBucketTitle;
   private ImageView imageBucket;
   private ImageView imageChecker;
 
@@ -59,9 +57,9 @@ public class BucketListDetailFragment extends FragmentBase<BucketListDetailPrese
   @Override
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
 
+    textBucketTitle = findViewById(R.id.text_view_select_bucket);
     imageBucket = findViewById(R.id.image_background);
     imageChecker = findViewById(R.id.image_checker);
-    bucketHeaderToolbar = findViewById(R.id.collapsing_tool_bar);
 
     imageBucket.setOnClickListener(view -> presenter.onEvent(new Event.Builder(Event.UPDATE).build()));
   }
@@ -152,7 +150,7 @@ public class BucketListDetailFragment extends FragmentBase<BucketListDetailPrese
 
   @Override
   public void setBucketTitle(String str) {
-    bucketHeaderToolbar.setTitle(str);
+    textBucketTitle.setText(str);
   }
 
   @Override

+ 45 - 17
app/src/main/res/layout/fragment_bucket_list_detail.xml

@@ -18,15 +18,13 @@
       android:id="@+id/collapsing_tool_bar"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      app:collapsedTitleGravity="center_horizontal"
-      app:expandedTitleGravity="start"
-      app:title="GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG"
       app:layout_constraintDimensionRatio="H,2:1"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintHeight_max="250dp"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
+
       <ImageView
         android:id="@+id/image_background"
         android:layout_width="match_parent"
@@ -35,29 +33,59 @@
         app:layout_collapseMode="parallax"
         tools:src="@drawable/img_bestbucket_banner_1"/>
 
+      <android.support.constraint.ConstraintLayout
+        android:id="@+id/layout_select_bucket"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingStart="80dp"
+        android:paddingEnd="80dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+          android:id="@+id/image_checker"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginTop="10dp"
+          app:layout_constraintEnd_toStartOf="@+id/text_view_select_bucket"
+          app:layout_constraintHorizontal_chainStyle="packed"
+          app:layout_constraintTop_toTopOf="@+id/text_view_select_bucket"
+          app:srcCompat="@drawable/icon_bucket_complete_white"
+          tools:visibility="visible"/>
 
-      <!--<ImageView-->
-        <!--android:id="@+id/image_checker"-->
-        <!--android:layout_width="wrap_content"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:layout_gravity="start"-->
-        <!--android:layout_marginTop="9dp"-->
-        <!--app:layout_constraintEnd_toStartOf="@+id/text_view_select_bucket"-->
-        <!--app:layout_constraintHorizontal_chainStyle="packed"-->
-        <!--app:layout_constraintStart_toStartOf="parent"-->
-        <!--app:layout_constraintTop_toTopOf="@+id/text_view_select_bucket"-->
-        <!--app:srcCompat="@drawable/icon_bucket_complete_white"-->
-        <!--tools:visibility="visible"/>-->
+        <TextView
+          android:id="@+id/text_view_select_bucket"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_centerInParent="true"
+          android:layout_marginStart="5dp"
+          android:layout_marginTop="20dp"
+          android:layout_marginBottom="20dp"
+          android:ellipsize="end"
+          android:gravity="center"
+          android:lineSpacingExtra="8sp"
+          android:maxLength="40"
+          android:maxLines="3"
+          android:textColor="@color/CFFFFFF"
+          android:textSize="21dp"
+          app:layout_constraintBottom_toBottomOf="parent"
+          app:layout_constraintHorizontal_chainStyle="packed"
+          app:layout_constraintStart_toEndOf="@+id/image_checker"
+          app:layout_constraintTop_toTopOf="parent"
+          tools:text="OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"/>
+      </android.support.constraint.ConstraintLayout>
 
       <android.support.v7.widget.Toolbar
         android:id="@+id/flexible.example.toolbar"
         android:layout_width="match_parent"
         android:layout_height="137dp"
         android:background="@null"
-        android:elevation="0dp"
-        app:elevation="0dp"
         app:layout_collapseMode="pin"
         app:layout_scrollFlags="scroll|enterAlways"
+        android:elevation="0dp"
+        app:elevation="0dp"
         />
 
     </android.support.design.widget.CollapsingToolbarLayout>