[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;
@@ -62,6 +64,9 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
     private static final int VIEW_TYPE_FOLLOW = 2;
     private static final int VIEW_TYPE_PLACEHOLDER = 3;
 
+    private static final InputFilter[] COLLAPSE_INPUT_FILTER = new InputFilter[] { SmartLengthInputFilter.INSTANCE };
+    private static final InputFilter[] NO_INPUT_FILTER = new InputFilter[0];
+
     private List<NotificationViewData> notifications;
     private StatusActionListener statusListener;
     private NotificationActionListener notificationActionListener;
@@ -243,6 +248,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 +321,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 +345,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 +368,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,10 +525,29 @@ 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);
+                    }
+                });
 
-            LinkHelper.setClickableText(statusContent, emojifiedText, statusViewData.getMentions(), listener);
+                contentCollapseButton.setVisibility(View.VISIBLE);
+                if (statusViewData.isCollapsed()) {
+                    contentCollapseButton.setChecked(true);
+                    statusContent.setFilters(COLLAPSE_INPUT_FILTER);
+                } else {
+                    contentCollapseButton.setChecked(false);
+                    statusContent.setFilters(NO_INPUT_FILTER);
+                }
+            } else {
+                contentCollapseButton.setVisibility(View.GONE);
+                statusContent.setFilters(NO_INPUT_FILTER);
+            }
 
+            Spanned emojifiedText = CustomEmojiHelper.emojifyText(content, emojis, statusContent);
+            LinkHelper.setClickableText(statusContent, emojifiedText, statusViewData.getMentions(), listener);
 
             Spanned emojifiedContentWarning =
                     CustomEmojiHelper.emojifyString(statusViewData.getSpoilerText(), statusViewData.getStatusEmojis(), contentWarningDescriptionTextView);

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

@@ -53,8 +53,10 @@ public class SearchResultsAdapter extends RecyclerView.Adapter {
     private LinkListener linkListener;
     private StatusActionListener statusListener;
 
-    public SearchResultsAdapter(boolean mediaPreviewsEnabled, boolean alwaysShowSensitiveMedia,
-                                LinkListener linkListener, StatusActionListener statusListener,
+    public SearchResultsAdapter(boolean mediaPreviewsEnabled,
+                                boolean alwaysShowSensitiveMedia,
+                                LinkListener linkListener,
+                                StatusActionListener statusListener,
                                 boolean useAbsoluteTime) {
 
         this.accountList = Collections.emptyList();
@@ -153,7 +155,10 @@ 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
+                ));
             }
             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;
@@ -39,6 +41,9 @@
 import at.connyduck.sparkbutton.SparkEventListener;
 
 abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
+    private static final InputFilter[] COLLAPSE_INPUT_FILTER = new InputFilter[] { SmartLengthInputFilter.INSTANCE };
+    private static final InputFilter[] NO_INPUT_FILTER = new InputFilter[0];
+
     private View container;
     private TextView displayName;
     private TextView username;
@@ -60,6 +65,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 +103,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 +499,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 +529,31 @@ 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(COLLAPSE_INPUT_FILTER);
+                } else {
+                    contentCollapseButton.setChecked(false);
+                    content.setFilters(NO_INPUT_FILTER);
+                }
+            } else {
+                contentCollapseButton.setVisibility(View.GONE);
+                content.setFilters(NO_INPUT_FILTER);
+            }
+        }
 
+        setContent(status.getContent(), status.getMentions(), status.getStatusEmojis(), listener);
+    }
 }

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

@@ -149,7 +149,10 @@ 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
+                );
             } else {
                 return new NotificationViewData.Placeholder(false);
             }
@@ -493,6 +496,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);
@@ -557,12 +606,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);

app/src/main/java/com/keylesspalace/tusky/fragment/SearchFragment.kt

@@ -52,7 +52,6 @@ class SearchFragment : SFragment(), StatusActionListener, Injectable {
     private var mediaPreviewEnabled = true
     private var useAbsoluteTime = false
 
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_search, container, false)
     }
@@ -65,7 +64,12 @@ class SearchFragment : SFragment(), StatusActionListener, Injectable {
 
         searchRecyclerView.addItemDecoration(DividerItemDecoration(view.context, DividerItemDecoration.VERTICAL))
         searchRecyclerView.layoutManager = LinearLayoutManager(view.context)
-        searchAdapter = SearchResultsAdapter(mediaPreviewEnabled, alwaysShowSensitiveMedia, this, this, useAbsoluteTime)
+        searchAdapter = SearchResultsAdapter(
+                mediaPreviewEnabled,
+                alwaysShowSensitiveMedia,
+                this,
+                this,
+                useAbsoluteTime)
         searchRecyclerView.adapter = searchAdapter
 
     }
@@ -137,17 +141,22 @@ class SearchFragment : SFragment(), StatusActionListener, Injectable {
 
     override fun onReblog(reblog: Boolean, position: Int) {
         val status = searchAdapter.getStatusAtPosition(position)
-        if(status != null) {
+        if (status != null) {
             timelineCases.reblogWithCallback(status, reblog, object: Callback<Status> {
                 override fun onResponse(call: Call<Status>?, response: Response<Status>?) {
                     status.reblogged = true
-                    searchAdapter.updateStatusAtPosition(ViewDataUtils.statusToViewData(status, alwaysShowSensitiveMedia), position)
+                    searchAdapter.updateStatusAtPosition(
+                            ViewDataUtils.statusToViewData(
+                                    status,
+                                    alwaysShowSensitiveMedia
+                            ),
+                            position
+                    )
                 }
 
                 override fun onFailure(call: Call<Status>?, t: Throwable?) {
                     Log.d(TAG, "Failed to reblog status " + status.id, t)
                 }
-
             })
         }
     }
@@ -158,7 +167,13 @@ class SearchFragment : SFragment(), StatusActionListener, Injectable {
             timelineCases.favouriteWithCallback(status, favourite, object: Callback<Status> {
                 override fun onResponse(call: Call<Status>?, response: Response<Status>?) {
                     status.favourited = true
-                    searchAdapter.updateStatusAtPosition(ViewDataUtils.statusToViewData(status, alwaysShowSensitiveMedia), position)
+                    searchAdapter.updateStatusAtPosition(
+                            ViewDataUtils.statusToViewData(
+                                    status,
+                                    alwaysShowSensitiveMedia
+                            ),
+                            position
+                    )
                 }
 
                 override fun onFailure(call: Call<Status>?, t: Throwable?) {
@@ -214,6 +229,21 @@ class SearchFragment : SFragment(), StatusActionListener, Injectable {
         // not needed here, search is not paginated
     }
 
+    override fun onContentCollapsedChange(isCollapsed: Boolean, position: Int) {
+        // TODO: No out-of-bounds check in getConcreteStatusAtPosition
+        val status = searchAdapter.getConcreteStatusAtPosition(position)
+        if(status == null) {
+            Log.e(TAG, String.format("Tried to access status but got null at position: %d", position))
+            return
+        }
+
+        val updatedStatus = StatusViewData.Builder(status)
+                .setCollapsed(isCollapsed)
+                .createStatusViewData()
+        searchAdapter.updateStatusAtPosition(updatedStatus, position)
+        searchRecyclerView.post { searchAdapter.notifyItemChanged(position, updatedStatus) }
+    }
+
     companion object {
         const val TAG = "SearchFragment"
     }
@@ -229,4 +259,4 @@ class SearchFragment : SFragment(), StatusActionListener, Injectable {
         startActivity(intent)
     }
 
-}
+}