From 65f8e306e922aee3d113f97be73873e0be034bcf Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 29 Jul 2018 19:55:24 -0400 Subject: [PATCH] Convert ThemePicker Activity to Controller --- .../moez/QKSMS/common/base/QkController.kt | 10 ++ .../feature/settings/SettingsController.kt | 34 +++--- .../feature/settings/SettingsPresenter.kt | 2 +- .../QKSMS/feature/settings/SettingsView.kt | 2 +- .../feature/settings/about/AboutController.kt | 12 +- .../themepicker/ThemePickerActivity.kt | 69 +++-------- .../themepicker/ThemePickerController.kt | 107 ++++++++++++++++++ ...erViewModel.kt => ThemePickerPresenter.kt} | 29 +++-- .../feature/themepicker/ThemePickerView.kt | 15 ++- .../injection/ThemePickerComponent.kt | 37 ++++++ .../ThemePickerModule.kt} | 17 +-- .../com/moez/QKSMS/injection/AppComponent.kt | 6 + .../com/moez/QKSMS/injection/AppModule.kt | 3 +- .../{ => android}/ActivityBuilderModule.kt | 6 +- .../BroadcastReceiverBuilderModule.kt | 3 +- .../{ => android}/ServiceBuilderModule.kt | 3 +- .../injection/{ => scope}/ActivityScope.kt | 2 +- .../QKSMS/injection/scope/ControllerScope.kt | 24 ++++ 18 files changed, 260 insertions(+), 121 deletions(-) create mode 100644 presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerController.kt rename presentation/src/main/java/com/moez/QKSMS/feature/themepicker/{ThemePickerViewModel.kt => ThemePickerPresenter.kt} (82%) create mode 100644 presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerComponent.kt rename presentation/src/main/java/com/moez/QKSMS/feature/themepicker/{ThemePickerActivityModule.kt => injection/ThemePickerModule.kt} (64%) rename presentation/src/main/java/com/moez/QKSMS/injection/{ => android}/ActivityBuilderModule.kt (95%) rename presentation/src/main/java/com/moez/QKSMS/injection/{ => android}/BroadcastReceiverBuilderModule.kt (97%) rename presentation/src/main/java/com/moez/QKSMS/injection/{ => android}/ServiceBuilderModule.kt (91%) rename presentation/src/main/java/com/moez/QKSMS/injection/{ => scope}/ActivityScope.kt (95%) create mode 100644 presentation/src/main/java/com/moez/QKSMS/injection/scope/ControllerScope.kt diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkController.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkController.kt index 1e944d04..50cbb641 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkController.kt @@ -1,7 +1,10 @@ package com.moez.QKSMS.common.base +import android.view.LayoutInflater import android.view.View +import android.view.ViewGroup import androidx.annotation.CallSuper +import androidx.annotation.LayoutRes import androidx.annotation.StringRes import androidx.appcompat.app.AppCompatActivity import com.bluelinelabs.conductor.Controller @@ -22,6 +25,13 @@ abstract class QkController, State, Present override val containerView: View? get() = view + @LayoutRes + var layoutRes: Int = 0 + + final override fun onCreateView(inflater: LayoutInflater, container: ViewGroup): View { + return inflater.inflate(layoutRes, container, false) + } + @CallSuper override fun onAttach(view: View) { super.onAttach(view) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt index b3413f3e..525e3db2 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt @@ -21,6 +21,7 @@ import com.moez.QKSMS.common.util.extensions.setBackgroundTint import com.moez.QKSMS.common.util.extensions.setVisible import com.moez.QKSMS.common.widget.PreferenceView import com.moez.QKSMS.feature.settings.about.AboutController +import com.moez.QKSMS.feature.themepicker.ThemePickerController import com.moez.QKSMS.injection.appComponent import com.moez.QKSMS.util.Preferences import com.uber.autodispose.kotlin.autoDisposable @@ -60,30 +61,27 @@ class SettingsController : QkController = (0 until preferences.childCount) @@ -168,10 +166,16 @@ class SettingsController : QkController navigator.showThemePicker() + R.id.theme -> view.showThemePicker() R.id.night -> view.showNightModeDialog() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsView.kt index ab75c5b8..0de2a6d6 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsView.kt @@ -23,7 +23,6 @@ import com.moez.QKSMS.common.widget.PreferenceView import io.reactivex.Observable interface SettingsView : QkViewContract { - fun preferenceClicks(): Observable fun viewQksmsPlusClicks(): Observable<*> fun nightModeSelected(): Observable @@ -40,5 +39,6 @@ interface SettingsView : QkViewContract { fun showTextSizePicker() fun showDelayDurationDialog() fun showMmsSizePicker() + fun showThemePicker() fun showAbout() } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutController.kt index 9655e442..9e5bf858 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutController.kt @@ -1,8 +1,6 @@ package com.moez.QKSMS.feature.settings.about -import android.view.LayoutInflater import android.view.View -import android.view.ViewGroup import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.BuildConfig import com.moez.QKSMS.R @@ -11,7 +9,6 @@ import com.moez.QKSMS.common.widget.PreferenceView import com.moez.QKSMS.injection.appComponent import io.reactivex.Observable import kotlinx.android.synthetic.main.about_activity.* -import kotlinx.android.synthetic.main.about_activity.view.* import javax.inject.Inject class AboutController : QkController(), AboutView { @@ -20,12 +17,7 @@ class AboutController : QkController(), AboutVi init { appComponent.inject(this) - } - - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup): View { - return inflater.inflate(R.layout.about_activity, container, false).apply { - version.summary = BuildConfig.VERSION_NAME - } + layoutRes = R.layout.about_activity } override fun onAttach(view: View) { @@ -33,6 +25,8 @@ class AboutController : QkController(), AboutVi presenter.bindIntents(this) setTitle(R.string.about_title) showBackButton(true) + + version.summary = BuildConfig.VERSION_NAME } override fun preferenceClicks(): Observable = (0 until preferences.childCount) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerActivity.kt index be49a9cb..4cecff51 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerActivity.kt @@ -19,73 +19,34 @@ package com.moez.QKSMS.feature.themepicker import android.os.Bundle -import androidx.lifecycle.ViewModelProvider -import androidx.lifecycle.ViewModelProviders -import androidx.recyclerview.widget.LinearLayoutManager -import com.google.android.material.snackbar.Snackbar -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.setVisible import dagger.android.AndroidInjection -import io.reactivex.subjects.PublishSubject -import io.reactivex.subjects.Subject -import kotlinx.android.synthetic.main.theme_picker_activity.* -import kotlinx.android.synthetic.main.theme_picker_hsv.* -import javax.inject.Inject +import kotlinx.android.synthetic.main.container_activity.* -class ThemePickerActivity : QkThemedActivity(), ThemePickerView { +class ThemePickerActivity : QkThemedActivity() { - @Inject lateinit var themeAdapter: ThemeAdapter - @Inject lateinit var themePagerAdapter: ThemePagerAdapter - @Inject lateinit var viewModelFactory: ViewModelProvider.Factory - - override val themeSelectedIntent by lazy { themeAdapter.colorSelected } - override val hsvThemeSelectedIntent by lazy { picker.selectedColor } - override val hsvThemeClearedIntent by lazy { clear.clicks() } - override val hsvThemeAppliedIntent by lazy { apply.clicks() } - override val viewQksmsPlusIntent: Subject = PublishSubject.create() - - private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ThemePickerViewModel::class.java] } + private lateinit var router: Router override fun onCreate(savedInstanceState: Bundle?) { AndroidInjection.inject(this) super.onCreate(savedInstanceState) - setContentView(R.layout.theme_picker_activity) - setTitle(R.string.title_theme) - showBackButton(true) - viewModel.bindView(this) + setContentView(R.layout.container_activity) - pager.offscreenPageLimit = 1 - pager.adapter = themePagerAdapter - tabs.pager = pager - - themeAdapter.data = colors.materialColors - - materialColors.layoutManager = LinearLayoutManager(this) - materialColors.adapter = themeAdapter - } - - override fun showQksmsPlusSnackbar() { - Snackbar.make(contentView, R.string.toast_qksms_plus, Snackbar.LENGTH_LONG).run { - setAction(R.string.button_more) { viewQksmsPlusIntent.onNext(Unit) } - show() + router = Conductor.attachRouter(this, container, savedInstanceState) + if (!router.hasRootController()) { + val threadId = intent.extras?.getLong("threadId") ?: 0L + router.setRoot(RouterTransaction.with(ThemePickerController(threadId))) } } - override fun render(state: ThemePickerState) { - tabs.setThreadId(state.threadId) - - hex.setText(Integer.toHexString(state.newColor).takeLast(6)) - - applyGroup.setVisible(state.applyThemeVisible) - apply.setBackgroundTint(state.newColor) - apply.setTextColor(state.newTextColor) + override fun onBackPressed() { + if (!router.handleBack()) { + super.onBackPressed() + } } - override fun setCurrentTheme(color: Int) { - picker.setColor(color) - themeAdapter.selectedColor = color - } } \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerController.kt new file mode 100644 index 00000000..c13bc1e4 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerController.kt @@ -0,0 +1,107 @@ +/* + * 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.themepicker + +import android.view.View +import androidx.recyclerview.widget.LinearLayoutManager +import com.google.android.material.snackbar.Snackbar +import com.jakewharton.rxbinding2.view.clicks +import com.moez.QKSMS.R +import com.moez.QKSMS.common.base.QkController +import com.moez.QKSMS.common.util.Colors +import com.moez.QKSMS.common.util.extensions.setBackgroundTint +import com.moez.QKSMS.common.util.extensions.setVisible +import com.moez.QKSMS.feature.themepicker.injection.ThemePickerModule +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.theme_picker_activity.* +import kotlinx.android.synthetic.main.theme_picker_hsv.* +import javax.inject.Inject + +class ThemePickerController(val threadId: Long = 0L) : QkController(), ThemePickerView { + + @Inject override lateinit var presenter: ThemePickerPresenter + + @Inject lateinit var colors: Colors + @Inject lateinit var themeAdapter: ThemeAdapter + @Inject lateinit var themePagerAdapter: ThemePagerAdapter + + private val viewQksmsPlusSubject: Subject = PublishSubject.create() + + init { + appComponent + .themePickerBuilder() + .themePickerModule(ThemePickerModule(this)) + .build() + .inject(this) + + layoutRes = R.layout.theme_picker_activity + } + + override fun onAttach(view: View) { + super.onAttach(view) + presenter.bindIntents(this) + setTitle(R.string.title_theme) + showBackButton(true) + + pager.offscreenPageLimit = 1 + pager.adapter = themePagerAdapter + tabs.pager = pager + + themeAdapter.data = colors.materialColors + + materialColors.layoutManager = LinearLayoutManager(activity) + materialColors.adapter = themeAdapter + } + + override fun showQksmsPlusSnackbar() { + Snackbar.make(contentView, R.string.toast_qksms_plus, Snackbar.LENGTH_LONG).run { + setAction(R.string.button_more) { viewQksmsPlusSubject.onNext(Unit) } + show() + } + } + + override fun themeSelected(): Observable = themeAdapter.colorSelected + + override fun hsvThemeSelected(): Observable = picker.selectedColor + + override fun clearHsvThemeClicks(): Observable<*> = clear.clicks() + + override fun applyHsvThemeClicks(): Observable<*> = apply.clicks() + + override fun viewQksmsPlusClicks(): Observable<*> = viewQksmsPlusSubject + + override fun render(state: ThemePickerState) { + tabs.setThreadId(state.threadId) + + hex.setText(Integer.toHexString(state.newColor).takeLast(6)) + + applyGroup.setVisible(state.applyThemeVisible) + apply.setBackgroundTint(state.newColor) + apply.setTextColor(state.newTextColor) + } + + override fun setCurrentTheme(color: Int) { + picker.setColor(color) + themeAdapter.selectedColor = color + } + +} \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt similarity index 82% rename from presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerViewModel.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt index 75e8cd53..7da036c2 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt @@ -20,8 +20,7 @@ package com.moez.QKSMS.feature.themepicker import com.f2prateek.rx.preferences2.Preference 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.moez.QKSMS.common.util.Colors import com.moez.QKSMS.util.Preferences @@ -31,30 +30,30 @@ import io.reactivex.rxkotlin.withLatestFrom import javax.inject.Inject import javax.inject.Named -class ThemePickerViewModel @Inject constructor( +class ThemePickerPresenter @Inject constructor( @Named("threadId") threadId: Long, + prefs: Preferences, private val billingManager: BillingManager, private val colors: Colors, - private val navigator: Navigator, - private val prefs: Preferences -) : QkViewModel(ThemePickerState(threadId = threadId)) { + private val navigator: Navigator +) : QkPresenter(ThemePickerState(threadId = threadId)) { private val theme: Preference = prefs.theme(threadId) - override fun bindView(view: ThemePickerView) { - super.bindView(view) + override fun bindIntents(view: ThemePickerView) { + super.bindIntents(view) theme.asObservable() .autoDisposable(view.scope()) .subscribe { color -> view.setCurrentTheme(color) } // Update the theme when a material theme is clicked - view.themeSelectedIntent + view.themeSelected() .autoDisposable(view.scope()) .subscribe { color -> theme.set(color) } // Update the color of the apply button - view.hsvThemeSelectedIntent + view.hsvThemeSelected() .doOnNext { color -> newState { copy(newColor = color) } } .map { color -> colors.textPrimaryOnThemeForColor(color) } .doOnNext { color -> newState { copy(newTextColor = color) } } @@ -62,13 +61,13 @@ class ThemePickerViewModel @Inject constructor( .subscribe() // Toggle the visibility of the apply group - Observables.combineLatest(theme.asObservable(), view.hsvThemeSelectedIntent) { old, new -> old != new } + Observables.combineLatest(theme.asObservable(), view.hsvThemeSelected()) { old, new -> old != new } .autoDisposable(view.scope()) .subscribe { themeChanged -> newState { copy(applyThemeVisible = themeChanged) } } // Update the theme, when apply is clicked - view.hsvThemeAppliedIntent - .withLatestFrom(view.hsvThemeSelectedIntent) { _, color -> color } + view.applyHsvThemeClicks() + .withLatestFrom(view.hsvThemeSelected()) { _, color -> color } .withLatestFrom(billingManager.upgradeStatus) { color, upgraded -> if (!upgraded) { view.showQksmsPlusSnackbar() @@ -80,12 +79,12 @@ class ThemePickerViewModel @Inject constructor( .subscribe() // Show QKSMS+ activity - view.viewQksmsPlusIntent + view.viewQksmsPlusClicks() .autoDisposable(view.scope()) .subscribe { navigator.showQksmsPlusActivity("settings_theme") } // Reset the theme - view.hsvThemeClearedIntent + view.clearHsvThemeClicks() .withLatestFrom(theme.asObservable()) { _, color -> color } .autoDisposable(view.scope()) .subscribe { color -> view.setCurrentTheme(color) } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerView.kt index 6489f0c1..a3005f01 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerView.kt @@ -18,17 +18,16 @@ */ package com.moez.QKSMS.feature.themepicker -import com.moez.QKSMS.common.base.QkView +import com.moez.QKSMS.common.base.QkViewContract import io.reactivex.Observable -import io.reactivex.subjects.Subject -interface ThemePickerView : QkView { +interface ThemePickerView : QkViewContract { - val themeSelectedIntent: Observable - val hsvThemeSelectedIntent: Observable - val hsvThemeClearedIntent: Observable<*> - val hsvThemeAppliedIntent: Observable<*> - val viewQksmsPlusIntent: Subject + fun themeSelected(): Observable + fun hsvThemeSelected(): Observable + fun clearHsvThemeClicks(): Observable<*> + fun applyHsvThemeClicks(): Observable<*> + fun viewQksmsPlusClicks(): Observable<*> fun setCurrentTheme(color: Int) fun showQksmsPlusSnackbar() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerComponent.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerComponent.kt new file mode 100644 index 00000000..6cc68455 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerComponent.kt @@ -0,0 +1,37 @@ +/* + * 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.themepicker.injection + +import com.moez.QKSMS.feature.themepicker.ThemePickerController +import com.moez.QKSMS.injection.scope.ControllerScope +import dagger.Subcomponent + +@ControllerScope +@Subcomponent(modules = [ThemePickerModule::class]) +interface ThemePickerComponent { + + fun inject(controller: ThemePickerController) + + @Subcomponent.Builder + interface Builder { + fun themePickerModule(module: ThemePickerModule): Builder + fun build(): ThemePickerComponent + } + +} \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerModule.kt similarity index 64% rename from presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerActivityModule.kt rename to presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerModule.kt index e6f3baa4..c320bdfc 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerModule.kt @@ -16,25 +16,20 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package com.moez.QKSMS.feature.themepicker +package com.moez.QKSMS.feature.themepicker.injection -import androidx.lifecycle.ViewModel -import com.moez.QKSMS.injection.ViewModelKey +import com.moez.QKSMS.feature.themepicker.ThemePickerController +import com.moez.QKSMS.injection.scope.ControllerScope import dagger.Module import dagger.Provides -import dagger.multibindings.IntoMap import javax.inject.Named @Module -class ThemePickerActivityModule { +class ThemePickerModule(private val controller: ThemePickerController) { @Provides + @ControllerScope @Named("threadId") - fun provideThreadId(activity: ThemePickerActivity): Long = activity.intent.extras?.getLong("threadId") ?: 0L - - @Provides - @IntoMap - @ViewModelKey(ThemePickerViewModel::class) - fun provideThemePickerViewModel(viewModel: ThemePickerViewModel): ViewModel = viewModel + fun provideThreadId(): Long = controller.threadId } \ No newline at end of file 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 24825ebd..26c4a9e8 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt @@ -29,7 +29,11 @@ import com.moez.QKSMS.common.widget.QkTextView import com.moez.QKSMS.feature.compose.DetailedChipView import com.moez.QKSMS.feature.settings.SettingsController import com.moez.QKSMS.feature.settings.about.AboutController +import com.moez.QKSMS.feature.themepicker.injection.ThemePickerComponent import com.moez.QKSMS.feature.widget.WidgetAdapter +import com.moez.QKSMS.injection.android.ActivityBuilderModule +import com.moez.QKSMS.injection.android.BroadcastReceiverBuilderModule +import com.moez.QKSMS.injection.android.ServiceBuilderModule import com.moez.QKSMS.util.ContactImageLoader import dagger.Component import dagger.android.support.AndroidSupportInjectionModule @@ -44,6 +48,8 @@ import javax.inject.Singleton ServiceBuilderModule::class]) interface AppComponent { + fun themePickerBuilder(): ThemePickerComponent.Builder + fun inject(application: QKApplication) fun inject(controller: AboutController) diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt index fd049ae9..84713f8d 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt @@ -26,6 +26,7 @@ import androidx.lifecycle.ViewModelProvider import com.f2prateek.rx.preferences2.RxSharedPreferences import com.moez.QKSMS.common.ViewModelFactory import com.moez.QKSMS.common.util.NotificationManagerImpl +import com.moez.QKSMS.feature.themepicker.injection.ThemePickerComponent import com.moez.QKSMS.manager.AlarmManager import com.moez.QKSMS.manager.AlarmManagerImpl import com.moez.QKSMS.manager.AnalyticsManager @@ -67,7 +68,7 @@ import dagger.Module import dagger.Provides import javax.inject.Singleton -@Module +@Module(subcomponents = [ThemePickerComponent::class]) class AppModule(private var application: Application) { @Provides diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/ActivityBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt similarity index 95% rename from presentation/src/main/java/com/moez/QKSMS/injection/ActivityBuilderModule.kt rename to presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt index 2309ef48..7fe8c7fb 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/ActivityBuilderModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package com.moez.QKSMS.injection +package com.moez.QKSMS.injection.android import com.moez.QKSMS.feature.blocked.BlockedActivity import com.moez.QKSMS.feature.blocked.BlockedActivityModule @@ -38,7 +38,7 @@ import com.moez.QKSMS.feature.scheduled.ScheduledActivity import com.moez.QKSMS.feature.scheduled.ScheduledActivityModule import com.moez.QKSMS.feature.settings.SettingsActivity import com.moez.QKSMS.feature.themepicker.ThemePickerActivity -import com.moez.QKSMS.feature.themepicker.ThemePickerActivityModule +import com.moez.QKSMS.injection.scope.ActivityScope import dagger.Module import dagger.android.ContributesAndroidInjector @@ -86,7 +86,7 @@ abstract class ActivityBuilderModule { abstract fun bindBlockedActivity(): BlockedActivity @ActivityScope - @ContributesAndroidInjector(modules = [ThemePickerActivityModule::class]) + @ContributesAndroidInjector(modules = []) abstract fun bindThemePickerActivity(): ThemePickerActivity } \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/BroadcastReceiverBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt similarity index 97% rename from presentation/src/main/java/com/moez/QKSMS/injection/BroadcastReceiverBuilderModule.kt rename to presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt index 477a7c75..a80925c0 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/BroadcastReceiverBuilderModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt @@ -16,9 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package com.moez.QKSMS.injection +package com.moez.QKSMS.injection.android import com.moez.QKSMS.feature.widget.WidgetProvider +import com.moez.QKSMS.injection.scope.ActivityScope import com.moez.QKSMS.receiver.BootReceiver import com.moez.QKSMS.receiver.DefaultSmsChangedReceiver import com.moez.QKSMS.receiver.MarkReadReceiver diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/ServiceBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt similarity index 91% rename from presentation/src/main/java/com/moez/QKSMS/injection/ServiceBuilderModule.kt rename to presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt index 0fbc0e2c..e1d73ea0 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/ServiceBuilderModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt @@ -16,8 +16,9 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package com.moez.QKSMS.injection +package com.moez.QKSMS.injection.android +import com.moez.QKSMS.injection.scope.ActivityScope import com.moez.QKSMS.service.HeadlessSmsSendService import dagger.Module import dagger.android.ContributesAndroidInjector diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/ActivityScope.kt b/presentation/src/main/java/com/moez/QKSMS/injection/scope/ActivityScope.kt similarity index 95% rename from presentation/src/main/java/com/moez/QKSMS/injection/ActivityScope.kt rename to presentation/src/main/java/com/moez/QKSMS/injection/scope/ActivityScope.kt index 00feeaaf..762f16f7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/ActivityScope.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/scope/ActivityScope.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package com.moez.QKSMS.injection +package com.moez.QKSMS.injection.scope import javax.inject.Scope diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/scope/ControllerScope.kt b/presentation/src/main/java/com/moez/QKSMS/injection/scope/ControllerScope.kt new file mode 100644 index 00000000..883a1eaa --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/injection/scope/ControllerScope.kt @@ -0,0 +1,24 @@ +/* + * 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.injection.scope + +import javax.inject.Scope + +@Scope +annotation class ControllerScope \ No newline at end of file