Make Dagger AppComponent easier to access

This commit is contained in:
Moez Bhatti
2017-12-04 02:48:20 -05:00
parent 19f1fb3988
commit 6d5ed6cdc6
21 changed files with 42 additions and 42 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.1.51'
ext.kotlin_version = '1.2.0'
repositories {
maven { url 'https://maven.google.com' }
jcenter()
@@ -2,10 +2,10 @@ package com.moez.QKSMS.common.di
import com.moez.QKSMS.common.QKApplication
internal object AppComponentManager {
internal lateinit var appComponent: AppComponent
private set
internal lateinit var appComponent: AppComponent
private set
internal object AppComponentManager {
fun init(application: QKApplication) {
appComponent = DaggerAppComponent.builder()
@@ -11,7 +11,7 @@ import com.bumptech.glide.load.data.DataFetcher
import com.bumptech.glide.load.model.ModelLoader
import com.bumptech.glide.load.model.ModelLoaderFactory
import com.bumptech.glide.load.model.MultiModelLoaderFactory
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.data.repository.ContactRepository
import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers
@@ -45,7 +45,7 @@ class ContactImageLoader(val context: Context) : ModelLoader<String, InputStream
private var loadPhotoDisposable: Disposable? = null
init {
AppComponentManager.appComponent.inject(this)
appComponent.inject(this)
}
override fun cleanup() {}
@@ -11,7 +11,7 @@ import com.google.android.flexbox.FlexboxLayoutManager
import com.jakewharton.rxbinding2.view.clicks
import com.jakewharton.rxbinding2.widget.textChanges
import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.common.util.extensions.setVisible
import com.moez.QKSMS.common.util.extensions.showKeyboard
import com.moez.QKSMS.data.model.Contact
@@ -48,7 +48,7 @@ class ComposeActivity : QkActivity<ComposeViewModel>(), ComposeView {
private var pendingCallVisibility = false
init {
AppComponentManager.appComponent.inject(this)
appComponent.inject(this)
}
override fun onCreate(savedInstanceState: Bundle?) {
@@ -3,7 +3,7 @@ package com.moez.QKSMS.presentation.compose
import android.content.Context
import android.telephony.PhoneNumberUtils
import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.common.util.ClipboardUtils
import com.moez.QKSMS.common.util.extensions.asObservable
import com.moez.QKSMS.common.util.extensions.makeToast
@@ -42,7 +42,7 @@ class ComposeViewModel(threadId: Long) : QkViewModel<ComposeView, ComposeState>(
private val conversation: Observable<Conversation>
init {
AppComponentManager.appComponent.inject(this)
appComponent.inject(this)
selectedContacts = contactsReducer
.scan(listOf<Contact>(), { previousState, reducer -> reducer(previousState) })
@@ -5,7 +5,7 @@ import android.view.View
import android.view.animation.AlphaAnimation
import android.widget.RelativeLayout
import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.common.util.ThemeManager
import com.moez.QKSMS.common.util.extensions.setBackgroundTint
import com.moez.QKSMS.data.model.Contact
@@ -23,7 +23,7 @@ class DetailedChipView(context: Context) : RelativeLayout(context) {
init {
View.inflate(context, R.layout.contact_chip_detailed, this)
AppComponentManager.appComponent.inject(this)
appComponent.inject(this)
setOnClickListener { hide() }
@@ -7,7 +7,7 @@ import android.view.View
import android.view.ViewGroup
import com.jakewharton.rxbinding2.view.RxView
import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.common.util.DateFormatter
import com.moez.QKSMS.common.util.ThemeManager
import com.moez.QKSMS.common.util.extensions.dpToPx
@@ -43,7 +43,7 @@ class MessagesAdapter : RealmRecyclerViewAdapter<Message, QkViewHolder>(null, tr
private val disposables = CompositeDisposable()
init {
AppComponentManager.appComponent.inject(this)
appComponent.inject(this)
}
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder {
@@ -6,7 +6,7 @@ import android.view.LayoutInflater
import android.view.ViewGroup
import com.jakewharton.rxbinding2.view.RxView
import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.common.util.DateFormatter
import com.moez.QKSMS.common.util.ThemeManager
import com.moez.QKSMS.data.model.ConversationMessagePair
@@ -31,7 +31,7 @@ class ConversationsAdapter(flowable: Flowable<List<ConversationMessagePair>>) :
private val disposables = CompositeDisposable()
init {
AppComponentManager.appComponent.inject(this)
appComponent.inject(this)
}
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder {
@@ -17,7 +17,7 @@ import com.karumi.dexter.PermissionToken
import com.karumi.dexter.listener.PermissionRequest
import com.karumi.dexter.listener.multi.MultiplePermissionsListener
import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.common.util.extensions.setBackgroundTint
import com.moez.QKSMS.presentation.Navigator
import com.moez.QKSMS.presentation.base.QkActivity
@@ -46,7 +46,7 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
private val itemTouchHelper by lazy { ItemTouchHelper(itemTouchCallback) }
init {
AppComponentManager.appComponent.inject(this)
appComponent.inject(this)
}
override fun onCreate(savedInstanceState: Bundle?) {
@@ -2,7 +2,7 @@ package com.moez.QKSMS.presentation.main
import android.content.Context
import android.provider.Telephony
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.data.repository.MessageRepository
import com.moez.QKSMS.domain.interactor.MarkAllSeen
import com.moez.QKSMS.domain.interactor.MarkArchived
@@ -22,7 +22,7 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
@Inject lateinit var partialSync: PartialSync
init {
AppComponentManager.appComponent.inject(this)
appComponent.inject(this)
disposables += markAllSeen
@@ -7,7 +7,7 @@ import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.presentation.base.QkActivity
import com.moez.QKSMS.presentation.view.PreferenceView
import io.reactivex.subjects.PublishSubject
@@ -52,7 +52,7 @@ class SettingsActivity : QkActivity<SettingsViewModel>(), SettingsView {
}
override fun onCreate(savedInstanceState: Bundle?) {
AppComponentManager.appComponent.inject(this)
appComponent.inject(this)
super.onCreate(savedInstanceState)
setContentView(R.layout.settings_activity)
setTitle(R.string.title_settings)
@@ -4,7 +4,7 @@ import android.content.Context
import android.content.Intent
import android.provider.Telephony
import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.common.util.Preferences
import com.moez.QKSMS.domain.interactor.FullSync
import com.moez.QKSMS.presentation.base.QkViewModel
@@ -19,7 +19,7 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
@Inject lateinit var fullSync: FullSync
init {
AppComponentManager.appComponent.inject(this)
appComponent.inject(this)
disposables += prefs.defaultSms
.asObservable()
@@ -6,7 +6,7 @@ import android.util.AttributeSet
import android.view.View
import android.widget.FrameLayout
import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.common.util.GlideApp
import com.moez.QKSMS.common.util.ThemeManager
import com.moez.QKSMS.data.model.Contact
@@ -29,7 +29,7 @@ class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet
init {
View.inflate(context, R.layout.avatar_view, this)
AppComponentManager.appComponent.inject(this)
appComponent.inject(this)
setBackgroundResource(R.drawable.circle)
clipToOutline = true
@@ -4,7 +4,7 @@ import android.content.Context
import android.content.res.ColorStateList
import android.support.v7.widget.SwitchCompat
import android.util.AttributeSet
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.common.util.ThemeManager
import com.moez.QKSMS.common.util.extensions.withAlpha
import io.reactivex.disposables.CompositeDisposable
@@ -19,7 +19,7 @@ class QkSwitch @JvmOverloads constructor(context: Context, attrs: AttributeSet?
private val disposables = CompositeDisposable()
init {
AppComponentManager.appComponent.inject(this)
appComponent.inject(this)
}
override fun onAttachedToWindow() {
@@ -6,7 +6,7 @@ import android.content.Intent
import android.os.Build
import android.provider.Telephony
import android.support.annotation.RequiresApi
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.common.util.Preferences
import com.moez.QKSMS.domain.interactor.PartialSync
import javax.inject.Inject
@@ -18,7 +18,7 @@ class DefaultSmsChangedReceiver : BroadcastReceiver() {
@RequiresApi(Build.VERSION_CODES.N)
override fun onReceive(context: Context, intent: Intent) {
AppComponentManager.appComponent.inject(this)
appComponent.inject(this)
val isDefaultSmsApp = intent.getBooleanExtra(Telephony.Sms.Intents.EXTRA_IS_DEFAULT_SMS_APP, false)
prefs.defaultSms.set(isDefaultSmsApp)
@@ -3,7 +3,7 @@ package com.moez.QKSMS.receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.domain.interactor.MarkRead
import javax.inject.Inject
@@ -12,7 +12,7 @@ class MarkReadReceiver : BroadcastReceiver() {
@Inject lateinit var markRead: MarkRead
override fun onReceive(context: Context, intent: Intent) {
AppComponentManager.appComponent.inject(this)
appComponent.inject(this)
val threadId = intent.getLongExtra("threadId", 0)
markRead.execute(threadId)
@@ -3,7 +3,7 @@ package com.moez.QKSMS.receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.domain.interactor.MarkSeen
import javax.inject.Inject
@@ -12,7 +12,7 @@ class MarkSeenReceiver : BroadcastReceiver() {
@Inject lateinit var markSeen: MarkSeen
override fun onReceive(context: Context, intent: Intent) {
AppComponentManager.appComponent.inject(this)
appComponent.inject(this)
val threadId = intent.getLongExtra("threadId", 0)
markSeen.execute(threadId)
@@ -5,7 +5,7 @@ import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.net.Uri
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.data.repository.MessageRepository
import javax.inject.Inject
@@ -15,7 +15,7 @@ class MessageDeliveredReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
val uri = Uri.parse(intent.getStringExtra("uri"))
AppComponentManager.appComponent.inject(this)
appComponent.inject(this)
when (resultCode) {
// TODO notify about delivery
@@ -6,7 +6,7 @@ import android.content.Context
import android.content.Intent
import android.net.Uri
import android.telephony.SmsManager
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.domain.interactor.MarkFailed
import com.moez.QKSMS.domain.interactor.MarkSent
import javax.inject.Inject
@@ -17,7 +17,7 @@ class MessageSentReceiver : BroadcastReceiver() {
@Inject lateinit var markFailed: MarkFailed
override fun onReceive(context: Context, intent: Intent) {
AppComponentManager.appComponent.inject(this)
appComponent.inject(this)
val uri = Uri.parse(intent.getStringExtra("uri"))
@@ -4,7 +4,7 @@ import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.support.v4.app.RemoteInput
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.domain.interactor.MarkRead
import com.moez.QKSMS.domain.interactor.SendMessage
import javax.inject.Inject
@@ -15,7 +15,7 @@ class RemoteMessagingReceiver : BroadcastReceiver() {
@Inject lateinit var markRead: MarkRead
override fun onReceive(context: Context, intent: Intent) {
AppComponentManager.appComponent.inject(this)
appComponent.inject(this)
val remoteInput = RemoteInput.getResultsFromIntent(intent)
val bundle = intent.extras
@@ -4,7 +4,7 @@ import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.provider.Telephony.Sms
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.domain.interactor.ReceiveMessage
import timber.log.Timber
import javax.inject.Inject
@@ -15,7 +15,7 @@ class SmsReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
Timber.v("Received SMS: $intent")
AppComponentManager.appComponent.inject(this)
appComponent.inject(this)
val messages = Sms.Intents.getMessagesFromIntent(intent)
messages?.takeIf { it.isNotEmpty() }?.let { messages ->