From 9c7015ff9b94557f5599713e9b53377980f50453 Mon Sep 17 00:00:00 2001
From: Austin Huang <im@austinhuang.me>
Date: Thu, 11 Mar 2021 14:47:54 -0500
Subject: [PATCH] reorganize fav string again

hopefully this is the final fix for #489
---
 .../instagrabber/fragments/HashTagFragment.java  |  2 +-
 .../instagrabber/fragments/LocationFragment.java |  2 +-
 .../fragments/main/ProfileFragment.java          |  8 ++++----
 app/src/main/res/values/strings.xml              | 16 +++++++++-------
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/awais/instagrabber/fragments/HashTagFragment.java b/app/src/main/java/awais/instagrabber/fragments/HashTagFragment.java
index 550d43e1..96d99644 100644
--- a/app/src/main/java/awais/instagrabber/fragments/HashTagFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/HashTagFragment.java
@@ -540,7 +540,7 @@ public class HashTagFragment extends Fragment implements SwipeRefreshLayout.OnRe
                             public void onSuccess(final Void result) {
                                 hashtagDetailsBinding.favChip.setText(R.string.favorite_short);
                                 hashtagDetailsBinding.favChip.setChipIconResource(R.drawable.ic_star_check_24);
-                                showSnackbar(getString(R.string.added_to_favs_short));
+                                showSnackbar(getString(R.string.added_to_favs));
                             }
 
                             @Override
diff --git a/app/src/main/java/awais/instagrabber/fragments/LocationFragment.java b/app/src/main/java/awais/instagrabber/fragments/LocationFragment.java
index 4c1c9618..ee2852c8 100644
--- a/app/src/main/java/awais/instagrabber/fragments/LocationFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/LocationFragment.java
@@ -528,7 +528,7 @@ public class LocationFragment extends Fragment implements SwipeRefreshLayout.OnR
                         public void onSuccess(final Void result) {
                             locationDetailsBinding.favChip.setText(R.string.favorite_short);
                             locationDetailsBinding.favChip.setChipIconResource(R.drawable.ic_star_check_24);
-                            showSnackbar(getString(R.string.added_to_favs_short));
+                            showSnackbar(getString(R.string.added_to_favs));
                         }
 
                         @Override
diff --git a/app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java b/app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java
index 4cb6cc64..7b0a1c35 100644
--- a/app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java
@@ -677,7 +677,7 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
             @Override
             public void onSuccess(final Favorite result) {
                 profileDetailsBinding.favChip.setChipIconResource(R.drawable.ic_star_check_24);
-                profileDetailsBinding.favChip.setText(R.string.added_to_favs_short);
+                profileDetailsBinding.favChip.setText(R.string.favorite_short);
                 favoriteRepository.insertOrUpdateFavorite(new Favorite(
                         result.getId(),
                         profileModel.getUsername(),
@@ -729,9 +729,9 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
                         ), new RepositoryCallback<Void>() {
                             @Override
                             public void onSuccess(final Void result) {
-                                profileDetailsBinding.favChip.setText(R.string.added_to_favs_short);
+                                profileDetailsBinding.favChip.setText(R.string.favorite_short);
                                 profileDetailsBinding.favChip.setChipIconResource(R.drawable.ic_star_check_24);
-                                showSnackbar(getString(R.string.added_to_favs_short));
+                                showSnackbar(getString(R.string.added_to_favs));
                             }
 
                             @Override
@@ -749,7 +749,7 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
 
         final String postCount = String.valueOf(profileModel.getMediaCount());
 
-        SpannableStringBuilder span = new SpannableStringBuilder(getResources().getQuantityString(R.plurals.main_posts_count_inline,
+        SpannableStringBuilder span = new SpannableStringBuilder(getResources().getQuantityString(R.plurals.main_posts_count,
                                                                                                   profileModel.getMediaCount() > 2000000000L
                                                                                                   ? 2000000000
                                                                                                   : (int) profileModel.getMediaCount(),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7e814f5e..ab473cd0 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -48,10 +48,14 @@
     <string name="instadp_settings">Use Instadp for high definition profile pictures</string>
     <string name="import_export">Import/Export</string>
     <string name="select_language">Language</string>
-    <plurals name="main_posts_count_inline">
+    <plurals name="main_posts_count">
         <item quantity="one">%s\nPost</item>
         <item quantity="other">%s\nPosts</item>
     </plurals>
+    <plurals name="main_posts_count_inline">
+        <item quantity="one">%s Post</item>
+        <item quantity="other">%s Posts</item>
+    </plurals>
     <plurals name="main_posts_followers">
         <item quantity="one">%s\nFollower</item>
         <item quantity="other">%s\nFollowers</item>
@@ -117,8 +121,7 @@
     <string name="unbookmark">Unbookmark</string>
     <string name="follow">Follow</string>
     <string name="unfollow">Unfollow</string>
-    <string name="favorite_short">Favorite</string>
-    <string name="unfavorite_short">Unfavorite</string>
+    <string name="favorite_short" comment="Adjective, not verb">Favorite</string>
     <string name="block">Block</string>
     <string name="unblock">Unblock</string>
     <string name="restrict">Restrict</string>
@@ -314,14 +317,13 @@
     <string name="light_barinsta_theme" comment="Yes, this one is Barista (the theme), you can also substitute it with other coffee-related words">Barista</string>
     <string name="light_bibliogram_theme" translatable="false">Bibliogram</string>
     <string name="dark_material_dark_theme">Material Dark</string>
-    <string name="added_to_favs">Added to Favorites</string>
-    <string name="added_to_favs_short" comment="Here it's an adjective (equivalent to verb past tense), used for the favorite chip on profile/hashtag/location fragments, so be short">Favorited</string>
-    <string name="add_to_favorites" comment="Here it's a verb, used for the favorite chip on profile/hashtag/location fragments, so be short">Favorite</string>
+    <string name="added_to_favs">Added to Favorites!</string>
+    <string name="add_to_favorites">Add to Favorites</string>
     <string name="accounts">Accounts</string>
     <string name="hashtags">Hashtags</string>
     <string name="locations">Locations</string>
     <string name="unknown">Unknown</string>
-    <string name="removed_from_favs">Removed from Favourites</string>
+    <string name="removed_from_favs">Removed from Favourites!</string>
     <string name="backup_and_restore">Backup &amp; Restore</string>
     <string name="backup_summary">Backup Barinsta app settings, account login data, and/or favorites to a plain text or encrypted backup file for later restoration.</string>
     <string name="backup_warning">If you\'re backing up account login data, treat the file as confidential and keep it somewhere safe!</string>