[Feature] Add support for collapsible statuses when they exceed 500 characters

app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java

@@ -25,6 +25,7 @@
 import android.support.v4.content.ContextCompat;
 import android.support.v4.text.BidiFormatter;
 import android.support.v7.widget.RecyclerView;
+import android.text.InputFilter;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextUtils;
@@ -46,6 +47,7 @@
 import com.keylesspalace.tusky.util.CustomEmojiHelper;
 import com.keylesspalace.tusky.util.DateUtils;
 import com.keylesspalace.tusky.util.LinkHelper;
+import com.keylesspalace.tusky.util.SmartLengthInputFilter;
 import com.keylesspalace.tusky.viewdata.NotificationViewData;
 import com.keylesspalace.tusky.viewdata.StatusViewData;
 import com.squareup.picasso.Picasso;
@@ -243,6 +245,14 @@ public interface NotificationActionListener {
 
         void onExpandedChange(boolean expanded, int position);
 
+        /**
+         * Called when the status {@link android.widget.ToggleButton} responsible for collapsing long
+         * status content is interacted with.
+         *
+         * @param isCollapsed Whether the status content is shown in a collapsed state or fully.
+         * @param position    The position of the status in the list.
+         */
+        void onNotificationContentCollapsedChange(boolean isCollapsed, int position);
     }
 
     private static class FollowViewHolder extends RecyclerView.ViewHolder {
@@ -308,6 +318,7 @@ private static class StatusNotificationViewHolder extends RecyclerView.ViewHolde
         private final ImageView notificationAvatar;
         private final TextView contentWarningDescriptionTextView;
         private final ToggleButton contentWarningButton;
+        private final ToggleButton contentCollapseButton; // TODO: This code SHOULD be based on StatusBaseViewHolder
 
         private String accountId;
         private String notificationId;
@@ -331,6 +342,7 @@ private static class StatusNotificationViewHolder extends RecyclerView.ViewHolde
             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);
