From 78ea14b3ae7d8f769ee869a654390dd376aee50f Mon Sep 17 00:00:00 2001 From: Docile-Alligator <25734209+Docile-Alligator@users.noreply.github.com> Date: Mon, 18 Sep 2023 23:41:21 -0400 Subject: Update strings. --- .../RedditAPIInfoBottomSheetFragment.java | 10 +--- .../fragment_reddit_api_info_bottom_sheet.xml | 2 - app/src/main/res/values/strings.xml | 53 ++++++++++++++++++---- 3 files changed, 47 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/RedditAPIInfoBottomSheetFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/RedditAPIInfoBottomSheetFragment.java index 54da61e9..85d50993 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/RedditAPIInfoBottomSheetFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/RedditAPIInfoBottomSheetFragment.java @@ -1,20 +1,14 @@ package ml.docilealligator.infinityforreddit.bottomsheetfragments; import android.content.Context; -import android.content.Intent; -import android.net.Uri; import android.os.Bundle; -import android.text.SpannableString; -import android.text.util.Linkify; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import androidx.annotation.NonNull; -import me.saket.bettermovementmethod.BetterLinkMovementMethod; import ml.docilealligator.infinityforreddit.R; -import ml.docilealligator.infinityforreddit.activities.LinkResolverActivity; import ml.docilealligator.infinityforreddit.activities.MainActivity; import ml.docilealligator.infinityforreddit.customviews.LandscapeExpandedRoundedBottomSheetDialogFragment; import ml.docilealligator.infinityforreddit.databinding.FragmentRedditApiInfoBottomSheetBinding; @@ -40,7 +34,7 @@ public class RedditAPIInfoBottomSheetFragment extends LandscapeExpandedRoundedBo binding.getRoot().setNestedScrollingEnabled(true); - SpannableString message = new SpannableString(getString(R.string.reddit_api_info, "https://www.reddit.com/r/reddit/comments/145bram/addressing_the_community_about_changes_to_our_api", "https://www.reddit.com/r/Infinity_For_Reddit/comments/147bhsg/the_future_of_infinity")); + /*SpannableString message = new SpannableString(getString(R.string.reddit_api_info, "https://www.reddit.com/r/reddit/comments/145bram/addressing_the_community_about_changes_to_our_api", "https://www.reddit.com/r/Infinity_For_Reddit/comments/147bhsg/the_future_of_infinity")); Linkify.addLinks(message, Linkify.WEB_URLS); binding.messageTextViewRedditApiInfoBottomSheetFragment.setText(message); binding.messageTextViewRedditApiInfoBottomSheetFragment.setMovementMethod(BetterLinkMovementMethod.newInstance().setOnLinkClickListener((textView, url) -> { @@ -48,7 +42,7 @@ public class RedditAPIInfoBottomSheetFragment extends LandscapeExpandedRoundedBo intent.setData(Uri.parse(url)); startActivity(intent); return true; - })); + }));*/ binding.messageTextViewRedditApiInfoBottomSheetFragment.setLinkTextColor(getResources().getColor(R.color.colorAccent)); binding.doNotShowThisAgainTextView.setOnClickListener(view -> { diff --git a/app/src/main/res/layout/fragment_reddit_api_info_bottom_sheet.xml b/app/src/main/res/layout/fragment_reddit_api_info_bottom_sheet.xml index d5f9f28b..8fc71245 100644 --- a/app/src/main/res/layout/fragment_reddit_api_info_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_reddit_api_info_bottom_sheet.xml @@ -16,7 +16,6 @@ android:paddingTop="16dp" android:paddingStart="16dp" android:paddingEnd="16dp" - android:text="@string/reddit_api_info_title" android:fontFamily="?attr/font_family" android:textSize="?attr/font_20" android:textColor="?attr/primaryTextColor" @@ -27,7 +26,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="16dp" - android:text="@string/reddit_api_info" android:fontFamily="?attr/font_family" android:textSize="?attr/font_16" android:textColor="?attr/primaryTextColor" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 939b75c1..1aaeb2ec 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,4 @@ - + Infinity Login @@ -45,6 +45,7 @@ Edit Profile Poll Post History + Subscription Open navigation drawer Close navigation drawer @@ -1166,7 +1167,7 @@ Start by joining a subreddit! This multireddit does not have a subreddit! - Successfully exported settings to the destination directory. The password of the generated zip file is 123321. Please don\'t modify the zip file. + Successfully exported settings to the destination directory. Could not create backup zip in the destination directory Could not backup some settings but others were successfully exported to the destination directory Successfully restored settings. Restart the app to see the changes. @@ -1307,12 +1308,8 @@ Handle Link Invalid link - Unexpected intent action: %1$s - Enable random adaptation Media includes video tracks, but none are playable by this device Media includes audio tracks, but none are playable by this device - Permission to access storage was denied - One or more sample lists failed to load Volume Up Volume Off @@ -1327,8 +1324,48 @@ Notification permission is not granted Settings - Please update Infinity after August 30th - Starting from August 31st, 2023, Infinity will be a subscription-only app due to Reddit API changes enforced since July 1st. The announcement from Reddit can be found here: %1$s\n\nYou can learn more about the changes in this post: %2$s\n\nIt\'s required for you to update Infinity after August 30th so that you will get the new version with subscription options. None of the previous versions (including this one) will work after August 31st. Thank you for your understanding! + Welcome to Infinity for Reddit, your gateway to a whole new dimension of Reddit browsing! + Before you dive into the countless possibilities this app offers, + I want to be upfront and transparent about a significant change I\'ve implemented to ensure the best possible service for you. + \n\nFrom now on, you will need a monthly subscription to access the Reddit API within Infinity for Reddit and + this is because Reddit has started charging for API access since July 1st, 2023. + \n\nAll the tiers work the same. If you want to support Infinity, you can subscribe to a higher tier. + Most of the money from the lowest tier goes to Reddit. + + Monthly + Yearly + Weekly + Billing service unavailable on device. + The developer made some errors. Not your fault. + Fatal error during the API action. + The requested feature is not supported by the Play Store on the current device. + The purchase failed because the item is already owned. + The requested product is not available for purchase. + A network error occurred during the operation. + The app is not connected to the Play Store service via the Google Play Billing Library. + The service is currently unavailable. + Transaction was canceled by the user. + Bronze + Silver + Gold - Perfect Choice! + Platinum + Diamond + Infinity + Cannot acknowledge purchase + Failed to connect to the billing system + Connecting to the billing system. Please wait. + Thank you for your subscription + Load subscription options + Acknowledging your subscription. Please wait. + Oops, there was an error when acknowledging your purchase. If this problem persists for three days, you will automatically get a refund.\nDon\'t worry, you can still enjoy Infinity for Reddit. + Continue to app + Already paid for the subscription? + Restore subscription purchase + + Please re-login your account + Infinity for Reddit with subscription uses a new API key from Reddit and you have to re-login to continue using the app.\n\nJust + open the navigation drawer and click your account header and select \"Add an account\" to login to Reddit using the same account again. + Otherwise, Infinity may not load posts at all. Sorry for the inconvenience. I understand -- cgit v1.2.3