Change button behavior for spoiler in notifications

1 files changed, 37 insertions, 25 deletions

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
index 897871f2b..776b04872 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
@@ -333,38 +333,39 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
                 imgReply = ContextCompat.getDrawable(context, R.drawable.ic_reply);
 
                 if( status.getReblog() == null) {
-                    if (status.getSpoiler_text() != null && status.getSpoiler_text().trim().length() > 0 && !status.isSpoilerShown()) {
-                        holder.notification_status_container.setVisibility(View.GONE);
+                    if (status.getSpoiler_text() != null && status.getSpoiler_text().trim().length() > 0 ) {
                         holder.status_spoiler_container.setVisibility(View.VISIBLE);
-                        holder.status_spoiler_button.setVisibility(View.VISIBLE);
-                        holder.status_spoiler_mention_container.setVisibility(View.VISIBLE);
-                        holder.status_spoiler.setVisibility(View.VISIBLE);
+                        if( !status.isSpoilerShown()) {
+                            holder.notification_status_container.setVisibility(View.GONE);
+                            holder.status_spoiler_mention_container.setVisibility(View.VISIBLE);
+                            holder.status_spoiler_button.setText(context.getString(R.string.load_attachment_spoiler));
+                        }else {
+                            holder.notification_status_container.setVisibility(View.VISIBLE);
+                            holder.status_spoiler_mention_container.setVisibility(View.GONE);
+                            holder.status_spoiler_button.setText(context.getString(R.string.load_attachment_spoiler_less));
+                        }
                     } else {
-                        holder.status_spoiler_button.setVisibility(View.GONE);
-                        holder.notification_status_container.setVisibility(View.VISIBLE);
+                        holder.status_spoiler_container.setVisibility(View.GONE);
                         holder.status_spoiler_mention_container.setVisibility(View.GONE);
-                        if (status.getSpoiler_text() != null && status.getSpoiler_text().trim().length() > 0)
-                            holder.status_spoiler_container.setVisibility(View.VISIBLE);
-                        else
-                            holder.status_spoiler_container.setVisibility(View.GONE);
-
+                        holder.notification_status_container.setVisibility(View.VISIBLE);
                     }
+
                 }else {
-                    if (status.getReblog().getSpoiler_text() != null && status.getReblog().getSpoiler_text().trim().length() > 0 && !status.isSpoilerShown()) {
-                        holder.notification_status_container.setVisibility(View.GONE);
+                    if (status.getReblog().getSpoiler_text() != null && status.getReblog().getSpoiler_text().trim().length() > 0) {
                         holder.status_spoiler_container.setVisibility(View.VISIBLE);
-                        holder.status_spoiler_mention_container.setVisibility(View.VISIBLE);
-                        holder.status_spoiler_button.setVisibility(View.VISIBLE);
-                        holder.status_spoiler.setVisibility(View.VISIBLE);
+                        if( !status.isSpoilerShown()) {
+                            holder.notification_status_container.setVisibility(View.GONE);
+                            holder.status_spoiler_mention_container.setVisibility(View.VISIBLE);
+                            holder.status_spoiler_button.setText(context.getString(R.string.load_attachment_spoiler));
+                        }else {
+                            holder.notification_status_container.setVisibility(View.VISIBLE);
+                            holder.status_spoiler_mention_container.setVisibility(View.GONE);
+                            holder.status_spoiler_button.setText(context.getString(R.string.load_attachment_spoiler_less));
+                        }
                     } else {
-                        holder.status_spoiler_button.setVisibility(View.GONE);
+                        holder.status_spoiler_container.setVisibility(View.GONE);
                         holder.status_spoiler_mention_container.setVisibility(View.GONE);
                         holder.notification_status_container.setVisibility(View.VISIBLE);
-                        if (status.getReblog().getSpoiler_text() != null && status.getReblog().getSpoiler_text().trim().length() > 0)
-                            holder.status_spoiler_container.setVisibility(View.VISIBLE);
-                        else
-                            holder.status_spoiler_container.setVisibility(View.GONE);
-
                     }
                 }
 
@@ -442,8 +443,8 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
                 holder.status_spoiler_button.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        status.setSpoilerShown(true);
-                        notificationsListAdapter.notifyDataSetChanged();
+                        notification.getStatus().setSpoilerShown(!status.isSpoilerShown());
+                        notifyNotificationChanged(notification);
                     }
                 });
 
@@ -764,6 +765,17 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
 
     }
 
+    private void notifyNotificationChanged(Notification notification){
+        for (int i = 0; i < notificationsListAdapter.getItemCount(); i++) {
+            if (notificationsListAdapter.getItemAt(i) != null && notificationsListAdapter.getItemAt(i).getId().equals(notification.getId())) {
+                try {
+                    notificationsListAdapter.notifyItemChanged(i);
+                } catch (Exception ignored) {
+                }
+            }
+        }
+    }
+
     @Override
     public long getItemId(int position) {
         return position;