Refactor notifications to Kotlin & paging

app/src/main/java/com/keylesspalace/tusky/MainActivity.kt

@@ -80,13 +80,13 @@ import com.keylesspalace.tusky.components.compose.ComposeActivity
 import com.keylesspalace.tusky.components.compose.ComposeActivity.Companion.canHandleMimeType
 import com.keylesspalace.tusky.components.drafts.DraftsActivity
 import com.keylesspalace.tusky.components.login.LoginActivity
-import com.keylesspalace.tusky.components.notifications.NotificationHelper
-import com.keylesspalace.tusky.components.notifications.disableAllNotifications
-import com.keylesspalace.tusky.components.notifications.enablePushNotificationsWithFallback
-import com.keylesspalace.tusky.components.notifications.showMigrationNoticeIfNecessary
 import com.keylesspalace.tusky.components.preference.PreferencesActivity
 import com.keylesspalace.tusky.components.scheduled.ScheduledStatusActivity
 import com.keylesspalace.tusky.components.search.SearchActivity
+import com.keylesspalace.tusky.components.systemnotifications.NotificationHelper
+import com.keylesspalace.tusky.components.systemnotifications.disableAllNotifications
+import com.keylesspalace.tusky.components.systemnotifications.enablePushNotificationsWithFallback
+import com.keylesspalace.tusky.components.systemnotifications.showMigrationNoticeIfNecessary
 import com.keylesspalace.tusky.components.trending.TrendingActivity
 import com.keylesspalace.tusky.databinding.ActivityMainBinding
 import com.keylesspalace.tusky.db.AccountEntity

app/src/main/java/com/keylesspalace/tusky/TabData.kt

@@ -20,10 +20,10 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.fragment.app.Fragment
 import com.keylesspalace.tusky.components.conversation.ConversationsFragment
+import com.keylesspalace.tusky.components.notifications.NotificationsFragment
 import com.keylesspalace.tusky.components.timeline.TimelineFragment
 import com.keylesspalace.tusky.components.timeline.viewmodel.TimelineViewModel
 import com.keylesspalace.tusky.components.trending.TrendingTagsFragment
-import com.keylesspalace.tusky.fragment.NotificationsFragment
 import java.util.Objects
 
 /** this would be a good case for a sealed class, but that does not work nice with Room */

app/src/main/java/com/keylesspalace/tusky/TuskyApplication.kt

@@ -23,7 +23,7 @@ import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import autodispose2.AutoDisposePlugins
-import com.keylesspalace.tusky.components.notifications.NotificationHelper
+import com.keylesspalace.tusky.components.systemnotifications.NotificationHelper
 import com.keylesspalace.tusky.di.AppInjector
 import com.keylesspalace.tusky.settings.AppTheme
 import com.keylesspalace.tusky.settings.NEW_INSTALL_SCHEMA_VERSION
@@ -132,12 +132,6 @@ class TuskyApplication : Application(), HasAndroidInjector {
             editor.remove(PrefKeys.MEDIA_PREVIEW_ENABLED)
         }
 
