mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 19:38:52 +01:00
Allow composing message from scheduled screen
This commit is contained in:
@@ -27,6 +27,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
|
||||
|
||||
override val messageClickIntent by lazy { messageAdapter.clicks }
|
||||
override val messageMenuIntent by lazy { dialog.adapter.menuItemClicks }
|
||||
override val composeIntent by lazy { compose.clicks() }
|
||||
override val upgradeIntent by lazy { upgrade.clicks() }
|
||||
|
||||
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java] }
|
||||
@@ -56,6 +57,8 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
|
||||
colors.theme().let { theme ->
|
||||
sampleMessage.setBackgroundTint(theme.theme)
|
||||
sampleMessage.setTextColor(theme.textPrimary)
|
||||
compose.setTint(theme.textPrimary)
|
||||
compose.setBackgroundTint(theme.theme)
|
||||
upgrade.setBackgroundTint(theme.theme)
|
||||
upgradeIcon.setTint(theme.textPrimary)
|
||||
upgradeLabel.setTextColor(theme.textPrimary)
|
||||
@@ -65,6 +68,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
|
||||
override fun render(state: ScheduledState) {
|
||||
messageAdapter.updateData(state.scheduledMessages)
|
||||
|
||||
compose.isVisible = state.upgraded
|
||||
upgrade.isVisible = !state.upgraded
|
||||
}
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@ interface ScheduledView : QkView<ScheduledState> {
|
||||
|
||||
val messageClickIntent: Observable<Long>
|
||||
val messageMenuIntent: Observable<Int>
|
||||
val composeIntent: Observable<*>
|
||||
val upgradeIntent: Observable<*>
|
||||
|
||||
fun showMessageOptions()
|
||||
|
||||
@@ -42,6 +42,10 @@ class ScheduledViewModel @Inject constructor(
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe()
|
||||
|
||||
view.composeIntent
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { navigator.showCompose() }
|
||||
|
||||
view.upgradeIntent
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { navigator.showQksmsPlusActivity("schedule_fab") }
|
||||
|
||||
@@ -105,6 +105,18 @@
|
||||
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||
android:id="@+id/compose"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:layout_margin="16dp"
|
||||
android:contentDescription="@string/scheduled_compose_cd"
|
||||
android:src="@drawable/ic_add_black_24dp"
|
||||
android:tint="@color/white"
|
||||
android:visibility="gone"
|
||||
tools:backgroundTint="@color/tools_theme" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/upgrade"
|
||||
android:layout_width="wrap_content"
|
||||
|
||||
@@ -141,6 +141,7 @@
|
||||
<string name="scheduled_empty_message_2">It\'s on December 23rd</string>
|
||||
<string name="scheduled_empty_message_3">Happy birthday! Look at what a great friend I am, remembering your birthday</string>
|
||||
<string name="scheduled_empty_message_3_timestamp">Sending on December 23rd </string>
|
||||
<string name="scheduled_compose_cd">Schedule a message</string>
|
||||
<string name="scheduled_options_title">Scheduled message</string>
|
||||
<string-array name="scheduled_options">
|
||||
<item>Send now</item>
|
||||
|
||||
Reference in New Issue
Block a user