Lomanic/BarInsta
1
0
Fork 0
mirror of https://github.com/KokaKiwi/BarInsta synced 2024-11-22 22:57:29 +00:00
Code Issues Releases Wiki Activity

reorganize fav string again

Browse Source 
hopefully this is the final fix for #489
This commit is contained in:
Austin Huang 2021-03-11 14:47:54 -05:00
parent d551969da3
commit 9c7015ff9b
No known key found for this signature in database
GPG Key ID: 84C23AA04587A91F
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/awais/instagrabber/fragments/HashTagFragment.java
View File

@ -540,7 +540,7 @@ public class HashTagFragment extends Fragment implements SwipeRefreshLayout.OnRe
public void onSuccess(final Void result) { public void onSuccess(final Void result) {
hashtagDetailsBinding.favChip.setText(R.string.favorite_short); hashtagDetailsBinding.favChip.setText(R.string.favorite_short);
hashtagDetailsBinding.favChip.setChipIconResource(R.drawable.ic_star_check_24); 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 @Override

2
app/src/main/java/awais/instagrabber/fragments/LocationFragment.java
View File

@ -528,7 +528,7 @@ public class LocationFragment extends Fragment implements SwipeRefreshLayout.OnR
public void onSuccess(final Void result) { public void onSuccess(final Void result) {
locationDetailsBinding.favChip.setText(R.string.favorite_short); locationDetailsBinding.favChip.setText(R.string.favorite_short);
locationDetailsBinding.favChip.setChipIconResource(R.drawable.ic_star_check_24); 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 @Override

8
app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java
View File

@ -677,7 +677,7 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
@Override @Override
public void onSuccess(final Favorite result) { public void onSuccess(final Favorite result) {
profileDetailsBinding.favChip.setChipIconResource(R.drawable.ic_star_check_24); 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( favoriteRepository.insertOrUpdateFavorite(new Favorite(
result.getId(), result.getId(),
profileModel.getUsername(), profileModel.getUsername(),
@ -729,9 +729,9 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
), new RepositoryCallback<Void>() { ), new RepositoryCallback<Void>() {
@Override @Override
public void onSuccess(final Void result) { 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); 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 @Override
@ -749,7 +749,7 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
final String postCount = String.valueOf(profileModel.getMediaCount()); 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 profileModel.getMediaCount() > 2000000000L
? 2000000000 ? 2000000000
: (int) profileModel.getMediaCount(), : (int) profileModel.getMediaCount(),

16
app/src/main/res/values/strings.xml
View File

@ -48,10 +48,14 @@
<string name="instadp_settings">Use Instadp for high definition profile pictures</string> <string name="instadp_settings">Use Instadp for high definition profile pictures</string>
<string name="import_export">Import/Export</string> <string name="import_export">Import/Export</string>
<string name="select_language">Language</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="one">%s\nPost</item>
<item quantity="other">%s\nPosts</item> <item quantity="other">%s\nPosts</item>
</plurals> </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"> <plurals name="main_posts_followers">
<item quantity="one">%s\nFollower</item> <item quantity="one">%s\nFollower</item>
<item quantity="other">%s\nFollowers</item> <item quantity="other">%s\nFollowers</item>
@ -117,8 +121,7 @@
<string name="unbookmark">Unbookmark</string> <string name="unbookmark">Unbookmark</string>
<string name="follow">Follow</string> <string name="follow">Follow</string>
<string name="unfollow">Unfollow</string> <string name="unfollow">Unfollow</string>
<string name="favorite_short">Favorite</string> <string name="favorite_short" comment="Adjective, not verb">Favorite</string>
<string name="unfavorite_short">Unfavorite</string>
<string name="block">Block</string> <string name="block">Block</string>
<string name="unblock">Unblock</string> <string name="unblock">Unblock</string>
<string name="restrict">Restrict</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_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="light_bibliogram_theme" translatable="false">Bibliogram</string>
<string name="dark_material_dark_theme">Material Dark</string> <string name="dark_material_dark_theme">Material Dark</string>
<string name="added_to_favs">Added to Favorites</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">Add to Favorites</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="accounts">Accounts</string> <string name="accounts">Accounts</string>
<string name="hashtags">Hashtags</string> <string name="hashtags">Hashtags</string>
<string name="locations">Locations</string> <string name="locations">Locations</string>
<string name="unknown">Unknown</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_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_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> <string name="backup_warning">If you\'re backing up account login data, treat the file as confidential and keep it somewhere safe!</string>