Show subscriptions terms of use

app/src/main/java/net/pokeranalytics/android/util/billing/AppGuard.kt

@@ -64,7 +64,7 @@ object AppGuard : PurchasesUpdatedListener {
 			if (this.endOfUse != null) return true
 
 			return if (BuildConfig.DEBUG) {
-				true //false //true
+				false //true
 			} else {
 				this._isProUser
 			}

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

@@ -66,16 +66,15 @@
 
         <androidx.viewpager.widget.ViewPager
             android:id="@+id/pager"
-
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_marginBottom="8dp"
             app:layout_constraintTop_toBottomOf="@+id/message"
             app:layout_constraintBottom_toTopOf="@+id/pageIndicator"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHeight_percent="0.6"
+            app:layout_constraintHeight_percent="0.5"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintVertical_bias="0.4" />
+            app:layout_constraintVertical_bias="0.5" />
 
         <LinearLayout
             android:id="@+id/pageIndicator"
@@ -107,12 +106,31 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="16dp"
             android:layout_marginRight="16dp"
-            android:layout_marginBottom="32dp"
+            android:layout_marginBottom="16dp"
             android:text="@string/pro_purchase"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/conditions_scrollview"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
+        <ScrollView
+            android:id="@+id/conditions_scrollview"
+            android:layout_width="match_parent"
+            android:layout_height="120dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:text="@string/subscription_text"
+                android:textColor="@color/gray"
+                android:paddingBottom="16dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+
+        </ScrollView>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </LinearLayout>

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

@@ -665,7 +665,7 @@
 	<string name="intermediate_sub_short_title">Semi-Pro</string>
 	<string name="pro_sub_short_title">Pro</string>
 	<string name="subscription_details">Conditions de l\'abonnement</string>
-	<string name="subscription_text">Conditions d’utilisations concernant l’abonnement:\n- Le paiement sera facturé sur votre compte iTunes.\n- L’abonnement est renouvelé automatiquement chaque année, à moins d’avoir été désactivé au moins 24 heures avant la fin de la période de l’abonnement.\n- L’abonnement peut être géré par l’utilisateur et désactivé en allant dans les réglages de son compte après s’être abonné.\n- Le compte sera facturé pour le renouvellement de l\'abonnement dans les 24 heures précédent la fin de la période d’abonnement.\n- Un abonnement en cours ne peut être annulé.\n- Toute partie inutilisée de l\'offre gratuite, si souscrite, sera abandonnée lorsque l\'utilisateur s\'abonnera, dans les cas applicables</string>
+	<string name="subscription_text">Conditions d’utilisations:\n• Votre compte ne sera pas prélevé pendant toute la durée de l\'essai gratuit\n• A la fin de l\'essai gratuit, vous serez automatiquement prélevé du montant total de l\'abonnement annuel\n• Un abonnement est automatiquement renouvelé sauf si annulé\n• Votre abonnement peut-être géré en allant dans le tab \"Autre\" de l\'app, puis \"Abonnement\"</string>
 	<string name="privacy_policy">Politique de confidentialité</string>
 	<string name="bug_report_message">Nous sommes désolé, mais il y a problème&#8230;Il est possible qu\'iCloud synchronise vos données. Veuillez réessayer plus tard. Pouvez-vous nous envoyer un rapport expliquant l\'état de l\'app pour nous aider à résoudre le problème? Merci!</string>
 	<string name="longtap_to_duplicate">Appuyez et maintenez sur une session pour la dupliquer</string>

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

@@ -6,7 +6,6 @@
     <string name="hour">Hour</string>
     <string name="minute">Minute</string>
     <string name="more">More</string>
-    <string name="variant">Variant</string>
     <string name="lines">Lines</string>
     <string name="initial_value">Initial Value</string>
     <string name="less_then_2_values_for_display">Can\'t show because there is less than two values to display!</string>
@@ -43,8 +42,9 @@
     <string name="stacking_incoming">Stacking incoming</string>
     <string name="stacking_outgoing">Stacking outgoing</string>
     <string name="import_error">There has been an issue with the import. Please check out your file or contact the support!</string>
+    <string name="subscription_text">Subscription terms of use:\n• When subscribing, the free trial prevents you from being charged until the period ends\n• At the end of the free trial, you will be automatically charged the yearly subscription amount\n• A subscription automatically renews unless canceled\n• You can manage your subscription by going in the app "More" tab, then "Subscription"</string>
+    <string name="show_fullscreen">Show full screen</string>
 
-    <string name="address">Address</string>
     <string name="suggestions">Naming suggestions</string>
     <string name="data_deleted">Data deleted</string>
     <string name="end_date_not_possible">The end date should be after the start date</string>
@@ -62,7 +62,6 @@
 	<string name="duplicate_tournament_name_error">This name already exists.</string>
     <string name="bankroll_relationship_error_transactions">One or more transactions are associated with this bankroll, please delete the linked transaction(s) first.</string>
     <string name="operation_type">Transaction type</string>
-
 	<string name="from_time">From</string>
 	<string name="to_time">To</string>
 	<string name="ordinal_suffix_first">st</string>
@@ -74,8 +73,6 @@
 	<string name="new_tournament_feature">New tournament feature</string>
 	<string name="new_filter">New filter</string>
 
-
-
 	<!-- Translated -->
 
     <string name="_ago">%s ago</string>
@@ -661,7 +658,6 @@
     <string name="intermediate_sub_short_title">Semi-Pro</string>
     <string name="pro_sub_short_title">Pro</string>
     <string name="subscription_details">Subscription terms</string>
-    <string name="subscription_text">Subscription terms of use:\n• Payment will be charged to iTunes Account at confirmation of purchase\n• Subscription automatically renews unless auto-renew is turned off at least 24-hours before the end of the current period\n• Account will be charged for renewal within 24-hours prior to the end of the current period, and identify the cost of the renewal\n• Subscriptions may be managed by the user and auto-renewal may be turned off by going to the user\'s Account Settings after purchase\n• Any unused portion of a free trial period, if offered, will be forfeited when the user purchases a subscription to that publication, where applicable</string>
     <string name="privacy_policy">Privacy policy</string>
     <string name="bug_report_message">We\'re truly sorry, but something is wrong here&#8230;You may be waiting for iCloud sync. Please wait and retry later. Would you mind sending us a report explaining your current state to help us solve this issue?</string>
     <string name="longtap_to_duplicate">Tap and hold on a session to duplicate it!</string>
@@ -757,7 +753,6 @@
     <string name="do_you_really_to_delete_this_game">Do you really want to delete this game?</string>
     <string name="comments">Comments</string>
     <string name="bb_ante_option">Big Blind Ante</string>
-    <string name="show_fullscreen">Show full screen</string>
 
     <!-- Info.plist -->