From b15ebc911c61ebfe2adfd2044dd654ffb3400940 Mon Sep 17 00:00:00 2001
From: Finn M Glas <finn@finnmglas.com>
Date: Sun, 18 Oct 2020 23:25:47 +0200
Subject: [PATCH] Use heart icon for sponsors link

In meta settings. Remove the 'donate' button and use an icon instead,
place this icon in the place of the old website link (to
www.finnmglas.com).
---
 .../settings/meta/SettingsFragmentMeta.kt     | 19 +++++--------------
 app/src/main/res/layout/settings_meta.xml     | 15 +++------------
 app/src/main/res/values-de/strings.xml        |  4 +---
 app/src/main/res/values-fr/strings.xml        |  4 +---
 app/src/main/res/values/icons.xml             |  1 +
 app/src/main/res/values/strings.xml           |  4 +---
 6 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/com/finnmglas/launcher/settings/meta/SettingsFragmentMeta.kt b/app/src/main/java/com/finnmglas/launcher/settings/meta/SettingsFragmentMeta.kt
index 3ff4d4d..b0abf0d 100644
--- a/app/src/main/java/com/finnmglas/launcher/settings/meta/SettingsFragmentMeta.kt
+++ b/app/src/main/java/com/finnmglas/launcher/settings/meta/SettingsFragmentMeta.kt
@@ -65,11 +65,10 @@ class SettingsFragmentMeta : Fragment(), UIObject {
         setButtonColor(settings_meta_button_view_tutorial, vibrantColor)
         setButtonColor(settings_meta_button_reset_settings, vibrantColor)
         setButtonColor(settings_meta_button_contact, vibrantColor)
-        setButtonColor(settings_meta_button_donate, vibrantColor)
 
-        settings_meta_icon_google_play.setTextColor(vibrantColor)
         settings_meta_icon_github.setTextColor(vibrantColor)
-        settings_meta_icon_globe.setTextColor(vibrantColor)
+        settings_meta_icon_store.setTextColor(vibrantColor)
+        settings_meta_icon_donate.setTextColor(vibrantColor)
     }
 
     override fun setOnClicks() {
@@ -134,8 +133,8 @@ class SettingsFragmentMeta : Fragment(), UIObject {
                 this.context!!
             )
         }
