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

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

@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout 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"
+<android.support.v4.widget.NestedScrollView
+  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"
+  android:layout_width="match_parent"
+  android:fillViewport="true"
+  android:layout_height="match_parent"
+  >
+
+<android.support.constraint.ConstraintLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/CFFFFFF"
     android:orientation="vertical">
 
-    <android.support.constraint.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
         <android.support.v4.view.ViewPager
             android:id="@+id/view_pager_bucket_list"
             android:layout_width="match_parent"
@@ -19,7 +22,11 @@
             android:layout_marginBottom="35dp"
             android:paddingLeft="25dp"
             android:paddingRight="25dp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+
             tools:background="@color/CD0D0D0" />
 
         <android.support.design.widget.TabLayout
@@ -29,6 +36,7 @@
             android:layout_alignBottom="@+id/view_pager_bucket_list"
             android:layout_alignParentStart="true"
             android:layout_marginBottom="10dp"
+            tools:background="@color/C000000"
             app:layout_constraintBottom_toBottomOf="@+id/view_pager_bucket_list"
             app:layout_constraintEnd_toEndOf="@+id/view_pager_bucket_list"
             app:layout_constraintStart_toStartOf="@+id/view_pager_bucket_list"
@@ -36,8 +44,7 @@
             app:tabGravity="center"
             app:tabIndicatorHeight="0dp"
             app:tabPaddingStart="6dp"
-            app:tabPaddingEnd="6dp"
-            tools:background="@color/CD0D0D0" />
+            app:tabPaddingEnd="6dp"/>
 
         <!--<ImageView-->
         <!--android:id="@+id/image_view_text_balloon"-->
@@ -64,4 +71,4 @@
         <!--app:layout_constraintStart_toStartOf="@+id/image_view_text_balloon"-->
         <!--app:layout_constraintTop_toTopOf="@+id/image_view_text_balloon"/>-->
     </android.support.constraint.ConstraintLayout>
-</LinearLayout>
+</android.support.v4.widget.NestedScrollView>