mirror of
https://github.com/KokaKiwi/BarInsta
synced 2026-03-05 12:01:35 +00:00
Merge branch 'master' of https://github.com/austinhuang0131/barinsta
This commit is contained in:
commit
74cfe75058
43 changed files with 1246 additions and 878 deletions
|
|
@ -250,8 +250,8 @@ public final class CommentsViewerFragment extends BottomSheetDialogFragment impl
|
|||
commentDialogList = new String[]{
|
||||
resources.getString(R.string.open_profile),
|
||||
resources.getString(R.string.view_pfp),
|
||||
resources.getString(R.string.comment_viewer_copy_user),
|
||||
// resources.getString(R.string.comment_viewer_copy_comment),
|
||||
// resources.getString(R.string.comment_viewer_copy_user),
|
||||
resources.getString(R.string.comment_viewer_copy_comment),
|
||||
resources.getString(R.string.comment_viewer_reply_comment),
|
||||
commentModel.getLiked() ? resources.getString(R.string.comment_viewer_unlike_comment)
|
||||
: resources.getString(R.string.comment_viewer_like_comment),
|
||||
|
|
@ -261,8 +261,8 @@ public final class CommentsViewerFragment extends BottomSheetDialogFragment impl
|
|||
commentDialogList = new String[]{
|
||||
resources.getString(R.string.open_profile),
|
||||
resources.getString(R.string.view_pfp),
|
||||
resources.getString(R.string.comment_viewer_copy_user),
|
||||
// resources.getString(R.string.comment_viewer_copy_comment),
|
||||
// resources.getString(R.string.comment_viewer_copy_user),
|
||||
resources.getString(R.string.comment_viewer_copy_comment),
|
||||
resources.getString(R.string.comment_viewer_reply_comment),
|
||||
commentModel.getLiked() ? resources.getString(R.string.comment_viewer_unlike_comment)
|
||||
: resources.getString(R.string.comment_viewer_like_comment),
|
||||
|
|
@ -271,8 +271,8 @@ public final class CommentsViewerFragment extends BottomSheetDialogFragment impl
|
|||
commentDialogList = new String[]{
|
||||
resources.getString(R.string.open_profile),
|
||||
resources.getString(R.string.view_pfp),
|
||||
resources.getString(R.string.comment_viewer_copy_user),
|
||||
// resources.getString(R.string.comment_viewer_copy_comment)
|
||||
// resources.getString(R.string.comment_viewer_copy_user),
|
||||
resources.getString(R.string.comment_viewer_copy_comment)
|
||||
};
|
||||
}
|
||||
final Context context = getContext();
|
||||
|
|
@ -294,12 +294,12 @@ public final class CommentsViewerFragment extends BottomSheetDialogFragment impl
|
|||
.add(fragment, "profilePicDialog")
|
||||
.commit();
|
||||
break;
|
||||
case 2: // copy username
|
||||
Utils.copyText(context, profileModel.getUsername());
|
||||
// case 2: // copy username
|
||||
// Utils.copyText(context, profileModel.getUsername());
|
||||
// break;
|
||||
case 2: // copy comment
|
||||
Utils.copyText(context, "@" + profileModel.getUsername() + ": " + commentModel.getText());
|
||||
break;
|
||||
// case 3: // copy comment
|
||||
// Utils.copyText(context, commentModel.getText().toString());
|
||||
// break;
|
||||
case 3: // reply to comment
|
||||
// final View focus = binding.rvComments.findViewWithTag(commentModel);
|
||||
// focus.setBackgroundColor(0x80888888);
|
||||
|
|
|
|||
|
|
@ -89,7 +89,8 @@ public class AboutFragment extends BasePreferencesFragment {
|
|||
preference.setIconSpaceReserved(false);
|
||||
preference.setOnPreferenceClickListener(p -> {
|
||||
final Intent intent = new Intent(Intent.ACTION_SENDTO);
|
||||
intent.setData(Uri.parse(getString(R.string.about_feedback_summary)));
|
||||
intent.setData(Uri.parse(getString(R.string.about_feedback_summary)
|
||||
+ "?body=Please%20note%20that%20your%20email%20address%20and%20the%20entire%20content%20will%20be%20published%20onto%20GitHub%20issues.%20If%20you%20do%20not%20wish%20to%20do%20that%2C%20use%20other%20contact%20methods%20instead."));
|
||||
if (intent.resolveActivity(context.getPackageManager()) != null) startActivity(intent);
|
||||
return true;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -16,8 +16,6 @@ public final class Constants {
|
|||
public static final String FOLDER_SAVE_TO = "saved_to";
|
||||
public static final String AUTOPLAY_VIDEOS = "autoplay_videos";
|
||||
public static final String MUTED_VIDEOS = "muted_videos";
|
||||
public static final String AUTOLOAD_POSTS = "autoload_posts";
|
||||
public static final String SHOW_FEED = "show_feed";
|
||||
public static final String CUSTOM_DATE_TIME_FORMAT_ENABLED = "data_time_custom_enabled";
|
||||
public static final String SWAP_DATE_TIME_FORMAT_ENABLED = "swap_date_time_enabled";
|
||||
public static final String MARK_AS_SEEN = "mark_as_seen";
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ import androidx.appcompat.app.AppCompatDelegate;
|
|||
|
||||
import static awais.instagrabber.utils.Constants.APP_LANGUAGE;
|
||||
import static awais.instagrabber.utils.Constants.APP_THEME;
|
||||
import static awais.instagrabber.utils.Constants.AUTOLOAD_POSTS;
|
||||
import static awais.instagrabber.utils.Constants.AUTOPLAY_VIDEOS;
|
||||
import static awais.instagrabber.utils.Constants.CHECK_ACTIVITY;
|
||||
import static awais.instagrabber.utils.Constants.CHECK_UPDATES;
|
||||
|
|
@ -121,14 +120,14 @@ public final class SettingsHelper {
|
|||
|
||||
@StringDef(
|
||||
{APP_LANGUAGE, APP_THEME, COOKIE, FOLDER_PATH, DATE_TIME_FORMAT, DATE_TIME_SELECTION, CUSTOM_DATE_TIME_FORMAT,
|
||||
DEVICE_UUID, SKIPPED_VERSION, DEFAULT_TAB, PREF_DARK_THEME, PREF_LIGHT_THEME, PREF_POSTS_LAYOUT, PREF_PROFILE_POSTS_LAYOUT,
|
||||
PREF_TOPIC_POSTS_LAYOUT, PREF_HASHTAG_POSTS_LAYOUT, PREF_LOCATION_POSTS_LAYOUT, PREF_LIKED_POSTS_LAYOUT, PREF_TAGGED_POSTS_LAYOUT,
|
||||
PREF_SAVED_POSTS_LAYOUT})
|
||||
DEVICE_UUID, SKIPPED_VERSION, DEFAULT_TAB, PREF_DARK_THEME, PREF_LIGHT_THEME, PREF_POSTS_LAYOUT,
|
||||
PREF_PROFILE_POSTS_LAYOUT, PREF_TOPIC_POSTS_LAYOUT, PREF_HASHTAG_POSTS_LAYOUT, PREF_LOCATION_POSTS_LAYOUT,
|
||||
PREF_LIKED_POSTS_LAYOUT, PREF_TAGGED_POSTS_LAYOUT, PREF_SAVED_POSTS_LAYOUT})
|
||||
public @interface StringSettings {}
|
||||
|
||||
@StringDef({DOWNLOAD_USER_FOLDER, FOLDER_SAVE_TO, AUTOPLAY_VIDEOS, SHOW_QUICK_ACCESS_DIALOG, MUTED_VIDEOS,
|
||||
AUTOLOAD_POSTS, CUSTOM_DATE_TIME_FORMAT_ENABLED, MARK_AS_SEEN, DM_MARK_AS_SEEN, INSTADP,
|
||||
CHECK_ACTIVITY, CHECK_UPDATES, SWAP_DATE_TIME_FORMAT_ENABLED})
|
||||
CUSTOM_DATE_TIME_FORMAT_ENABLED, MARK_AS_SEEN, DM_MARK_AS_SEEN, INSTADP, CHECK_ACTIVITY,
|
||||
CHECK_UPDATES, SWAP_DATE_TIME_FORMAT_ENABLED})
|
||||
public @interface BooleanSettings {}
|
||||
|
||||
@StringDef({PREV_INSTALL_VERSION})
|
||||
|
|
|
|||
|
|
@ -53,10 +53,12 @@ public final class CrashReporter implements Thread.UncaughtExceptionHandler {
|
|||
@Override
|
||||
public void uncaughtException(@NonNull final Thread t, @NonNull final Throwable exception) {
|
||||
final StringBuilder reportBuilder = new StringBuilder();
|
||||
reportBuilder.append("Error report collected on: ").append(new Date().toString());
|
||||
reportBuilder.append("\r\n\r\nInformation:\r\n==============");
|
||||
reportBuilder.append("IMPORTANT: If sending by email, your email address and the entire content will be made public on GitHub issues.");
|
||||
reportBuilder.append("IMPORTANT: When possible, please describe the steps leading to this crash. Thank you for your cooperation.");
|
||||
reportBuilder.append("\r\n\r\nError report collected on: ").append(new Date().toString());
|
||||
|
||||
reportBuilder
|
||||
.append("\r\n\r\nInformation:\r\n==============")
|
||||
.append("\r\nVERSION : ").append(BuildConfig.VERSION_NAME)
|
||||
.append("\r\nVERSION_CODE : ").append(BuildConfig.VERSION_CODE)
|
||||
.append("\r\nPHONE-MODEL : ").append(Build.MODEL)
|
||||
|
|
@ -69,8 +71,6 @@ public final class CrashReporter implements Thread.UncaughtExceptionHandler {
|
|||
.append("\r\nPRODUCT : ").append(Build.PRODUCT)
|
||||
.append("\r\nHOST : ").append(Build.HOST)
|
||||
.append("\r\nTAGS : ").append(Build.TAGS)
|
||||
.append("\r\nINSTRUCTION : Please attach details on how to produce this crash. Your help is appreciated.")
|
||||
.append("\r\nPRIVACY : Your email address and crash report will be made PUBLIC on the GitHub repository.");
|
||||
|
||||
reportBuilder.append("\r\n\r\nStack:\r\n==============\r\n");
|
||||
final Writer result = new StringWriter();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue