Fix crashes originating form merging updates from upstream

This commit is contained in:
Balazs Toldi 2023-11-05 14:38:05 +01:00
parent 343484aff2
commit ec3b89a056
No known key found for this signature in database
GPG Key ID: 6C7D440036F99D58
3 changed files with 6 additions and 2 deletions

View File

@ -1244,6 +1244,7 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
MaterialButton upvoteButton, MaterialButton upvoteButton,
TextView scoreTextView, TextView scoreTextView,
MaterialButton downvoteButton, MaterialButton downvoteButton,
TextView downvoteTextView,
View placeholder, View placeholder,
MaterialButton moreButton, MaterialButton moreButton,
MaterialButton saveButton, MaterialButton saveButton,
@ -1264,6 +1265,7 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
this.upvoteButton = upvoteButton; this.upvoteButton = upvoteButton;
this.scoreTextView = scoreTextView; this.scoreTextView = scoreTextView;
this.downvoteButton = downvoteButton; this.downvoteButton = downvoteButton;
this.downvoteTextView = downvoteTextView;
this.placeholder = placeholder; this.placeholder = placeholder;
this.moreButton = moreButton; this.moreButton = moreButton;
this.saveButton = saveButton; this.saveButton = saveButton;
@ -1880,6 +1882,7 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
binding.upvoteButtonItemPostComment, binding.upvoteButtonItemPostComment,
binding.scoreTextViewItemPostComment, binding.scoreTextViewItemPostComment,
binding.downvoteButtonItemPostComment, binding.downvoteButtonItemPostComment,
binding.downvoteTextViewItemPostComment,
binding.placeholderItemPostComment, binding.placeholderItemPostComment,
binding.moreButtonItemPostComment, binding.moreButtonItemPostComment,
binding.saveButtonItemPostComment, binding.saveButtonItemPostComment,

View File

@ -58,7 +58,6 @@ import java.util.regex.Pattern;
import javax.inject.Provider; import javax.inject.Provider;
import eu.toldi.infinityforlemmy.FetchGfycatOrRedgifsVideoLinks; import eu.toldi.infinityforlemmy.FetchGfycatOrRedgifsVideoLinks;
import eu.toldi.infinityforlemmy.FetchStreamableVideo; import eu.toldi.infinityforlemmy.FetchStreamableVideo;
import eu.toldi.infinityforlemmy.R; import eu.toldi.infinityforlemmy.R;
@ -1254,7 +1253,9 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
MaterialButton shareButton) { MaterialButton shareButton) {
this.iconGifImageView = iconGifImageView; this.iconGifImageView = iconGifImageView;
this.subredditTextView = subredditTextView; this.subredditTextView = subredditTextView;
this.mCommunityInstanceTextView = mCommunityInstanceTextView;
this.userTextView = userTextView; this.userTextView = userTextView;
this.mUserInstanceTextView = mUserInstanceTextView;
this.authorFlairTextView = authorFlairTextView; this.authorFlairTextView = authorFlairTextView;
this.postTimeTextView = postTimeTextView; this.postTimeTextView = postTimeTextView;
this.titleTextView = titleTextView; this.titleTextView = titleTextView;

View File

@ -213,7 +213,7 @@
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/down_vote_button_item_post_comment" app:layout_constraintStart_toEndOf="@+id/downvote_button_item_post_comment"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<View <View