Make install/uninstall/run/upgrade buttons not overlap last updated text

Instead of showing them below the icon, it now puts the icon + name +
author + last updated into a single layout which can grow if the app
name or author wraps to a second line. The buttons are now below this
additional layout.
This commit is contained in:
Peter Serwylo 2017-04-25 14:48:59 +10:00
parent 2a6dcb63bb
commit 4b70d81e5c

View File

@ -26,53 +26,63 @@
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
> >
<ImageView <!-- Icon, Name, Author (optional), Updated date -->
android:id="@+id/icon" <RelativeLayout
android:layout_width="72dp" android:id="@+id/icon_and_name"
android:layout_height="72dp" android:layout_width="match_parent"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:paddingBottom="8dp"
android:paddingRight="8dp"
android:paddingEnd="8dp"
android:src="@drawable/ic_repo_app_default" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:paddingBottom="8dp">
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:layout_marginTop="8dp"
android:layout_toEndOf="@id/icon"
android:layout_toRightOf="@id/icon"
android:orientation="vertical">
<TextView <ImageView
android:id="@+id/title" android:id="@+id/icon"
android:layout_width="match_parent" android:layout_width="72dp"
android:layout_height="72dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:paddingRight="8dp"
android:paddingEnd="8dp"
android:src="@drawable/ic_repo_app_default" />
<!-- Name, Author (optional), Updated date -->
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="@style/DetailsAppTitleStyle" android:layout_alignParentEnd="true"
tools:text="App Title" /> android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:layout_marginTop="8dp"
android:layout_toEndOf="@id/icon"
android:layout_toRightOf="@id/icon"
android:orientation="vertical">
<TextView <TextView
android:id="@+id/author" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/DetailsAppTitleStyle"
tools:text="Author" /> tools:text="Really Long App Title Which Wraps Around Onto the Second Line" />
<TextView <TextView
android:id="@+id/text_last_update" android:id="@+id/author"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="@style/DetailsLastUpdatedStyle" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@android:color/darker_gray" tools:text="Author" />
tools:text="Update released 12 days ago" />
</LinearLayout> <TextView
android:id="@+id/text_last_update"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/DetailsLastUpdatedStyle"
android:textColor="@android:color/darker_gray"
tools:text="Update released 12 days ago" />
</LinearLayout>
</RelativeLayout>
<!-- Progress info -->
<RelativeLayout <RelativeLayout
android:id="@+id/progress_layout" android:id="@+id/progress_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -81,7 +91,8 @@
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_below="@id/icon"> android:layout_below="@id/icon_and_name"
tools:visibility="gone">
<ImageView <ImageView
android:id="@+id/progress_cancel" android:id="@+id/progress_cancel"
@ -125,18 +136,19 @@
android:layout_toStartOf="@id/progress_cancel" /> android:layout_toStartOf="@id/progress_cancel" />
</RelativeLayout> </RelativeLayout>
<!-- Install, Uninstall, Upgrade, Run buttons -->
<LinearLayout <LinearLayout
android:id="@+id/button_layout" android:id="@+id/button_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/icon" android:layout_below="@id/icon_and_name"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:clipToPadding="false" android:clipToPadding="false"
android:visibility="gone" android:visibility="visible"
> >
<Button <Button