diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt index 99978ff7..9aa78ce8 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt @@ -33,6 +33,7 @@ import com.moez.QKSMS.common.util.extensions.setBackgroundTint import com.moez.QKSMS.common.util.extensions.setTint import com.moez.QKSMS.common.util.extensions.setVisible import dagger.android.AndroidInjection +import kotlinx.android.synthetic.main.collapsing_toolbar.* import kotlinx.android.synthetic.main.qksms_plus_activity.* import javax.inject.Inject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt index 0558b19c..ff58a7b0 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt @@ -1,23 +1,33 @@ package com.moez.QKSMS.feature.scheduled +import android.graphics.Typeface import android.os.Bundle +import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProviders +import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.moez.QKSMS.common.QkDialog import com.moez.QKSMS.common.base.QkThemedActivity +import com.moez.QKSMS.common.util.FontProvider +import com.moez.QKSMS.common.util.extensions.setBackgroundTint +import com.moez.QKSMS.common.util.extensions.setTint import dagger.android.AndroidInjection +import kotlinx.android.synthetic.main.collapsing_toolbar.* import kotlinx.android.synthetic.main.scheduled_activity.* import javax.inject.Inject + class ScheduledActivity : QkThemedActivity(), ScheduledView { @Inject lateinit var dialog: QkDialog + @Inject lateinit var fontProvider: FontProvider @Inject lateinit var messageAdapter: ScheduledMessageAdapter @Inject lateinit var viewModelFactory: ViewModelProvider.Factory override val messageClickIntent by lazy { messageAdapter.clicks } override val messageMenuIntent by lazy { dialog.adapter.menuItemClicks } + override val upgradeIntent by lazy { upgrade.clicks() } private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java] } @@ -29,15 +39,31 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { showBackButton(true) viewModel.bindView(this) + if (!prefs.systemFont.get()) { + fontProvider.getLato { lato -> + val typeface = Typeface.create(lato, Typeface.BOLD) + collapsingToolbar.setCollapsedTitleTypeface(typeface) + collapsingToolbar.setExpandedTitleTypeface(typeface) + } + } + dialog.title = getString(R.string.scheduled_options_title) dialog.adapter.setData(R.array.scheduled_options) messageAdapter.emptyView = empty messages.adapter = messageAdapter + + colors.theme().let { theme -> + upgrade.setBackgroundTint(theme.theme) + upgradeIcon.setTint(theme.textPrimary) + upgradeLabel.setTextColor(theme.textPrimary) + } } override fun render(state: ScheduledState) { messageAdapter.updateData(state.scheduledMessages) + + upgrade.isVisible = !state.upgraded } override fun showMessageOptions() { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt index 30cee059..a79c6cd4 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt @@ -4,5 +4,6 @@ import com.moez.QKSMS.model.ScheduledMessage import io.realm.RealmResults data class ScheduledState( - val scheduledMessages: RealmResults? = null + val scheduledMessages: RealmResults? = null, + val upgraded: Boolean = false ) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledView.kt index fb560389..51ddaf60 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledView.kt @@ -7,6 +7,7 @@ interface ScheduledView : QkView { val messageClickIntent: Observable val messageMenuIntent: Observable + val upgradeIntent: Observable<*> fun showMessageOptions() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt index 47071afe..bac20d0d 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt @@ -1,20 +1,30 @@ package com.moez.QKSMS.feature.scheduled +import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.androidxcompat.scope import com.moez.QKSMS.common.base.QkViewModel +import com.moez.QKSMS.common.util.BillingManager import com.moez.QKSMS.interactor.SendScheduledMessage import com.moez.QKSMS.repository.ScheduledMessageRepository import com.uber.autodispose.kotlin.autoDisposable +import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom import javax.inject.Inject class ScheduledViewModel @Inject constructor( + billingManager: BillingManager, + private val navigator: Navigator, private val scheduledMessageRepo: ScheduledMessageRepository, private val sendScheduledMessage: SendScheduledMessage ) : QkViewModel(ScheduledState( scheduledMessages = scheduledMessageRepo.getScheduledMessages() )) { + init { + disposables += billingManager.upgradeStatus + .subscribe { upgraded -> newState { copy(upgraded = upgraded) } } + } + override fun bindView(view: ScheduledView) { super.bindView(view) @@ -31,6 +41,10 @@ class ScheduledViewModel @Inject constructor( } .autoDisposable(view.scope()) .subscribe() + + view.upgradeIntent + .autoDisposable(view.scope()) + .subscribe { navigator.showQksmsPlusActivity("schedule_fab") } } } \ No newline at end of file diff --git a/presentation/src/main/res/drawable/rounded_rectangle_24dp.xml b/presentation/src/main/res/drawable/rounded_rectangle_24dp.xml new file mode 100755 index 00000000..6c362f66 --- /dev/null +++ b/presentation/src/main/res/drawable/rounded_rectangle_24dp.xml @@ -0,0 +1,27 @@ + + + + + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/collapsing_toolbar.xml b/presentation/src/main/res/layout/collapsing_toolbar.xml new file mode 100644 index 00000000..8ea01578 --- /dev/null +++ b/presentation/src/main/res/layout/collapsing_toolbar.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/qksms_plus_activity.xml b/presentation/src/main/res/layout/qksms_plus_activity.xml index 4f5b19c8..50cc773c 100644 --- a/presentation/src/main/res/layout/qksms_plus_activity.xml +++ b/presentation/src/main/res/layout/qksms_plus_activity.xml @@ -23,28 +23,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - - - - - + + android:orientation="vertical" + android:paddingTop="8dp"> + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/scheduled_activity.xml b/presentation/src/main/res/layout/scheduled_activity.xml index 37d1ab91..e3739ae9 100644 --- a/presentation/src/main/res/layout/scheduled_activity.xml +++ b/presentation/src/main/res/layout/scheduled_activity.xml @@ -17,55 +17,73 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - - + + android:text="@string/scheduled_empty_text" /> - + - + + + + + + + + android:layout_gravity="bottom" + android:background="?android:attr/divider" /> - \ No newline at end of file + \ No newline at end of file diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 490a86e5..3e4bd55e 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -136,6 +136,7 @@ Saved to gallery Scheduled + Automatically send a message, at the exact moment you\'d like Your scheduled messages will appear here Scheduled message diff --git a/presentation/src/main/res/values/styles.xml b/presentation/src/main/res/values/styles.xml index aabda93d..63188f2d 100644 --- a/presentation/src/main/res/values/styles.xml +++ b/presentation/src/main/res/values/styles.xml @@ -79,10 +79,12 @@