aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-07-23 00:22:01 -0700
committerAllan Wang <me@allanwang.ca>2017-07-23 00:22:01 -0700
commitbe41e13ea2cec00f448d929278fe5b93f789dffb (patch)
tree0a5e8d5983d6e3b3bccefc3c78fbdf9bf0584c2f
parent3b0bc17a514eba6670de0405b6b0c6d4d8e15a83 (diff)
downloadfrost-be41e13ea2cec00f448d929278fe5b93f789dffb.tar.gz
frost-be41e13ea2cec00f448d929278fe5b93f789dffb.tar.bz2
frost-be41e13ea2cec00f448d929278fe5b93f789dffb.zip
Rename restore to get
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt6
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IABBinder.kt3
-rw-r--r--app/src/main/res/values/strings_preferences4
-rw-r--r--app/src/main/res/xml/frost_changelog.xml9
4 files changed, 13 insertions, 9 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt
index fb595095..34dc07de 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt
@@ -67,9 +67,9 @@ class SettingsActivity : KPrefActivity(), FrostBilling by IABSettings() {
iicon = CommunityMaterial.Icon.cmd_flask_outline
}
- plainText(R.string.restore_purchases) {
- descRes = R.string.restore_purchases_desc
- iicon = GoogleMaterial.Icon.gmd_refresh
+ plainText(R.string.get_pro) {
+ descRes = R.string.get_pro
+ iicon = GoogleMaterial.Icon.gmd_star
onClick = { _, _, _ -> restorePurchases(); true }
}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IABBinder.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IABBinder.kt
index 0572166f..87a428b6 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IABBinder.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IABBinder.kt
@@ -113,6 +113,9 @@ class IABSettings : IABBinder() {
activity?.playStoreGenericError(null)
}
+ /**
+ * Attempts to get pro, or launch purchase flow if user doesn't have it
+ */
override fun restorePurchases() {
if (bp == null) return
doAsync {
diff --git a/app/src/main/res/values/strings_preferences b/app/src/main/res/values/strings_preferences
index 81545f1c..796b9d47 100644
--- a/app/src/main/res/values/strings_preferences
+++ b/app/src/main/res/values/strings_preferences
@@ -13,7 +13,7 @@
<string name="experimental">Experimental</string>
<string name="experimental_desc">Enable early access to potentially unstable features</string>
- <string name="restore_purchases">Restore Purchases</string>
- <string name="restore_purchases_desc">Restore any previous purchases from the Play Store</string>
+ <string name="get_pro">Get Frost Pro</string>
+ <string name="get_pro_desc">Purchase or restore pro and unlock all the full potential of Frost! Includes ad blockers, custom themes, full configurations, and much more to come.</string>
</resources> \ No newline at end of file
diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml
index 7964c0e9..4da90f8c 100644
--- a/app/src/main/res/xml/frost_changelog.xml
+++ b/app/src/main/res/xml/frost_changelog.xml
@@ -9,10 +9,8 @@
-->
<version title="Beta Updates" />
-
- <item text="Fix regex bug for some devices" />
- <item text="Fix notification text" />
- <item text="Update round icons" />
+
+ <item text="Allow for multiple result flags in settings to better reload the main view" />
<item text="" />
<item text="" />
<item text="" />
@@ -29,6 +27,9 @@
<item text="Aggressively filter nonrecent posts in recents mode" />
<item text="Add download option for full sized images" />
<item text="Fix rounded icons" />
+ <item text="Fix regex bug for some devices" />
+ <item text="Fix notification text" />
+ <item text="Update round icons" />
<version title="v1.3" />
<item text="Create toggle for notifications only from primary account" />