From 3b925f8674d73e185a5390d953d335aaee821621 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Tue, 8 Sep 2020 12:48:52 -0300
Subject: [PATCH] Add in-app donate button to preferences screen.

---
 .../securesms/ApplicationPreferencesActivity.java        | 9 ++++++++-
 app/src/main/res/drawable/ic_heart_outline_24.xml        | 9 +++++++++
 app/src/main/res/drawable/ic_heart_solid_24.xml          | 9 +++++++++
 app/src/main/res/drawable/ic_open_20.xml                 | 9 +++++++++
 app/src/main/res/layout/donate_preference_widget.xml     | 7 +++++++
 app/src/main/res/values/attrs.xml                        | 1 +
 app/src/main/res/values/strings.xml                      | 2 ++
 app/src/main/res/values/themes.xml                       | 2 ++
 app/src/main/res/xml/preferences.xml                     | 5 +++++
 9 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/ic_heart_outline_24.xml
 create mode 100644 app/src/main/res/drawable/ic_heart_solid_24.xml
 create mode 100644 app/src/main/res/drawable/ic_open_20.xml
 create mode 100644 app/src/main/res/layout/donate_preference_widget.xml

diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
index 61372cdce..ca252ff42 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
@@ -47,6 +47,7 @@ import org.thoughtcrime.securesms.preferences.widgets.UsernamePreference;
 import org.thoughtcrime.securesms.profiles.edit.EditProfileActivity;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.service.KeyCachingService;
+import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.FeatureFlags;
@@ -77,6 +78,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
   private static final String PREFERENCE_CATEGORY_DEVICES        = "preference_category_devices";
   private static final String PREFERENCE_CATEGORY_HELP           = "preference_category_help";
   private static final String PREFERENCE_CATEGORY_ADVANCED       = "preference_category_advanced";
+  private static final String PREFERENCE_CATEGORY_DONATE         = "preference_category_donate";
 
   private final DynamicTheme    dynamicTheme    = new DynamicTheme();
   private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
@@ -177,7 +179,9 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
       this.findPreference(PREFERENCE_CATEGORY_HELP)
           .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_HELP));
       this.findPreference(PREFERENCE_CATEGORY_ADVANCED)
-        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_ADVANCED));
+          .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_ADVANCED));
+      this.findPreference(PREFERENCE_CATEGORY_DONATE)
+          .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_DONATE));
 
       tintIcons();
     }
@@ -292,6 +296,9 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
         case PREFERENCE_CATEGORY_HELP:
           fragment = new HelpFragment();
           break;
+        case PREFERENCE_CATEGORY_DONATE:
+          CommunicationActions.openBrowserLink(requireContext(), getString(R.string.donate_url));
+          break;
         default:
           throw new AssertionError();
         }
