forked from upstream-mirrors/quik
Break up QkActivity into QkThemedActivity and QkActivity
This commit is contained in:
@@ -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 }
|
||||
|
||||
Reference in New Issue
Block a user