Break up QkActivity into QkThemedActivity and QkActivity

This commit is contained in:
Moez Bhatti
2018-02-13 19:18:46 -05:00
parent e48a43edd5
commit a51b0af779
9 changed files with 99 additions and 64 deletions
@@ -19,27 +19,19 @@
package presentation.common.base
import android.annotation.SuppressLint
import android.arch.lifecycle.Lifecycle
import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import android.view.Menu
import android.view.MenuItem
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
import common.util.Colors
import io.reactivex.rxkotlin.Observables
import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.toolbar.*
import presentation.common.Navigator
import javax.inject.Inject
import kotlin.reflect.KClass
abstract class QkActivity<VM : QkViewModel<*, *>> : AppCompatActivity() {
@Inject lateinit var colors: Colors
protected abstract val viewModelClass: KClass<VM>
protected val viewModel: VM by lazy {
ViewModelProviders.of(this, Navigator.ViewModelFactory(intent))[viewModelClass.java]
@@ -51,48 +43,6 @@ abstract class QkActivity<VM : QkViewModel<*, *>> : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
onNewIntent(intent)
colors.appThemeResources
.autoDisposable(scope())
.subscribe { res -> setTheme(res) }
colors.statusBarIcons
.autoDisposable(scope())
.subscribe { systemUiVisibility -> window.decorView.systemUiVisibility = systemUiVisibility }
colors.statusBar
.autoDisposable(scope())
.subscribe { color -> window.statusBarColor = color }
}
override fun onPostCreate(savedInstanceState: Bundle?) {
super.onPostCreate(savedInstanceState)
// Update the colours of the menu items
Observables.combineLatest(menu, colors.theme, { menu, color ->
(0 until menu.size())
.map { position -> menu.getItem(position) }
.forEach { menuItem ->
menuItem?.icon?.run {
setTint(color)
menuItem.icon = this
}
}
}).autoDisposable(scope(Lifecycle.Event.ON_DESTROY)).subscribe()
colors.textTertiary
.doOnNext { color -> toolbar?.overflowIcon = toolbar?.overflowIcon?.apply { setTint(color) } }
.doOnNext { color -> toolbar?.navigationIcon = toolbar?.navigationIcon?.apply { setTint(color) } }
.autoDisposable(scope(Lifecycle.Event.ON_DESTROY))
.subscribe()
colors.popupThemeResource
.autoDisposable(scope(Lifecycle.Event.ON_DESTROY))
.subscribe { res -> toolbar?.popupTheme = res }
colors.toolbarColor
.autoDisposable(scope(Lifecycle.Event.ON_DESTROY))
.subscribe { color -> toolbar?.setBackgroundColor(color) }
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -0,0 +1,87 @@
/*
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
*
* 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 <http://www.gnu.org/licenses/>.
*/
package presentation.common.base
import android.annotation.SuppressLint
import android.arch.lifecycle.Lifecycle
import android.os.Bundle
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
import common.util.Colors
import io.reactivex.rxkotlin.Observables
import kotlinx.android.synthetic.main.toolbar.*
import javax.inject.Inject
/**
* Base activity that automatically applies any necessary theme theme settings and colors
*
* In most cases, this should be used instead of the base QkActivity, except for when
* an activity does not depend on the theme
*/
abstract class QkThemedActivity<VM : QkViewModel<*, *>> : QkActivity<VM>() {
@Inject lateinit var colors: Colors
@SuppressLint("InlinedApi")
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
colors.appThemeResources
.autoDisposable(scope())
.subscribe { res -> setTheme(res) }
colors.statusBarIcons
.autoDisposable(scope())
.subscribe { systemUiVisibility -> window.decorView.systemUiVisibility = systemUiVisibility }
colors.statusBar
.autoDisposable(scope())
.subscribe { color -> window.statusBarColor = color }
}
override fun onPostCreate(savedInstanceState: Bundle?) {
super.onPostCreate(savedInstanceState)
// Update the colours of the menu items
Observables.combineLatest(menu, colors.theme, { menu, color ->
(0 until menu.size())
.map { position -> menu.getItem(position) }
.forEach { menuItem ->
menuItem?.icon?.run {
setTint(color)
menuItem.icon = this
}
}
}).autoDisposable(scope(Lifecycle.Event.ON_DESTROY)).subscribe()
colors.textTertiary
.doOnNext { color -> toolbar?.overflowIcon = toolbar?.overflowIcon?.apply { setTint(color) } }
.doOnNext { color -> toolbar?.navigationIcon = toolbar?.navigationIcon?.apply { setTint(color) } }
.autoDisposable(scope(Lifecycle.Event.ON_DESTROY))
.subscribe()
colors.popupThemeResource
.autoDisposable(scope(Lifecycle.Event.ON_DESTROY))
.subscribe { res -> toolbar?.popupTheme = res }
colors.toolbarColor
.autoDisposable(scope(Lifecycle.Event.ON_DESTROY))
.subscribe { color -> toolbar?.setBackgroundColor(color) }
}
}
@@ -47,11 +47,11 @@ import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.compose_activity.*
import kotlinx.android.synthetic.main.toolbar_chips.*
import presentation.common.base.QkActivity
import presentation.common.base.QkThemedActivity
import javax.inject.Inject
class ComposeActivity : QkActivity<ComposeViewModel>(), ComposeView {
class ComposeActivity : QkThemedActivity<ComposeViewModel>(), ComposeView {
override val viewModelClass = ComposeViewModel::class
override val activityVisibleIntent: Subject<Boolean> = PublishSubject.create()
@@ -21,7 +21,6 @@ package presentation.feature.gallery
import android.os.Bundle
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
import common.di.appComponent
import common.util.GlideApp
import common.util.extensions.setVisible
import kotlinx.android.synthetic.main.gallery_activity.*
@@ -33,7 +32,6 @@ class GalleryActivity : QkActivity<GalleryViewModel>(), GalleryView {
override val screenTouchedIntent by lazy { image.clicks() }
override fun onCreate(savedInstanceState: Bundle?) {
appComponent.inject(this)
super.onCreate(savedInstanceState)
setContentView(R.layout.gallery_activity)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
@@ -50,12 +50,12 @@ import kotlinx.android.synthetic.main.main_activity.*
import kotlinx.android.synthetic.main.toolbar_search.*
import presentation.common.MenuItemAdapter
import presentation.common.Navigator
import presentation.common.base.QkActivity
import presentation.common.base.QkThemedActivity
import presentation.feature.conversations.ConversationItemTouchCallback
import presentation.feature.conversations.ConversationsAdapter
import javax.inject.Inject
class MainActivity : QkActivity<MainViewModel>(), MainView {
class MainActivity : QkThemedActivity<MainViewModel>(), MainView {
@Inject lateinit var navigator: Navigator
@Inject lateinit var conversationsAdapter: ConversationsAdapter
@@ -31,10 +31,10 @@ import common.util.extensions.setBackgroundTint
import common.util.extensions.setTint
import common.util.extensions.setVisible
import kotlinx.android.synthetic.main.qksms_plus_activity.*
import presentation.common.base.QkActivity
import presentation.common.base.QkThemedActivity
import javax.inject.Inject
class PlusActivity : QkActivity<PlusViewModel>(), PlusView {
class PlusActivity : QkThemedActivity<PlusViewModel>(), PlusView {
@Inject lateinit var fontProvider: FontProvider
@@ -43,11 +43,11 @@ import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.settings_activity.*
import kotlinx.android.synthetic.main.settings_switch_widget.view.*
import presentation.common.MenuItemAdapter
import presentation.common.base.QkActivity
import presentation.common.base.QkThemedActivity
import presentation.common.widget.PreferenceView
import javax.inject.Inject
class SettingsActivity : QkActivity<SettingsViewModel>(), SettingsView {
class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
@Inject lateinit var nightModeAdapter: MenuItemAdapter
@Inject lateinit var mmsSizeAdapter: MenuItemAdapter
@@ -30,10 +30,10 @@ import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.setup_activity.*
import presentation.common.Navigator
import presentation.common.base.QkActivity
import presentation.common.base.QkThemedActivity
import javax.inject.Inject
class SetupActivity : QkActivity<SetupViewModel>(), SetupView {
class SetupActivity : QkThemedActivity<SetupViewModel>(), SetupView {
override val viewModelClass = SetupViewModel::class
override val activityResumedIntent: Subject<Unit> = PublishSubject.create()
@@ -26,10 +26,10 @@ import com.uber.autodispose.kotlin.autoDisposable
import common.di.appComponent
import common.util.extensions.pageScrolled
import kotlinx.android.synthetic.main.theme_picker_activity.*
import presentation.common.base.QkActivity
import presentation.common.base.QkThemedActivity
import javax.inject.Inject
class ThemePickerActivity : QkActivity<ThemePickerViewModel>(), ThemePickerView {
class ThemePickerActivity : QkThemedActivity<ThemePickerViewModel>(), ThemePickerView {
override val viewModelClass = ThemePickerViewModel::class
override val themeSelectedIntent by lazy { themeAdapter.colorSelected }