-        if (oldVersion < 2023072401) {
-            // The notifications filter / clear options are shown on a menu, not a separate bar,
-            // the preference to display them is not needed.
-            editor.remove(PrefKeys.Deprecated.SHOW_NOTIFICATIONS_FILTER)
-        }
-
         if (oldVersion != NEW_INSTALL_SCHEMA_VERSION && oldVersion < 2023082301) {
             // Default value for appTheme is now THEME_SYSTEM. If the user is upgrading and
             // didn't have an explicit preference set use the previous default, so the

app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestViewHolder.kt

@@ -21,10 +21,12 @@ import android.text.Spanned
 import android.text.style.StyleSpan
 import androidx.recyclerview.widget.RecyclerView
 import com.keylesspalace.tusky.R
+import com.keylesspalace.tusky.components.notifications.NotificationsViewHolder
 import com.keylesspalace.tusky.databinding.ItemFollowRequestBinding
 import com.keylesspalace.tusky.entity.TimelineAccount
 import com.keylesspalace.tusky.interfaces.AccountActionListener
 import com.keylesspalace.tusky.interfaces.LinkListener
+import com.keylesspalace.tusky.util.StatusDisplayOptions
 import com.keylesspalace.tusky.util.emojify
 import com.keylesspalace.tusky.util.hide
 import com.keylesspalace.tusky.util.loadAvatar
@@ -33,12 +35,21 @@ import com.keylesspalace.tusky.util.setClickableText
 import com.keylesspalace.tusky.util.show
 import com.keylesspalace.tusky.util.unicodeWrap
 import com.keylesspalace.tusky.util.visible
+import com.keylesspalace.tusky.viewdata.NotificationViewData
 
 class FollowRequestViewHolder(
     private val binding: ItemFollowRequestBinding,
     private val linkListener: LinkListener,
     private val showHeader: Boolean
-) : RecyclerView.ViewHolder(binding.root) {
+) : RecyclerView.ViewHolder(binding.root), NotificationsViewHolder {
+
+    override fun bind(
+        viewData: NotificationViewData.Concrete,
+        payloads: List<*>?,
+        statusDisplayOptions: StatusDisplayOptions
+    ) {
+        TODO("Not yet implemented")
+    }
 
     fun setupWithAccount(
         account: TimelineAccount,

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

@@ -41,8 +41,10 @@
 
 import com.bumptech.glide.Glide;
 import com.keylesspalace.tusky.R;
+import com.keylesspalace.tusky.components.notifications.ReportNotificationViewHolder;
 import com.keylesspalace.tusky.databinding.ItemFollowRequestBinding;
 import com.keylesspalace.tusky.databinding.ItemReportNotificationBinding;
+import com.keylesspalace.tusky.databinding.ItemStatusPlaceholderBinding;
 import com.keylesspalace.tusky.entity.Emoji;
 import com.keylesspalace.tusky.entity.Notification;
 import com.keylesspalace.tusky.entity.Status;
@@ -59,7 +61,7 @@
 import com.keylesspalace.tusky.util.StatusDisplayOptions;
 import com.keylesspalace.tusky.util.StringUtils;
 import com.keylesspalace.tusky.util.TimestampUtils;
-import com.keylesspalace.tusky.viewdata.NotificationViewData;
+import com.keylesspalace.tusky.viewdata.NotificationViewData2;
 import com.keylesspalace.tusky.viewdata.StatusViewData;
 
 import java.util.Date;
@@ -92,11 +94,11 @@ public interface AdapterDataSource<T> {
     private final StatusActionListener statusListener;
     private final NotificationActionListener notificationActionListener;
     private final AccountActionListener accountActionListener;
-    private final AdapterDataSource<NotificationViewData> dataSource;
+    private final AdapterDataSource<NotificationViewData2> dataSource;
     private final AbsoluteTimeFormatter absoluteTimeFormatter = new AbsoluteTimeFormatter();
 
     public NotificationsAdapter(String accountId,
-                                AdapterDataSource<NotificationViewData> dataSource,
+                                AdapterDataSource<NotificationViewData2> dataSource,
                                 StatusDisplayOptions statusDisplayOptions,
                                 StatusActionListener statusListener,
                                 NotificationActionListener notificationActionListener,
@@ -137,11 +139,11 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
             case VIEW_TYPE_PLACEHOLDER: {
                 View view = inflater
                         .inflate(R.layout.item_status_placeholder, parent, false);
-                return new PlaceholderViewHolder(view);
+                return new PlaceholderViewHolder(ItemStatusPlaceholderBinding.inflate(inflater, parent, false), statusListener);
             }
             case VIEW_TYPE_REPORT: {
                 ItemReportNotificationBinding binding = ItemReportNotificationBinding.inflate(inflater, parent, false);
-                return new ReportNotificationViewHolder(binding);
+                return new ReportNotificationViewHolder(binding, notificationActionListener);
             }
             default:
             case VIEW_TYPE_UNKNOWN: {
@@ -171,17 +173,17 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int po
     private void bindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int position, @Nullable List<Object> payloads) {
         Object payloadForHolder = payloads != null && !payloads.isEmpty() ? payloads.get(0) : null;
         if (position < this.dataSource.getItemCount()) {
-            NotificationViewData notification = dataSource.getItemAt(position);
-            if (notification instanceof NotificationViewData.Placeholder) {
+            NotificationViewData2 notification = dataSource.getItemAt(position);
+            if (notification instanceof NotificationViewData2.Placeholder) {
                 if (payloadForHolder == null) {
-                    NotificationViewData.Placeholder placeholder = ((NotificationViewData.Placeholder) notification);
+                    NotificationViewData2.Placeholder placeholder = ((NotificationViewData2.Placeholder) notification);
                     PlaceholderViewHolder holder = (PlaceholderViewHolder) viewHolder;
-                    holder.setup(statusListener, placeholder.isLoading());
+                    holder.setup(placeholder.isLoading());
                 }
                 return;
             }
-            NotificationViewData.Concrete concreteNotification =
-                    (NotificationViewData.Concrete) notification;
+            NotificationViewData2.Concrete concreteNotification =
+                    (NotificationViewData2.Concrete) notification;
             switch (viewHolder.getItemViewType()) {
                 case VIEW_TYPE_STATUS: {
                     StatusViewHolder holder = (StatusViewHolder) viewHolder;
@@ -261,8 +263,8 @@ private void bindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int pos
                 case VIEW_TYPE_REPORT: {
                     if (payloadForHolder == null) {
                         ReportNotificationViewHolder holder = (ReportNotificationViewHolder) viewHolder;
-                        holder.setupWithReport(concreteNotification.getAccount(), concreteNotification.getReport(), statusDisplayOptions.animateAvatars(), statusDisplayOptions.animateEmojis());
-                        holder.setupActionListener(notificationActionListener, concreteNotification.getReport().getTargetAccount().getId(), concreteNotification.getAccount().getId(), concreteNotification.getReport().getId());
+                       // holder.setupWithReport(concreteNotification.getAccount(), concreteNotification.getReport(), statusDisplayOptions.animateAvatars(), statusDisplayOptions.animateEmojis());
+                      //  holder.setupActionListener(notificationActionListener, concreteNotification.getReport().getTargetAccount().getId(), concreteNotification.getAccount().getId(), concreteNotification.getReport().getId());
                     }
                 }
                 default:
@@ -299,9 +301,9 @@ public boolean isMediaPreviewEnabled() {
 
     @Override
     public int getItemViewType(int position) {
-        NotificationViewData notification = dataSource.getItemAt(position);
-        if (notification instanceof NotificationViewData.Concrete) {
-            NotificationViewData.Concrete concrete = ((NotificationViewData.Concrete) notification);
+        NotificationViewData2 notification = dataSource.getItemAt(position);
+        if (notification instanceof NotificationViewData2.Concrete) {
+            NotificationViewData2.Concrete concrete = ((NotificationViewData2.Concrete) notification);
             switch (concrete.getType()) {
                 case MENTION:
                 case POLL: {
@@ -327,7 +329,7 @@ public int getItemViewType(int position) {
                     return VIEW_TYPE_UNKNOWN;
                 }
             }
-        } else if (notification instanceof NotificationViewData.Placeholder) {
+        } else if (notification instanceof NotificationViewData2.Placeholder) {
             return VIEW_TYPE_PLACEHOLDER;
         } else {
             throw new AssertionError("Unknown notification type");
@@ -355,14 +357,14 @@ public interface NotificationActionListener {
         void onNotificationContentCollapsedChange(boolean isCollapsed, int position);
     }
 
-    private static class FollowViewHolder extends RecyclerView.ViewHolder {
+    public static class FollowViewHolder extends RecyclerView.ViewHolder {
         private final TextView message;
         private final TextView usernameView;
         private final TextView displayNameView;
         private final ImageView avatar;
         private final StatusDisplayOptions statusDisplayOptions;
 
-        FollowViewHolder(View itemView, StatusDisplayOptions statusDisplayOptions) {
+        public FollowViewHolder(View itemView, StatusDisplayOptions statusDisplayOptions) {
             super(itemView);
             message = itemView.findViewById(R.id.notification_text);
             usernameView = itemView.findViewById(R.id.notification_username);
@@ -404,7 +406,7 @@ void setupButtons(final NotificationActionListener listener, final String accoun
         }
     }
 
-    private static class StatusNotificationViewHolder extends RecyclerView.ViewHolder
+    public static class StatusNotificationViewHolder extends RecyclerView.ViewHolder
             implements View.OnClickListener {
 
         private final View container;
@@ -431,7 +433,7 @@ private static class StatusNotificationViewHolder extends RecyclerView.ViewHolde
         private final int avatarRadius36dp;
         private final int avatarRadius24dp;
 
-        StatusNotificationViewHolder(
+        public StatusNotificationViewHolder(
             View itemView,
             StatusDisplayOptions statusDisplayOptions,
             AbsoluteTimeFormatter absoluteTimeFormatter
@@ -522,7 +524,7 @@ Drawable getIconWithColor(Context context, @DrawableRes int drawable, @ColorRes
             return icon;
         }
 
-        void setMessage(NotificationViewData.Concrete notificationViewData, LinkListener listener) {
+        void setMessage(NotificationViewData2.Concrete notificationViewData, LinkListener listener) {
             this.statusViewData = notificationViewData.getStatusViewData();
 
             String displayName = StringUtils.unicodeWrap(notificationViewData.getAccount().getName());

app/src/main/java/com/keylesspalace/tusky/adapter/PlaceholderViewHolder.kt

@@ -14,54 +14,34 @@
  * see <http://www.gnu.org/licenses>. */
 package com.keylesspalace.tusky.adapter
 
-import android.view.View
 import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.button.MaterialButton
-import com.google.android.material.progressindicator.CircularProgressIndicatorSpec
-import com.google.android.material.progressindicator.IndeterminateDrawable
-import com.keylesspalace.tusky.R
+import com.keylesspalace.tusky.databinding.ItemStatusPlaceholderBinding
 import com.keylesspalace.tusky.interfaces.StatusActionListener
+import com.keylesspalace.tusky.util.hide
+import com.keylesspalace.tusky.util.show
+import com.keylesspalace.tusky.util.visible
 
 /**
- * Placeholder for different timelines.
+ * Placeholder for missing parts in timelines.
  *
- * Displays a "Load more" button for a particular status ID, or a
- * circular progress wheel if the status' page is being loaded.
- *
- * The user can only have one "Load more" operation in progress at
- * a time (determined by the adapter), so the contents of the view
- * and the enabled state is driven by that.
+ * Displays a "Load more" button to load the gap, or a
+ * circular progress bar if the missing page is being loaded.
  */
-class PlaceholderViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-    private val loadMoreButton: MaterialButton = itemView.findViewById(R.id.button_load_more)
-    private val drawable = IndeterminateDrawable.createCircularDrawable(
-        itemView.context,
-        CircularProgressIndicatorSpec(itemView.context, null)
-    )
-
-    fun setup(listener: StatusActionListener, loading: Boolean) {
-        itemView.isEnabled = !loading
-        loadMoreButton.isEnabled = !loading
-
-        if (loading) {
-            loadMoreButton.text = ""
-            loadMoreButton.icon = drawable
-            return
-        }
+class PlaceholderViewHolder(
+    private val binding: ItemStatusPlaceholderBinding,
+    private val listener: StatusActionListener
+) : RecyclerView.ViewHolder(binding.root) {
 
-        loadMoreButton.text = itemView.context.getString(R.string.load_more_placeholder_text)
-        loadMoreButton.icon = null
+    fun setup(loading: Boolean) {
+        binding.loadMoreButton.visible(!loading)
+        binding.loadMoreProgressBar.visible(loading)
 
-        // To allow the user to click anywhere in the layout to load more content set the click
-        // listener on the parent layout instead of loadMoreButton.
-        //
-        // See the comments in item_status_placeholder.xml for more details.
-        itemView.setOnClickListener {
-            itemView.isEnabled = false
-            loadMoreButton.isEnabled = false
-            loadMoreButton.icon = drawable
-            loadMoreButton.text = ""
-            listener.onLoadMore(bindingAdapterPosition)
+        if (!loading) {
+            binding.loadMoreButton.setOnClickListener {
+                binding.loadMoreButton.hide()
+                binding.loadMoreProgressBar.show()
+                listener.onLoadMore(bindingAdapterPosition)
+            }
         }
     }
 }

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

@@ -105,7 +105,7 @@ private void setRebloggedByDisplayName(final CharSequence name,
     }
 
     // don't use this on the same ViewHolder as setRebloggedByDisplayName, will cause recycling issues as paddings are changed
-    protected void setPollInfo(final boolean ownPoll) {
+    public void setPollInfo(final boolean ownPoll) {
         statusInfo.setText(ownPoll ? R.string.poll_ended_created : R.string.poll_ended_voted);
         statusInfo.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_poll_24dp, 0, 0, 0);
         statusInfo.setCompoundDrawablePadding(Utils.dpToPx(statusInfo.getContext(), 10));

app/src/main/java/com/keylesspalace/tusky/components/notifications/FollowViewHolder.kt

@@ -0,0 +1,53 @@
+package com.keylesspalace.tusky.components.notifications
+
+import androidx.recyclerview.widget.RecyclerView
+import com.keylesspalace.tusky.R
+import com.keylesspalace.tusky.adapter.NotificationsAdapter.NotificationActionListener
+import com.keylesspalace.tusky.databinding.ItemFollowBinding
+import com.keylesspalace.tusky.entity.Notification
+import com.keylesspalace.tusky.util.StatusDisplayOptions
+import com.keylesspalace.tusky.util.emojify
+import com.keylesspalace.tusky.util.loadAvatar
+import com.keylesspalace.tusky.util.unicodeWrap
+import com.keylesspalace.tusky.viewdata.NotificationViewData
+
+class FollowViewHolder(
+    private val binding: ItemFollowBinding,
+    private val listener: NotificationActionListener,
+) : RecyclerView.ViewHolder(binding.root), NotificationsViewHolder {
+
+    override fun bind(
+        viewData: NotificationViewData.Concrete,
+        payloads: List<*>?,
+        statusDisplayOptions: StatusDisplayOptions
+    ) {
+        val context = itemView.context
+        val account = viewData.account
+        val messageTemplate =
+            context.getString(if (viewData.type == Notification.Type.SIGN_UP) R.string.notification_sign_up_format else R.string.notification_follow_format)
+        val wrappedDisplayName = account.name.unicodeWrap()
+
+        binding.notificationText.text = messageTemplate.format(wrappedDisplayName)
+            .emojify(account.emojis, binding.notificationText, statusDisplayOptions.animateEmojis)
+
+        binding.notificationUsername.text = context.getString(R.string.post_username_format, viewData.account.username)
+
+        val emojifiedDisplayName = wrappedDisplayName.emojify(
+            account.emojis,
+            binding.notificationDisplayName,
+            statusDisplayOptions.animateEmojis
+        )
+        binding.notificationDisplayName.text = emojifiedDisplayName
+
+        val avatarRadius = context.resources
+            .getDimensionPixelSize(R.dimen.avatar_radius_42dp)
+        loadAvatar(
+            account.avatar,
+            binding.notificationAvatar,
+            avatarRadius,
+            statusDisplayOptions.animateAvatars, null
+        )
+
+        itemView.setOnClickListener { listener.onViewAccount(account.id) }
+    }
+}