diff --git a/qksms/src/main/java/presentation/common/base/QkActivity.kt b/qksms/src/main/java/presentation/common/base/QkActivity.kt index bdfb9e61..ae68bda9 100644 --- a/qksms/src/main/java/presentation/common/base/QkActivity.kt +++ b/qksms/src/main/java/presentation/common/base/QkActivity.kt @@ -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> : AppCompatActivity() { - @Inject lateinit var colors: Colors - protected abstract val viewModelClass: KClass protected val viewModel: VM by lazy { ViewModelProviders.of(this, Navigator.ViewModelFactory(intent))[viewModelClass.java] @@ -51,48 +43,6 @@ abstract class QkActivity> : 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 { diff --git a/qksms/src/main/java/presentation/common/base/QkThemedActivity.kt b/qksms/src/main/java/presentation/common/base/QkThemedActivity.kt new file mode 100644 index 00000000..74d2c2de --- /dev/null +++ b/qksms/src/main/java/presentation/common/base/QkThemedActivity.kt @@ -0,0 +1,87 @@ +/* + * 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 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> : QkActivity() { + + @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) } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt b/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt index bc5b5b04..21951a30 100644 --- a/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt +++ b/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt @@ -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(), ComposeView { +class ComposeActivity : QkThemedActivity(), ComposeView { override val viewModelClass = ComposeViewModel::class override val activityVisibleIntent: Subject = PublishSubject.create() diff --git a/qksms/src/main/java/presentation/feature/gallery/GalleryActivity.kt b/qksms/src/main/java/presentation/feature/gallery/GalleryActivity.kt index 1511450a..7c9835d6 100644 --- a/qksms/src/main/java/presentation/feature/gallery/GalleryActivity.kt +++ b/qksms/src/main/java/presentation/feature/gallery/GalleryActivity.kt @@ -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(), 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) diff --git a/qksms/src/main/java/presentation/feature/main/MainActivity.kt b/qksms/src/main/java/presentation/feature/main/MainActivity.kt index b4bceb2c..ef6523d1 100644 --- a/qksms/src/main/java/presentation/feature/main/MainActivity.kt +++ b/qksms/src/main/java/presentation/feature/main/MainActivity.kt @@ -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(), MainView { +class MainActivity : QkThemedActivity(), MainView { @Inject lateinit var navigator: Navigator @Inject lateinit var conversationsAdapter: ConversationsAdapter diff --git a/qksms/src/main/java/presentation/feature/plus/PlusActivity.kt b/qksms/src/main/java/presentation/feature/plus/PlusActivity.kt index a6d532fa..2340d531 100644 --- a/qksms/src/main/java/presentation/feature/plus/PlusActivity.kt +++ b/qksms/src/main/java/presentation/feature/plus/PlusActivity.kt @@ -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(), PlusView { +class PlusActivity : QkThemedActivity(), PlusView { @Inject lateinit var fontProvider: FontProvider diff --git a/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt b/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt index 333d437b..1aa89115 100644 --- a/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt +++ b/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt @@ -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(), SettingsView { +class SettingsActivity : QkThemedActivity(), SettingsView { @Inject lateinit var nightModeAdapter: MenuItemAdapter @Inject lateinit var mmsSizeAdapter: MenuItemAdapter diff --git a/qksms/src/main/java/presentation/feature/setup/SetupActivity.kt b/qksms/src/main/java/presentation/feature/setup/SetupActivity.kt index 7ce84b89..65a18a05 100644 --- a/qksms/src/main/java/presentation/feature/setup/SetupActivity.kt +++ b/qksms/src/main/java/presentation/feature/setup/SetupActivity.kt @@ -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(), SetupView { +class SetupActivity : QkThemedActivity(), SetupView { override val viewModelClass = SetupViewModel::class override val activityResumedIntent: Subject = PublishSubject.create() diff --git a/qksms/src/main/java/presentation/feature/themepicker/ThemePickerActivity.kt b/qksms/src/main/java/presentation/feature/themepicker/ThemePickerActivity.kt index 6807cd19..006171c5 100644 --- a/qksms/src/main/java/presentation/feature/themepicker/ThemePickerActivity.kt +++ b/qksms/src/main/java/presentation/feature/themepicker/ThemePickerActivity.kt @@ -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(), ThemePickerView { +class ThemePickerActivity : QkThemedActivity(), ThemePickerView { override val viewModelClass = ThemePickerViewModel::class override val themeSelectedIntent by lazy { themeAdapter.colorSelected }