Added free trial indication + translations

dev
Laurent 7 years ago
parent 801b6df2aa
commit eca2835666
  1. 11
      app/src/main/java/net/pokeranalytics/android/ui/fragment/SubscriptionFragment.kt
  2. 11
      app/src/main/res/layout/fragment_subscription.xml
  3. 5
      app/src/main/res/values-fr/strings.xml
  4. 1
      app/src/main/res/values/strings.xml
  5. 8
      app/src/main/res/values/styles.xml

@ -21,6 +21,7 @@ import net.pokeranalytics.android.util.Preferences
import net.pokeranalytics.android.util.billing.AppGuard import net.pokeranalytics.android.util.billing.AppGuard
import net.pokeranalytics.android.util.billing.IAPProducts import net.pokeranalytics.android.util.billing.IAPProducts
import net.pokeranalytics.android.util.billing.PurchaseDelegate import net.pokeranalytics.android.util.billing.PurchaseDelegate
import java.time.Period
class SubscriptionFragment : PokerAnalyticsFragment(), SkuDetailsResponseListener, PurchaseDelegate { class SubscriptionFragment : PokerAnalyticsFragment(), SkuDetailsResponseListener, PurchaseDelegate {
@ -98,6 +99,16 @@ class SubscriptionFragment : PokerAnalyticsFragment(), SkuDetailsResponseListene
val perYearString = requireContext().getString(R.string.year_subscription) val perYearString = requireContext().getString(R.string.year_subscription)
val formattedPrice = it.price + " / " + perYearString val formattedPrice = it.price + " / " + perYearString
this.price.text = formattedPrice 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
} }
} }

@ -18,6 +18,17 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> 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 <androidx.appcompat.widget.AppCompatTextView

@ -9,6 +9,11 @@
<string name="lines">Lignes</string> <string name="lines">Lignes</string>
<string name="initial_value">Valeur initiale</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="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 --> <!-- Not translated -->
<string name="address">Adresse</string> <string name="address">Adresse</string>

@ -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="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_upgrade">Upgrade to Pro</string>
<string name="pro_purchase">Go Pro</string> <string name="pro_purchase">Go Pro</string>
<string name="free_trial">free trial</string>
<string name="address">Address</string> <string name="address">Address</string>
<string name="suggestions">Naming suggestions</string> <string name="suggestions">Naming suggestions</string>

@ -313,6 +313,14 @@
<item name="android:textSize">36sp</item> <item name="android:textSize">36sp</item>
</style> </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"> <style name="PokerAnalyticsTheme.TextView.SubscriptionPrice">
<item name="android:textColor">@color/white</item> <item name="android:textColor">@color/white</item>
<item name="android:maxLines">1</item> <item name="android:maxLines">1</item>

Loading…
Cancel
Save