From 6e5f4807f9b78a0450fca680638741f162dfba4d Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 6 Dec 2017 18:19:06 -0500 Subject: [PATCH] Use constructor injection for all adapters --- .../java/com/moez/QKSMS/common/di/AppComponent.kt | 5 +---- .../QKSMS/presentation/compose/ChipsAdapter.kt | 9 ++++----- .../QKSMS/presentation/compose/ComposeActivity.kt | 14 ++++++++------ .../QKSMS/presentation/compose/ContactAdapter.kt | 3 ++- .../QKSMS/presentation/compose/MessagesAdapter.kt | 15 +++++---------- 5 files changed, 20 insertions(+), 26 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt b/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt index 6f940993..ed1ba6f3 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt @@ -4,7 +4,6 @@ import com.moez.QKSMS.common.util.ContactImageLoader import com.moez.QKSMS.presentation.compose.ComposeActivity import com.moez.QKSMS.presentation.compose.ComposeViewModel import com.moez.QKSMS.presentation.compose.DetailedChipView -import com.moez.QKSMS.presentation.compose.MessagesAdapter import com.moez.QKSMS.presentation.main.MainActivity import com.moez.QKSMS.presentation.main.MainViewModel import com.moez.QKSMS.presentation.settings.SettingsActivity @@ -15,15 +14,13 @@ import dagger.Component import javax.inject.Singleton @Singleton -@Component(modules = arrayOf(AppModule::class)) +@Component(modules = [(AppModule::class)]) interface AppComponent { fun inject(activity: MainActivity) fun inject(activity: ComposeActivity) fun inject(activity: SettingsActivity) - fun inject(adapter: MessagesAdapter) - fun inject(receiver: DefaultSmsChangedReceiver) fun inject(receiver: SmsReceiver) fun inject(receiver: MessageDeliveredReceiver) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt index dbe0e697..f172c68b 100755 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt @@ -21,11 +21,9 @@ import com.moez.QKSMS.presentation.base.QkAdapter import com.moez.QKSMS.presentation.base.QkViewHolder import io.reactivex.subjects.PublishSubject import kotlinx.android.synthetic.main.contact_chip.view.* +import javax.inject.Inject -class ChipsAdapter( - private val context: Context, - private val view: RecyclerView) - : QkAdapter() { +class ChipsAdapter @Inject constructor(private val context: Context) : QkAdapter() { companion object { private val TYPE_EDIT_TEXT = 0 @@ -35,6 +33,7 @@ class ChipsAdapter( private val hint: String = context.getString(R.string.title_compose) private val editText = View.inflate(context, R.layout.chip_input_list_item, null) as EditText + var view: RecyclerView? = null val chipDeleted: PublishSubject = PublishSubject.create() val textChanges = editText.textChanges() @@ -98,7 +97,7 @@ class ChipsAdapter( val detailedChipView = DetailedChipView(context) detailedChipView.setContact(contact) - val rootView = view.rootView as ViewGroup + val rootView = view?.rootView as ViewGroup val layoutParams = RelativeLayout.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt index fd4cdd1c..cebb9714 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt @@ -25,12 +25,11 @@ import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.compose_activity.* import kotlinx.android.synthetic.main.toolbar_chips.* +import javax.inject.Inject class ComposeActivity : QkActivity(), ComposeView { - private lateinit var layoutManager: LinearLayoutManager - override val viewModelClass = ComposeViewModel::class override val queryChangedIntent: Observable by lazy { chipsAdapter.textChanges } override val chipSelectedIntent: Subject by lazy { contactsAdapter.contactSelected } @@ -46,9 +45,11 @@ class ComposeActivity : QkActivity(), ComposeView { override val attachIntent by lazy { attach.clicks() } override val sendIntent by lazy { send.clicks() } - private val chipsAdapter by lazy { ChipsAdapter(this, chips) } - private val contactsAdapter by lazy { ContactAdapter(this) } - private val messageAdapter by lazy { MessagesAdapter() } + private val layoutManager by lazy { LinearLayoutManager(this).apply { stackFromEnd = true } } + + @Inject lateinit var chipsAdapter: ChipsAdapter + @Inject lateinit var contactsAdapter: ContactAdapter + @Inject lateinit var messageAdapter: MessagesAdapter init { appComponent.inject(this) @@ -60,6 +61,8 @@ class ComposeActivity : QkActivity(), ComposeView { supportActionBar?.setDisplayHomeAsUpEnabled(true) viewModel.bindView(this) + chipsAdapter.view = chips + chips.itemAnimator = null chips.layoutManager = FlexboxLayoutManager(this) chips.adapter = chipsAdapter @@ -70,7 +73,6 @@ class ComposeActivity : QkActivity(), ComposeView { setupMessagesAdapter() - layoutManager = LinearLayoutManager(this).apply { stackFromEnd = true } messageList.layoutManager = layoutManager messageList.adapter = messageAdapter diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt index ba3af366..0df83475 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt @@ -11,8 +11,9 @@ import com.moez.QKSMS.presentation.base.QkViewHolder import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.contact_list_item.view.* +import javax.inject.Inject -class ContactAdapter(private val context: Context) : QkAdapter() { +class ContactAdapter @Inject constructor(private val context: Context) : QkAdapter() { val contactSelected: Subject = PublishSubject.create() diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt index a1bf885a..2b5f8d2a 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt @@ -7,7 +7,6 @@ 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.appComponent import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.common.util.DateFormatter import com.moez.QKSMS.common.util.extensions.dpToPx @@ -26,26 +25,22 @@ import timber.log.Timber import java.util.concurrent.TimeUnit import javax.inject.Inject -class MessagesAdapter : RealmRecyclerViewAdapter(null, true) { +class MessagesAdapter @Inject constructor( + private val context: Context, + private val colors: Colors, + private val dateFormatter: DateFormatter) + : RealmRecyclerViewAdapter(null, true) { companion object { private val VIEWTYPE_ME = -1 private val TIMESTAMP_THRESHOLD = 60 } - @Inject lateinit var context: Context - @Inject lateinit var colors: Colors - @Inject lateinit var dateFormatter: DateFormatter - val longClicks: Subject = PublishSubject.create() private val people = ArrayList() private val disposables = CompositeDisposable() - init { - appComponent.inject(this) - } - override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder { val layoutInflater = LayoutInflater.from(context)