mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2024-12-25 02:18:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed sending child comments.

Browse Source
This commit is contained in:
Alex Ning 2019-06-18 17:41:45 +08:00
parent 70f4a7fc4c
commit 8092c07ea0
4 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/ml/docilealligator/infinityforreddit/CommentActivity.java
View File

@ -98,6 +98,7 @@ public class CommentActivity extends AppCompatActivity {
public void sendCommentSuccess(CommentData commentData) { public void sendCommentSuccess(CommentData commentData) {
Intent returnIntent = new Intent(); Intent returnIntent = new Intent();
returnIntent.putExtra(EXTRA_COMMENT_DATA_KEY, commentData); returnIntent.putExtra(EXTRA_COMMENT_DATA_KEY, commentData);
returnIntent.putExtra(EXTRA_PARENT_FULLNAME_KEY, parentFullname);
if(isReplying) { if(isReplying) {
returnIntent.putExtra(EXTRA_PARENT_POSITION_KEY, parentPosition); returnIntent.putExtra(EXTRA_PARENT_POSITION_KEY, parentPosition);
} }

7
app/src/main/java/ml/docilealligator/infinityforreddit/CommentData.java
View File

@ -171,6 +171,13 @@ class CommentData implements Parcelable {
} }
} }
public void addChild(CommentData comment) {
if(children == null) {
children = new ArrayList<>();
}
children.add(0, comment);
}
public ArrayList<String> getMoreChildrenIds() { public ArrayList<String> getMoreChildrenIds() {
return moreChildrenIds; return moreChildrenIds;
} }

27
app/src/main/java/ml/docilealligator/infinityforreddit/CommentRecyclerViewAdapter.java
View File

@ -334,16 +334,25 @@ class CommentRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
notifyItemInserted(0); notifyItemInserted(0);
} }
//Need proper implementation void addChildComment(CommentData comment, String parentFullname, int parentPosition) {
void addChildComment(CommentData comment, int parentPosition) { if(parentFullname.equals(mVisibleComments.get(parentPosition).getFullName())) {
ArrayList<CommentData> childComments = mCommentData.get(parentPosition).getChildren(); for(int i = 0; i < mVisibleComments.size(); i++) {
if(childComments == null) { if(parentFullname.equals(mVisibleComments.get(i).getFullName())) {
childComments = new ArrayList<>(); parentPosition = i;
break;
}
}
}
mVisibleComments.get(parentPosition).addChild(comment);
mVisibleComments.get(parentPosition).setHasReply(true);
if(!mVisibleComments.get(parentPosition).isExpanded()) {
expandChildren(parentPosition);
notifyItemChanged(parentPosition);
} else {
mVisibleComments.add(parentPosition + 1, comment);
notifyItemInserted(parentPosition + 1);
} }
childComments.add(0, comment);
mCommentData.get(parentPosition).addChildren(childComments);
mCommentData.get(parentPosition).setHasReply(true);
notifyItemChanged(parentPosition);
} }
void clearData() { void clearData() {

3
app/src/main/java/ml/docilealligator/infinityforreddit/ViewPostDetailActivity.java
View File

@ -694,8 +694,9 @@ public class ViewPostDetailActivity extends AppCompatActivity {
if(comment.getDepth() == 0) { if(comment.getDepth() == 0) {
mAdapter.addComment(comment); mAdapter.addComment(comment);
} else { } else {
String parentFullname = data.getExtras().getString(CommentActivity.EXTRA_PARENT_FULLNAME_KEY);
int parentPosition = data.getExtras().getInt(CommentActivity.EXTRA_PARENT_POSITION_KEY); int parentPosition = data.getExtras().getInt(CommentActivity.EXTRA_PARENT_POSITION_KEY);
mAdapter.addChildComment(comment, parentPosition); mAdapter.addChildComment(comment, parentFullname, parentPosition);
} }
} else { } else {
Toast.makeText(this, R.string.send_comment_failed, Toast.LENGTH_SHORT).show(); Toast.makeText(this, R.string.send_comment_failed, Toast.LENGTH_SHORT).show();