Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Unread Divider #60

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add Unread Divider #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a12eb78
refactor: Move DetailViewHolder out of DetailAdapter
thgoebel Jun 16, 2023
3b76564
refactor: Move DetailAdapter and DetailViewModel into detail package
thgoebel Jun 16, 2023
c6ca0a9
Add divider between read and unread notifications
thgoebel Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/src/main/java/io/heckel/ntfy/db/Database.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@ data class Notification(
@ColumnInfo(name = "actions") val actions: List<Action>?,
@Embedded(prefix = "attachment_") val attachment: Attachment?,
@ColumnInfo(name = "deleted") val deleted: Boolean,
)
) {
val isUnread: Boolean get() = notificationId != 0
}

@Entity
data class Attachment(
Expand Down
36 changes: 22 additions & 14 deletions app/src/main/java/io/heckel/ntfy/ui/DetailActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ import io.heckel.ntfy.db.Notification
import io.heckel.ntfy.db.Repository
import io.heckel.ntfy.db.Subscription
import io.heckel.ntfy.firebase.FirebaseMessenger
import io.heckel.ntfy.util.Log
import io.heckel.ntfy.msg.ApiService
import io.heckel.ntfy.msg.NotificationService
import io.heckel.ntfy.service.SubscriberServiceManager
import io.heckel.ntfy.ui.detail.*
import io.heckel.ntfy.util.*
import kotlinx.coroutines.*
import java.util.*
Expand Down Expand Up @@ -194,17 +194,15 @@ class DetailActivity : AppCompatActivity(), ActionMode.Callback, NotificationFra

// Update main list based on viewModel (& its datasource/livedata)
val noEntriesText: View = findViewById(R.id.detail_no_notifications)
val onNotificationClick = { n: Notification -> onNotificationClick(n) }
val onNotificationLongClick = { n: Notification -> onNotificationLongClick(n) }

adapter = DetailAdapter(this, lifecycleScope, repository, onNotificationClick, onNotificationLongClick)
adapter = DetailAdapter(this, lifecycleScope, repository, this::onNotificationItemClick, this::onNotificationItemLongClick)
mainList = findViewById(R.id.detail_notification_list)
mainList.adapter = adapter

viewModel.list(subscriptionId).observe(this) {
it?.let {
// Show list view
adapter.submitList(it as MutableList<Notification>)
adapter.submitNotifications(it as MutableList<Notification>)
if (it.isEmpty()) {
mainListContainer.visibility = View.GONE
noEntriesText.visibility = View.VISIBLE
Expand All @@ -223,8 +221,19 @@ class DetailActivity : AppCompatActivity(), ActionMode.Callback, NotificationFra
override fun onMove(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
return false
}
override fun getSwipeDirs(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder): Int {
val item = adapter.getItem(viewHolder.absoluteAdapterPosition)
if (item is UnreadDividerItem) {
return 0 // disallow swiping the unread divider
}
return super.getSwipeDirs(recyclerView, viewHolder)
}
override fun onSwiped(viewHolder: RecyclerView.ViewHolder, swipeDir: Int) {
val notification = adapter.get(viewHolder.absoluteAdapterPosition)
val item = adapter.getItem(viewHolder.absoluteAdapterPosition)
if (item !is NotificationItem) {
return
}
val notification = item.notification
lifecycleScope.launch(Dispatchers.IO) {
repository.markAsDeleted(notification.id)
}
Expand Down Expand Up @@ -624,7 +633,7 @@ class DetailActivity : AppCompatActivity(), ActionMode.Callback, NotificationFra
dialog.show()
}

private fun onNotificationClick(notification: Notification) {
private fun onNotificationItemClick(notification: Notification) {
if (actionMode != null) {
handleActionModeClick(notification)
} else if (notification.click != "") {
Expand All @@ -649,18 +658,18 @@ class DetailActivity : AppCompatActivity(), ActionMode.Callback, NotificationFra
}
}

private fun onNotificationLongClick(notification: Notification) {
private fun onNotificationItemLongClick(notification: Notification) {
if (actionMode == null) {
beginActionMode(notification)
}
}

private fun handleActionModeClick(notification: Notification) {
adapter.toggleSelection(notification.id)
if (adapter.selected.size == 0) {
if (adapter.selectedNotificationIds.size == 0) {
finishActionMode()
} else {
actionMode!!.title = adapter.selected.size.toString()
actionMode!!.title = adapter.selectedNotificationIds.size.toString()
}
}

Expand Down Expand Up @@ -695,7 +704,7 @@ class DetailActivity : AppCompatActivity(), ActionMode.Callback, NotificationFra
Log.d(TAG, "Copying multiple notifications to clipboard")

lifecycleScope.launch(Dispatchers.IO) {
val content = adapter.selected.joinToString("\n\n") { notificationId ->
val content = adapter.selectedNotificationIds.joinToString("\n\n") { notificationId ->
val notification = repository.getNotification(notificationId)
notification?.let {
decodeMessage(it) + "\n" + Date(it.timestamp * 1000).toString()
Expand All @@ -720,7 +729,7 @@ class DetailActivity : AppCompatActivity(), ActionMode.Callback, NotificationFra
val dialog = builder
.setMessage(R.string.detail_action_mode_delete_dialog_message)
.setPositiveButton(R.string.detail_action_mode_delete_dialog_permanently_delete) { _, _ ->
adapter.selected.map { notificationId -> viewModel.markAsDeleted(notificationId) }
adapter.selectedNotificationIds.map { notificationId -> viewModel.markAsDeleted(notificationId) }
finishActionMode()
}
.setNegativeButton(R.string.detail_action_mode_delete_dialog_cancel) { _, _ ->
Expand Down Expand Up @@ -756,8 +765,7 @@ class DetailActivity : AppCompatActivity(), ActionMode.Callback, NotificationFra

private fun endActionModeAndRedraw() {
actionMode = null
adapter.selected.clear()
adapter.notifyItemRangeChanged(0, adapter.currentList.size)
adapter.clearSelection()

// Fade status bar color
val fromColor = ContextCompat.getColor(this, Colors.statusBarActionMode(this))
Expand Down
Loading