Merge branch 'new-ui--app-details-2' into 'master'

Tweak some styles in AppDetails2

See merge request !426

app/build.gradle

@@ -20,6 +20,7 @@ repositories {
 dependencies {
     compile 'com.android.support:support-v4:24.2.1'
     compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:gridlayout-v7:24.2.1'
     compile 'com.android.support:support-annotations:24.2.1'
     compile 'com.android.support:design:24.2.1'
     compile 'com.android.support:cardview-v7:24.2.1'
@@ -105,6 +106,7 @@ if (!hasProperty('sourceDeps')) {
                 'com.android.support:support-vector-drawable:6ee37a7f7b93c1df1294e6f6f97df3724ac989fcda0549faf677001085330548',
                 'com.android.support:design:89842bb1243507fe3079066ea4ea58795effe69cdf9a819e05274d21760adfc2',
                 'com.android.support:cardview-v7:2303b351686d1db060b5fcf1a9c709c79b4a54a85bfda0fb3c4849e244606ee1',
+                'com.android.support:gridlayout-v7:1a31c248d69faa815cc155883ddcb0ccc7ba8e14e69ec58dd18d8017e23d76f5',
                 'com.android.support:recyclerview-v7:9077766a1a0f4e89528fbf9dcdf6d5880a8686f0266fa852d58d803beeef18fa',
                 'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259',
                 'com.madgag.spongycastle:core:9b6b7ac856b91bcda2ede694eccd26cefb0bf0b09b89f13cda05b5da5ff68c6b',

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

@@ -6,10 +6,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
+import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.v4.view.ViewCompat;
 import android.support.v4.widget.TextViewCompat;
 import android.support.v7.text.AllCapsTransformationMethod;
+import android.support.v7.widget.GridLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Html;
@@ -133,11 +135,19 @@ public class AppDetailsRecyclerViewAdapter
 
     private void setShowVersions(boolean showVersions) {
         this.showVersions = showVersions;
-        items.removeAll(versions);
+        boolean itemsWereRemoved = items.removeAll(versions);
+        int startIndex = items.indexOf(VIEWTYPE_VERSIONS) + 1;
+
+        // When adding/removing items, be sure to only notifyItemInserted and notifyItemRemoved
+        // rather than notifyDatasetChanged(). If we only notify about the entire thing, then
+        // everything gets rebuilt, including the expandable "Versions" item. By rebuilding that
+        // item it will interrupt the nice material-design-style-ripple from the background.
         if (showVersions) {
-            items.addAll(items.indexOf(VIEWTYPE_VERSIONS) + 1, versions);
+            items.addAll(startIndex, versions);
+            notifyItemRangeInserted(startIndex, versions.size());
+        } else if (itemsWereRemoved) {
+            notifyItemRangeRemoved(startIndex, versions.size());
         }
-        notifyDataSetChanged();
     }
 
     private void addItem(int item) {
@@ -503,38 +513,57 @@ public class AppDetailsRecyclerViewAdapter
     }
 
     private class DonateViewHolder extends RecyclerView.ViewHolder {
-        final TextView textView;
+        final TextView donateHeading;
-        final LinearLayout contentView;
+        final GridLayout donationOptionsLayout;
 
         DonateViewHolder(View view) {
             super(view);
-            textView = (TextView) view.findViewById(R.id.information);
+            donateHeading = (TextView) view.findViewById(R.id.donate_header);
-            contentView = (LinearLayout) view.findViewById(R.id.ll_information);
+            donationOptionsLayout = (GridLayout) view.findViewById(R.id.donation_options);
         }
 
         public void bindModel() {
-            contentView.removeAllViews();
+            if (TextUtils.isEmpty(app.author)) {
+                donateHeading.setText(context.getString(R.string.app_details_donate_prompt_unknown_author, app.name));
+            } else {
+                String author = "<strong>" + app.author + "</strong>";
+                donateHeading.setText(Html.fromHtml(context.getString(R.string.app_details_donate_prompt, app.name, author)));
+            }
+
+            donationOptionsLayout.removeAllViews();
 
             // Donate button
             if (uriIsSetAndCanBeOpened(app.donateURL)) {
-                addLinkItemView(contentView, R.string.menu_donate, R.drawable.ic_donate, app.donateURL);
+                addDonateOption(R.layout.donate_generic, app.donateURL);
             }
 
             // Bitcoin
             if (uriIsSetAndCanBeOpened(app.getBitcoinUri())) {
-                addLinkItemView(contentView, R.string.menu_bitcoin, R.drawable.ic_bitcoin, app.getBitcoinUri());
+                addDonateOption(R.layout.donate_bitcoin, app.getBitcoinUri());
             }
 
             // Litecoin
             if (uriIsSetAndCanBeOpened(app.getLitecoinUri())) {
-                addLinkItemView(contentView, R.string.menu_litecoin, R.drawable.ic_litecoin, app.getLitecoinUri());
+                addDonateOption(R.layout.donate_litecoin, app.getLitecoinUri());
             }
 
             // Flattr
             if (uriIsSetAndCanBeOpened(app.getFlattrUri())) {
-                addLinkItemView(contentView, R.string.menu_flattr, R.drawable.ic_flattr, app.getFlattrUri());
+                addDonateOption(R.layout.donate_flattr, app.getFlattrUri());
             }
         }
+
+        private void addDonateOption(@LayoutRes int layout, final String uri) {
+            LayoutInflater inflater = LayoutInflater.from(context);
+            View option = inflater.inflate(layout, donationOptionsLayout, false);
+            option.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    onLinkClicked(uri);
+                }
+            });
+            donationOptionsLayout.addView(option);
+        }
     }
 
     private abstract class ExpandableLinearLayoutViewHolder extends RecyclerView.ViewHolder {

app/src/main/res/drawable/donation_option_bitcoin.xml

@@ -0,0 +1,33 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="306dp"
+        android:height="64dp"
+        android:viewportWidth="306.5"
+        android:viewportHeight="64.001">
+    <path
+        android:pathData="m63.03,39.75c-4.27,17.14 -21.64,27.58 -38.78,23.3 -17.14,-4.27 -27.57,-21.64 -23.3,-38.78 4.27,-17.15 21.64,-27.58 38.78,-23.31 17.14,4.27 27.58,21.64 23.3,38.78z"
+        android:fillColor="#f7931a"/>
+    <path
+        android:pathData="m46.1,27.45c0.64,-4.26 -2.61,-6.55 -7.04,-8.07l1.44,-5.77 -3.51,-0.88 -1.4,5.62c-0.92,-0.23 -1.87,-0.45 -2.81,-0.66l1.41,-5.65 -3.51,-0.88 -1.44,5.77c-0.76,-0.17 -1.51,-0.35 -2.24,-0.53l0,-0.02 -4.84,-1.21 -0.93,3.75s2.61,0.6 2.55,0.63c1.42,0.35 1.68,1.3 1.64,2.04l-1.64,6.57c0.1,0.03 0.22,0.06 0.37,0.12 -0.12,-0.03 -0.24,-0.06 -0.37,-0.09l-2.3,9.2c-0.17,0.43 -0.62,1.08 -1.61,0.83 0.04,0.05 -2.55,-0.64 -2.55,-0.64l-1.74,4.02 4.57,1.14c0.85,0.21 1.68,0.44 2.5,0.65l-1.45,5.83 3.51,0.88 1.44,-5.77c0.96,0.26 1.89,0.5 2.8,0.73l-1.43,5.74 3.51,0.88 1.45,-5.82c5.99,1.13 10.49,0.68 12.38,-4.74 1.53,-4.36 -0.08,-6.88 -3.23,-8.52 2.29,-0.53 4.02,-2.04 4.48,-5.16zM38.08,38.69c-1.09,4.36 -8.43,2 -10.81,1.41l1.93,-7.73c2.38,0.59 10.01,1.77 8.88,6.32zM39.17,27.38c-0.99,3.97 -7.1,1.95 -9.08,1.46l1.75,-7.01c1.98,0.49 8.36,1.42 7.33,5.55z"
+        android:fillColor="#FFF"/>
+    <path
+        android:pathData="m93.77,19.37c2.6,0 4.84,0.47 6.72,1.38 1.89,0.92 3.45,2.16 4.71,3.73 1.24,1.57 2.16,3.4 2.75,5.51 0.59,2.11 0.89,4.38 0.89,6.8 0,3.73 -0.68,7.25 -2.06,10.57 -1.38,3.33 -3.25,6.21 -5.63,8.67 -2.38,2.46 -5.19,4.39 -8.42,5.82 -3.23,1.43 -6.75,2.15 -10.52,2.15 -0.49,0 -1.35,-0.01 -2.56,-0.04s-2.61,-0.15 -4.16,-0.36c-1.57,-0.22 -3.23,-0.54 -4.98,-0.98 -1.75,-0.43 -3.42,-1.02 -4.98,-1.78l14.01,-58.88 12.55,-1.95 -5.02,20.89c1.07,-0.48 2.16,-0.86 3.24,-1.13 1.08,-0.27 2.24,-0.41 3.48,-0.41zM83.25,54.04c1.89,0 3.67,-0.47 5.34,-1.38 1.68,-0.91 3.13,-2.15 4.34,-3.68 1.21,-1.54 2.17,-3.28 2.87,-5.23s1.05,-3.97 1.05,-6.08c0,-2.59 -0.43,-4.61 -1.3,-6.07 -0.86,-1.46 -2.46,-2.19 -4.78,-2.19 -0.76,0 -1.74,0.14 -2.95,0.4 -1.22,0.28 -2.31,0.85 -3.29,1.71l-5.34,22.19c0.32,0.06 0.61,0.11 0.85,0.16 0.24,0.05 0.5,0.09 0.76,0.12 0.28,0.03 0.59,0.05 0.98,0.05s0.86,0 1.46,0z"
+        android:fillColor="#4d4d4d"/>
+    <path
+        android:pathData="m121.85,62.87h-11.99l10.12,-42.6h12.07l-10.2,42.6zM127.69,15.08c-1.67,0 -3.19,-0.5 -4.54,-1.5 -1.36,-0.99 -2.03,-2.52 -2.03,-4.58 0,-1.13 0.23,-2.19 0.69,-3.2 0.46,-1 1.07,-1.86 1.83,-2.59 0.76,-0.73 1.63,-1.31 2.63,-1.74 1,-0.43 2.07,-0.64 3.2,-0.64 1.67,0 3.18,0.5 4.53,1.5 1.35,1 2.02,2.53 2.02,4.58 0,1.14 -0.23,2.2 -0.69,3.2 -0.46,1 -1.06,1.86 -1.82,2.59 -0.75,0.73 -1.64,1.3 -2.63,1.74 -1,0.44 -2.07,0.64 -3.2,0.64z"
+        android:fillColor="#4d4d4d"/>
+    <path
+        android:pathData="m142.56,9.66 l12.56,-1.95 -3.08,12.56h13.45l-2.43,9.88h-13.36l-3.56,14.9c-0.33,1.24 -0.51,2.4 -0.57,3.48 -0.06,1.08 0.08,2.01 0.4,2.8 0.32,0.79 0.9,1.39 1.74,1.82 0.84,0.44 2.03,0.65 3.6,0.65 1.29,0 2.55,-0.12 3.77,-0.37 1.21,-0.24 2.44,-0.57 3.68,-1.01l0.89,9.24c-1.62,0.59 -3.37,1.11 -5.26,1.53 -1.89,0.44 -4.13,0.65 -6.72,0.65 -3.72,0 -6.61,-0.55 -8.67,-1.65 -2.05,-1.11 -3.51,-2.62 -4.38,-4.54 -0.86,-1.91 -1.24,-4.11 -1.13,-6.6 0.11,-2.49 0.49,-5.1 1.13,-7.86l7.94,-33.53z"
+        android:fillColor="#4d4d4d"/>
+    <path
+        android:pathData="m164.95,45.86c0,-3.67 0.59,-7.13 1.78,-10.37 1.18,-3.24 2.89,-6.08 5.11,-8.51 2.21,-2.42 4.9,-4.34 8.06,-5.75 3.15,-1.4 6.68,-2.11 10.56,-2.11 2.43,0 4.61,0.23 6.52,0.69 1.92,0.47 3.66,1.07 5.23,1.82l-4.13,9.4c-1.08,-0.44 -2.2,-0.82 -3.36,-1.17 -1.16,-0.36 -2.58,-0.53 -4.25,-0.53 -4,0 -7.16,1.38 -9.52,4.13 -2.35,2.75 -3.53,6.45 -3.53,11.1 0,2.75 0.59,4.98 1.79,6.68 1.19,1.7 3.38,2.55 6.56,2.55 1.57,0 3.09,-0.16 4.54,-0.48 1.46,-0.32 2.75,-0.73 3.89,-1.21l0.89,9.64c-1.52,0.59 -3.19,1.12 -5.02,1.58 -1.84,0.45 -4.03,0.68 -6.56,0.68 -3.35,0 -6.18,-0.49 -8.5,-1.46 -2.32,-0.98 -4.24,-2.28 -5.75,-3.93 -1.52,-1.65 -2.61,-3.58 -3.28,-5.8 -0.67,-2.21 -1.02,-4.54 -1.02,-6.96z"
+        android:fillColor="#4d4d4d"/>
+    <path
+        android:pathData="m218.2,64c-2.86,0 -5.35,-0.44 -7.45,-1.3 -2.1,-0.86 -3.84,-2.07 -5.22,-3.64 -1.38,-1.56 -2.41,-3.41 -3.12,-5.55 -0.71,-2.13 -1.05,-4.49 -1.05,-7.08 0,-3.24 0.52,-6.49 1.57,-9.72 1.05,-3.24 2.6,-6.16 4.66,-8.74 2.04,-2.59 4.56,-4.71 7.53,-6.37 2.96,-1.64 6.37,-2.47 10.2,-2.47 2.81,0 5.28,0.44 7.42,1.3 2.13,0.86 3.88,2.08 5.26,3.64 1.37,1.57 2.41,3.41 3.11,5.55 0.7,2.13 1.05,4.49 1.05,7.08 0,3.23 -0.51,6.48 -1.53,9.72 -1.02,3.23 -2.54,6.15 -4.54,8.74 -2,2.59 -4.49,4.71 -7.49,6.35 -2.99,1.65 -6.47,2.47 -10.41,2.47zM224.19,29.33c-1.78,0 -3.35,0.52 -4.69,1.53 -1.35,1.03 -2.48,2.33 -3.4,3.89 -0.92,1.57 -1.61,3.28 -2.07,5.14 -0.46,1.87 -0.68,3.63 -0.68,5.3 0,2.7 0.44,4.81 1.29,6.32 0.87,1.51 2.43,2.27 4.7,2.27 1.78,0 3.35,-0.51 4.7,-1.54 1.34,-1.02 2.48,-2.32 3.4,-3.89 0.92,-1.56 1.61,-3.28 2.07,-5.14 0.45,-1.86 0.68,-3.63 0.68,-5.3 0,-2.7 -0.43,-4.81 -1.3,-6.32 -0.86,-1.51 -2.43,-2.27 -4.7,-2.27z"
+        android:fillColor="#4d4d4d"/>
+    <path
+        android:pathData="m255.23,62.87h-12l10.12,-42.6h12.07l-10.2,42.6zM261.06,15.08c-1.67,0 -3.19,-0.5 -4.53,-1.5 -1.35,-0.99 -2.03,-2.52 -2.03,-4.58 0,-1.13 0.23,-2.19 0.69,-3.2 0.46,-1 1.07,-1.86 1.82,-2.59 0.75,-0.73 1.64,-1.31 2.63,-1.74 1,-0.43 2.06,-0.64 3.19,-0.64 1.68,0 3.19,0.5 4.54,1.5 1.35,1 2.03,2.53 2.03,4.58 0,1.14 -0.24,2.2 -0.69,3.2s-1.06,1.86 -1.82,2.59c-0.76,0.73 -1.63,1.3 -2.63,1.74 -1,0.44 -2.07,0.64 -3.21,0.64z"
+        android:fillColor="#4d4d4d"/>
+    <path
+        android:pathData="m274.07,22.21c0.91,-0.27 1.93,-0.59 3.03,-0.93 1.11,-0.35 2.35,-0.67 3.73,-0.96 1.37,-0.3 2.91,-0.55 4.61,-0.73 1.7,-0.19 3.63,-0.29 5.79,-0.29 6.32,0 10.68,1.84 13.09,5.51 2.4,3.67 2.82,8.69 1.26,15.06l-5.51,23h-12.07l5.34,-22.52c0.33,-1.41 0.58,-2.77 0.77,-4.09 0.19,-1.32 0.18,-2.48 -0.04,-3.48 -0.21,-0.99 -0.71,-1.8 -1.49,-2.43 -0.79,-0.62 -1.99,-0.93 -3.61,-0.93 -1.56,0 -3.15,0.17 -4.78,0.49l-7.86,32.96h-12.07l9.81,-40.65z"
+        android:fillColor="#4d4d4d"/>
+</vector>

app/src/main/res/drawable/donation_option_litecoin.xml

@@ -0,0 +1,64 @@
+<vector android:height="32dp" android:viewportHeight="129.34668"
+    android:viewportWidth="400.0" android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#666666"
+        android:pathData="M35.43,0L364.57,0A35.43,35.43 48.94,0 1,400 35.43L400,93.91A35.43,35.43 49.14,0 1,364.57 129.35L35.43,129.35A35.43,35.43 0,0 1,-0 93.91L-0,35.43A35.43,35.43 0,0 1,35.43 0z"
+        android:strokeColor="#00000000" android:strokeWidth="20"/>
+    <path android:fillAlpha="1" android:fillColor="#f2f2f2"
+        android:pathData="M36.65,2.13L363.35,2.13A33.75,33.75 46.31,0 1,397.1 35.88L397.1,93.47A33.75,33.75 46.31,0 1,363.35 127.22L36.65,127.22A33.75,33.75 0,0 1,2.9 93.47L2.9,35.88A33.75,33.75 0,0 1,36.65 2.13z"
+        android:strokeColor="#00000000" android:strokeWidth="20"/>
+    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:pathData="m69.87,20.24c-7.37,0.02 -14.73,1.83 -21.25,5.27 -6.05,3.17 -11.38,7.7 -15.49,13.16 -3.61,4.78 -6.29,10.28 -7.8,16.08 -1.79,6.83 -1.99,14.08 -0.58,21 0.82,4.05 2.19,7.98 4.06,11.66 2.72,5.37 6.5,10.19 11.06,14.12 4.41,3.81 9.54,6.78 15.06,8.69 5.19,1.8 10.71,2.66 16.2,2.53 5.87,-0.13 11.72,-1.38 17.12,-3.69 6.12,-2.61 11.66,-6.57 16.12,-11.5 4.21,-4.64 7.47,-10.15 9.49,-16.08 1.78,-5.2 2.61,-10.71 2.46,-16.2 -0.15,-5.72 -1.36,-11.41 -3.58,-16.68 -2.62,-6.22 -6.61,-11.86 -11.62,-16.38 -4.46,-4.04 -9.71,-7.21 -15.38,-9.24 -5.07,-1.83 -10.47,-2.75 -15.86,-2.72z"
+        android:strokeColor="#00000000" android:strokeWidth="6.7312851"/>
+    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:pathData="M189.48,56.05m0,0a<30>,<2C> <20>,1 1,0 0a<30>,<2C> <20>,1 1,0 0"
+        android:strokeColor="#00000000" android:strokeWidth="6.82086611"/>
+    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:pathData="m268.03,55.9 l-3.15,8.46c-1.8,-0.84 -3.42,-1.47 -4.86,-1.89 -1.44,-0.42 -2.91,-0.63 -4.41,-0.63 -3.96,0 -7.35,1.35 -10.17,4.05 -2.64,2.76 -3.96,6.18 -3.96,10.26 0,4.08 1.3,7.44 3.91,10.07 2.61,2.64 5.95,3.96 10.03,3.96 2.88,0 6,-0.99 9.36,-2.97l3.51,7.83 -2.97,1.62c-3.42,1.62 -7.2,2.43 -11.34,2.43 -6.48,0 -11.89,-2.17 -16.24,-6.52 -4.35,-4.35 -6.52,-9.79 -6.52,-16.33 0,-6.66 2.26,-12.22 6.79,-16.69 4.53,-4.47 10.18,-6.7 16.96,-6.7 4.56,0 8.91,1.02 13.04,3.06z" android:strokeColor="#00000000"/>
+    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:pathData="m270.63,75.97c0,-6.6 2.26,-12.1 6.79,-16.51 4.53,-4.41 10.15,-6.61 16.87,-6.61 6.72,0 12.34,2.17 16.87,6.52 4.53,4.35 6.79,9.88 6.79,16.6 0,6.6 -2.25,12.1 -6.75,16.51 -4.5,4.41 -10.14,6.61 -16.91,6.61 -6.9,0 -12.56,-2.17 -17,-6.52 -4.44,-4.35 -6.66,-9.88 -6.66,-16.6zM294.29,61.48c-3.96,0 -7.27,1.38 -9.94,4.14 -2.67,2.76 -4,6.21 -4,10.35 0,2.16 0.3,4.05 0.9,5.67 0.6,1.62 1.62,3.18 3.06,4.68 2.64,2.7 5.97,4.05 9.99,4.05 3.96,0 7.27,-1.36 9.94,-4.09 2.67,-2.73 4,-6.16 4,-10.3 0,-2.16 -0.3,-4.05 -0.9,-5.67 -0.6,-1.62 -1.62,-3.18 -3.06,-4.68 -2.64,-2.76 -5.97,-4.14 -9.99,-4.14z" android:strokeColor="#00000000"/>
+    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:pathData="m323.46,98.76 l0,-43.72 9.99,0 0,43.72z" android:strokeColor="#00000000"/>
+    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:pathData="m322.11,44.86c0,-1.62 0.6,-3.03 1.8,-4.23 1.32,-1.14 2.82,-1.71 4.5,-1.71 1.86,0 3.4,0.55 4.63,1.66 1.23,1.11 1.84,2.53 1.84,4.27 0,1.56 -0.63,2.97 -1.89,4.23 -1.32,1.14 -2.85,1.71 -4.59,1.71 -1.68,0 -3.15,-0.55 -4.41,-1.66 -1.26,-1.11 -1.89,-2.53 -1.89,-4.27z" android:strokeColor="#00000000"/>
+    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:pathData="m340.75,98.76 l0,-43.72 9.99,0 0,6.75c3.24,-5.4 7.92,-8.1 14.03,-8.1 5.82,0 10.07,2.25 12.77,6.75 1.32,2.28 1.98,5.82 1.98,10.61l0,27.71 -9.99,0 0,-25.19 -0.27,-4.5c-0.24,-1.98 -1.2,-3.57 -2.88,-4.77 -1.56,-1.26 -3.39,-1.89 -5.49,-1.89 -3,0 -5.49,1.11 -7.47,3.33 -1.8,2.16 -2.7,5.22 -2.7,9.18l0,23.84z" android:strokeColor="#00000000"/>
+    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:pathData="m129.22,98.76 l0,-64.86 5.13,0 0,64.86z" android:strokeColor="#00000000"/>
+    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:pathData="m144.89,98.76 l0,-43.72 5.22,0 0,43.72z" android:strokeColor="#00000000"/>
+    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:pathData="m156.86,58.88 l0,-4.5 5.94,0 0,-12.24 5.22,0 0,12.24 12.14,0 0,4.5 -12.14,0 0,25.82c0,2.28 0.06,3.63 0.18,4.05 0.36,3.84 2.61,5.76 6.75,5.76 1.68,0 3.27,-0.33 4.77,-0.99l1.26,4.59c-2.64,0.66 -4.92,0.99 -6.84,0.99 -3.96,0 -7.02,-1.38 -9.18,-4.14 -0.84,-1.14 -1.44,-2.34 -1.8,-3.6 -0.12,-0.78 -0.21,-1.62 -0.27,-2.52 -0.06,-0.9 -0.09,-2.34 -0.09,-4.32l0,-25.64z" android:strokeColor="#00000000"/>
+    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:pathData="m225.59,77.77 l-37.96,0c0,2.52 0.42,4.78 1.26,6.79 0.84,2.01 2.1,3.85 3.78,5.53 3.12,3 7.02,4.5 11.7,4.5 7.2,0 12.42,-3.51 15.65,-10.53l4.77,2.43c-4.14,8.4 -10.92,12.6 -20.33,12.6 -6.66,0 -12.04,-2.1 -16.15,-6.3 -4.11,-4.2 -6.16,-9.72 -6.16,-16.56 0,-6.84 2.08,-12.47 6.25,-16.91 4.17,-4.44 9.49,-6.66 15.97,-6.66 6.06,0 11.13,2.08 15.2,6.25 4.08,4.17 6.12,9.43 6.12,15.79l0,1.26zM204.27,57.17c-4.56,0 -8.26,1.38 -11.11,4.14 -2.85,2.76 -4.72,6.75 -5.62,11.96l32.48,0c0,-4.8 -1.48,-8.68 -4.45,-11.65 -2.97,-2.97 -6.73,-4.45 -11.29,-4.45z" android:strokeColor="#00000000"/>
+    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:pathData="m141.37,44.86c0,-1.62 0.6,-3.03 1.8,-4.23 1.32,-1.14 2.82,-1.71 4.5,-1.71 1.86,0 3.4,0.55 4.63,1.66 1.23,1.11 1.84,2.53 1.84,4.27 0,1.56 -0.63,2.97 -1.89,4.23 -1.32,1.14 -2.85,1.71 -4.59,1.71 -1.68,0 -3.15,-0.55 -4.41,-1.66 -1.26,-1.11 -1.89,-2.53 -1.89,-4.27z" android:strokeColor="#00000000"/>
+    <path android:fillAlpha="1" android:fillColor="#b3b3b3"
+        android:pathData="m67.96,18.33c-7.37,0.02 -14.73,1.83 -21.25,5.27 -6.05,3.17 -11.38,7.7 -15.49,13.16 -3.61,4.78 -6.29,10.28 -7.8,16.08 -1.79,6.83 -1.99,14.08 -0.58,21 0.82,4.05 2.19,7.98 4.06,11.66 2.72,5.37 6.5,10.19 11.06,14.12 4.41,3.81 9.54,6.78 15.06,8.69 5.19,1.8 10.71,2.66 16.2,2.53 5.87,-0.13 11.72,-1.38 17.12,-3.69 6.12,-2.61 11.66,-6.57 16.12,-11.5 4.21,-4.64 7.47,-10.15 9.49,-16.08 1.78,-5.2 2.61,-10.71 2.46,-16.2 -0.15,-5.72 -1.36,-11.41 -3.58,-16.68 -2.62,-6.22 -6.61,-11.86 -11.62,-16.38 -4.46,-4.04 -9.71,-7.21 -15.38,-9.24 -5.07,-1.83 -10.47,-2.75 -15.86,-2.72z"
+        android:strokeColor="#00000000" android:strokeWidth="6.7312851"/>
+    <path android:fillAlpha="1" android:fillColor="#808080"
+        android:pathData="M187.58,54.15m0,0a<30>,<2C> <20>,1 1,0 0a<30>,<2C> <20>,1 1,0 0"
+        android:strokeColor="#00000000" android:strokeWidth="6.82086611"/>
+    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:pathData="m59.98,32.27 l-8.39,31.8 -7.08,2.62 -2.02,7.61 7.11,-2.67 -5.01,19.04 48.37,0 2.94,-11.16 -30.12,0 4.06,-15.38 8.18,-3.04 2,-7.62 -8.19,3.09 6.38,-24.31z"
+        android:strokeColor="#00000000" android:strokeWidth="4.80000019"/>
+    <path android:fillAlpha="1" android:fillColor="#666666"
+        android:pathData="m266.13,54 l-3.15,8.46c-1.8,-0.84 -3.42,-1.47 -4.86,-1.89 -1.44,-0.42 -2.91,-0.63 -4.41,-0.63 -3.96,0 -7.35,1.35 -10.17,4.05 -2.64,2.76 -3.96,6.18 -3.96,10.26 0,4.08 1.3,7.44 3.91,10.07 2.61,2.64 5.95,3.96 10.03,3.96 2.88,0 6,-0.99 9.36,-2.97l3.51,7.83 -2.97,1.62c-3.42,1.62 -7.2,2.43 -11.34,2.43 -6.48,0 -11.89,-2.17 -16.24,-6.52 -4.35,-4.35 -6.52,-9.79 -6.52,-16.33 0,-6.66 2.26,-12.22 6.79,-16.69 4.53,-4.47 10.18,-6.7 16.96,-6.7 4.56,0 8.91,1.02 13.04,3.06z" android:strokeColor="#00000000"/>
+    <path android:fillAlpha="1" android:fillColor="#666666"
+        android:pathData="m268.73,74.06c0,-6.6 2.26,-12.1 6.79,-16.51 4.53,-4.41 10.15,-6.61 16.87,-6.61 6.72,0 12.34,2.17 16.87,6.52 4.53,4.35 6.79,9.88 6.79,16.6 0,6.6 -2.25,12.1 -6.75,16.51 -4.5,4.41 -10.14,6.61 -16.91,6.61 -6.9,0 -12.56,-2.17 -17,-6.52 -4.44,-4.35 -6.66,-9.88 -6.66,-16.6zM292.39,59.58c-3.96,0 -7.27,1.38 -9.94,4.14 -2.67,2.76 -4,6.21 -4,10.35 0,2.16 0.3,4.05 0.9,5.67 0.6,1.62 1.62,3.18 3.06,4.68 2.64,2.7 5.97,4.05 9.99,4.05 3.96,0 7.27,-1.36 9.94,-4.09 2.67,-2.73 4,-6.16 4,-10.3 0,-2.16 -0.3,-4.05 -0.9,-5.67 -0.6,-1.62 -1.62,-3.18 -3.06,-4.68 -2.64,-2.76 -5.97,-4.14 -9.99,-4.14z" android:strokeColor="#00000000"/>
+    <path android:fillAlpha="1" android:fillColor="#666666"
+        android:pathData="m321.56,96.85 l0,-43.72 9.99,0 0,43.72z" android:strokeColor="#00000000"/>
+    <path android:fillAlpha="1" android:fillColor="#666666"
+        android:pathData="m320.21,42.96c0,-1.62 0.6,-3.03 1.8,-4.23 1.32,-1.14 2.82,-1.71 4.5,-1.71 1.86,0 3.4,0.55 4.63,1.66 1.23,1.11 1.84,2.53 1.84,4.27 0,1.56 -0.63,2.97 -1.89,4.23 -1.32,1.14 -2.85,1.71 -4.59,1.71 -1.68,0 -3.15,-0.55 -4.41,-1.66 -1.26,-1.11 -1.89,-2.53 -1.89,-4.27z" android:strokeColor="#00000000"/>
+    <path android:fillAlpha="1" android:fillColor="#666666"
+        android:pathData="m338.84,96.85 l0,-43.72 9.99,0 0,6.75c3.24,-5.4 7.92,-8.1 14.03,-8.1 5.82,0 10.07,2.25 12.77,6.75 1.32,2.28 1.98,5.82 1.98,10.61l0,27.71 -9.99,0 0,-25.19 -0.27,-4.5c-0.24,-1.98 -1.2,-3.57 -2.88,-4.77 -1.56,-1.26 -3.39,-1.89 -5.49,-1.89 -3,0 -5.49,1.11 -7.47,3.33 -1.8,2.16 -2.7,5.22 -2.7,9.18l0,23.84z" android:strokeColor="#00000000"/>
+    <path android:fillAlpha="1" android:fillColor="#808080"
+        android:pathData="m127.32,96.85 l0,-64.86 5.13,0 0,64.86z" android:strokeColor="#00000000"/>
+    <path android:fillAlpha="1" android:fillColor="#808080"
+        android:pathData="m142.99,96.85 l0,-43.72 5.22,0 0,43.72z" android:strokeColor="#00000000"/>
+    <path android:fillAlpha="1" android:fillColor="#808080"
+        android:pathData="m154.95,56.97 l0,-4.5 5.94,0 0,-12.24 5.22,0 0,12.24 12.14,0 0,4.5 -12.14,0 0,25.82c0,2.28 0.06,3.63 0.18,4.05 0.36,3.84 2.61,5.76 6.75,5.76 1.68,0 3.27,-0.33 4.77,-0.99l1.26,4.59c-2.64,0.66 -4.92,0.99 -6.84,0.99 -3.96,0 -7.02,-1.38 -9.18,-4.14 -0.84,-1.14 -1.44,-2.34 -1.8,-3.6 -0.12,-0.78 -0.21,-1.62 -0.27,-2.52 -0.06,-0.9 -0.09,-2.34 -0.09,-4.32l0,-25.64z" android:strokeColor="#00000000"/>
+    <path android:fillAlpha="1" android:fillColor="#808080"
+        android:pathData="m223.69,75.86 l-37.96,0c0,2.52 0.42,4.78 1.26,6.79 0.84,2.01 2.1,3.85 3.78,5.53 3.12,3 7.02,4.5 11.7,4.5 7.2,0 12.42,-3.51 15.65,-10.53l4.77,2.43c-4.14,8.4 -10.92,12.6 -20.33,12.6 -6.66,0 -12.04,-2.1 -16.15,-6.3 -4.11,-4.2 -6.16,-9.72 -6.16,-16.56 0,-6.84 2.08,-12.47 6.25,-16.91 4.17,-4.44 9.49,-6.66 15.97,-6.66 6.06,0 11.13,2.08 15.2,6.25 4.08,4.17 6.12,9.43 6.12,15.79l0,1.26zM202.37,55.26c-4.56,0 -8.26,1.38 -11.11,4.14 -2.85,2.76 -4.72,6.75 -5.62,11.96l32.48,0c0,-4.8 -1.48,-8.68 -4.45,-11.65 -2.97,-2.97 -6.73,-4.45 -11.29,-4.45z" android:strokeColor="#00000000"/>
+    <path android:fillAlpha="1" android:fillColor="#808080"
+        android:pathData="m139.47,42.96c0,-1.62 0.6,-3.03 1.8,-4.23 1.32,-1.14 2.82,-1.71 4.5,-1.71 1.86,0 3.4,0.55 4.63,1.66 1.23,1.11 1.84,2.53 1.84,4.27 0,1.56 -0.63,2.97 -1.89,4.23 -1.32,1.14 -2.85,1.71 -4.59,1.71 -1.68,0 -3.15,-0.55 -4.41,-1.66 -1.26,-1.11 -1.89,-2.53 -1.89,-4.27z" android:strokeColor="#00000000"/>
+</vector>

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

@@ -1,19 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/ll_information"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/details_activity_padding"
     android:clickable="true"
     android:orientation="vertical"
     android:background="@drawable/details_panel_light_background"
-    android:padding="@dimen/details_activity_padding"
+    android:padding="@dimen/details_activity_padding">
-    tools:ignore="UnusedAttribute">
+
     <TextView
-        android:id="@+id/information"
+        android:id="@+id/donate_header"
-        style="@style/AppDetailsSubheaderText"
+        android:layout_width="match_parent"
-        android:text="@string/menu_donate"
+        android:layout_height="wrap_content"
-     />
+        android:textSize="15sp"
+        android:textAlignment="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
+        android:id="@+id/donation_options"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:columnCount="3" />
+
 </LinearLayout>

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

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     style="@style/AppDetailsLink"
     android:drawableLeft="@drawable/ic_website"
     android:drawableStart="@drawable/ic_website"
     android:layout_marginLeft="@dimen/layout_horizontal_margin"
     android:layout_marginStart="@dimen/layout_horizontal_margin"
-    android:text="@string/menu_website"
+    tools:text="@string/menu_website" />
-    xmlns:android="http://schemas.android.com/apk/res/android" />

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

@@ -5,18 +5,33 @@
     android:id="@+id/ll_information"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/details_activity_padding"
+    android:layout_marginStart="@dimen/details_activity_padding"
+    android:layout_marginLeft="@dimen/details_activity_padding"
+    android:layout_marginEnd="@dimen/details_activity_padding"
+    android:layout_marginRight="@dimen/details_activity_padding"
+    android:layout_marginTop="@dimen/details_activity__collapsable_lists__padding__vertical"
+    android:layout_marginBottom="@dimen/details_activity__collapsable_lists__padding__vertical"
     android:clickable="true"
     android:orientation="vertical"
     tools:ignore="UnusedAttribute">
-    <TextView
+
-        android:id="@+id/information"
+    <!-- This frame layout is only for showing the material-design-like background ripple when
-        style="@style/AppDetailsSubheaderText"
+         selecting the TextView. -->
-        android:text="@string/links"
+    <FrameLayout style="@style/AppDetailsLink">
-        android:drawableRight="@drawable/ic_expand_more_grey600"
+
-        android:drawableEnd="@drawable/ic_expand_more_grey600"
+        <TextView
-        android:drawableLeft="@drawable/ic_website"
+            android:id="@+id/information"
-        android:drawableStart="@drawable/ic_website" />
+            style="@style/AppDetailsSubheaderText"
+            android:text="@string/links"
+            android:paddingLeft="@dimen/details_activity__collapsable_lists__padding__horizontal"
+            android:paddingStart="@dimen/details_activity__collapsable_lists__padding__horizontal"
+            android:paddingRight="@dimen/details_activity__collapsable_lists__padding__horizontal"
+            android:paddingEnd="@dimen/details_activity__collapsable_lists__padding__horizontal"
+            android:drawableRight="@drawable/ic_expand_more_grey600"
+            android:drawableEnd="@drawable/ic_expand_more_grey600"
+            android:drawableLeft="@drawable/ic_website"
+            android:drawableStart="@drawable/ic_website" />
+    </FrameLayout>
 
     <LinearLayout
         android:id="@+id/ll_content"

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

@@ -184,15 +184,15 @@ Changelog" />
             <TextView
                 android:id="@+id/litecoin"
                 style="@style/AppDetailsLink"
-                android:drawableLeft="@drawable/ic_litecoin"
+                android:drawableLeft="@drawable/donation_option_litecoin"
-                android:drawableStart="@drawable/ic_litecoin"
+                android:drawableStart="@drawable/donation_option_litecoin"
                 android:text="@string/menu_litecoin" />
 
             <TextView
                 android:id="@+id/flattr"
                 style="@style/AppDetailsLink"
-                android:drawableLeft="@drawable/ic_flattr"
+                android:drawableLeft="@drawable/donation_option_flattr"
-                android:drawableStart="@drawable/ic_flattr"
+                android:drawableStart="@drawable/donation_option_flattr"
                 android:text="@string/menu_flattr" />
 
         </LinearLayout>

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

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

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

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

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="30dp"
+    android:drawableLeft="@drawable/ic_donate"
+    android:drawableStart="@drawable/ic_donate"
+    android:drawablePadding="4dp"
+    android:gravity="center_vertical"
+    android:text="@string/menu_donate" />

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="80dp"
+    android:layout_height="20dp"
+    android:src="@drawable/donation_option_litecoin"
+    android:contentDescription="@string/menu_litecoin" />

app/src/main/res/values/dimens.xml

@@ -4,7 +4,12 @@
     <dimen name="layout_horizontal_margin">16dp</dimen>
     <dimen name="material_listitem_height">48dp</dimen>
     <dimen name="app_bar_height">180dp</dimen>
-    <dimen name="details_activity_padding">8dp</dimen>
+    <dimen name="details_activity_padding">16dp</dimen>
+
+    <dimen name="details_activity__collapsable_lists__padding__vertical">3dp</dimen>
+    <!-- This is in addition to the padding that almost all items in the app details screen have
+         applied. The collapsable lists have a little extra on the sides. -->
+    <dimen name="details_activity__collapsable_lists__padding__horizontal">4dp</dimen>
 
     <dimen name="details_screenshot_height">200dp</dimen>
     <dimen name="details_screenshot_width">200dp</dimen>

app/src/main/res/values/strings.xml

@@ -48,6 +48,9 @@
     <string name="app_details">App Details</string>
     <string name="no_such_app">No such app found.</string>
 
+    <string name="app_details_donate_prompt_unknown_author">Buy the developers of %1$s a coffee!</string>
+    <string name="app_details_donate_prompt">%1$s is created by %2$s. Buy them a coffee!</string>
+
     <string name="about_title">About F-Droid</string>
     <string name="about_version">Version</string>
     <string name="about_site">Website</string>