From 50da29ad8c507898b337b0ebcb84b34ef1680978 Mon Sep 17 00:00:00 2001 From: Alex Ning Date: Wed, 18 Sep 2019 16:01:08 +0800 Subject: [PATCH] Saving and unsaving comments are now available. Use xml thumbtack to avoid crashes on low resolution devices. Add a subreddit link in Settings -> About. --- .idea/assetWizardSettings.xml | 4 +- .../Settings/AboutPreferenceFragment.java | 10 ++++ .../AccountPostsActivity.java | 2 - .../CommentAndPostRecyclerViewAdapter.java | 45 ++++++++++++++++++ .../infinityforreddit/CommentData.java | 12 ++++- .../CommentsListingRecyclerViewAdapter.java | 45 ++++++++++++++++++ .../ModifyCommentBottomSheetFragment.java | 2 +- .../infinityforreddit/ParseComment.java | 3 +- .../PostRecyclerViewAdapter.java | 2 +- .../SharedPreferencesUtils.java | 1 + .../main/res/drawable/ic_thumbtack_24dp.xml | 4 ++ app/src/main/res/drawable/thumbtack.png | Bin 6774 -> 0 bytes .../fragment_modify_comment_bottom_sheet.xml | 14 ++++++ app/src/main/res/layout/item_comment.xml | 31 +++++++++--- app/src/main/res/values/arrays.xml | 4 ++ app/src/main/res/values/strings.xml | 7 +++ app/src/main/res/xml/about_preferences.xml | 5 ++ 17 files changed, 177 insertions(+), 14 deletions(-) create mode 100644 app/src/main/res/drawable/ic_thumbtack_24dp.xml delete mode 100644 app/src/main/res/drawable/thumbtack.png diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml index 1b44cede..c744f14f 100644 --- a/.idea/assetWizardSettings.xml +++ b/.idea/assetWizardSettings.xml @@ -159,8 +159,8 @@ - - + + diff --git a/app/src/main/java/Settings/AboutPreferenceFragment.java b/app/src/main/java/Settings/AboutPreferenceFragment.java index 8d93bd6c..f2ba0518 100644 --- a/app/src/main/java/Settings/AboutPreferenceFragment.java +++ b/app/src/main/java/Settings/AboutPreferenceFragment.java @@ -27,6 +27,7 @@ public class AboutPreferenceFragment extends PreferenceFragmentCompat { Preference reviewPreference = findPreference(SharedPreferencesUtils.RATE_KEY); Preference emailPreference = findPreference(SharedPreferencesUtils.EMAIL_KEY); Preference redditAccountPreference = findPreference(SharedPreferencesUtils.REDDIT_ACCOUNT_KEY); + Preference subredditPreference = findPreference(SharedPreferencesUtils.SUBREDDIT_KEY); Activity activity = getActivity(); @@ -76,6 +77,15 @@ public class AboutPreferenceFragment extends PreferenceFragmentCompat { return true; }); } + + if(subredditPreference != null) { + subredditPreference.setOnPreferenceClickListener(preference -> { + Intent intent = new Intent(activity, LinkResolverActivity.class); + intent.setData(Uri.parse("https://www.reddit.com/r/Infinity_For_Reddit")); + startActivity(intent); + return true; + }); + } } } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AccountPostsActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/AccountPostsActivity.java index d7ee9918..e2e0a5b8 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/AccountPostsActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/AccountPostsActivity.java @@ -139,8 +139,6 @@ public class AccountPostsActivity extends AppCompatActivity implements UserThing toolbar.setTitle(R.string.upvoted); } else if(mUserWhere.equals(PostDataSource.USER_WHERE_DOWNVOTED)) { toolbar.setTitle(R.string.downvoted); - } else if(mUserWhere.equals(PostDataSource.USER_WHERE_SAVED)) { - toolbar.setTitle(R.string.saved); } else if(mUserWhere.equals(PostDataSource.USER_WHERE_HIDDEN)) { toolbar.setTitle(R.string.hidden); } else if(mUserWhere.equals(PostDataSource.USER_WHERE_GILDED)){ diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CommentAndPostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/CommentAndPostRecyclerViewAdapter.java index b68628fb..b3c501c0 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/CommentAndPostRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/CommentAndPostRecyclerViewAdapter.java @@ -747,6 +747,50 @@ class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter { + if (comment.isSaved()) { + comment.setSaved(false); + SaveThing.unsaveThing(mOauthRetrofit, mAccessToken, comment.getFullName(), new SaveThing.SaveThingListener() { + @Override + public void success() { + comment.setSaved(false); + ((CommentViewHolder) holder).saveButton.setImageResource(R.drawable.ic_baseline_bookmark_border_24px); + Toast.makeText(mActivity, R.string.comment_unsaved_success, Toast.LENGTH_SHORT).show(); + } + + @Override + public void failed() { + comment.setSaved(true); + ((CommentViewHolder) holder).saveButton.setImageResource(R.drawable.ic_baseline_bookmark_24px); + Toast.makeText(mActivity, R.string.comment_unsaved_failed, Toast.LENGTH_SHORT).show(); + } + }); + } else { + comment.setSaved(true); + SaveThing.saveThing(mOauthRetrofit, mAccessToken, comment.getFullName(), new SaveThing.SaveThingListener() { + @Override + public void success() { + comment.setSaved(true); + ((CommentViewHolder) holder).saveButton.setImageResource(R.drawable.ic_baseline_bookmark_24px); + Toast.makeText(mActivity, R.string.comment_saved_success, Toast.LENGTH_SHORT).show(); + } + + @Override + public void failed() { + comment.setSaved(false); + ((CommentViewHolder) holder).saveButton.setImageResource(R.drawable.ic_baseline_bookmark_border_24px); + Toast.makeText(mActivity, R.string.comment_saved_failed, Toast.LENGTH_SHORT).show(); + } + }); + } + }); } else if(holder instanceof LoadMoreChildCommentsViewHolder) { CommentData placeholder; placeholder = mIsSingleCommentThreadMode ? mVisibleComments.get(holder.getAdapterPosition() - 2) @@ -1314,6 +1358,7 @@ class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter children; private ArrayList moreChildrenFullnames; @@ -38,7 +39,7 @@ class CommentData implements Parcelable { CommentData(String id, String fullName, String author, String linkAuthor, String commentTime, String commentContent, String linkId, String subredditName, String parentId, int score, int voteType, boolean isSubmitter, String permalink, - int depth, boolean collapsed, boolean hasReply, boolean scoreHidden) { + int depth, boolean collapsed, boolean hasReply, boolean scoreHidden, boolean saved) { this.id = id; this.fullName = fullName; this.author = author; @@ -56,6 +57,7 @@ class CommentData implements Parcelable { this.collapsed = collapsed; this.hasReply = hasReply; this.scoreHidden = scoreHidden; + this.saved = saved; this.isExpanded = false; moreChildrenStartingIndex = 0; isPlaceHolder = false; @@ -192,6 +194,14 @@ class CommentData implements Parcelable { return scoreHidden; } + public boolean isSaved() { + return saved; + } + + public void setSaved(boolean saved) { + this.saved = saved; + } + public boolean isExpanded() { return isExpanded; } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CommentsListingRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/CommentsListingRecyclerViewAdapter.java index d148f026..0a2ec243 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/CommentsListingRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/CommentsListingRecyclerViewAdapter.java @@ -287,6 +287,50 @@ class CommentsListingRecyclerViewAdapter extends PagedListAdapter { + if (comment.isSaved()) { + comment.setSaved(false); + SaveThing.unsaveThing(mOauthRetrofit, mAccessToken, comment.getFullName(), new SaveThing.SaveThingListener() { + @Override + public void success() { + comment.setSaved(false); + ((DataViewHolder) holder).saveButton.setImageResource(R.drawable.ic_baseline_bookmark_border_24px); + Toast.makeText(mContext, R.string.comment_unsaved_success, Toast.LENGTH_SHORT).show(); + } + + @Override + public void failed() { + comment.setSaved(true); + ((DataViewHolder) holder).saveButton.setImageResource(R.drawable.ic_baseline_bookmark_24px); + Toast.makeText(mContext, R.string.comment_unsaved_failed, Toast.LENGTH_SHORT).show(); + } + }); + } else { + comment.setSaved(true); + SaveThing.saveThing(mOauthRetrofit, mAccessToken, comment.getFullName(), new SaveThing.SaveThingListener() { + @Override + public void success() { + comment.setSaved(true); + ((DataViewHolder) holder).saveButton.setImageResource(R.drawable.ic_baseline_bookmark_24px); + Toast.makeText(mContext, R.string.comment_saved_success, Toast.LENGTH_SHORT).show(); + } + + @Override + public void failed() { + comment.setSaved(false); + ((DataViewHolder) holder).saveButton.setImageResource(R.drawable.ic_baseline_bookmark_border_24px); + Toast.makeText(mContext, R.string.comment_saved_failed, Toast.LENGTH_SHORT).show(); + } + }); + } + }); } } } @@ -352,6 +396,7 @@ class CommentsListingRecyclerViewAdapter extends PagedListAdapter { - Intent intent = new Intent(getActivity(), EditCommentActivity.class); + Intent intent = new Intent(activity, EditCommentActivity.class); intent.putExtra(EditCommentActivity.EXTRA_ACCESS_TOKEN, accessToken); intent.putExtra(EditCommentActivity.EXTRA_FULLNAME, fullName); intent.putExtra(EditCommentActivity.EXTRA_CONTENT, content); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ParseComment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ParseComment.java index 7f48d8ea..e84b8e24 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/ParseComment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ParseComment.java @@ -232,6 +232,7 @@ class ParseComment { } long submitTime = singleCommentData.getLong(JSONUtils.CREATED_UTC_KEY) * 1000; boolean scoreHidden = singleCommentData.getBoolean(JSONUtils.SCORE_HIDDEN_KEY); + boolean saved = singleCommentData.getBoolean(JSONUtils.SAVED_KEY); Calendar submitTimeCalendar = Calendar.getInstance(); submitTimeCalendar.setTimeInMillis(submitTime); @@ -247,7 +248,7 @@ class ParseComment { return new CommentData(id, fullName, author, linkAuthor, formattedSubmitTime, commentContent, linkId, subredditName, parentId, score, voteType, isSubmitter, permalink, depth, collapsed, - hasReply, scoreHidden); + hasReply, scoreHidden, saved); } @Nullable diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/PostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/PostRecyclerViewAdapter.java index e671bda5..15b5187b 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/PostRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/PostRecyclerViewAdapter.java @@ -360,7 +360,7 @@ class PostRecyclerViewAdapter extends PagedListAdapter + + diff --git a/app/src/main/res/drawable/thumbtack.png b/app/src/main/res/drawable/thumbtack.png deleted file mode 100644 index b537f614f8a2923d5122d5da86078cbf3e5796eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6774 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 D(Qw51 diff --git a/app/src/main/res/layout/fragment_modify_comment_bottom_sheet.xml b/app/src/main/res/layout/fragment_modify_comment_bottom_sheet.xml index a419912e..c637e910 100644 --- a/app/src/main/res/layout/fragment_modify_comment_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_modify_comment_bottom_sheet.xml @@ -7,6 +7,20 @@ android:orientation="vertical" tools:context=".ModifyCommentBottomSheetFragment"> + + - + android:textColor="@color/colorPrimaryDarkDayNightTheme" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toStartOf="@id/comment_time_text_view_item_post_comment" + app:layout_constraintHorizontal_bias="0" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" /> - + + + diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index f82fc670..196fc489 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -38,6 +38,8 @@ + 1s + 2s 2.5s 3s 5s @@ -46,6 +48,8 @@ + 1 + 2 2.5 3 5 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 51149699..094846ee 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -300,6 +300,8 @@ docilealligator.app@gmail.com Reddit Account u/Hostilenemy + Subreddit + r/Infinity_For_Reddit Cannot get the link @@ -318,4 +320,9 @@ Share No Email client found + + Comment saved + Unable to save comment + Comment unsaved + Unable to unsave comment diff --git a/app/src/main/res/xml/about_preferences.xml b/app/src/main/res/xml/about_preferences.xml index e27844fc..942a0cd4 100644 --- a/app/src/main/res/xml/about_preferences.xml +++ b/app/src/main/res/xml/about_preferences.xml @@ -30,4 +30,9 @@ app:title="@string/settings_reddit_account_title" app:summary="@string/settings_reddit_account_summary" /> + + \ No newline at end of file