Convert ThemePicker Activity to Controller

This commit is contained in:
Moez Bhatti
2018-07-29 19:55:24 -04:00
parent ea55af67f6
commit 65f8e306e9
18 changed files with 260 additions and 121 deletions
@@ -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)
@@ -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
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
*/
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
}
@@ -16,9 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
*/
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
@@ -16,8 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
*/
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
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
*/
package com.moez.QKSMS.injection
package com.moez.QKSMS.injection.scope
import javax.inject.Scope
@@ -0,0 +1,24 @@
/*
* 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 com.moez.QKSMS.injection.scope
import javax.inject.Scope
@Scope
annotation class ControllerScope