From ba9d810791805d7452f0ba89e5ec87387dadb7f7 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 4 May 2022 12:22:24 +0200
Subject: [PATCH] Added purchase hint text

---
 .../java/eu/faircode/email/FragmentPro.java   |  7 ++--
 app/src/main/res/layout/fragment_pro.xml      | 34 ++++++++++++-------
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentPro.java b/app/src/main/java/eu/faircode/email/FragmentPro.java
index 79ee18b447..902824c610 100644
--- a/app/src/main/java/eu/faircode/email/FragmentPro.java
+++ b/app/src/main/java/eu/faircode/email/FragmentPro.java
@@ -59,8 +59,9 @@ public class FragmentPro extends FragmentBase implements SharedPreferences.OnSha
     private TextView tvList;
     private Button btnPurchase;
     private ImageView ivExternal;
-    private TextView tvNoPlay;
     private TextView tvPrice;
+    private TextView tvGoogle;
+    private TextView tvNoPlay;
     private TextView tvPriceHint;
     private TextView tvFamilyHint;
     private TextView tvRestoreHint;
@@ -87,8 +88,9 @@ public class FragmentPro extends FragmentBase implements SharedPreferences.OnSha
         tvList = view.findViewById(R.id.tvList);
         btnPurchase = view.findViewById(R.id.btnPurchase);
         ivExternal = view.findViewById(R.id.ivExternal);
-        tvNoPlay = view.findViewById(R.id.tvNoPlay);
         tvPrice = view.findViewById(R.id.tvPrice);
+        tvGoogle = view.findViewById(R.id.tvGoogle);
+        tvNoPlay = view.findViewById(R.id.tvNoPlay);
         tvPriceHint = view.findViewById(R.id.tvPriceHint);
         tvFamilyHint = view.findViewById(R.id.tvFamilyHint);
         tvRestoreHint = view.findViewById(R.id.tvRestoreHint);
@@ -180,6 +182,7 @@ public class FragmentPro extends FragmentBase implements SharedPreferences.OnSha
         btnPurchase.setEnabled(!play);
         ivExternal.setVisibility(play ? View.GONE : View.VISIBLE);
         tvPrice.setVisibility(View.GONE);
+        tvGoogle.setVisibility(play ? View.VISIBLE : View.GONE);
         tvNoPlay.setVisibility(
                 BuildConfig.PLAY_STORE_RELEASE && !Helper.hasPlayStore(getContext())
                         ? View.VISIBLE : View.GONE);
diff --git a/app/src/main/res/layout/fragment_pro.xml b/app/src/main/res/layout/fragment_pro.xml
index 74b085232a..e3e5179c8a 100644
--- a/app/src/main/res/layout/fragment_pro.xml
+++ b/app/src/main/res/layout/fragment_pro.xml
@@ -111,6 +111,26 @@
             app:layout_constraintTop_toTopOf="@+id/btnPurchase"
             app:srcCompat="@drawable/twotone_open_in_new_24" />
 
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvPrice"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="5 euro (once only)"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/btnPurchase" />
+
+        <eu.faircode.email.FixedTextView
+            android:id="@+id/tvGoogle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_pro_google"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvPrice" />
+
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvNoPlay"
             android:layout_width="wrap_content"
@@ -120,17 +140,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textColor="?attr/colorWarning"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btnPurchase" />
-
-        <eu.faircode.email.FixedTextView
-            android:id="@+id/tvPrice"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="5 euro (once only)"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvNoPlay" />
+            app:layout_constraintTop_toBottomOf="@+id/tvGoogle" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvHint"
@@ -140,7 +150,7 @@
             android:text="@string/title_pro_hint"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvPrice" />
+            app:layout_constraintTop_toBottomOf="@id/tvNoPlay" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvPriceHint"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ad2db34bc7..674a5ed68e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1884,6 +1884,7 @@
         FairEmail shows a small message to remind you of this, which will be removed if you purchase the pro features.
     </string>
     <string name="title_pro_whichever">Whichever features are chosen as pro features, there is always someone who complains that a feature should be free. Please don\'t be that person.</string>
+    <string name="title_pro_google">The app initiates a Play store purchase, but Google manages the purchase process. So please don\'t blame the app in case of problems!</string>
     <string name="title_pro_hide">Hide small message for %1$d weeks</string>
     <string name="title_pro_hint">Buying pro features will allow you to use all current and future pro features, will keep this app maintained, and supported.</string>
     <string name="title_pro_price">Why are the pro features so expensive?</string>