Lomanic/BarInsta
1
0
Fork 0
mirror of https://github.com/KokaKiwi/BarInsta synced 2024-12-23 21:36:59 +00:00
Code Issues Releases Wiki Activity

conflict resolution

Browse Source
This commit is contained in:
Austin Huang 2020-09-02 13:20:19 -04:00
parent 13cacf43f9
commit a7ec65d88f
No known key found for this signature in database
GPG Key ID: 84C23AA04587A91F
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/awais/instagrabber/MainHelper.java
View File

@ -1415,7 +1415,15 @@ public final class MainHelper implements SwipeRefreshLayout.OnRefreshListener {
: mainActivity.userQuery.replaceAll("^@", ""))); : mainActivity.userQuery.replaceAll("^@", "")));
onRefresh(); onRefresh();
} else if (v == mainActivity.mainBinding.profileView.btnFollow) { } else if (v == mainActivity.mainBinding.profileView.btnFollow) {
new ProfileAction().execute("follow"); if (mainActivity.profileModel.isPrivate() && mainActivity.profileModel.getFollowing()) {
new AlertDialog.Builder(main)
.setTitle(R.string.priv_acc)
.setMessage(R.string.priv_acc_confirm)
.setNegativeButton(R.string.no, null)
.setPositiveButton(R.string.yes, (dialog, which) -> new ProfileAction().execute("follow"))
.show();
}
else new ProfileAction().execute("follow");
} else if (v == mainActivity.mainBinding.profileView.btnRestrict && isLoggedIn) { } else if (v == mainActivity.mainBinding.profileView.btnRestrict && isLoggedIn) {
new ProfileAction().execute("restrict"); new ProfileAction().execute("restrict");
} else if (v == mainActivity.mainBinding.profileView.btnSaved && !isSelf) { } else if (v == mainActivity.mainBinding.profileView.btnSaved && !isSelf) {

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

@ -34,10 +34,13 @@
<string name="title_user_story">User Story</string> <string name="title_user_story">User Story</string>
<string name="title_changelog">Changelog</string> <string name="title_changelog">Changelog</string>
<string name="bottom_toolbar">Show toolbar at bottom</string> <string name="bottom_toolbar">Show toolbar at bottom</string>
<string name="update_check">Check for new updates on GitHub at startup</string>
<string name="download_user_folder">Download posts to username folder in Downloads</string> <string name="download_user_folder">Download posts to username folder in Downloads</string>
<string name="autoload_posts">Auto-load all posts from user</string> <string name="autoload_posts">Auto-load all posts from user</string>
<string name="mark_as_seen_setting">Mark stories as seen after viewing</string> <string name="mark_as_seen_setting">Mark stories as seen after viewing</string>
<string name="mark_as_seen_setting_summary">Story author will know you viewed it</string> <string name="mark_as_seen_setting_summary">Story author will know you viewed it</string>
<string name="dm_mark_as_seen_setting">Automatically mark DM as seen after viewing</string>
<string name="dm_mark_as_seen_setting_summary">Other members will know you viewed it</string>
<string name="activity_setting">Enable activity notifications</string> <string name="activity_setting">Enable activity notifications</string>
<string name="error_loading_profile">Error loading profile!\nTry logging in and search again.</string> <string name="error_loading_profile">Error loading profile!\nTry logging in and search again.</string>
<string name="error_creating_folders">Error creating Download folder(s).</string> <string name="error_creating_folders">Error creating Download folder(s).</string>
@ -85,6 +88,7 @@
<string name="story_quizzed">You have already answered!</string> <string name="story_quizzed">You have already answered!</string>
<string name="story_mentions">Mentions</string> <string name="story_mentions">Mentions</string>
<string name="priv_acc">This Account is Private</string> <string name="priv_acc">This Account is Private</string>
<string name="priv_acc_confirm">You won\'t be able to access posts after unfollowing! Are you sure?</string>
<string name="no_acc">You can log in via Settings on the bottom-right corner. Or, you can view public accounts without login!</string> <string name="no_acc">You can log in via Settings on the bottom-right corner. Or, you can view public accounts without login!</string>
<string name="no_acc_logged_in">You can swipe left/right for explore/feed, or search something below!</string> <string name="no_acc_logged_in">You can swipe left/right for explore/feed, or search something below!</string>
<string name="empty_acc">This Account has No Posts</string> <string name="empty_acc">This Account has No Posts</string>
@ -174,6 +178,8 @@
<string name="dms_action_success">Great success!</string> <string name="dms_action_success">Great success!</string>
<string name="dms_action_leave">Leave</string> <string name="dms_action_leave">Leave</string>
<string name="dms_action_leave_question">Leave this chat?</string> <string name="dms_action_leave_question">Leave this chat?</string>
<string name="dms_action_kick">Kick</string>
<string name="dms_left_users">Left users</string>
<string name="direct_download">Download directly</string> <string name="direct_download">Download directly</string>
<string name="direct_download_desc">Downloads posts directly to the phone!</string> <string name="direct_download_desc">Downloads posts directly to the phone!</string>
<string name="direct_download_loading">Fetching post(s)</string> <string name="direct_download_loading">Fetching post(s)</string>