From eca283566693b8283f6cc89b7c6cc286833fdd1c Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Wed, 8 May 2019 18:30:17 +0200
Subject: [PATCH] Added free trial indication + translations

---
 .../android/ui/fragment/SubscriptionFragment.kt       | 11 +++++++++++
 app/src/main/res/layout/fragment_subscription.xml     | 11 +++++++++++
 app/src/main/res/values-fr/strings.xml                |  5 +++++
 app/src/main/res/values/strings.xml                   |  1 +
 app/src/main/res/values/styles.xml                    |  8 ++++++++
 5 files changed, 36 insertions(+)

diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SubscriptionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SubscriptionFragment.kt
index 0740ffb2..2aa6d4c2 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SubscriptionFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SubscriptionFragment.kt
@@ -21,6 +21,7 @@ import net.pokeranalytics.android.util.Preferences
 import net.pokeranalytics.android.util.billing.AppGuard
 import net.pokeranalytics.android.util.billing.IAPProducts
 import net.pokeranalytics.android.util.billing.PurchaseDelegate
+import java.time.Period
 
 
 class SubscriptionFragment : PokerAnalyticsFragment(), SkuDetailsResponseListener, PurchaseDelegate {
@@ -98,6 +99,16 @@ class SubscriptionFragment : PokerAnalyticsFragment(), SkuDetailsResponseListene
 			val perYearString = requireContext().getString(R.string.year_subscription)
 			val formattedPrice = it.price + " / " + perYearString
 			this.price.text = formattedPrice
+
+			var freeTrialDays = 30 // initial, should be more, no less
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+				val p = Period.parse(it.freeTrialPeriod)
+				freeTrialDays = p.days
+			}
+			val formattedFreeTrial =
+				"${freeTrialDays} " + requireContext().getString(R.string.days) + " " + requireContext().getString(R.string.free_trial)
+			this.freetrial.text = formattedFreeTrial
+
 		}
 
 	}
diff --git a/app/src/main/res/layout/fragment_subscription.xml b/app/src/main/res/layout/fragment_subscription.xml
index 8d876b7d..8cf138d1 100644
--- a/app/src/main/res/layout/fragment_subscription.xml
+++ b/app/src/main/res/layout/fragment_subscription.xml
@@ -18,6 +18,17 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/freetrial"
+        style="@style/PokerAnalyticsTheme.TextView.SubscriptionSubTitle"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:text="30 day free trial"/>
+
     <!-- -->
 
     <androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4afbf1a8..ffc7f535 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -9,6 +9,11 @@
 	<string name="lines">Lignes</string>
 	<string name="initial_value">Valeur initiale</string>
 	<string name="less_then_2_values_for_display">Il faut au moins deux valeurs pour afficher ce rapport!</string>
+	<string name="invalid_object">L\'objet est invalide</string>
+	<string name="billingclient_unavailable">Les services de paiement sont indisponibles. Veuillez vérifier votre connexion internet et réessayez plus tard.</string>
+	<string name="pro_upgrade">Devenez membre Pro</string>
+	<string name="pro_purchase">Passer Pro</string>
+	<string name="free_trial">d\'essai gratuit</string>
 
 	<!-- Not translated -->
 	<string name="address">Adresse</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9d0dd112..d94aecac 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,6 +14,7 @@
     <string name="billingclient_unavailable">The billing services are unavailable at the moment. Please check your internet connection and retry later.</string>
     <string name="pro_upgrade">Upgrade to Pro</string>
     <string name="pro_purchase">Go Pro</string>
+    <string name="free_trial">free trial</string>
 
     <string name="address">Address</string>
     <string name="suggestions">Naming suggestions</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4d179335..c20890d5 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -313,6 +313,14 @@
 		<item name="android:textSize">36sp</item>
 	</style>
 
+	<style name="PokerAnalyticsTheme.TextView.SubscriptionSubTitle">
+		<item name="android:textColor">@color/white</item>
+		<item name="android:maxLines">1</item>
+		<item name="android:ellipsize">end</item>
+		<item name="android:fontFamily">@font/roboto_light</item>
+		<item name="android:textSize">18sp</item>
+	</style>
+
 	<style name="PokerAnalyticsTheme.TextView.SubscriptionPrice">
 		<item name="android:textColor">@color/white</item>
 		<item name="android:maxLines">1</item>