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

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

@@ -12,16 +12,13 @@
   <android.support.design.widget.AppBarLayout
     android:id="@+id/app_bar_layout"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    app:elevation="0dp">
 
     <android.support.design.widget.CollapsingToolbarLayout
       android:id="@+id/collapsing_tool_bar"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      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">
 
 
@@ -36,13 +33,11 @@
       <android.support.constraint.ConstraintLayout
         android:id="@+id/layout_select_bucket"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="208dp"
+        android:layout_gravity="center"
         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">
+        app:layout_collapseMode="parallax"
+        android:paddingEnd="80dp">
 
         <ImageView
           android:id="@+id/image_checker"
@@ -82,10 +77,11 @@
         android:layout_width="match_parent"
         android:layout_height="137dp"
         android:background="@null"
-        app:layout_collapseMode="pin"
-        app:layout_scrollFlags="scroll|enterAlways"
         android:elevation="0dp"
         app:elevation="0dp"
+        app:layout_collapseMode="pin"
+        app:layout_scrollFlags="scroll|enterAlways"
+        tools:visibility="gone"
         />
 
     </android.support.design.widget.CollapsingToolbarLayout>