Merge branch 'ui' into 'master'

slight changes to the user interface

fdroid/fdroidclient!646

app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java

@@ -911,7 +911,7 @@ public class AppDetailsRecyclerViewAdapter
 
             int margin = context.getResources().getDimensionPixelSize(R.dimen.layout_horizontal_margin);
             int padding = context.getResources().getDimensionPixelSize(R.dimen.details_activity_padding);
-            ViewCompat.setPaddingRelative(view, margin + padding + ViewCompat.getPaddingStart(view), view.getPaddingTop(), ViewCompat.getPaddingEnd(view), view.getPaddingBottom());
+            ViewCompat.setPaddingRelative(view, margin + padding + ViewCompat.getPaddingStart(view), view.getPaddingTop(), margin + padding + ViewCompat.getPaddingEnd(view), view.getPaddingBottom());
         }
 
         public void bindModel(final Apk apk) {

app/src/main/res/layout/app_details2_donate.xml

@@ -1,29 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="fill_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/details_activity_padding"
-    android:clickable="true"
+    app:cardBackgroundColor="?attr/appDetailsCardBackground"
-    android:orientation="vertical"
+    app:cardCornerRadius="3dp"
-    android:background="?attr/detailPanel"
+    app:cardElevation="3dp">
-    android:padding="@dimen/details_activity_padding">
 
-    <TextView
+    <LinearLayout
-        android:id="@+id/donate_header"
+        android:layout_width="fill_parent"
-        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textSize="15sp"
+        android:orientation="vertical"
-        android:textAlignment="center"
+        android:padding="@dimen/details_activity_padding">
-        android:gravity="center"
-        tools:text="F-Droid is created by F-Droid Limited and Contributors. Buy them a coffee!"
-        android:layout_marginBottom="12dp" />
 
-    <android.support.v7.widget.GridLayout
+        <TextView
-        android:id="@+id/donation_options"
+            android:id="@+id/donate_header"
-        android:layout_width="match_parent"
+            android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+            android:layout_height="wrap_content"
-        app:columnCount="3" />
+            android:layout_marginBottom="12dp"
+            android:gravity="center"
+            android:textAlignment="center"
+            android:textSize="15sp"
+            tools:text="F-Droid is created by F-Droid Limited and Contributors. Buy them a coffee!" />
 
-</LinearLayout>
+        <android.support.v7.widget.GridLayout
+            android:id="@+id/donation_options"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:columnCount="3" />
+
+    </LinearLayout>
+</android.support.v7.widget.CardView>

app/src/main/res/layout/app_details2_screenshot_item.xml

@@ -6,6 +6,7 @@
     android:layout_margin="@dimen/details_screenshot_margin"
     android:padding="10dp"
     app:cardBackgroundColor="#ffffff"
+    app:cardCornerRadius="0dp"
     app:cardElevation="3dp">
 
     <ImageView
@@ -14,6 +15,6 @@
         android:layout_height="match_parent"
         android:adjustViewBounds="true"
         android:minWidth="@dimen/details_screenshot_width"
-        android:scaleType="fitCenter" />
+        android:scaleType="centerCrop" />
 
 </android.support.v7.widget.CardView>

app/src/main/res/layout/app_details2_version_item.xml

@@ -9,8 +9,7 @@
         android:paddingBottom="5dp"
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
-        android:background="?attr/selectableItemBackground"
+        android:background="?attr/selectableItemBackground">
-        >
 
       <TextView android:id="@+id/version"
             android:textStyle="bold"
@@ -100,7 +99,6 @@
             tools:text=""
             tools:visibility="gone" />
 
-
       <TextView android:id="@+id/incompatible_reasons"
             android:textSize="13sp"
             android:layout_below="@id/container_added_nativecode"

app/src/main/res/layout/donate_bitcoin.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="80dp"
-    android:layout_height="20dp"
+    android:layout_height="30dp"
-    android:layout_marginLeft="12dp"
+    android:padding="4dp"
-    android:layout_marginStart="12dp"
+    android:layout_marginStart="4dp"
-    android:layout_marginEnd="12dp"
+    android:layout_marginLeft="4dp"
-    android:layout_marginRight="12dp"
+    android:layout_marginEnd="4dp"
+    android:layout_marginRight="4dp"
     android:src="@drawable/donation_option_bitcoin"
     android:contentDescription="@string/menu_bitcoin" />

app/src/main/res/layout/donate_flattr.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="80dp"
-    android:layout_height="16dp"
+    android:layout_height="30dp"
-    android:layout_marginLeft="12dp"
+    android:padding="6dp"
-    android:layout_marginStart="12dp"
+    android:layout_marginStart="4dp"
-    android:layout_marginEnd="12dp"
+    android:layout_marginLeft="4dp"
-    android:layout_marginRight="12dp"
+    android:layout_marginEnd="4dp"
+    android:layout_marginRight="4dp"
     android:src="@drawable/donation_option_flattr"
     android:contentDescription="@string/menu_flattr" />

app/src/main/res/layout/donate_generic.xml

@@ -6,5 +6,9 @@
     android:drawableLeft="@drawable/ic_donate"
     android:drawableStart="@drawable/ic_donate"
     android:drawablePadding="4dp"
+    android:layout_marginStart="4dp"
+    android:layout_marginLeft="4dp"
+    android:layout_marginEnd="4dp"
+    android:layout_marginRight="4dp"
     android:gravity="center_vertical"
     android:text="@string/menu_donate" />

app/src/main/res/layout/donate_litecoin.xml

@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="80dp"
-    android:layout_height="20dp"
+    android:layout_height="30dp"
+    android:padding="2dp"
+    android:layout_marginStart="4dp"
+    android:layout_marginLeft="4dp"
+    android:layout_marginEnd="4dp"
+    android:layout_marginRight="4dp"
     android:src="@drawable/donation_option_litecoin"
     android:contentDescription="@string/menu_litecoin" />

tools/png-pre-compress

@@ -7,5 +7,12 @@ for f in `find $(dirname $0)/../app/src/ -type f -name \*.png`; do
     echo $f | grep -Eo '\.9\.png$' && continue  # do not optimized 9-patch, it breaks them
     tmpfile=$(mktemp)
     aapt singleCrunch -v -i $f -o $tmpfile
+    exiftool -all= $tmpfile
     mv $tmpfile $f
 done
+
+for f in metadata/*/images/*Screenshots/*.png; do
+    exiftool -all= $f
+    tmpfile=$(mktemp)
+    (zopflipng --filters=01234mepb --lossy_8bit --lossy_transparent -y $f $tmpfile && mv $tmpfile $f) &
+done