diff --git a/app/src/main/res/drawable/ic_heart_outline_24.xml b/app/src/main/res/drawable/ic_heart_outline_24.xml
new file mode 100644
index 000000000..0654b6e60
--- /dev/null
+++ b/app/src/main/res/drawable/ic_heart_outline_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="?icon_tint"
+      android:pathData="M17.5,3.5a4,4 0,0 1,4 4c0,5.018 -6.208,10.993 -9.5,13.613C8.706,18.5 2.5,12.529 2.5,7.5A4,4 0,0 1,9.336 4.679a12.607,12.607 0,0 1,1.419 1.626l1.239,1.831 1.248,-1.827A12.682,12.682 0,0 1,14.67 4.673,3.977 3.977,0 0,1 17.5,3.5m0,-1.5a5.484,5.484 0,0 0,-3.891 1.613A13.738,13.738 0,0 0,12 5.467a13.738,13.738 0,0 0,-1.609 -1.854A5.5,5.5 0,0 0,1 7.5C1,15 12,23 12,23S23,15 23,7.5A5.5,5.5 0,0 0,17.5 2Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_heart_solid_24.xml b/app/src/main/res/drawable/ic_heart_solid_24.xml
new file mode 100644
index 000000000..8b0e33a84
--- /dev/null
+++ b/app/src/main/res/drawable/ic_heart_solid_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="?icon_tint"
+      android:pathData="M17.5,2a5.484,5.484 0,0 0,-3.891 1.613A13.738,13.738 0,0 0,12 5.467a13.738,13.738 0,0 0,-1.609 -1.854A5.5,5.5 0,0 0,1 7.5C1,15 12,23 12,23S23,15 23,7.5A5.5,5.5 0,0 0,17.5 2Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_open_20.xml b/app/src/main/res/drawable/ic_open_20.xml
new file mode 100644
index 000000000..ef2c78bbf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_open_20.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:fillColor="?pref_icon_tint"
+      android:pathData="M16,11v5a2,2 0,0 1,-2 2H4a2,2 0,0 1,-2 -2V6A2,2 0,0 1,4 4H9V5.5H4a0.5,0.5 0,0 0,-0.5 0.5V16a0.5,0.5 0,0 0,0.5 0.5H14a0.5,0.5 0,0 0,0.5 -0.5V11ZM10.5,2V3.5h4l1.1,-0.18L7.47,11.47l1.06,1.06 8.15,-8.15 -0.18,1.1v4H18V2Z"/>
+</vector>
diff --git a/app/src/main/res/layout/donate_preference_widget.xml b/app/src/main/res/layout/donate_preference_widget.xml
new file mode 100644
index 000000000..70ed9737f
--- /dev/null
+++ b/app/src/main/res/layout/donate_preference_widget.xml
@@ -0,0 +1,7 @@
+<?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="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_vertical"
+    app:srcCompat="@drawable/ic_open_20" />
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 105cc958a..f15d18003 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -240,6 +240,7 @@
     <attr name="advanced_icon" format="reference" />
     <attr name="safety_number_icon" format="reference" />
     <attr name="help_icon" format="reference" />
+    <attr name="donate_icon" format="reference" />
 
     <attr name="help_problem_background" format="reference" />
     <attr name="help_next_background" format="reference" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c3291deb7..b90f4c83a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_name" translatable="false">Signal</string>
 
     <string name="install_url" translatable="false">https://signal.org/install</string>
+    <string name="donate_url" translatable="false">https://signal.org/donate</string>
 
     <string name="yes">Yes</string>
     <string name="no">No</string>
@@ -2049,6 +2050,7 @@
     <string name="preferences__slow">Slow</string>
     <string name="preferences__help">Help</string>
     <string name="preferences__advanced">Advanced</string>
+    <string name="preferences__donate_to_signal">Donate to Signal</string>
     <string name="preferences__privacy">Privacy</string>
     <string name="preferences__mms_user_agent">MMS User Agent</string>
     <string name="preferences__advanced_mms_access_point_names">Manual MMS settings</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 5f3e55dd3..726a938c2 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -400,6 +400,7 @@
         <item name="advanced_icon">@drawable/ic_advanced_24</item>
         <item name="safety_number_icon">@drawable/ic_safety_number_outline_24</item>
         <item name="help_icon">@drawable/ic_help_outline_24</item>
+        <item name="donate_icon">@drawable/ic_heart_outline_24</item>
         <item name="message_request_dialog_button_background">@drawable/message_request_button_background_light</item>
         <item name="message_request_text_color_primary">@color/core_grey_90</item>
         <item name="message_request_text_color_secondary">@color/core_grey_60</item>
@@ -731,6 +732,7 @@
         <item name="advanced_icon">@drawable/ic_advanced_24</item>
         <item name="safety_number_icon">@drawable/ic_safety_number_solid_24</item>
         <item name="help_icon">@drawable/ic_help_solid_24</item>
+        <item name="donate_icon">@drawable/ic_heart_solid_24</item>
         <item name="message_request_dialog_button_background">@drawable/message_request_button_background_dark</item>
         <item name="message_request_text_color_primary">@color/core_grey_05</item>
         <item name="message_request_text_color_secondary">@color/core_grey_25</item>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 052e35cfe..66f4e0983 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -46,4 +46,9 @@
                 android:title="@string/preferences__advanced"
                 android:icon="?attr/advanced_icon"/>
 
+    <Preference android:key="preference_category_donate"
+                android:title="@string/preferences__donate_to_signal"
+                android:icon="?attr/donate_icon"
+                android:widgetLayout="@layout/donate_preference_widget" />
+
 </PreferenceScreen>