Merge remote-tracking branch 'origin/master' into view-bindings-2

This commit is contained in:
Ben Iofel
2026-01-26 02:25:15 -05:00
48 changed files with 608 additions and 294 deletions
@@ -140,6 +140,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
override val confirmDeleteIntent: Subject<List<Long>> = PublishSubject.create()
override val clearCurrentMessageIntent: Subject<Boolean> = PublishSubject.create()
override val messageLinkAskIntent: Subject<Uri> by lazy { messageAdapter.messageLinkClicks }
override val reactionClickIntent: Subject<Long> by lazy { messageAdapter.reactionClicks }
override val speechRecogniserIntent by lazy { binding.speechToTextIcon.clicks() }
override val shadeIntent by lazy { binding.shadeBackground.clicks() }
override val recordAudioStartStopRecording: Subject<Boolean> = PublishSubject.create()
@@ -708,6 +709,13 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
.show()
}
override fun showReactionsDialog(reactions: List<String>) {
AlertDialog.Builder(this)
.setTitle(R.string.compose_reactions_title)
.setMessage(reactions.joinToString("\n"))
.show()
}
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
menuInflater.inflate(R.menu.compose, menu)
return super.onCreateOptionsMenu(menu)
@@ -77,6 +77,7 @@ interface ComposeView : QkView<ComposeState> {
val confirmDeleteIntent: Observable<List<Long>>
val clearCurrentMessageIntent: Subject<Boolean>
val messageLinkAskIntent: Observable<Uri>
val reactionClickIntent: Subject<Long>
val speechRecogniserIntent: Observable<*>
val shadeIntent: Observable<Unit>
val recordAudioStartStopRecording: Subject<Boolean>
@@ -111,6 +112,7 @@ interface ComposeView : QkView<ComposeState> {
fun showQksmsPlusSnackbar(@StringRes message: Int)
fun showDeleteDialog( messages: List<Long>)
fun showClearCurrentMessageDialog()
fun showReactionsDialog(reactions: List<String>)
fun startSpeechRecognition()
fun focusMessage()
}
@@ -759,6 +759,23 @@ class ComposeViewModel @Inject constructor(
.autoDisposable(view.scope())
.subscribe { view.showMessageLinkAskDialog(it) }
// Show reaction details popup
view.reactionClickIntent
.mapNotNull { messageId -> messageRepo.getMessage(messageId) }
.withLatestFrom(conversation) { message, conv ->
message.emojiReactions.map { reaction ->
val contactName = conv.recipients
.firstOrNull { recipient ->
phoneNumberUtils.compare(recipient.address, reaction.senderAddress)
}
?.getDisplayName()
?: reaction.senderAddress
"${reaction.emoji} $contactName"
}
}
.autoDisposable(view.scope())
.subscribe { reactions -> view.showReactionsDialog(reactions) }
// Set the current conversation
Observables
.combineLatest(
@@ -110,6 +110,7 @@ class MessagesAdapter @Inject constructor(
val sendNowClicks: Subject<Long> = PublishSubject.create()
val resendClicks: Subject<Long> = PublishSubject.create()
val partContextMenuRegistrar: Subject<View> = PublishSubject.create()
val reactionClicks: Subject<Long> = PublishSubject.create()
var data: Pair<Conversation, RealmResults<Message>>? = null
set(value) {
@@ -431,40 +432,25 @@ class MessagesAdapter @Inject constructor(
val hasReactions = reactions.isNotEmpty()
if (hasReactions) {
val reactionCounts = reactions.groupBy { it.emoji }
.mapValues { it.value.size }
.toList()
.sortedByDescending { it.second } // Sort by count, most reactions first
val uniqueEmojis = reactions.map { it.emoji }.distinct()
val totalCount = reactions.size
// For now, show just the first (most popular) reaction
val topReaction = reactionCounts.first()
val reactionText = if (topReaction.second == 1) {
topReaction.first
// Show unique emojis followed by total count
val reactionText = if (totalCount == 1) {
uniqueEmojis.first()
} else {
// Use a non-breaking space to keep the emoji and count together
"${topReaction.first}\u00A0${topReaction.second}"
"${uniqueEmojis.joinToString("")}\u00A0$totalCount"
}
reactionTextView.text = reactionText
reactionTextView.setOnClickListener { reactionClicks.onNext(message.id) }
reactionsContainer.setVisible(true)
makeRoomForEmojis(reactionsContainer)
} else {
reactionsContainer.setVisible(false)
reactionTextView.setOnClickListener(null)
}
}
private fun makeRoomForEmojis(reactionsContainer: View) {
val paddingBottom = 25.dpToPx(context)
(reactionsContainer.parent?.parent as? ViewGroup)?.let { parent ->
parent.setPadding(
parent.paddingLeft,
parent.paddingTop,
parent.paddingRight,
paddingBottom
)
}
}
private fun bindStatus(
statusView: TextView,
@@ -47,4 +47,4 @@ class MessageUtilsActivity : QkThemedActivity() {
super.onBackPressed()
}
}
}
}
@@ -2,6 +2,7 @@ package dev.octoshrimpy.quik.feature.messageutils
import android.animation.ObjectAnimator
import android.app.AlertDialog
import android.content.Context
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@@ -11,19 +12,33 @@ import dev.octoshrimpy.quik.R
import dev.octoshrimpy.quik.common.base.QkController
import dev.octoshrimpy.quik.common.util.extensions.animateLayoutChanges
import dev.octoshrimpy.quik.databinding.MessageUtilsControllerBinding
import dev.octoshrimpy.quik.feature.settings.autodelete.AutoDeleteDialog
import dev.octoshrimpy.quik.injection.appComponent
import dev.octoshrimpy.quik.repository.MessageRepository
import io.reactivex.Observable
import io.reactivex.Single
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.suspendCancellableCoroutine
import kotlinx.coroutines.withContext
import javax.inject.Inject
import kotlin.coroutines.resume
class MessageUtilsController : QkController<MessageUtilsControllerBinding, MessageUtilsView, MessageUtilsState, MessageUtilsPresenter>(), MessageUtilsView {
override fun inflateBinding(inflater: LayoutInflater, container: ViewGroup): MessageUtilsControllerBinding =
MessageUtilsControllerBinding.inflate(inflater, container, false)
@Inject lateinit var context: Context
@Inject override lateinit var presenter: MessageUtilsPresenter
private val autoDeleteDialog: AutoDeleteDialog by lazy {
AutoDeleteDialog(activity!!, autoDeleteSubject::onNext)
}
private val autoDeleteSubject: Subject<Int> = PublishSubject.create()
override val autoDeduplicateClickIntent by lazy { binding.autoDeduplicate.clicks() }
override val deduplicateClickIntent by lazy { binding.deduplicateMessages.clicks() }
override val autoDeleteClickIntent by lazy { binding.autoDelete.clicks() }
init {
appComponent.inject(this)
@@ -70,6 +85,12 @@ class MessageUtilsController : QkController<MessageUtilsControllerBinding, Messa
state.deduplicationProgress.indeterminate
}
}
binding!!.autoDelete.summary = when (state.autoDelete) {
0 -> context.getString(R.string.settings_auto_delete_never)
else -> context.resources.getQuantityString(
R.plurals.settings_auto_delete_summary, state.autoDelete, state.autoDelete)
}
}
override fun showDeduplicationConfirmationDialog(): Single<Boolean> = Single.create { emitter ->
@@ -82,8 +103,24 @@ class MessageUtilsController : QkController<MessageUtilsControllerBinding, Messa
.show()
}
override fun handleResult(resIdString: Int) {
override fun handleDeduplicationResult(resIdString: Int) {
binding.deduplicationProgressText.isVisible = true
binding.deduplicationProgressText.setText(resIdString)
}
override fun autoDeleteChanged(): Observable<Int> = autoDeleteSubject
override fun showAutoDeleteDialog(days: Int) = autoDeleteDialog.setExpiry(days).show()
override suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean = withContext(Dispatchers.Main) {
suspendCancellableCoroutine { cont ->
androidx.appcompat.app.AlertDialog.Builder(activity!!)
.setTitle(R.string.settings_auto_delete_warning)
.setMessage(context.resources.getString(R.string.settings_auto_delete_warning_message, messages))
.setOnCancelListener { cont.resume(false) }
.setNegativeButton(R.string.button_cancel) { _, _ -> cont.resume(false) }
.setPositiveButton(R.string.button_yes) { _, _ -> cont.resume(true) }
.show()
}
}
}
@@ -1,23 +1,29 @@
package dev.octoshrimpy.quik.feature.messageutils
import android.content.Context
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.autoDisposable
import dev.octoshrimpy.quik.R
import dev.octoshrimpy.quik.common.base.QkPresenter
import dev.octoshrimpy.quik.interactor.DeduplicateMessages
import dev.octoshrimpy.quik.interactor.DeleteOldMessages
import dev.octoshrimpy.quik.repository.MessageRepository
import dev.octoshrimpy.quik.service.AutoDeleteService
import dev.octoshrimpy.quik.util.Preferences
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.schedulers.Schedulers
import kotlinx.coroutines.runBlocking
import timber.log.Timber
import java.util.concurrent.TimeUnit
import javax.inject.Inject
class MessageUtilsPresenter @Inject constructor(
private val context: Context,
private val deduplicateMessages: DeduplicateMessages,
private val prefs: Preferences,
messageRepo: MessageRepository
private val deleteOldMessages: DeleteOldMessages,
private val messageRepo: MessageRepository
) : QkPresenter<MessageUtilsView, MessageUtilsState>(MessageUtilsState()) {
init {
disposables += messageRepo.deduplicationProgress
@@ -27,6 +33,9 @@ class MessageUtilsPresenter @Inject constructor(
disposables += prefs.autoDeduplicate.asObservable()
.subscribe { enabled -> newState { copy(autoDeduplicateMessages = enabled) } }
disposables += prefs.autoDelete.asObservable()
.subscribe { autoDelete -> newState { copy(autoDelete = autoDelete) } }
}
override fun bindIntents(view: MessageUtilsView) {
@@ -43,16 +52,16 @@ class MessageUtilsPresenter @Inject constructor(
.subscribe { result ->
when (result) {
is MessageRepository.DeduplicationResult.Success -> {
view.handleResult(R.string.deduplicating_messages_finished)
view.handleDeduplicationResult(R.string.deduplicating_messages_finished)
}
is MessageRepository.DeduplicationResult.NoDuplicates -> {
view.handleResult(R.string.deduplicating_messages_no_messages)
view.handleDeduplicationResult(R.string.deduplicating_messages_no_messages)
}
is MessageRepository.DeduplicationResult.Failure -> {
view.handleResult(R.string.deduplicating_messages_failed)
Timber.e("Error: ${result.error.localizedMessage}")
view.handleDeduplicationResult(R.string.deduplicating_messages_failed)
Timber.e("Error while deduplicating messages: ${result.error}")
}
}
}
@@ -61,5 +70,36 @@ class MessageUtilsPresenter @Inject constructor(
view.autoDeduplicateClickIntent
.autoDisposable(view.scope())
.subscribe { prefs.autoDeduplicate.set(!prefs.autoDeduplicate.get()) }
view.autoDeleteClickIntent
.autoDisposable(view.scope())
.subscribe { view.showAutoDeleteDialog(prefs.autoDelete.get()) }
view.autoDeleteChanged()
.observeOn(Schedulers.io())
.filter { maxAge ->
if (maxAge == 0) {
return@filter true
}
val counts = messageRepo.getOldMessageCounts(maxAge)
if (counts.values.sum() == 0) {
return@filter true
}
runBlocking { view.showAutoDeleteWarningDialog(counts.values.sum()) }
}
.doOnNext { maxAge ->
when (maxAge == 0) {
true -> AutoDeleteService.cancelJob(context)
false -> {
AutoDeleteService.scheduleJob(context)
deleteOldMessages.execute(Unit)
}
}
}
.doOnNext(prefs.autoDelete::set)
.autoDisposable(view.scope())
.subscribe()
}
}
}
@@ -4,5 +4,7 @@ import dev.octoshrimpy.quik.repository.MessageRepository
data class MessageUtilsState(
val autoDeduplicateMessages: Boolean = false,
val deduplicationProgress: MessageRepository.DeduplicationProgress = MessageRepository.DeduplicationProgress.Idle
val deduplicationProgress: MessageRepository.DeduplicationProgress = MessageRepository.DeduplicationProgress.Idle,
val autoDelete: Int = 0,
)
@@ -7,7 +7,12 @@ import io.reactivex.Single
interface MessageUtilsView: QkViewContract<MessageUtilsState> {
val autoDeduplicateClickIntent: Observable<*>
val deduplicateClickIntent: Observable<Unit>
val autoDeleteClickIntent: Observable<Unit>
fun showDeduplicationConfirmationDialog(): Single<Boolean>
fun handleResult(resIdString: Int)
}
fun handleDeduplicationResult(resIdString: Int)
fun autoDeleteChanged(): Observable<Int>
fun showAutoDeleteDialog(days: Int)
suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean
}
@@ -26,7 +26,6 @@ import android.text.format.DateFormat
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.appcompat.app.AlertDialog
import androidx.core.view.isVisible
import com.bluelinelabs.conductor.RouterTransaction
import com.google.android.material.snackbar.Snackbar
@@ -48,7 +47,6 @@ import dev.octoshrimpy.quik.common.widget.PreferenceView
import dev.octoshrimpy.quik.common.widget.TextInputDialog
import dev.octoshrimpy.quik.databinding.SettingsControllerBinding
import dev.octoshrimpy.quik.feature.settings.about.AboutController
import dev.octoshrimpy.quik.feature.settings.autodelete.AutoDeleteDialog
import dev.octoshrimpy.quik.feature.settings.swipe.SwipeActionsController
import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController
import dev.octoshrimpy.quik.injection.appComponent
@@ -57,11 +55,7 @@ import dev.octoshrimpy.quik.util.Preferences
import io.reactivex.Observable
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.suspendCancellableCoroutine
import kotlinx.coroutines.withContext
import javax.inject.Inject
import kotlin.coroutines.resume
class SettingsController : QkController<SettingsControllerBinding, SettingsView, SettingsState, SettingsPresenter>(), SettingsView {
@@ -81,15 +75,11 @@ class SettingsController : QkController<SettingsControllerBinding, SettingsView,
private val signatureDialog: TextInputDialog by lazy {
TextInputDialog(activity!!, context.getString(R.string.settings_signature_title), signatureSubject::onNext)
}
private val autoDeleteDialog: AutoDeleteDialog by lazy {
AutoDeleteDialog(activity!!, autoDeleteSubject::onNext)
}
private val viewQksmsPlusSubject: Subject<Unit> = PublishSubject.create()
private val startTimeSelectedSubject: Subject<Pair<Int, Int>> = PublishSubject.create()
private val endTimeSelectedSubject: Subject<Pair<Int, Int>> = PublishSubject.create()
private val signatureSubject: Subject<String> = PublishSubject.create()
private val autoDeleteSubject: Subject<Int> = PublishSubject.create()
private val progressAnimator by lazy { ObjectAnimator.ofInt(binding.syncingProgress, "progress", 0, 0) }
@@ -148,8 +138,6 @@ class SettingsController : QkController<SettingsControllerBinding, SettingsView,
override fun signatureChanged(): Observable<String> = signatureSubject
override fun autoDeleteChanged(): Observable<Int> = autoDeleteSubject
override fun mmsSizeSelected(): Observable<Int> = mmsSizeDialog.adapter.menuItemClicks
override fun messageLinkHandlingSelected(): Observable<Int> = messageLinkHandlingDialog.adapter.menuItemClicks
@@ -190,12 +178,6 @@ class SettingsController : QkController<SettingsControllerBinding, SettingsView,
binding.unicode.checkbox?.isChecked = state.stripUnicodeEnabled
binding.mobileOnly.checkbox?.isChecked = state.mobileOnly
binding.autoDelete.summary = when (state.autoDelete) {
0 -> context.getString(R.string.settings_auto_delete_never)
else -> context.resources.getQuantityString(
R.plurals.settings_auto_delete_summary, state.autoDelete, state.autoDelete)
}
binding.longAsMms.checkbox?.isChecked = state.longAsMms
binding.mmsSize.summary = state.maxMmsSizeSummary
@@ -256,20 +238,6 @@ class SettingsController : QkController<SettingsControllerBinding, SettingsView,
override fun showSignatureDialog(signature: String) = signatureDialog.setText(signature).show()
override fun showAutoDeleteDialog(days: Int) = autoDeleteDialog.setExpiry(days).show()
override suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean = withContext(Dispatchers.Main) {
suspendCancellableCoroutine { cont ->
AlertDialog.Builder(activity!!)
.setTitle(R.string.settings_auto_delete_warning)
.setMessage(context.resources.getString(R.string.settings_auto_delete_warning_message, messages))
.setOnCancelListener { cont.resume(false) }
.setNegativeButton(R.string.button_cancel) { _, _ -> cont.resume(false) }
.setPositiveButton(R.string.button_yes) { _, _ -> cont.resume(true) }
.show()
}
}
override fun showMmsSizePicker() = mmsSizeDialog.show(activity!!)
override fun showMessageLinkHandlingDialogPicker() = messageLinkHandlingDialog.show(activity!!)
@@ -27,17 +27,12 @@ import dev.octoshrimpy.quik.common.base.QkPresenter
import dev.octoshrimpy.quik.common.util.Colors
import dev.octoshrimpy.quik.common.util.DateFormatter
import dev.octoshrimpy.quik.common.util.extensions.makeToast
import dev.octoshrimpy.quik.interactor.DeleteOldMessages
import dev.octoshrimpy.quik.interactor.SyncMessages
import dev.octoshrimpy.quik.manager.BillingManager
import dev.octoshrimpy.quik.repository.MessageRepository
import dev.octoshrimpy.quik.repository.SyncRepository
import dev.octoshrimpy.quik.service.AutoDeleteService
import dev.octoshrimpy.quik.util.NightModeManager
import dev.octoshrimpy.quik.util.Preferences
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.schedulers.Schedulers
import kotlinx.coroutines.runBlocking
import timber.log.Timber
import java.util.Calendar
import java.util.concurrent.TimeUnit
@@ -49,8 +44,6 @@ class SettingsPresenter @Inject constructor(
private val context: Context,
private val billingManager: BillingManager,
private val dateFormatter: DateFormatter,
private val deleteOldMessages: DeleteOldMessages,
private val messageRepo: MessageRepository,
private val navigator: Navigator,
private val nightModeManager: NightModeManager,
private val prefs: Preferences,
@@ -124,9 +117,6 @@ class SettingsPresenter @Inject constructor(
disposables += prefs.mobileOnly.asObservable()
.subscribe { enabled -> newState { copy(mobileOnly = enabled) } }
disposables += prefs.autoDelete.asObservable()
.subscribe { autoDelete -> newState { copy(autoDelete = autoDelete) } }
disposables += prefs.longAsMms.asObservable()
.subscribe { enabled -> newState { copy(longAsMms = enabled) } }
@@ -218,8 +208,6 @@ class SettingsPresenter @Inject constructor(
R.id.mobileOnly -> prefs.mobileOnly.set(!prefs.mobileOnly.get())
R.id.autoDelete -> view.showAutoDeleteDialog(prefs.autoDelete.get())
R.id.longAsMms -> prefs.longAsMms.set(!prefs.longAsMms.get())
R.id.mmsSize -> view.showMmsSizePicker()
@@ -288,33 +276,6 @@ class SettingsPresenter @Inject constructor(
.autoDisposable(view.scope())
.subscribe()
view.autoDeleteChanged()
.observeOn(Schedulers.io())
.filter { maxAge ->
if (maxAge == 0) {
return@filter true
}
val counts = messageRepo.getOldMessageCounts(maxAge)
if (counts.values.sum() == 0) {
return@filter true
}
runBlocking { view.showAutoDeleteWarningDialog(counts.values.sum()) }
}
.doOnNext { maxAge ->
when (maxAge == 0) {
true -> AutoDeleteService.cancelJob(context)
false -> {
AutoDeleteService.scheduleJob(context)
deleteOldMessages.execute(Unit)
}
}
}
.doOnNext(prefs.autoDelete::set)
.autoDisposable(view.scope())
.subscribe()
view.mmsSizeSelected()
.autoDisposable(view.scope())
.subscribe(prefs.mmsSize::set)
@@ -45,7 +45,6 @@ data class SettingsState(
val splitSmsEnabled: Boolean = false,
val stripUnicodeEnabled: Boolean = false,
val mobileOnly: Boolean = false,
val autoDelete: Int = 0,
val longAsMms: Boolean = false,
val maxMmsSizeSummary: String = "100KB",
val maxMmsSizeId: Int = 100,
@@ -32,7 +32,6 @@ interface SettingsView : QkViewContract<SettingsState> {
fun textSizeSelected(): Observable<Int>
fun sendDelaySelected(): Observable<Int>
fun signatureChanged(): Observable<String>
fun autoDeleteChanged(): Observable<Int>
fun mmsSizeSelected(): Observable<Int>
fun messageLinkHandlingSelected(): Observable<Int>
@@ -43,8 +42,6 @@ interface SettingsView : QkViewContract<SettingsState> {
fun showTextSizePicker()
fun showDelayDurationDialog()
fun showSignatureDialog(signature: String)
fun showAutoDeleteDialog(days: Int)
suspend fun showAutoDeleteWarningDialog(messages: Int): Boolean
fun showMmsSizePicker()
fun showMessageLinkHandlingDialogPicker()
fun showSwipeActions()