|
@@ -28,18 +28,6 @@
|
|
|
app:contentScrim="@color/colorPrimary"
|
|
app:contentScrim="@color/colorPrimary"
|
|
|
app:layout_scrollFlags="scroll|exitUntilCollapsed">
|
|
app:layout_scrollFlags="scroll|exitUntilCollapsed">
|
|
|
|
|
|
|
|
-
|
|
|
|
|
- <android.support.v7.widget.Toolbar
|
|
|
|
|
- android:layout_width="match_parent"
|
|
|
|
|
- android:layout_height="@dimen/layout_heigh_default"
|
|
|
|
|
- android:layout_gravity="top"
|
|
|
|
|
- app:contentInsetLeft="0dp"
|
|
|
|
|
- app:contentInsetStart="0dp"
|
|
|
|
|
- app:layout_collapseMode="pin">
|
|
|
|
|
-
|
|
|
|
|
- <include layout="@layout/title"/>
|
|
|
|
|
- </android.support.v7.widget.Toolbar>
|
|
|
|
|
-
|
|
|
|
|
<android.support.constraint.ConstraintLayout
|
|
<android.support.constraint.ConstraintLayout
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
@@ -108,6 +96,17 @@
|
|
|
|
|
|
|
|
</android.support.constraint.ConstraintLayout>
|
|
</android.support.constraint.ConstraintLayout>
|
|
|
|
|
|
|
|
|
|
+ <android.support.v7.widget.Toolbar
|
|
|
|
|
+ android:layout_width="match_parent"
|
|
|
|
|
+ android:layout_height="@dimen/layout_heigh_default"
|
|
|
|
|
+ android:layout_gravity="top"
|
|
|
|
|
+ app:contentInsetLeft="0dp"
|
|
|
|
|
+ app:contentInsetStart="0dp"
|
|
|
|
|
+ app:layout_collapseMode="pin">
|
|
|
|
|
+
|
|
|
|
|
+ <include layout="@layout/title"/>
|
|
|
|
|
+ </android.support.v7.widget.Toolbar>
|
|
|
|
|
+
|
|
|
</android.support.design.widget.CollapsingToolbarLayout>
|
|
</android.support.design.widget.CollapsingToolbarLayout>
|
|
|
|
|
|
|
|
<com.sheep.jiuyan.samllsheep.page.view.RappTabLayout
|
|
<com.sheep.jiuyan.samllsheep.page.view.RappTabLayout
|
|
@@ -117,21 +116,22 @@
|
|
|
android:background="@color/colorPrimary"/>
|
|
android:background="@color/colorPrimary"/>
|
|
|
</android.support.design.widget.AppBarLayout>
|
|
</android.support.design.widget.AppBarLayout>
|
|
|
|
|
|
|
|
- <android.support.v4.widget.NestedScrollView
|
|
|
|
|
|
|
+ <!-- <android.support.v4.widget.NestedScrollView
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="match_parent"
|
|
android:layout_height="match_parent"
|
|
|
android:fillViewport="true"
|
|
android:fillViewport="true"
|
|
|
- app:layout_behavior="@string/appbar_scrolling_view_behavior">
|
|
|
|
|
|
|
+ app:layout_behavior="@string/appbar_scrolling_view_behavior">-->
|
|
|
|
|
|
|
|
<android.support.v4.view.ViewPager
|
|
<android.support.v4.view.ViewPager
|
|
|
android:id="@+id/viewpager_main_activity"
|
|
android:id="@+id/viewpager_main_activity"
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
- android:background="@color/white">
|
|
|
|
|
|
|
+ android:background="@color/white"
|
|
|
|
|
+ app:layout_behavior="@string/appbar_scrolling_view_behavior">
|
|
|
|
|
|
|
|
</android.support.v4.view.ViewPager>
|
|
</android.support.v4.view.ViewPager>
|
|
|
|
|
|
|
|
- </android.support.v4.widget.NestedScrollView>
|
|
|
|
|
|
|
+ <!--</android.support.v4.widget.NestedScrollView>-->
|
|
|
|
|
|
|
|
</android.support.design.widget.CoordinatorLayout>
|
|
</android.support.design.widget.CoordinatorLayout>
|
|
|
|
|
|