Indicate in UI when scheduled messages are present

Added a new property to scheduled messages to save which conversation the scheduled message belongs to.
This commit is contained in:
Inhishonor
2025-07-08 18:22:07 -07:00
parent 56a767bbd7
commit 3d7526512d
19 changed files with 146 additions and 18 deletions
@@ -99,7 +99,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
((scheduledMessageAdapter.itemCount != 0) && (state.selectedMessages == 1))
// show compose button
compose.isVisible = state.upgraded
compose.isVisible = state.upgraded && (state.conversationId == null)
upgrade.isVisible = !state.upgraded
}
@@ -23,6 +23,7 @@ import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
import dev.octoshrimpy.quik.injection.ViewModelKey
import javax.inject.Named
@Module
class ScheduledActivityModule {
@@ -32,4 +33,9 @@ class ScheduledActivityModule {
@ViewModelKey(ScheduledViewModel::class)
fun provideScheduledViewModel(viewModel: ScheduledViewModel): ViewModel = viewModel
}
@Provides
@Named("conversationId")
fun getConversationId(activity: ScheduledActivity):
Long? = activity.intent.extras?.getLong("conversationId")
}
@@ -25,4 +25,5 @@ data class ScheduledState(
val scheduledMessages: RealmResults<ScheduledMessage>? = null,
val upgraded: Boolean = true,
val selectedMessages: Int = 0,
val conversationId: Long? = null,
)
@@ -15,8 +15,10 @@ import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.schedulers.Schedulers
import javax.inject.Inject
import javax.inject.Named
class ScheduledViewModel @Inject constructor(
@Named("conversationId") private val conversationId: Long?,
billingManager: BillingManager,
private val context: Context,
private val navigator: Navigator,
@@ -24,10 +26,12 @@ class ScheduledViewModel @Inject constructor(
private val sendScheduledMessageInteractor: SendScheduledMessage,
private val deleteScheduledMessagesInteractor: DeleteScheduledMessages,
) : QkViewModel<ScheduledView, ScheduledState>(ScheduledState(
scheduledMessages = scheduledMessageRepo.getScheduledMessages()
scheduledMessages = scheduledMessageRepo.getScheduledMessages(),
conversationId = conversationId
)) {
init {
loadMessages(conversationId)
disposables += billingManager.upgradeStatus
.subscribe { upgraded -> newState { copy(upgraded = upgraded) } }
}
@@ -157,4 +161,12 @@ class ScheduledViewModel @Inject constructor(
.autoDisposable(view.scope())
.subscribe { navigator.showQksmsPlusActivity("schedule_fab") }
}
private fun loadMessages(conversationId: Long?) {
val results = if (conversationId != null)
scheduledMessageRepo.getScheduledMessagesForConversation(conversationId)
else
scheduledMessageRepo.getScheduledMessages()
newState { copy(scheduledMessages = results) }
}
}