diff --git a/app/src/main/res/layout-sw720dp/activity_settings.xml b/app/src/main/res/layout-sw720dp/activity_settings.xml index 9ddcca6501850130e86a239153e01c27ff092353..a1d1ba3f46f4dda7fe5360f96696d909797f8663 100644 --- a/app/src/main/res/layout-sw720dp/activity_settings.xml +++ b/app/src/main/res/layout-sw720dp/activity_settings.xml @@ -37,17 +37,11 @@ android:clipToPadding="false" app:cardElevation="4dp"> - <android.support.v4.widget.NestedScrollView + <FrameLayout + android:id="@+id/fragment_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:scrollbars="vertical"> - - <FrameLayout - android:id="@+id/fragment_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - tools:layout="@layout/fragment_about" /> - </android.support.v4.widget.NestedScrollView> + tools:layout="@layout/fragment_about" /> </android.support.v7.widget.CardView> </LinearLayout> diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 8ed200484e6b8198498f08675f047daf9f57519c..6d73bc486607747daea1e1ab0a5c0326ca97715a 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -25,16 +25,10 @@ </android.support.design.widget.AppBarLayout> - <android.support.v4.widget.NestedScrollView + <FrameLayout + android:id="@+id/fragment_container" android:layout_width="match_parent" - android:layout_height="match_parent" - android:scrollbars="vertical"> - - <FrameLayout - android:id="@+id/fragment_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - </android.support.v4.widget.NestedScrollView> + android:layout_height="match_parent" /> </LinearLayout> </android.support.v4.widget.DrawerLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index f7a76b384fa5b39301d97543b4fc112ae2d2533e..1f91e76b0de0a6fcea69875ef95fe8d2e1bddba8 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -1,71 +1,76 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <include layout="@layout/layout_about_header" /> + android:layout_height="match_parent"> <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="?listPreferredItemHeight" + android:layout_height="match_parent" android:orientation="vertical"> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:minHeight="?android:attr/listPreferredItemHeightSmall" - android:paddingBottom="8dp" - android:paddingEnd="?android:attr/listPreferredItemPaddingRight" - android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" - android:paddingRight="?android:attr/listPreferredItemPaddingRight" - android:paddingStart="?android:attr/listPreferredItemPaddingLeft" - android:paddingTop="8dp" - android:text="@string/label_contributors" - android:textColor="?colorAccent" - android:textSize="16sp" - android:textStyle="bold" /> + <include layout="@layout/layout_about_header" /> - <android.support.v7.widget.RecyclerView - android:id="@+id/contributors" + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - tools:itemCount="5" - tools:listitem="@layout/widget_contributor" /> + android:layout_marginTop="?listPreferredItemHeight" + android:orientation="vertical"> - </LinearLayout> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:minHeight="?android:attr/listPreferredItemHeightSmall" + android:paddingBottom="8dp" + android:paddingEnd="?android:attr/listPreferredItemPaddingRight" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + android:paddingRight="?android:attr/listPreferredItemPaddingRight" + android:paddingStart="?android:attr/listPreferredItemPaddingLeft" + android:paddingTop="8dp" + android:text="@string/label_contributors" + android:textColor="?colorAccent" + android:textSize="16sp" + android:textStyle="bold" /> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="?listPreferredItemHeight" - android:orientation="vertical"> + <android.support.v7.widget.RecyclerView + android:id="@+id/contributors" + android:layout_width="match_parent" + android:layout_height="wrap_content" + tools:itemCount="5" + tools:listitem="@layout/widget_contributor" /> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="center_vertical" - android:minHeight="?android:attr/listPreferredItemHeightSmall" - android:paddingBottom="8dp" - android:paddingEnd="?android:attr/listPreferredItemPaddingRight" - android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" - android:paddingRight="?android:attr/listPreferredItemPaddingRight" - android:paddingStart="?android:attr/listPreferredItemPaddingLeft" - android:paddingTop="8dp" - android:text="@string/label_libraries" - android:textColor="?colorAccent" - android:textSize="16sp" - android:textStyle="bold" /> + </LinearLayout> - <android.support.v7.widget.RecyclerView - android:id="@+id/libraries" + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - tools:listitem="@layout/widget_library" /> + android:layout_marginTop="?listPreferredItemHeight" + android:orientation="vertical"> - </LinearLayout> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:minHeight="?android:attr/listPreferredItemHeightSmall" + android:paddingBottom="8dp" + android:paddingEnd="?android:attr/listPreferredItemPaddingRight" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + android:paddingRight="?android:attr/listPreferredItemPaddingRight" + android:paddingStart="?android:attr/listPreferredItemPaddingLeft" + android:paddingTop="8dp" + android:text="@string/label_libraries" + android:textColor="?colorAccent" + android:textSize="16sp" + android:textStyle="bold" /> -</LinearLayout> \ No newline at end of file + <android.support.v7.widget.RecyclerView + android:id="@+id/libraries" + android:layout_width="match_parent" + android:layout_height="wrap_content" + tools:listitem="@layout/widget_library" /> + + </LinearLayout> + + </LinearLayout> +</android.support.v4.widget.NestedScrollView> \ No newline at end of file