-        // rate app
-        settings_meta_icon_google_play.setOnClickListener {
+        // rate app / open store
+        settings_meta_icon_store.setOnClickListener {
             try {
                 val rateIntent = rateIntentForUrl("market://details")
                 intendedSettingsPause = true
@@ -147,14 +146,6 @@ class SettingsFragmentMeta : Fragment(), UIObject {
             }
         }
 
-        settings_meta_icon_globe.setOnClickListener {
-            intendedSettingsPause = true
-            openNewTabWindow(
-                getString(R.string.settings_meta_link_web),
-                this.context!!
-            )
-        }
-
         // contact developer
         settings_meta_button_contact.setOnClickListener {
             intendedSettingsPause = true
@@ -165,7 +156,7 @@ class SettingsFragmentMeta : Fragment(), UIObject {
         }
 
         // donate
-        settings_meta_button_donate.setOnClickListener {
+        settings_meta_icon_donate.setOnClickListener {
             intendedSettingsPause = true
             openNewTabWindow(
                 getString(R.string.settings_meta_donate_url),
diff --git a/app/src/main/res/layout/settings_meta.xml b/app/src/main/res/layout/settings_meta.xml
index e4f3f42..e5d6e67 100644
--- a/app/src/main/res/layout/settings_meta.xml
+++ b/app/src/main/res/layout/settings_meta.xml
@@ -46,7 +46,7 @@
         android:orientation="horizontal">
 
         <com.finnmglas.launcher.libraries.FontAwesome
-            android:id="@+id/settings_meta_icon_google_play"
+            android:id="@+id/settings_meta_icon_store"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
@@ -78,17 +78,15 @@
             custom:type="brands" />
 
         <com.finnmglas.launcher.libraries.FontAwesome
-            android:id="@+id/settings_meta_icon_globe"
+            android:id="@+id/settings_meta_icon_donate"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
             android:layout_weight="1"
             android:gravity="center"
             android:includeFontPadding="true"
             android:paddingLeft="16sp"
             android:paddingRight="16sp"
-            android:text="@string/fas_globe"
+            android:text="@string/fas_heart"
             android:textColor="?attr/colorAccent"
             android:textSize="40sp"
             custom:type="solid" />
@@ -103,11 +101,4 @@
         android:text="@string/settings_meta_contact"
         android:textAllCaps="false" />
 
-    <Button
-        android:id="@+id/settings_meta_button_donate"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/settings_meta_donate"
-        android:textAllCaps="false" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 64bdc4a..a8765c1 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -95,13 +95,11 @@
     <string name="settings_meta_reset_confirm">All deine Einstellungen gehen verloren. Weitermachen?</string>
 
     <string name="settings_meta_link_github">https://github.com/finnmglas/Launcher#de</string>
-    <string name="settings_meta_link_web">https://www.finnmglas.com/de/</string>
 
     <string name="settings_meta_contact">Entwickler kontaktieren</string>
     <string name="settings_meta_contact_url">https://www.finnmglas.com/de/kontakt/</string>
 
-    <string name="settings_meta_donate">Finanziell unterstützen</string>
-    <string name="settings_meta_donate_url">https://sponsor.finnmglas.com</string>
+    <string name="settings_meta_donate_url">https://www.finnmglas.com/de/sponsor</string>
 
     <!--
       -
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 1bcbc06..1f993ae 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -95,13 +95,11 @@
     <string name="settings_meta_reset_confirm">Vous allez supprimer toutes vos préférences. Continuer?</string>
 
     <string name="settings_meta_link_github">https://github.com/finnmglas/Launcher#fr</string>
-    <string name="settings_meta_link_web">https://www.finnmglas.com/fr/</string>
 
     <string name="settings_meta_contact">Contacter le développeur</string>
     <string name="settings_meta_contact_url">https://www.finnmglas.com/fr/contact/</string>
 
-    <string name="settings_meta_donate">Faire un don</string>
-    <string name="settings_meta_donate_url">https://sponsor.finnmglas.com</string>
+    <string name="settings_meta_donate_url">https://www.finnmglas.com/fr/sponsor</string>
 
     <!--
       -
diff --git a/app/src/main/res/values/icons.xml b/app/src/main/res/values/icons.xml
index 1606d54..7951b88 100644
--- a/app/src/main/res/values/icons.xml
+++ b/app/src/main/res/values/icons.xml
@@ -26,6 +26,7 @@
   <string name="fas_angle_double_up" translatable="false">&#xf102;</string>
   <string name="fas_angle_double_down" translatable="false">&#xf103;</string>
   <string name="fas_store" translatable="false">&#xf54e;</string>
+  <string name="fas_heart" translatable="false">&#xf004;</string>
 
   <!-- icons that can be used with type="brands" -->
   <string name="fab_apple" translatable="false">&#xf179;</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5407011..d89df1a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -115,13 +115,11 @@
     <string name="settings_meta_reset_confirm">You are going to discard all your preferences. Continue?</string>
 
     <string name="settings_meta_link_github">https://github.com/finnmglas/Launcher#en</string>
-    <string name="settings_meta_link_web">https://www.finnmglas.com</string>
 
     <string name="settings_meta_contact">Contact the developer</string>
     <string name="settings_meta_contact_url">https://www.finnmglas.com/contact/</string>
 
-    <string name="settings_meta_donate">Make a donation</string>
-    <string name="settings_meta_donate_url">https://sponsor.finnmglas.com</string>
+    <string name="settings_meta_donate_url">https://www.finnmglas.com/sponsor</string>
 
     <!--
       -