Use constructor injection for ViewModels

This commit is contained in:
Moez Bhatti
2018-05-11 03:36:40 -04:00
parent 697f665674
commit bf8cab3c8b
45 changed files with 532 additions and 308 deletions
@@ -20,8 +20,6 @@ package common
import android.app.Activity
import android.app.ActivityOptions
import android.arch.lifecycle.ViewModel
import android.arch.lifecycle.ViewModelProvider
import android.content.ActivityNotFoundException
import android.content.Context
import android.content.Intent
@@ -33,25 +31,14 @@ import android.provider.Telephony
import android.view.View
import com.moez.QKSMS.BuildConfig
import feature.blocked.BlockedActivity
import feature.blocked.BlockedViewModel
import feature.compose.ComposeActivity
import feature.compose.ComposeViewModel
import feature.conversationinfo.ConversationInfoActivity
import feature.conversationinfo.ConversationInfoViewModel
import feature.gallery.GalleryActivity
import feature.gallery.GalleryViewModel
import feature.main.MainViewModel
import feature.notificationprefs.NotificationPrefsActivity
import feature.notificationprefs.NotificationPrefsViewModel
import feature.plus.PlusActivity
import feature.plus.PlusViewModel
import feature.qkreply.QkReplyViewModel
import feature.settings.SettingsActivity
import feature.settings.SettingsViewModel
import feature.settings.about.AboutActivity
import feature.settings.about.AboutViewModel
import feature.themepicker.ThemePickerActivity
import feature.themepicker.ThemePickerViewModel
import manager.NotificationManager
import javax.inject.Inject
import javax.inject.Singleton
@@ -248,25 +235,4 @@ class Navigator @Inject constructor(private val context: Context, private val no
}
}
class ViewModelFactory(private val intent: Intent) : ViewModelProvider.Factory {
@Suppress("UNCHECKED_CAST")
override fun <T : ViewModel?> create(modelClass: Class<T>): T {
return when (modelClass) {
MainViewModel::class.java -> MainViewModel()
PlusViewModel::class.java -> PlusViewModel()
AboutViewModel::class.java -> AboutViewModel()
ComposeViewModel::class.java -> ComposeViewModel(intent)
ConversationInfoViewModel::class.java -> ConversationInfoViewModel(intent)
GalleryViewModel::class.java -> GalleryViewModel(intent)
NotificationPrefsViewModel::class.java -> NotificationPrefsViewModel(intent)
QkReplyViewModel::class.java -> QkReplyViewModel(intent)
SettingsViewModel::class.java -> SettingsViewModel()
BlockedViewModel::class.java -> BlockedViewModel()
ThemePickerViewModel::class.java -> ThemePickerViewModel(intent)
else -> throw IllegalArgumentException("Invalid ViewModel class. If this is a new ViewModel, please add it to Navigator.kt")
} as T
}
}
}
@@ -18,6 +18,7 @@ package common
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
*/
import android.app.Activity
import android.app.Application
import android.support.text.emoji.EmojiCompat
import android.support.text.emoji.FontRequestEmojiCompatConfig
@@ -27,6 +28,9 @@ import com.bugsnag.android.Configuration
import com.moez.QKSMS.BuildConfig
import com.moez.QKSMS.R
import common.util.NightModeManager
import dagger.android.AndroidInjector
import dagger.android.DispatchingAndroidInjector
import dagger.android.HasActivityInjector
import injection.AppComponentManager
import injection.appComponent
import io.realm.Realm
@@ -36,7 +40,7 @@ import migration.QkRealmMigration
import timber.log.Timber
import javax.inject.Inject
class QKApplication : Application() {
class QKApplication : Application(), HasActivityInjector {
/**
* Inject this so that it is forced to initialize
@@ -44,6 +48,7 @@ class QKApplication : Application() {
@Suppress("unused")
@Inject lateinit var analyticsManager: AnalyticsManager
@Inject lateinit var dispatchingAndroidInjector: DispatchingAndroidInjector<Activity>
@Inject lateinit var nightModeManager: NightModeManager
override fun onCreate() {
@@ -76,4 +81,8 @@ class QKApplication : Application() {
Timber.plant(Timber.DebugTree())
}
override fun activityInjector(): AndroidInjector<Activity> {
return dispatchingAndroidInjector
}
}
@@ -0,0 +1,12 @@
package common
import android.arch.lifecycle.ViewModel
import android.arch.lifecycle.ViewModelProvider
import javax.inject.Inject
import javax.inject.Provider
class ViewModelFactory @Inject constructor(private val viewModels: MutableMap<Class<out ViewModel>, Provider<ViewModel>>) : ViewModelProvider.Factory {
override fun <T : ViewModel> create(modelClass: Class<T>): T = viewModels[modelClass]?.get() as T
}
@@ -19,23 +19,15 @@
package common.base
import android.annotation.SuppressLint
import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import android.view.Menu
import android.view.MenuItem
import common.Navigator
import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.toolbar.*
import kotlin.reflect.KClass
abstract class QkActivity<VM : QkViewModel<*, *>> : AppCompatActivity() {
protected abstract val viewModelClass: KClass<VM>
protected val viewModel: VM by lazy {
ViewModelProviders.of(this, Navigator.ViewModelFactory(intent))[viewModelClass.java]
}
abstract class QkActivity : AppCompatActivity() {
protected val menu: Subject<Menu> = BehaviorSubject.create()
@@ -40,7 +40,7 @@ import javax.inject.Inject
* 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>() {
abstract class QkThemedActivity : QkActivity() {
@Inject lateinit var colors: Colors
@@ -19,33 +19,34 @@
package feature.blocked
import android.app.AlertDialog
import android.arch.lifecycle.ViewModelProvider
import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
import common.base.QkThemedActivity
import injection.appComponent
import dagger.android.AndroidInjection
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.blocked_activity.*
import kotlinx.android.synthetic.main.settings_switch_widget.view.*
import javax.inject.Inject
class BlockedActivity : QkThemedActivity<BlockedViewModel>(), BlockedView {
class BlockedActivity : QkThemedActivity(), BlockedView {
@Inject lateinit var blockedAdapter: BlockedAdapter
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
override val viewModelClass = BlockedViewModel::class
override val siaClickedIntent by lazy { shouldIAnswer.clicks() }
override val unblockIntent by lazy { blockedAdapter.unblock }
override val confirmUnblockIntent: Subject<Unit> = PublishSubject.create()
init {
appComponent.inject(this)
}
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[BlockedViewModel::class.java] }
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
super.onCreate(savedInstanceState)
setContentView(R.layout.blocked_activity)
setTitle(R.string.blocked_title)
@@ -0,0 +1,17 @@
package feature.blocked
import android.arch.lifecycle.ViewModel
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
import injection.ViewModelKey
@Module
class BlockedActivityModule {
@Provides
@IntoMap
@ViewModelKey(BlockedViewModel::class)
fun provideBlockedViewModel(viewModel: BlockedViewModel): ViewModel = viewModel
}
@@ -23,7 +23,6 @@ import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
import common.Navigator
import common.base.QkViewModel
import injection.appComponent
import interactor.MarkUnblocked
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.rxkotlin.withLatestFrom
@@ -32,17 +31,15 @@ import util.Preferences
import util.tryOrNull
import javax.inject.Inject
class BlockedViewModel : QkViewModel<BlockedView, BlockedState>(BlockedState()) {
@Inject lateinit var context: Context
@Inject lateinit var markUnblocked: MarkUnblocked
@Inject lateinit var messageRepo: MessageRepository
@Inject lateinit var navigator: Navigator
@Inject lateinit var prefs: Preferences
class BlockedViewModel @Inject constructor(
private val context: Context,
private val markUnblocked: MarkUnblocked,
private val messageRepo: MessageRepository,
private val navigator: Navigator,
private val prefs: Preferences
) : QkViewModel<BlockedView, BlockedState>(BlockedState()) {
init {
appComponent.inject(this)
newState { it.copy(data = messageRepo.getBlockedConversations()) }
disposables += prefs.sia.asObservable()
@@ -18,6 +18,8 @@
*/
package feature.compose
import android.arch.lifecycle.ViewModelProvider
import android.arch.lifecycle.ViewModelProviders
import android.content.res.ColorStateList
import android.graphics.PorterDuff
import android.os.Bundle
@@ -36,7 +38,7 @@ import common.util.extensions.setBackgroundTint
import common.util.extensions.setTint
import common.util.extensions.setVisible
import common.util.extensions.showKeyboard
import injection.appComponent
import dagger.android.AndroidInjection
import io.reactivex.Observable
import io.reactivex.rxkotlin.Observables
import io.reactivex.subjects.PublishSubject
@@ -46,9 +48,14 @@ import model.Contact
import model.Message
import javax.inject.Inject
class ComposeActivity : QkThemedActivity<ComposeViewModel>(), ComposeView {
class ComposeActivity : QkThemedActivity(), ComposeView {
@Inject lateinit var attachmentAdapter: AttachmentAdapter
@Inject lateinit var chipsAdapter: ChipsAdapter
@Inject lateinit var contactsAdapter: ContactAdapter
@Inject lateinit var messageAdapter: MessagesAdapter
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
override val viewModelClass = ComposeViewModel::class
override val activityVisibleIntent: Subject<Boolean> = PublishSubject.create()
override val queryChangedIntent: Observable<CharSequence> by lazy { chipsAdapter.textChanges }
override val queryBackspaceIntent: Observable<*> by lazy { chipsAdapter.backspaces }
@@ -69,16 +76,10 @@ class ComposeActivity : QkThemedActivity<ComposeViewModel>(), ComposeView {
override val sendIntent by lazy { send.clicks() }
override val backPressedIntent: Subject<Unit> = PublishSubject.create()
@Inject lateinit var chipsAdapter: ChipsAdapter
@Inject lateinit var contactsAdapter: ContactAdapter
@Inject lateinit var messageAdapter: MessagesAdapter
@Inject lateinit var attachmentAdapter: AttachmentAdapter
init {
appComponent.inject(this)
}
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ComposeViewModel::class.java] }
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
super.onCreate(savedInstanceState)
setContentView(R.layout.compose_activity)
showBackButton(true)
@@ -0,0 +1,21 @@
package feature.compose
import android.arch.lifecycle.ViewModel
import android.content.Intent
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
import injection.ViewModelKey
@Module
class ComposeActivityModule {
@Provides
fun provideIntent(activity: ComposeActivity): Intent = activity.intent
@Provides
@IntoMap
@ViewModelKey(ComposeViewModel::class)
fun provideComposeViewModel(viewModel: ComposeViewModel): ViewModel = viewModel
}
@@ -34,7 +34,6 @@ import common.base.QkViewModel
import common.util.ClipboardUtils
import common.util.extensions.makeToast
import common.util.filter.ContactFilter
import injection.appComponent
import interactor.CancelDelayedMessage
import interactor.ContactSync
import interactor.DeleteMessages
@@ -65,20 +64,22 @@ import java.net.URLDecoder
import java.util.*
import java.util.concurrent.TimeUnit
import javax.inject.Inject
import javax.inject.Named
class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(ComposeState()) {
@Inject lateinit var context: Context
@Inject lateinit var cancelMessage: CancelDelayedMessage
@Inject lateinit var contactFilter: ContactFilter
@Inject lateinit var contactsRepo: ContactRepository
@Inject lateinit var messageRepo: MessageRepository
@Inject lateinit var navigator: Navigator
@Inject lateinit var syncContacts: ContactSync
@Inject lateinit var sendMessage: SendMessage
@Inject lateinit var retrySending: RetrySending
@Inject lateinit var markRead: MarkRead
@Inject lateinit var deleteMessages: DeleteMessages
class ComposeViewModel @Inject constructor(
private val intent: Intent,
private val context: Context,
private val cancelMessage: CancelDelayedMessage,
private val contactFilter: ContactFilter,
private val contactsRepo: ContactRepository,
private val messageRepo: MessageRepository,
private val navigator: Navigator,
private val syncContacts: ContactSync,
private val sendMessage: SendMessage,
private val retrySending: RetrySending,
private val markRead: MarkRead,
private val deleteMessages: DeleteMessages
) : QkViewModel<ComposeView, ComposeState>(ComposeState()) {
private var sharedText: String = ""
private val attachments: Subject<List<Attachment>> = BehaviorSubject.createDefault(ArrayList())
@@ -89,8 +90,6 @@ class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(
private val messages: Subject<List<Message>> = BehaviorSubject.create()
init {
appComponent.inject(this)
sharedText = intent.extras?.getString(Intent.EXTRA_TEXT) ?: ""
// If there are any image attachments, we'll set those as the initial attachments for the
@@ -18,6 +18,8 @@
*/
package feature.conversationinfo
import android.arch.lifecycle.ViewModelProvider
import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle
import android.support.v7.app.AlertDialog
import com.jakewharton.rxbinding2.view.clicks
@@ -27,14 +29,19 @@ import com.uber.autodispose.kotlin.autoDisposable
import common.Navigator
import common.base.QkThemedActivity
import common.util.extensions.setVisible
import injection.appComponent
import dagger.android.AndroidInjection
import io.reactivex.subjects.PublishSubject
import kotlinx.android.synthetic.main.conversation_info_activity.*
import javax.inject.Inject
class ConversationInfoActivity : QkThemedActivity<ConversationInfoViewModel>(), ConversationInfoView {
class ConversationInfoActivity : QkThemedActivity(), ConversationInfoView {
@Inject lateinit var navigator: Navigator
@Inject lateinit var recipientAdapter: ConversationRecipientAdapter
@Inject lateinit var mediaAdapter: ConversationMediaAdapter
@Inject lateinit var itemDecoration: GridSpacingItemDecoration
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
override val viewModelClass = ConversationInfoViewModel::class
override val notificationsIntent by lazy { notifications.clicks() }
override val themeIntent by lazy { themePrefs.clicks() }
override val archiveIntent by lazy { archive.clicks() }
@@ -42,16 +49,10 @@ class ConversationInfoActivity : QkThemedActivity<ConversationInfoViewModel>(),
override val deleteIntent by lazy { delete.clicks() }
override val confirmDeleteIntent: PublishSubject<Unit> = PublishSubject.create()
@Inject lateinit var navigator: Navigator
@Inject lateinit var recipientAdapter: ConversationRecipientAdapter
@Inject lateinit var mediaAdapter: ConversationMediaAdapter
@Inject lateinit var itemDecoration: GridSpacingItemDecoration
init {
appComponent.inject(this)
}
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ConversationInfoViewModel::class.java] }
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
super.onCreate(savedInstanceState)
setContentView(R.layout.conversation_info_activity)
showBackButton(true)
@@ -0,0 +1,21 @@
package feature.conversationinfo
import android.arch.lifecycle.ViewModel
import android.content.Intent
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
import injection.ViewModelKey
@Module
class ConversationInfoActivityModule {
@Provides
fun provideIntent(activity: ConversationInfoActivity): Intent = activity.intent
@Provides
@IntoMap
@ViewModelKey(ConversationInfoViewModel::class)
fun provideConversationInfoViewModel(viewModel: ConversationInfoViewModel): ViewModel = viewModel
}
@@ -18,13 +18,11 @@
*/
package feature.conversationinfo
import android.content.Context
import android.content.Intent
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
import common.Navigator
import common.base.QkViewModel
import injection.appComponent
import interactor.DeleteConversations
import interactor.MarkArchived
import interactor.MarkBlocked
@@ -38,22 +36,21 @@ import repository.MessageRepository
import util.extensions.asObservable
import javax.inject.Inject
class ConversationInfoViewModel(intent: Intent) : QkViewModel<ConversationInfoView,
ConversationInfoState>(ConversationInfoState()) {
class ConversationInfoViewModel @Inject constructor(
private val intent: Intent,
private val messageRepo: MessageRepository,
private val markArchived: MarkArchived,
private val markUnarchived: MarkUnarchived,
private val markBlocked: MarkBlocked,
private val markUnblocked: MarkUnblocked,
private val navigator: Navigator,
private val deleteConversations: DeleteConversations
) : QkViewModel<ConversationInfoView, ConversationInfoState>(ConversationInfoState()) {
@Inject lateinit var context: Context
@Inject lateinit var messageRepo: MessageRepository
@Inject lateinit var markArchived: MarkArchived
@Inject lateinit var markUnarchived: MarkUnarchived
@Inject lateinit var markBlocked: MarkBlocked
@Inject lateinit var markUnblocked: MarkUnblocked
@Inject lateinit var navigator: Navigator
@Inject lateinit var deleteConversations: DeleteConversations
private val conversation: Observable<Conversation>
init {
appComponent.inject(this)
val threadId = intent.extras?.getLong("threadId") ?: 0L
newState { it.copy(threadId = threadId) }
@@ -18,6 +18,8 @@
*/
package feature.gallery
import android.arch.lifecycle.ViewModelProvider
import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle
import android.transition.ChangeBounds
import android.transition.ChangeImageTransform
@@ -30,17 +32,23 @@ import common.GlideCompletionListener
import common.base.QkActivity
import common.util.GlideApp
import common.util.extensions.setVisible
import dagger.android.AndroidInjection
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.gallery_activity.*
import javax.inject.Inject
class GalleryActivity : QkActivity<GalleryViewModel>(), GalleryView {
class GalleryActivity : QkActivity(), GalleryView {
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
override val viewModelClass = GalleryViewModel::class
override val screenTouchedIntent by lazy { image.clicks() }
override val optionsItemSelectedIntent: Subject<Int> = PublishSubject.create()
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[GalleryViewModel::class.java] }
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
super.onCreate(savedInstanceState)
setContentView(R.layout.gallery_activity)
postponeEnterTransition()
@@ -0,0 +1,21 @@
package feature.gallery
import android.arch.lifecycle.ViewModel
import android.content.Intent
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
import injection.ViewModelKey
@Module
class GalleryActivityModule {
@Provides
fun provideIntent(activity: GalleryActivity): Intent = activity.intent
@Provides
@IntoMap
@ViewModelKey(GalleryViewModel::class)
fun provideGalleryViewModel(viewModel: GalleryViewModel): ViewModel = viewModel
}
@@ -25,7 +25,6 @@ import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
import common.base.QkViewModel
import common.util.extensions.makeToast
import injection.appComponent
import interactor.SaveImage
import io.reactivex.Flowable
import io.reactivex.rxkotlin.plusAssign
@@ -34,19 +33,18 @@ import repository.MessageRepository
import util.extensions.mapNotNull
import javax.inject.Inject
class GalleryViewModel(intent: Intent) : QkViewModel<GalleryView, GalleryState>(GalleryState()) {
@Inject lateinit var context: Context
@Inject lateinit var messageRepo: MessageRepository
@Inject lateinit var saveImage: SaveImage
class GalleryViewModel @Inject constructor(
private val intent: Intent,
private val context: Context,
private val messageRepo: MessageRepository,
private val saveImage: SaveImage
) : QkViewModel<GalleryView, GalleryState>(GalleryState()) {
private val partIdFlowable = Flowable.just(intent)
.map { it.getLongExtra("partId", 0L) }
.filter { partId -> partId != 0L }
init {
appComponent.inject(this)
disposables += partIdFlowable
.mapNotNull { partId -> messageRepo.getPart(partId) }
.mapNotNull { part -> part.getUri() }
@@ -20,6 +20,8 @@ package feature.main
import android.Manifest
import android.app.AlertDialog
import android.arch.lifecycle.ViewModelProvider
import android.arch.lifecycle.ViewModelProviders
import android.content.res.ColorStateList
import android.graphics.drawable.ColorDrawable
import android.graphics.drawable.StateListDrawable
@@ -46,9 +48,9 @@ import common.util.extensions.dismissKeyboard
import common.util.extensions.setBackgroundTint
import common.util.extensions.setTint
import common.util.extensions.setVisible
import dagger.android.AndroidInjection
import feature.conversations.ConversationItemTouchCallback
import feature.conversations.ConversationsAdapter
import injection.appComponent
import io.reactivex.Observable
import io.reactivex.rxkotlin.Observables
import io.reactivex.subjects.PublishSubject
@@ -58,13 +60,13 @@ import kotlinx.android.synthetic.main.main_activity.*
import repository.SyncRepository
import javax.inject.Inject
class MainActivity : QkThemedActivity<MainViewModel>(), MainView {
class MainActivity : QkThemedActivity(), MainView {
@Inject lateinit var navigator: Navigator
@Inject lateinit var conversationsAdapter: ConversationsAdapter
@Inject lateinit var itemTouchCallback: ConversationItemTouchCallback
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
override val viewModelClass = MainViewModel::class
override val activityResumedIntent: Subject<Unit> = PublishSubject.create()
override val queryChangedIntent by lazy { toolbarSearch.textChanges() }
override val composeIntent by lazy { compose.clicks() }
@@ -93,6 +95,7 @@ class MainActivity : QkThemedActivity<MainViewModel>(), MainView {
override val snackbarButtonIntent by lazy { snackbarButton.clicks() }
override val backPressedIntent: Subject<Unit> = PublishSubject.create()
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[MainViewModel::class.java] }
private val toggle by lazy { ActionBarDrawerToggle(this, drawerLayout, toolbar, 0, 0) }
private val itemTouchHelper by lazy { ItemTouchHelper(itemTouchCallback) }
private val archiveSnackbar by lazy {
@@ -101,11 +104,8 @@ class MainActivity : QkThemedActivity<MainViewModel>(), MainView {
}
}
init {
appComponent.inject(this)
}
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
super.onCreate(savedInstanceState)
setContentView(R.layout.main_activity)
viewModel.bindView(this)
@@ -0,0 +1,17 @@
package feature.main
import android.arch.lifecycle.ViewModel
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
import injection.ViewModelKey
@Module
class MainActivityModule {
@Provides
@IntoMap
@ViewModelKey(MainViewModel::class)
fun provideMainViewModel(viewModel: MainViewModel): ViewModel = viewModel
}
@@ -18,14 +18,12 @@
*/
package feature.main
import android.content.Context
import com.moez.QKSMS.R
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
import common.Navigator
import common.base.QkViewModel
import common.util.filter.ConversationFilter
import injection.appComponent
import interactor.DeleteConversations
import interactor.MarkAllSeen
import interactor.MarkArchived
@@ -41,37 +39,29 @@ import manager.PermissionManager
import manager.RatingManager
import repository.MessageRepository
import repository.SyncRepository
import util.Preferences
import util.extensions.removeAccents
import java.util.concurrent.TimeUnit
import javax.inject.Inject
class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
class MainViewModel @Inject constructor(
private val conversationFilter: ConversationFilter,
private val messageRepo: MessageRepository,
private val markAllSeen: MarkAllSeen,
private val deleteConversations: DeleteConversations,
private val markArchived: MarkArchived,
private val markUnarchived: MarkUnarchived,
private val markBlocked: MarkBlocked,
private val migratePreferences: MigratePreferences,
private val navigator: Navigator,
private val permissionManager: PermissionManager,
private val ratingManager: RatingManager,
private val syncMessages: SyncMessages,
private val syncRepository: SyncRepository
) : QkViewModel<MainView, MainState>(MainState()) {
@Inject lateinit var context: Context
@Inject lateinit var conversationFilter: ConversationFilter
@Inject lateinit var messageRepo: MessageRepository
@Inject lateinit var markAllSeen: MarkAllSeen
@Inject lateinit var deleteConversations: DeleteConversations
@Inject lateinit var markArchived: MarkArchived
@Inject lateinit var markUnarchived: MarkUnarchived
@Inject lateinit var markBlocked: MarkBlocked
@Inject lateinit var migratePreferences: MigratePreferences
@Inject lateinit var navigator: Navigator
@Inject lateinit var permissionManager: PermissionManager
@Inject lateinit var prefs: Preferences
@Inject lateinit var ratingManager: RatingManager
@Inject lateinit var syncMessages: SyncMessages
@Inject lateinit var syncRepository: SyncRepository
private val conversations by lazy { messageRepo.getConversations() }
private val conversations = messageRepo.getConversations()
init {
appComponent.inject(this)
// Now the conversations can be loaded
conversations
disposables += deleteConversations
disposables += markAllSeen
disposables += markArchived
@@ -19,6 +19,8 @@
package feature.notificationprefs
import android.app.Activity
import android.arch.lifecycle.ViewModelProvider
import android.arch.lifecycle.ViewModelProviders
import android.content.Intent
import android.media.RingtoneManager
import android.net.Uri
@@ -32,27 +34,26 @@ import common.QkDialog
import common.base.QkThemedActivity
import common.util.extensions.setVisible
import common.widget.PreferenceView
import injection.appComponent
import dagger.android.AndroidInjection
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.notification_prefs_activity.*
import kotlinx.android.synthetic.main.settings_switch_widget.view.*
import javax.inject.Inject
class NotificationPrefsActivity : QkThemedActivity<NotificationPrefsViewModel>(), NotificationPrefsView {
class NotificationPrefsActivity : QkThemedActivity(), NotificationPrefsView {
@Inject lateinit var previewModeDialog: QkDialog
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
override val viewModelClass = NotificationPrefsViewModel::class
override val preferenceClickIntent: Subject<PreferenceView> = PublishSubject.create()
override val previewModeSelectedIntent by lazy { previewModeDialog.adapter.menuItemClicks }
override val ringtoneSelectedIntent: Subject<String> = PublishSubject.create()
init {
appComponent.inject(this)
}
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[NotificationPrefsViewModel::class.java] }
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
super.onCreate(savedInstanceState)
setContentView(R.layout.notification_prefs_activity)
setTitle(R.string.title_notification_prefs)
@@ -0,0 +1,21 @@
package feature.notificationprefs
import android.arch.lifecycle.ViewModel
import android.content.Intent
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
import injection.ViewModelKey
@Module
class NotificationPrefsActivityModule {
@Provides
fun provideIntent(activity: NotificationPrefsActivity): Intent = activity.intent
@Provides
@IntoMap
@ViewModelKey(NotificationPrefsViewModel::class)
fun provideNotificationPrefsViewModel(viewModel: NotificationPrefsViewModel): ViewModel = viewModel
}
@@ -29,7 +29,6 @@ import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
import common.Navigator
import common.base.QkViewModel
import injection.appComponent
import io.reactivex.Flowable
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.schedulers.Schedulers
@@ -38,12 +37,13 @@ import util.Preferences
import util.extensions.mapNotNull
import javax.inject.Inject
class NotificationPrefsViewModel(intent: Intent) : QkViewModel<NotificationPrefsView, NotificationPrefsState>(NotificationPrefsState()) {
@Inject lateinit var context: Context
@Inject lateinit var messageRepo: MessageRepository
@Inject lateinit var navigator: Navigator
@Inject lateinit var prefs: Preferences
class NotificationPrefsViewModel @Inject constructor(
private val intent: Intent,
private val context: Context,
private val messageRepo: MessageRepository,
private val navigator: Navigator,
private val prefs: Preferences
) : QkViewModel<NotificationPrefsView, NotificationPrefsState>(NotificationPrefsState()) {
private val threadId = intent.extras?.getLong("threadId") ?: 0L
@@ -53,8 +53,6 @@ class NotificationPrefsViewModel(intent: Intent) : QkViewModel<NotificationPrefs
private val ringtone: Preference<String>
init {
appComponent.inject(this)
notifications = prefs.notifications(threadId)
previews = prefs.notificationPreviews(threadId)
vibration = prefs.vibration(threadId)
@@ -18,6 +18,8 @@
*/
package feature.plus
import android.arch.lifecycle.ViewModelProvider
import android.arch.lifecycle.ViewModelProviders
import android.graphics.Typeface
import android.os.Bundle
import com.jakewharton.rxbinding2.view.clicks
@@ -31,24 +33,23 @@ import common.util.FontProvider
import common.util.extensions.setBackgroundTint
import common.util.extensions.setTint
import common.util.extensions.setVisible
import injection.appComponent
import dagger.android.AndroidInjection
import kotlinx.android.synthetic.main.qksms_plus_activity.*
import javax.inject.Inject
class PlusActivity : QkThemedActivity<PlusViewModel>(), PlusView {
class PlusActivity : QkThemedActivity(), PlusView {
@Inject lateinit var fontProvider: FontProvider
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[PlusViewModel::class.java] }
override val viewModelClass = PlusViewModel::class
override val upgradeIntent by lazy { upgrade.clicks() }
override val upgradeDonateIntent by lazy { upgradeDonate.clicks() }
override val donateIntent by lazy { donate.clicks() }
init {
appComponent.inject(this)
}
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
super.onCreate(savedInstanceState)
setContentView(R.layout.qksms_plus_activity)
setTitle(R.string.title_qksms_plus)
@@ -0,0 +1,17 @@
package feature.plus
import android.arch.lifecycle.ViewModel
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
import injection.ViewModelKey
@Module
class PlusActivityModule {
@Provides
@IntoMap
@ViewModelKey(PlusViewModel::class)
fun providePlusViewModel(viewModel: PlusViewModel): ViewModel = viewModel
}
@@ -23,20 +23,18 @@ import com.uber.autodispose.kotlin.autoDisposable
import common.Navigator
import common.base.QkViewModel
import common.util.BillingManager
import injection.appComponent
import io.reactivex.Observable
import io.reactivex.rxkotlin.plusAssign
import manager.AnalyticsManager
import javax.inject.Inject
class PlusViewModel : QkViewModel<PlusView, PlusState>(PlusState()) {
@Inject lateinit var analyticsManager: AnalyticsManager
@Inject lateinit var billingManager: BillingManager
@Inject lateinit var navigator: Navigator
class PlusViewModel @Inject constructor(
private val analyticsManager: AnalyticsManager,
private val billingManager: BillingManager,
private val navigator: Navigator
) : QkViewModel<PlusView, PlusState>(PlusState()) {
init {
appComponent.inject(this)
analyticsManager.track("Viewed QKSMS+")
disposables += billingManager.upgradeStatus
@@ -18,6 +18,8 @@
*/
package feature.qkreply
import android.arch.lifecycle.ViewModelProvider
import android.arch.lifecycle.ViewModelProviders
import android.content.res.ColorStateList
import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
@@ -35,8 +37,8 @@ import common.base.QkThemedActivity
import common.util.extensions.autoScrollToStart
import common.util.extensions.setBackgroundTint
import common.util.extensions.setVisible
import dagger.android.AndroidInjection
import feature.compose.MessagesAdapter
import injection.appComponent
import io.reactivex.rxkotlin.Observables
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
@@ -44,21 +46,20 @@ import kotlinx.android.synthetic.main.qkreply_activity.*
import util.Preferences
import javax.inject.Inject
class QkReplyActivity : QkThemedActivity<QkReplyViewModel>(), QkReplyView {
class QkReplyActivity : QkThemedActivity(), QkReplyView {
@Inject lateinit var adapter: MessagesAdapter
@Inject lateinit var prefs: Preferences
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
override val viewModelClass = QkReplyViewModel::class
override val menuItemIntent: Subject<Int> = PublishSubject.create()
override val textChangedIntent by lazy { message.textChanges() }
override val sendIntent by lazy { send.clicks() }
@Inject lateinit var adapter: MessagesAdapter
@Inject lateinit var prefs: Preferences
init {
appComponent.inject(this)
}
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[QkReplyViewModel::class.java] }
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
supportRequestWindowFeature(Window.FEATURE_NO_TITLE)
super.onCreate(savedInstanceState)
@@ -0,0 +1,21 @@
package feature.qkreply
import android.arch.lifecycle.ViewModel
import android.content.Intent
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
import injection.ViewModelKey
@Module
class QkReplyActivityModule {
@Provides
fun provideIntent(activity: QkReplyActivity): Intent = activity.intent
@Provides
@IntoMap
@ViewModelKey(QkReplyViewModel::class)
fun provideQkReplyViewModel(viewModel: QkReplyViewModel): ViewModel = viewModel
}
@@ -25,7 +25,6 @@ import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
import common.Navigator
import common.base.QkViewModel
import injection.appComponent
import interactor.MarkRead
import interactor.SendMessage
import io.reactivex.rxkotlin.plusAssign
@@ -42,12 +41,13 @@ import util.extensions.mapNotNull
import java.util.concurrent.TimeUnit
import javax.inject.Inject
class QkReplyViewModel(intent: Intent) : QkViewModel<QkReplyView, QkReplyState>(QkReplyState()) {
@Inject lateinit var markRead: MarkRead
@Inject lateinit var messageRepo: MessageRepository
@Inject lateinit var navigator: Navigator
@Inject lateinit var sendMessage: SendMessage
class QkReplyViewModel @Inject constructor(
private val intent: Intent,
private val markRead: MarkRead,
private val messageRepo: MessageRepository,
private val navigator: Navigator,
private val sendMessage: SendMessage
) : QkViewModel<QkReplyView, QkReplyState>(QkReplyState()) {
private val conversation by lazy {
messageRepo.getConversationAsync(intent.getLongExtra("threadId", -1))
@@ -60,8 +60,6 @@ class QkReplyViewModel(intent: Intent) : QkViewModel<QkReplyView, QkReplyState>(
private val messages: Subject<RealmResults<Message>> = PublishSubject.create()
init {
appComponent.inject(this)
disposables += markRead
disposables += sendMessage
@@ -20,6 +20,8 @@ package feature.settings
import android.app.ProgressDialog
import android.app.TimePickerDialog
import android.arch.lifecycle.ViewModelProvider
import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle
import android.support.design.widget.Snackbar
import android.text.format.DateFormat
@@ -33,7 +35,7 @@ import common.base.QkThemedActivity
import common.util.extensions.setBackgroundTint
import common.util.extensions.setVisible
import common.widget.PreferenceView
import injection.appComponent
import dagger.android.AndroidInjection
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.settings_activity.*
@@ -42,14 +44,14 @@ import kotlinx.android.synthetic.main.settings_theme_widget.*
import util.Preferences
import javax.inject.Inject
class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
class SettingsActivity : QkThemedActivity(), SettingsView {
@Inject lateinit var nightModeDialog: QkDialog
@Inject lateinit var textSizeDialog: QkDialog
@Inject lateinit var sendDelayDialog: QkDialog
@Inject lateinit var mmsSizeDialog: QkDialog
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
override val viewModelClass = SettingsViewModel::class
override val preferenceClickIntent: Subject<PreferenceView> = PublishSubject.create()
override val viewQksmsPlusIntent: Subject<Unit> = PublishSubject.create()
override val nightModeSelectedIntent by lazy { nightModeDialog.adapter.menuItemClicks }
@@ -59,6 +61,8 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
override val sendDelayChangedIntent by lazy { sendDelayDialog.adapter.menuItemClicks }
override val mmsSizeSelectedIntent: Subject<Int> by lazy { mmsSizeDialog.adapter.menuItemClicks }
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[SettingsViewModel::class.java] }
// TODO remove this
private val progressDialog by lazy {
ProgressDialog(this).apply {
@@ -68,11 +72,8 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
}
}
init {
appComponent.inject(this)
}
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
super.onCreate(savedInstanceState)
setContentView(R.layout.settings_activity)
setTitle(R.string.title_settings)
@@ -0,0 +1,17 @@
package feature.settings
import android.arch.lifecycle.ViewModel
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
import injection.ViewModelKey
@Module
class SettingsActivityModule {
@Provides
@IntoMap
@ViewModelKey(SettingsViewModel::class)
fun provideSettingsViewModel(viewModel: SettingsViewModel): ViewModel = viewModel
}
@@ -28,7 +28,6 @@ import common.util.BillingManager
import common.util.Colors
import common.util.DateFormatter
import common.util.NightModeManager
import injection.appComponent
import interactor.SyncMessages
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.rxkotlin.withLatestFrom
@@ -37,20 +36,19 @@ import util.Preferences
import java.util.*
import javax.inject.Inject
class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState()) {
class SettingsViewModel @Inject constructor(
private val context: Context,
private val billingManager: BillingManager,
private val colors: Colors,
private val dateFormatter: DateFormatter,
private val navigator: Navigator,
private val nightModeManager: NightModeManager,
private val prefs: Preferences,
private val syncMessages: SyncMessages
) : QkViewModel<SettingsView, SettingsState>(SettingsState()) {
@Inject lateinit var context: Context
@Inject lateinit var billingManager: BillingManager
@Inject lateinit var colors: Colors
@Inject lateinit var dateFormatter: DateFormatter
@Inject lateinit var navigator: Navigator
@Inject lateinit var nightModeManager: NightModeManager
@Inject lateinit var prefs: Preferences
@Inject lateinit var syncMessages: SyncMessages
init {
appComponent.inject(this)
disposables += colors.theme
.subscribe { color -> newState { it.copy(theme = color) } }
@@ -1,5 +1,7 @@
package feature.settings.about
import android.arch.lifecycle.ViewModelProvider
import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.BuildConfig
@@ -8,21 +10,22 @@ import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
import common.base.QkThemedActivity
import common.widget.PreferenceView
import injection.appComponent
import dagger.android.AndroidInjection
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.about_activity.*
import javax.inject.Inject
class AboutActivity : QkThemedActivity<AboutViewModel>(), AboutView {
class AboutActivity : QkThemedActivity(), AboutView {
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
override val viewModelClass = AboutViewModel::class
override val preferenceClickIntent: Subject<PreferenceView> = PublishSubject.create()
init {
appComponent.inject(this)
}
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[AboutViewModel::class.java] }
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
super.onCreate(savedInstanceState)
setContentView(R.layout.about_activity)
setTitle(R.string.about_title)
@@ -0,0 +1,17 @@
package feature.settings.about
import android.arch.lifecycle.ViewModel
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
import injection.ViewModelKey
@Module
class AboutActivityModule {
@Provides
@IntoMap
@ViewModelKey(AboutViewModel::class)
fun provideAboutViewModel(viewModel: AboutViewModel): ViewModel = viewModel
}
@@ -5,16 +5,11 @@ import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
import common.Navigator
import common.base.QkViewModel
import injection.appComponent
import javax.inject.Inject
class AboutViewModel : QkViewModel<AboutView, Unit>(Unit) {
@Inject lateinit var navigator: Navigator
init {
appComponent.inject(this)
}
class AboutViewModel @Inject constructor(
private val navigator: Navigator
) : QkViewModel<AboutView, Unit>(Unit) {
override fun bindView(view: AboutView) {
super.bindView(view)
@@ -22,7 +17,7 @@ class AboutViewModel : QkViewModel<AboutView, Unit>(Unit) {
view.preferenceClickIntent
.autoDisposable(view.scope())
.subscribe { preference ->
when(preference.id) {
when (preference.id) {
R.id.developer -> navigator.showDeveloper()
R.id.source -> navigator.showSourceCode()
@@ -18,6 +18,8 @@
*/
package feature.themepicker
import android.arch.lifecycle.ViewModelProvider
import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle
import android.support.design.widget.Snackbar
import android.support.v7.widget.LinearLayoutManager
@@ -29,30 +31,29 @@ import common.base.QkThemedActivity
import common.util.extensions.setBackgroundTint
import common.util.extensions.setTint
import common.util.extensions.setVisible
import injection.appComponent
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
class ThemePickerActivity : QkThemedActivity<ThemePickerViewModel>(), ThemePickerView {
class ThemePickerActivity : QkThemedActivity(), ThemePickerView {
@Inject lateinit var themeAdapter: ThemeAdapter
@Inject lateinit var themePagerAdapter: ThemePagerAdapter
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
override val viewModelClass = ThemePickerViewModel::class
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<Unit> = PublishSubject.create()
@Inject lateinit var themeAdapter: ThemeAdapter
@Inject lateinit var themePagerAdapter: ThemePagerAdapter
init {
appComponent.inject(this)
}
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ThemePickerViewModel::class.java] }
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
super.onCreate(savedInstanceState)
setContentView(R.layout.theme_picker_activity)
setTitle(R.string.title_theme)
@@ -0,0 +1,21 @@
package feature.themepicker
import android.arch.lifecycle.ViewModel
import android.content.Intent
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
import injection.ViewModelKey
@Module
class ThemePickerActivityModule {
@Provides
fun provideIntent(activity: ThemePickerActivity): Intent = activity.intent
@Provides
@IntoMap
@ViewModelKey(ThemePickerViewModel::class)
fun provideThemePickerViewModel(viewModel: ThemePickerViewModel): ViewModel = viewModel
}
@@ -26,25 +26,23 @@ import common.Navigator
import common.base.QkViewModel
import common.util.BillingManager
import common.util.Colors
import injection.appComponent
import io.reactivex.rxkotlin.Observables
import io.reactivex.rxkotlin.withLatestFrom
import util.Preferences
import javax.inject.Inject
class ThemePickerViewModel(intent: Intent) : QkViewModel<ThemePickerView, ThemePickerState>(ThemePickerState()) {
@Inject lateinit var billingManager: BillingManager
@Inject lateinit var colors: Colors
@Inject lateinit var navigator: Navigator
@Inject lateinit var prefs: Preferences
class ThemePickerViewModel @Inject constructor(
private val intent: Intent,
private val billingManager: BillingManager,
private val colors: Colors,
private val navigator: Navigator,
private val prefs: Preferences
) : QkViewModel<ThemePickerView, ThemePickerState>(ThemePickerState()) {
private val threadId = intent.extras?.getLong("threadId") ?: 0L
private val theme: Preference<Int>
init {
appComponent.inject(this)
newState { it.copy(threadId = threadId) }
theme = prefs.theme(threadId)
@@ -0,0 +1,6 @@
package injection
import javax.inject.Scope
@Scope
annotation class ActivityScope
@@ -29,29 +29,8 @@ import common.widget.QkSwitch
import common.widget.QkTextView
import common.widget.Separator
import dagger.Component
import feature.blocked.BlockedActivity
import feature.blocked.BlockedViewModel
import feature.compose.ComposeActivity
import feature.compose.ComposeViewModel
import dagger.android.support.AndroidSupportInjectionModule
import feature.compose.DetailedChipView
import feature.conversationinfo.ConversationInfoActivity
import feature.conversationinfo.ConversationInfoViewModel
import feature.gallery.GalleryActivity
import feature.gallery.GalleryViewModel
import feature.main.MainActivity
import feature.main.MainViewModel
import feature.notificationprefs.NotificationPrefsActivity
import feature.notificationprefs.NotificationPrefsViewModel
import feature.plus.PlusActivity
import feature.plus.PlusViewModel
import feature.qkreply.QkReplyActivity
import feature.qkreply.QkReplyViewModel
import feature.settings.SettingsActivity
import feature.settings.SettingsViewModel
import feature.settings.about.AboutActivity
import feature.settings.about.AboutViewModel
import feature.themepicker.ThemePickerActivity
import feature.themepicker.ThemePickerViewModel
import feature.widget.WidgetAdapter
import feature.widget.WidgetProvider
import receiver.DefaultSmsChangedReceiver
@@ -71,23 +50,11 @@ import service.HeadlessSmsSendService
import javax.inject.Singleton
@Singleton
@Component(modules = [(AppModule::class)])
@Component(modules = [AndroidSupportInjectionModule::class, AppModule::class, BuildersModule::class])
interface AppComponent {
fun inject(application: QKApplication)
fun inject(activity: MainActivity)
fun inject(activity: AboutActivity)
fun inject(activity: BlockedActivity)
fun inject(activity: ComposeActivity)
fun inject(activity: ConversationInfoActivity)
fun inject(activity: GalleryActivity)
fun inject(activity: NotificationPrefsActivity)
fun inject(activity: PlusActivity)
fun inject(activity: QkReplyActivity)
fun inject(activity: SettingsActivity)
fun inject(activity: ThemePickerActivity)
fun inject(dialog: QkDialog)
fun inject(fetcher: ContactImageLoader.ContactImageFetcher)
@@ -119,16 +86,4 @@ interface AppComponent {
fun inject(view: QkTextView)
fun inject(view: Separator)
fun inject(viewModel: MainViewModel)
fun inject(viewModel: AboutViewModel)
fun inject(viewModel: BlockedViewModel)
fun inject(viewModel: ComposeViewModel)
fun inject(viewModel: ConversationInfoViewModel)
fun inject(viewModel: GalleryViewModel)
fun inject(viewModel: NotificationPrefsViewModel)
fun inject(viewModel: PlusViewModel)
fun inject(viewModel: QkReplyViewModel)
fun inject(viewModel: SettingsViewModel)
fun inject(viewModel: ThemePickerViewModel)
}
@@ -19,10 +19,12 @@
package injection
import android.app.Application
import android.arch.lifecycle.ViewModelProvider
import android.content.ContentResolver
import android.content.Context
import android.preference.PreferenceManager
import com.f2prateek.rx.preferences2.RxSharedPreferences
import common.ViewModelFactory
import common.util.AnalyticsManagerImpl
import common.util.NotificationManagerImpl
import dagger.Module
@@ -64,14 +66,10 @@ class AppModule(private var application: Application) {
@Provides
@Singleton
fun provideContext(): Context {
return application
}
fun provideContext(): Context = application
@Provides
fun provideContentResolver(context: Context): ContentResolver {
return context.contentResolver
}
fun provideContentResolver(context: Context): ContentResolver = context.contentResolver
@Provides
@Singleton
@@ -80,6 +78,9 @@ class AppModule(private var application: Application) {
return RxSharedPreferences.create(preferences)
}
@Provides
fun provideViewModelFactory(factory: ViewModelFactory): ViewModelProvider.Factory = factory
// Manager
@Provides
@@ -0,0 +1,75 @@
package injection
import dagger.Module
import dagger.android.ContributesAndroidInjector
import feature.blocked.BlockedActivity
import feature.blocked.BlockedActivityModule
import feature.compose.ComposeActivity
import feature.compose.ComposeActivityModule
import feature.conversationinfo.ConversationInfoActivity
import feature.conversationinfo.ConversationInfoActivityModule
import feature.gallery.GalleryActivity
import feature.gallery.GalleryActivityModule
import feature.main.MainActivity
import feature.main.MainActivityModule
import feature.notificationprefs.NotificationPrefsActivity
import feature.notificationprefs.NotificationPrefsActivityModule
import feature.plus.PlusActivity
import feature.plus.PlusActivityModule
import feature.qkreply.QkReplyActivity
import feature.qkreply.QkReplyActivityModule
import feature.settings.SettingsActivity
import feature.settings.SettingsActivityModule
import feature.settings.about.AboutActivity
import feature.settings.about.AboutActivityModule
import feature.themepicker.ThemePickerActivity
import feature.themepicker.ThemePickerActivityModule
@Module
abstract class BuildersModule {
@ActivityScope
@ContributesAndroidInjector(modules = [MainActivityModule::class])
abstract fun bindMainActivity(): MainActivity
@ActivityScope
@ContributesAndroidInjector(modules = [PlusActivityModule::class])
abstract fun bindPlusActivity(): PlusActivity
@ActivityScope
@ContributesAndroidInjector(modules = [AboutActivityModule::class])
abstract fun bindAboutActivity(): AboutActivity
@ActivityScope
@ContributesAndroidInjector(modules = [ComposeActivityModule::class])
abstract fun bindComposeActivity(): ComposeActivity
@ActivityScope
@ContributesAndroidInjector(modules = [ConversationInfoActivityModule::class])
abstract fun bindConversationInfoActivity(): ConversationInfoActivity
@ActivityScope
@ContributesAndroidInjector(modules = [GalleryActivityModule::class])
abstract fun bindGalleryActivity(): GalleryActivity
@ActivityScope
@ContributesAndroidInjector(modules = [NotificationPrefsActivityModule::class])
abstract fun bindNotificationPrefsActivity(): NotificationPrefsActivity
@ActivityScope
@ContributesAndroidInjector(modules = [QkReplyActivityModule::class])
abstract fun bindQkReplyActivity(): QkReplyActivity
@ActivityScope
@ContributesAndroidInjector(modules = [SettingsActivityModule::class])
abstract fun bindSettingsActivity(): SettingsActivity
@ActivityScope
@ContributesAndroidInjector(modules = [BlockedActivityModule::class])
abstract fun bindBlockedActivity(): BlockedActivity
@ActivityScope
@ContributesAndroidInjector(modules = [ThemePickerActivityModule::class])
abstract fun bindThemePickerActivity(): ThemePickerActivity
}
@@ -0,0 +1,10 @@
package injection
import android.arch.lifecycle.ViewModel
import dagger.MapKey
import kotlin.reflect.KClass
@Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER)
@Retention(AnnotationRetention.RUNTIME)
@MapKey
internal annotation class ViewModelKey(val value: KClass<out ViewModel>)