Merge branch 'card-covered' into 'master'

Fix: card-covered

See merge request fdroid/fdroidclient!595
This commit is contained in:
Peter Serwylo 2017-10-29 21:44:29 +00:00
commit f3a58980f4

View File

@ -1,14 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout 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:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context="org.fdroid.fdroid.AppDetails2"
android:background="?attr/appDetailsBackground"
android:id="@+id/rootCoordinator"
>
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context="org.fdroid.fdroid.AppDetails2"
android:background="?attr/appDetailsBackground"
android:id="@+id/rootCoordinator">
<android.support.design.widget.AppBarLayout
android:id="@+id/app_bar"
@ -22,7 +21,8 @@
android:layout_height="match_parent"
android:fitsSystemWindows="true"
app:contentScrim="?attr/colorPrimary"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
app:layout_scrollFlags="scroll|exitUntilCollapsed"
app:expandedTitleMarginTop="24dp">
<org.fdroid.fdroid.views.apps.FeatureImage
android:id="@+id/feature_graphic"
@ -50,11 +50,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
app:behavior_overlapTop="40dp"
app:layoutManager="LinearLayoutManager"
tools:context="org.fdroid.fdroid.AppDetails2"
tools:showIn="@layout/app_details2"
>
</android.support.v7.widget.RecyclerView>
tools:showIn="@layout/app_details2" />
</android.support.design.widget.CoordinatorLayout>