Mastodon/Tusky-App-Android
1
0
Fork 0
mirror of https://github.com/tuskyapp/Tusky synced 2025-02-03 13:47:33 +01:00
Code Issues Releases Wiki Activity

Update codebase with some suggested changes by @charlang

Browse Source
This commit is contained in:
HellPie 2018-08-31 22:06:58 +02:00 committed by HellPie
parent f1c71de19a
commit d5d57aae04
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
View File

@ -338,6 +338,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
notificationAvatar = itemView.findViewById(R.id.notification_notification_avatar);
contentWarningDescriptionTextView = itemView.findViewById(R.id.notification_content_warning_description);
contentWarningButton = itemView.findViewById(R.id.notification_content_warning_button);
contentCollapseButton = itemView.findViewById(R.id.button_toggle_notification_content);
int darkerFilter = Color.rgb(123, 123, 123);
statusAvatar.setColorFilter(darkerFilter, PorterDuff.Mode.MULTIPLY);
@ -347,8 +348,6 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
message.setOnClickListener(this);
statusContent.setOnClickListener(this);
contentWarningButton.setOnCheckedChangeListener(this);
contentCollapseButton = itemView.findViewById(R.id.button_toggle_notification_content);
}
private void showNotificationContent(boolean show) {
@ -499,7 +498,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
Spanned content = statusViewData.getContent();
List<Emoji> emojis = statusViewData.getStatusEmojis();
if(contentCollapseButton != null && statusViewData.isCollapsible() && (notificationViewData.isExpanded() || !hasSpoiler)) {
if(statusViewData.isCollapsible() && (notificationViewData.isExpanded() || !hasSpoiler)) {
contentCollapseButton.setOnCheckedChangeListener((buttonView, isChecked) -> {
int position = getAdapterPosition();
if(position != RecyclerView.NO_POSITION && notificationActionListener != null) {
@ -543,7 +542,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
contentCollapseButton.setChecked(false);
statusContent.setFilters(new InputFilter[]{});
}
} else if(contentCollapseButton != null) {
} else {
contentCollapseButton.setVisibility(View.GONE);
statusContent.setFilters(new InputFilter[]{});
}

4
app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
View File

@ -502,7 +502,7 @@ abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
setSpoilerText(status.getSpoilerText(), status.getStatusEmojis(), status.isExpanded(), listener);
}
if(contentCollapseButton != null && status.isCollapsible() && (status.isExpanded() || status.getSpoilerText() == null || status.getSpoilerText().isEmpty())) {
if(status.isCollapsible() && (status.isExpanded() || status.getSpoilerText() == null || status.getSpoilerText().isEmpty())) {
contentCollapseButton.setOnCheckedChangeListener((buttonView, isChecked) -> {
int position = getAdapterPosition();
if(position != RecyclerView.NO_POSITION) listener.onContentCollapsedChange(isChecked, position);
@ -544,7 +544,7 @@ abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
contentCollapseButton.setChecked(false);
content.setFilters(new InputFilter[] {});
}
} else if(contentCollapseButton != null) {
} else {
contentCollapseButton.setVisibility(View.GONE);
content.setFilters(new InputFilter[] {});
}