From b7605cd3627c896798154e31d1f9def78f82e0aa Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 22 Aug 2018 17:09:43 -0400 Subject: [PATCH] Migrate Backup screen to Conductor --- .../QKSMS/feature/backup/BackupActivity.kt | 75 ++------- .../feature/backup/BackupActivityModule.kt | 35 ---- .../QKSMS/feature/backup/BackupController.kt | 103 ++++++++++++ ...{BackupViewModel.kt => BackupPresenter.kt} | 11 +- .../moez/QKSMS/feature/backup/BackupView.kt | 4 +- .../com/moez/QKSMS/injection/AppComponent.kt | 2 + .../android/ActivityBuilderModule.kt | 3 +- .../src/main/res/layout/backup_controller.xml | 152 ++++++++---------- 8 files changed, 192 insertions(+), 193 deletions(-) delete mode 100644 presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivityModule.kt create mode 100644 presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt rename presentation/src/main/java/com/moez/QKSMS/feature/backup/{BackupViewModel.kt => BackupPresenter.kt} (87%) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt index 1da75461..65c52b3c 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt @@ -18,84 +18,35 @@ */ package com.moez.QKSMS.feature.backup -import android.app.Activity -import android.content.Intent -import android.net.Uri import android.os.Bundle -import androidx.lifecycle.ViewModelProvider -import androidx.lifecycle.ViewModelProviders -import com.jakewharton.rxbinding2.view.clicks +import com.bluelinelabs.conductor.Conductor +import com.bluelinelabs.conductor.Router +import com.bluelinelabs.conductor.RouterTransaction import com.moez.QKSMS.R import com.moez.QKSMS.common.base.QkThemedActivity -import com.moez.QKSMS.common.util.extensions.setBackgroundTint -import com.moez.QKSMS.common.util.extensions.setTint import dagger.android.AndroidInjection -import io.reactivex.Observable -import io.reactivex.subjects.PublishSubject -import io.reactivex.subjects.Subject -import kotlinx.android.synthetic.main.backup_controller.* -import javax.inject.Inject +import kotlinx.android.synthetic.main.container_activity.* -class BackupActivity : QkThemedActivity(), BackupView { +class BackupActivity : QkThemedActivity() { - companion object { - private const val REQUEST_CODE = 427 - } - - @Inject lateinit var viewModelFactory: ViewModelProvider.Factory - - private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[BackupViewModel::class.java] } - - private val restoreFileSubject: Subject = PublishSubject.create() + private lateinit var router: Router override fun onCreate(savedInstanceState: Bundle?) { AndroidInjection.inject(this) super.onCreate(savedInstanceState) - setContentView(R.layout.backup_controller) - setTitle(R.string.backup_title) - showBackButton(true) - viewModel.bindView(this) + setContentView(R.layout.container_activity) - colors.theme().let { theme -> - fab.setBackgroundTint(theme.theme) - fabIcon.setTint(theme.textPrimary) - fabLabel.setTextColor(theme.textPrimary) + router = Conductor.attachRouter(this, container, savedInstanceState) + if (!router.hasRootController()) { + router.setRoot(RouterTransaction.with(BackupController())) } } - override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { - super.onActivityResult(requestCode, resultCode, data) - - if (requestCode == REQUEST_CODE && resultCode == Activity.RESULT_OK) { - data?.data?.run(restoreFileSubject::onNext) + override fun onBackPressed() { + if (!router.handleBack()) { + super.onBackPressed() } } - override fun render(state: BackupState) { - restore.isEnabled = state.upgraded - - fabIcon.setImageResource(when (state.upgraded) { - true -> R.drawable.ic_file_upload_black_24dp - false -> R.drawable.ic_star_black_24dp - }) - - fabLabel.setText(when (state.upgraded) { - true -> R.string.backup_now - false -> R.string.title_qksms_plus - }) - } - - override fun restoreClicks(): Observable<*> = restore.clicks() - - override fun restoreFileSelected(): Observable = restoreFileSubject - - override fun fabClicks(): Observable<*> = fab.clicks() - - override fun selectFile() { - val intent = Intent(Intent.ACTION_GET_CONTENT) - intent.type = "*/*" - startActivityForResult(Intent.createChooser(intent, "Choose directory"), REQUEST_CODE) - } - } \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivityModule.kt deleted file mode 100644 index 3b5e6d41..00000000 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivityModule.kt +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2017 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ -package com.moez.QKSMS.feature.backup - -import androidx.lifecycle.ViewModel -import com.moez.QKSMS.injection.ViewModelKey -import dagger.Module -import dagger.Provides -import dagger.multibindings.IntoMap - -@Module -class BackupActivityModule { - - @Provides - @IntoMap - @ViewModelKey(BackupViewModel::class) - fun providePlusViewModel(viewModel: BackupViewModel): ViewModel = viewModel - -} \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt new file mode 100644 index 00000000..e51a5252 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupController.kt @@ -0,0 +1,103 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package com.moez.QKSMS.feature.backup + +import android.app.Activity +import android.content.Intent +import android.net.Uri +import android.view.View +import com.jakewharton.rxbinding2.view.clicks +import com.moez.QKSMS.R +import com.moez.QKSMS.common.base.QkController +import com.moez.QKSMS.common.util.extensions.setBackgroundTint +import com.moez.QKSMS.common.util.extensions.setTint +import com.moez.QKSMS.injection.appComponent +import io.reactivex.Observable +import io.reactivex.subjects.PublishSubject +import io.reactivex.subjects.Subject +import kotlinx.android.synthetic.main.backup_controller.* +import javax.inject.Inject + +class BackupController : QkController(), BackupView { + + companion object { + private const val REQUEST_CODE = 427 + } + + @Inject override lateinit var presenter: BackupPresenter + + private val restoreFileSubject: Subject = PublishSubject.create() + + init { + appComponent.inject(this) + layoutRes = R.layout.backup_controller + } + + override fun onAttach(view: View) { + super.onAttach(view) + presenter.bindIntents(this) + setTitle(R.string.backup_title) + showBackButton(true) + } + + override fun onViewCreated() { + super.onViewCreated() + + themedActivity?.colors?.theme()?.let { theme -> + fab.setBackgroundTint(theme.theme) + fabIcon.setTint(theme.textPrimary) + fabLabel.setTextColor(theme.textPrimary) + } + } + + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + super.onActivityResult(requestCode, resultCode, data) + + if (requestCode == REQUEST_CODE && resultCode == Activity.RESULT_OK) { + data?.data?.run(restoreFileSubject::onNext) + } + } + + override fun render(state: BackupState) { + restore.isEnabled = state.upgraded + + fabIcon.setImageResource(when (state.upgraded) { + true -> R.drawable.ic_file_upload_black_24dp + false -> R.drawable.ic_star_black_24dp + }) + + fabLabel.setText(when (state.upgraded) { + true -> R.string.backup_now + false -> R.string.title_qksms_plus + }) + } + + override fun restoreClicks(): Observable<*> = restore.clicks() + + override fun restoreFileSelected(): Observable = restoreFileSubject + + override fun fabClicks(): Observable<*> = fab.clicks() + + override fun selectFile() { + val intent = Intent(Intent.ACTION_GET_CONTENT) + intent.type = "*/*" + startActivityForResult(Intent.createChooser(intent, null), REQUEST_CODE) + } + +} \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt similarity index 87% rename from presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupViewModel.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt index 4169d834..c1a59297 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt @@ -19,26 +19,25 @@ package com.moez.QKSMS.feature.backup 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.base.QkPresenter import com.moez.QKSMS.common.util.BillingManager import com.uber.autodispose.kotlin.autoDisposable import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom import javax.inject.Inject -class BackupViewModel @Inject constructor( +class BackupPresenter @Inject constructor( private val billingManager: BillingManager, private val navigator: Navigator -) : QkViewModel(BackupState()) { +) : QkPresenter(BackupState()) { init { disposables += billingManager.upgradeStatus .subscribe { upgraded -> newState { copy(upgraded = upgraded) } } } - override fun bindView(view: BackupView) { - super.bindView(view) + override fun bindIntents(view: BackupView) { + super.bindIntents(view) view.restoreClicks() .autoDisposable(view.scope()) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupView.kt index 6b6809bc..6a760f94 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupView.kt @@ -19,10 +19,10 @@ package com.moez.QKSMS.feature.backup import android.net.Uri -import com.moez.QKSMS.common.base.QkView +import com.moez.QKSMS.common.base.QkViewContract import io.reactivex.Observable -interface BackupView : QkView { +interface BackupView : QkViewContract { fun restoreClicks(): Observable<*> fun restoreFileSelected(): Observable diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt index a618b54a..177e80a5 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt @@ -26,6 +26,7 @@ import com.moez.QKSMS.common.widget.PreferenceView import com.moez.QKSMS.common.widget.QkEditText import com.moez.QKSMS.common.widget.QkSwitch import com.moez.QKSMS.common.widget.QkTextView +import com.moez.QKSMS.feature.backup.BackupController import com.moez.QKSMS.feature.compose.DetailedChipView import com.moez.QKSMS.feature.conversationinfo.injection.ConversationInfoComponent import com.moez.QKSMS.feature.settings.SettingsController @@ -56,6 +57,7 @@ interface AppComponent { fun inject(application: QKApplication) fun inject(controller: AboutController) + fun inject(controller: BackupController) fun inject(controller: SettingsController) fun inject(controller: SwipeActionsController) diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt index b89740b0..926b3cdc 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt @@ -19,7 +19,6 @@ package com.moez.QKSMS.injection.android import com.moez.QKSMS.feature.backup.BackupActivity -import com.moez.QKSMS.feature.backup.BackupActivityModule import com.moez.QKSMS.feature.blocked.BlockedActivity import com.moez.QKSMS.feature.blocked.BlockedActivityModule import com.moez.QKSMS.feature.compose.ComposeActivity @@ -54,7 +53,7 @@ abstract class ActivityBuilderModule { abstract fun bindPlusActivity(): PlusActivity @ActivityScope - @ContributesAndroidInjector(modules = [BackupActivityModule::class]) + @ContributesAndroidInjector(modules = []) abstract fun bindBackupActivity(): BackupActivity @ActivityScope diff --git a/presentation/src/main/res/layout/backup_controller.xml b/presentation/src/main/res/layout/backup_controller.xml index de9d8685..0a2de0bc 100644 --- a/presentation/src/main/res/layout/backup_controller.xml +++ b/presentation/src/main/res/layout/backup_controller.xml @@ -17,106 +17,86 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - + android:layout_height="match_parent"> - - - - - - - - - - - - - - - - - - - + android:layout_height="match_parent" + android:paddingBottom="8dp" + android:paddingTop="8dp"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> - + + + + + + android:layout_margin="24dp" + android:text="@string/backup_disclaimer" + android:textColor="?android:attr/textColorTertiary" + app:textSize="secondary" /> - + - + - + - \ No newline at end of file + + + + + \ No newline at end of file