@@ -353,7 +365,6 @@ private void showNotificationContent(boolean show) {
             statusContent.setVisibility(show ? View.VISIBLE : View.GONE);
             statusAvatar.setVisibility(show ? View.VISIBLE : View.GONE);
             notificationAvatar.setVisibility(show ? View.VISIBLE : View.GONE);
-
         }
 
         private void setDisplayName(String name, List<Emoji> emojis) {
@@ -511,11 +522,32 @@ private void setupContentAndSpoiler(NotificationViewData.Concrete notificationVi
             Spanned content = statusViewData.getContent();
             List<Emoji> emojis = statusViewData.getStatusEmojis();
 
-            Spanned emojifiedText = CustomEmojiHelper.emojifyText(content, emojis, statusContent);
+            if(statusViewData.isCollapsible() && (notificationViewData.isExpanded() || !hasSpoiler)) {
+                contentCollapseButton.setOnCheckedChangeListener((buttonView, isChecked) -> {
+                    int position = getAdapterPosition();
+                    if(position != RecyclerView.NO_POSITION && notificationActionListener != null) {
+                        notificationActionListener.onNotificationContentCollapsedChange(isChecked, position);
+                    }
+                });
+
+                contentCollapseButton.setVisibility(View.VISIBLE);
+                if(statusViewData.isCollapsed()) {
+                    contentCollapseButton.setChecked(true);
+                    statusContent.setFilters(new InputFilter[]{
+                            new SmartLengthInputFilter(SmartLengthInputFilter.LENGTH_DEFAULT)
+                    });
+                } else {
+                    contentCollapseButton.setChecked(false);
+                    statusContent.setFilters(new InputFilter[]{});
+                }
+            } else {
+                contentCollapseButton.setVisibility(View.GONE);
+                statusContent.setFilters(new InputFilter[]{});
+            }
 
+            Spanned emojifiedText = CustomEmojiHelper.emojifyText(content, emojis, statusContent);
             LinkHelper.setClickableText(statusContent, emojifiedText, statusViewData.getMentions(), listener);
 
-
             Spanned emojifiedContentWarning =
                     CustomEmojiHelper.emojifyString(statusViewData.getSpoilerText(), statusViewData.getStatusEmojis(), contentWarningDescriptionTextView);
             contentWarningDescriptionTextView.setText(emojifiedContentWarning);

app/src/main/java/com/keylesspalace/tusky/adapter/SearchResultsAdapter.java

@@ -48,13 +48,17 @@ public class SearchResultsAdapter extends RecyclerView.Adapter {
 
     private boolean mediaPreviewsEnabled;
     private boolean alwaysShowSensitiveMedia;
+    private boolean collapseLongStatusContent;
     private boolean useAbsoluteTime;
 
     private LinkListener linkListener;
     private StatusActionListener statusListener;
 
-    public SearchResultsAdapter(boolean mediaPreviewsEnabled, boolean alwaysShowSensitiveMedia,
-                                LinkListener linkListener, StatusActionListener statusListener,
+    public SearchResultsAdapter(boolean mediaPreviewsEnabled,
+                                boolean alwaysShowSensitiveMedia,
+                                boolean collapseLongStatusContent,
+                                LinkListener linkListener,
+                                StatusActionListener statusListener,
                                 boolean useAbsoluteTime) {
 
         this.accountList = Collections.emptyList();
@@ -64,6 +68,7 @@ public SearchResultsAdapter(boolean mediaPreviewsEnabled, boolean alwaysShowSens
 
         this.mediaPreviewsEnabled = mediaPreviewsEnabled;
         this.alwaysShowSensitiveMedia = alwaysShowSensitiveMedia;
+        this.collapseLongStatusContent = collapseLongStatusContent;
         this.useAbsoluteTime = useAbsoluteTime;
 
         this.linkListener = linkListener;
@@ -153,7 +158,11 @@ public void updateSearchResults(SearchResults results) {
             accountList = results.getAccounts();
             statusList = results.getStatuses();
             for(Status status: results.getStatuses()) {
-                concreteStatusList.add(ViewDataUtils.statusToViewData(status, alwaysShowSensitiveMedia));
+                concreteStatusList.add(ViewDataUtils.statusToViewData(
+                        status,
+                        alwaysShowSensitiveMedia,
+                        collapseLongStatusContent
+                ));
             }
             hashtagList = results.getHashtags();
 

app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java

@@ -7,6 +7,7 @@
 import android.support.annotation.Nullable;
 import android.support.v7.content.res.AppCompatResources;
 import android.support.v7.widget.RecyclerView;
+import android.text.InputFilter;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.view.View;
@@ -25,6 +26,7 @@
 import com.keylesspalace.tusky.util.DateUtils;
 import com.keylesspalace.tusky.util.HtmlUtils;
 import com.keylesspalace.tusky.util.LinkHelper;
+import com.keylesspalace.tusky.util.SmartLengthInputFilter;
 import com.keylesspalace.tusky.util.ThemeUtils;
 import com.keylesspalace.tusky.viewdata.StatusViewData;
 import com.mikepenz.iconics.utils.Utils;
@@ -60,6 +62,7 @@ abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
     private View sensitiveMediaShow;
     private TextView mediaLabel;
     private ToggleButton contentWarningButton;
+    private ToggleButton contentCollapseButton;
 
     ImageView avatar;
     TextView timestampInfo;
@@ -97,6 +100,7 @@ abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
         mediaLabel = itemView.findViewById(R.id.status_media_label);
         contentWarningDescription = itemView.findViewById(R.id.status_content_warning_description);
         contentWarningButton = itemView.findViewById(R.id.status_content_warning_button);
+        contentCollapseButton = itemView.findViewById(R.id.button_toggle_content);
 
         this.useAbsoluteTime = useAbsoluteTime;
         shortSdf = new SimpleDateFormat("HH:mm:ss", Locale.getDefault());
@@ -492,7 +496,6 @@ void setupWithStatus(StatusViewData.Concrete status, final StatusActionListener
         setUsername(status.getNickname());
         setCreatedAt(status.getCreatedAt());
         setIsReply(status.getInReplyToId() != null);
-        setContent(status.getContent(), status.getMentions(), status.getStatusEmojis(), listener);
         setAvatar(status.getAvatar(), status.getRebloggedAvatar());
         setReblogged(status.isReblogged());
         setFavourited(status.isFavourited());
@@ -523,7 +526,33 @@ void setupWithStatus(StatusViewData.Concrete status, final StatusActionListener
         } else {
             setSpoilerText(status.getSpoilerText(), status.getStatusEmojis(), status.isExpanded(), listener);
         }
-    }
 
+        // When viewing threads this ViewHolder is used and the main post does not have a collapse
+        // button by design so avoid crashing the app when that happens
+        if(contentCollapseButton != null) {
+            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);
+                });
+
+                contentCollapseButton.setVisibility(View.VISIBLE);
+                if(status.isCollapsed()) {
+                    contentCollapseButton.setChecked(true);
+                    content.setFilters(new InputFilter[]{
+                            new SmartLengthInputFilter(SmartLengthInputFilter.LENGTH_DEFAULT)
+                    });
+                } else {
+                    contentCollapseButton.setChecked(false);
+                    content.setFilters(new InputFilter[]{});
+                }
+            } else {
+                contentCollapseButton.setVisibility(View.GONE);
+                content.setFilters(new InputFilter[]{});
+            }
+        }
 
+        setContent(status.getContent(), status.getMentions(), status.getStatusEmojis(), listener);
+    }
 }

app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java

@@ -136,6 +136,7 @@ private Placeholder() {
     private String bottomId;
     private String topId;
     private boolean alwaysShowSensitiveMedia;
+    private boolean collapseLongStatusContent;
 
     @Override
     protected TimelineCases timelineCases() {
@@ -149,7 +150,11 @@ protected TimelineCases timelineCases() {
         public NotificationViewData apply(Either<Placeholder, Notification> input) {
             if (input.isRight()) {
                 Notification notification = input.getAsRight();
-                return ViewDataUtils.notificationToViewData(notification, alwaysShowSensitiveMedia);
+                return ViewDataUtils.notificationToViewData(
+                        notification,
+                        alwaysShowSensitiveMedia,
+                        collapseLongStatusContent
+                );
             } else {
                 return new NotificationViewData.Placeholder(false);
             }
@@ -194,6 +199,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(
                 getActivity());
         alwaysShowSensitiveMedia = preferences.getBoolean("alwaysShowSensitiveMedia", false);
+        collapseLongStatusContent = preferences.getBoolean("collapseLongStatuses", true);
         boolean mediaPreviewEnabled = preferences.getBoolean("mediaPreviewEnabled", true);
         adapter.setMediaPreviewEnabled(mediaPreviewEnabled);
         boolean useAbsoluteTime = preferences.getBoolean("absoluteTimeView", false);
@@ -493,6 +499,52 @@ public void onLoadMore(int position) {
         }
     }
 
+    @Override
+    public void onContentCollapsedChange(boolean isCollapsed, int position) {
+        if(position < 0 || position >= notifications.size()) {
+            Log.e(TAG, String.format("Tried to access out of bounds status position: %d of %d", position, notifications.size() - 1));
+            return;
+        }
+
+        NotificationViewData notification = notifications.getPairedItem(position);
+        if(!(notification instanceof NotificationViewData.Concrete)) {
+            Log.e(TAG, String.format(
+                    "Expected NotificationViewData.Concrete, got %s instead at position: %d of %d",
+                    notification == null ? "null" : notification.getClass().getSimpleName(),
+                    position,
+                    notifications.size() - 1
+            ));
+            return;
+        }
+
+        StatusViewData.Concrete status = ((NotificationViewData.Concrete) notification).getStatusViewData();
+        StatusViewData.Concrete updatedStatus = new StatusViewData.Builder(status)
+                .setCollapsed(isCollapsed)
+                .createStatusViewData();
+
+        NotificationViewData.Concrete concreteNotification = (NotificationViewData.Concrete) notification;
+        NotificationViewData updatedNotification = new NotificationViewData.Concrete(
+                concreteNotification.getType(),
+                concreteNotification.getId(),
+                concreteNotification.getAccount(),
+                updatedStatus,
+                concreteNotification.isExpanded()
+        );
+        notifications.setPairedItem(position, updatedNotification);
+        adapter.updateItemWithNotify(position, updatedNotification, false);
+
+        // Since we cannot notify to the RecyclerView right away because it may be scrolling
+        // we run this when the RecyclerView is done doing measurements and other calculations.
+        // To test this is not bs: try getting a notification while scrolling, without wrapping
+        // notifyItemChanged in a .post() call. App will crash.
+        recyclerView.post(() -> adapter.notifyItemChanged(position, notification));
+    }
+
+    @Override
+    public void onNotificationContentCollapsedChange(boolean isCollapsed, int position) {
+        onContentCollapsedChange(isCollapsed, position);
+    }
+
     @Override
     public void onViewTag(String tag) {
         super.viewTag(tag);
@@ -530,6 +582,10 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
                 }
                 break;
             }
+            case "collapseLongStatuses":
+                collapseLongStatusContent = sharedPreferences.getBoolean("collapseLongStatuses", true);
+                fullyRefresh();
+                break;
         }
     }
 
@@ -557,12 +613,18 @@ private void onLoadMore() {
             // already loaded everything
             return;
         }
-        Either<Placeholder, Notification> last = notifications.get(notifications.size() - 1);
-        if (last.isRight()) {
-            notifications.add(Either.left(Placeholder.getInstance()));
-            NotificationViewData viewData = new NotificationViewData.Placeholder(true);
-            notifications.setPairedItem(notifications.size() - 1, viewData);
-            recyclerView.post(() -> adapter.addItems(Collections.singletonList(viewData)));
+
+        // Check for out-of-bounds when loading
+        // This is required to allow full-timeline reloads of collapsible statuses when the settings
+        // change.
+        if(notifications.size() > 0) {
+            Either<Placeholder, Notification> last = notifications.get(notifications.size() - 1);
+            if(last.isRight()) {
+                notifications.add(Either.left(Placeholder.getInstance()));
+                NotificationViewData viewData = new NotificationViewData.Placeholder(true);
+                notifications.setPairedItem(notifications.size() - 1, viewData);
+                recyclerView.post(() -> adapter.addItems(Collections.singletonList(viewData)));
+            }
         }
 
         sendFetchNotificationsRequest(bottomId, null, FetchEnd.BOTTOM, -1);