Skip to content

Commit

Permalink
DemoApp: changed signature and fixed scrolling in landscape
Browse files Browse the repository at this point in the history
  • Loading branch information
davideas committed Mar 7, 2017
1 parent 0d39054 commit eae69aa
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion flipview-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ android {
buildToolsVersion buildTools

defaultConfig {
applicationId "eu.davidea.examples.flipview"
applicationId "eu.davidea.samples.flipview"
minSdkVersion minSdk
targetSdkVersion targetSdk
versionCode libraryCode
Expand Down
18 changes: 12 additions & 6 deletions flipview-app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,23 @@

</android.support.design.widget.AppBarLayout>

<LinearLayout
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">

<include layout="@layout/content_flipviews"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

<include layout="@layout/content_flipviews"/>

<include layout="@layout/content_flipviews_list"/>

<include layout="@layout/content_flipviews_list"/>
</LinearLayout>

</LinearLayout>
</android.support.v4.widget.NestedScrollView>

<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
Expand All @@ -42,4 +48,4 @@
android:layout_margin="@dimen/fab_margin"
android:src="@drawable/ic_github_circle_white_24dp"/>

</android.support.design.widget.CoordinatorLayout>
</android.support.design.widget.CoordinatorLayout>

0 comments on commit eae69aa

Please sign in to comment.