Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'uninstall-button' into 'master'

Browse Source 
uninstall-button (wrap)

See merge request fdroid/fdroidclient!600
This commit is contained in:
Peter Serwylo 2017-11-19 20:33:19 +00:00
commit 4c6dd8d5ac
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/res/layout/app_details2_header.xml
View File

@ -13,8 +13,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingBottom="8dp">
>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -23,8 +22,7 @@
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp">
>
<!-- Icon, Name, Author (optional), Updated date --> <!-- Icon, Name, Author (optional), Updated date -->
<RelativeLayout <RelativeLayout
@ -81,7 +79,6 @@
tools:text="Update released 12 days ago" /> tools:text="Update released 12 days ago" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
<!-- Progress info --> <!-- Progress info -->
@ -151,32 +148,30 @@
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:clipToPadding="false" android:clipToPadding="false"
android:visibility="visible" android:visibility="visible"
> android:gravity="end">
<android.support.v7.widget.AppCompatButton <android.support.v7.widget.AppCompatButton
android:id="@+id/secondaryButtonView" android:id="@+id/secondaryButtonView"
style="@style/DetailsSecondaryButtonStyle" style="@style/DetailsSecondaryButtonStyle"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="0"
android:ellipsize="marquee" android:ellipsize="marquee"
app:textAllCaps="true" app:textAllCaps="true"
android:padding="12dp" tools:text="Uninstall"/>
tools:text="Uninstall" />
<android.support.v7.widget.AppCompatButton <android.support.v7.widget.AppCompatButton
android:id="@+id/primaryButtonView" android:id="@+id/primaryButtonView"
style="@style/DetailsPrimaryButtonStyle" style="@style/DetailsPrimaryButtonStyle"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_weight="1" android:layout_weight="0"
android:ellipsize="marquee" android:ellipsize="marquee"
app:textAllCaps="true" app:textAllCaps="true"
tools:text="Run" /> tools:text="Run"/>
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
<TextView <TextView
@ -193,8 +188,7 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:background="?attr/detailPanel" android:background="?attr/detailPanel"
tools:text="NEW IN VERSION 1.0.2233\n\nA lot has happened since the last build:\n\n\t• Improved UI\n\t• Bug fixes" tools:text="NEW IN VERSION 1.0.2233\n\nA lot has happened since the last build:\n\n\t• Improved UI\n\t• Bug fixes" />
/>
<TextView <TextView
android:id="@+id/description" android:id="@+id/description"