diff --git a/presentation/src/main/java/common/QkDialog.kt b/presentation/src/main/java/common/QkDialog.kt new file mode 100644 index 00000000..92f94e96 --- /dev/null +++ b/presentation/src/main/java/common/QkDialog.kt @@ -0,0 +1,50 @@ +package common + +import android.app.Activity +import android.app.AlertDialog +import android.content.Context +import android.support.annotation.StringRes +import android.support.v7.widget.LinearLayoutManager +import android.support.v7.widget.RecyclerView +import common.util.extensions.dpToPx +import common.util.extensions.setPadding +import injection.appComponent +import javax.inject.Inject + +/** + * Wrapper around AlertDialog which makes it easier to display lists that use our UI + */ +class QkDialog @Inject constructor(private val context: Context, val adapter: MenuItemAdapter) { + + var title: String? = null + + init { + appComponent.inject(this) + } + + fun show(activity: Activity) { + val recyclerView = RecyclerView(context) + recyclerView.layoutManager = LinearLayoutManager(context) + recyclerView.adapter = adapter + recyclerView.setPadding(top = 8.dpToPx(context), bottom = 8.dpToPx(context)) + + val dialog = AlertDialog.Builder(activity) + .setTitle(title) + .setView(recyclerView) + .create() + + val clicks = adapter.menuItemClicks + .subscribe { dialog.dismiss() } + + dialog.setOnDismissListener { + clicks.dispose() + } + + dialog.show() + } + + fun setTitle(@StringRes title: Int) { + this.title = context.getString(title) + } + +} \ No newline at end of file diff --git a/presentation/src/main/java/feature/compose/ComposeActivity.kt b/presentation/src/main/java/feature/compose/ComposeActivity.kt index 644229e5..f9726c15 100644 --- a/presentation/src/main/java/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/feature/compose/ComposeActivity.kt @@ -35,6 +35,7 @@ import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable import common.MenuItemAdapter +import common.QkDialog import common.base.QkThemedActivity import common.util.extensions.autoScrollToStart import common.util.extensions.dpToPx @@ -66,7 +67,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { override val infoIntent: Subject = PublishSubject.create() override val messageClickIntent: Subject by lazy { messageAdapter.clicks } override val messageLongClickIntent: Subject by lazy { messageAdapter.longClicks } - override val menuItemIntent: Subject by lazy { menuItemAdapter.menuItemClicks } + override val menuItemIntent: Subject by lazy { dialog.adapter.menuItemClicks } override val attachmentDeletedIntent: Subject by lazy { attachmentAdapter.attachmentDeleted } override val textChangedIntent by lazy { message.textChanges() } override val attachIntent by lazy { attach.clicks() } @@ -74,8 +75,8 @@ class ComposeActivity : QkThemedActivity(), ComposeView { @Inject lateinit var chipsAdapter: ChipsAdapter @Inject lateinit var contactsAdapter: ContactAdapter + @Inject lateinit var dialog: QkDialog @Inject lateinit var messageAdapter: MessagesAdapter - @Inject lateinit var menuItemAdapter: MenuItemAdapter @Inject lateinit var attachmentAdapter: AttachmentAdapter init { @@ -205,20 +206,8 @@ class ComposeActivity : QkThemedActivity(), ComposeView { } override fun showMenu(menuItems: List) { - val recyclerView = RecyclerView(this) - recyclerView.layoutManager = LinearLayoutManager(this) - recyclerView.adapter = menuItemAdapter - recyclerView.setPadding(0, 8.dpToPx(this), 0, 8.dpToPx(this)) - - val dialog = AlertDialog.Builder(this) - .setView(recyclerView) - .create() - .apply { show() } - - menuItemAdapter.data = menuItems - menuItemAdapter.menuItemClicks - .autoDisposable(scope()) - .subscribe { dialog.dismiss() } + dialog.adapter.data = menuItems + dialog.show(this) } override fun onCreateOptionsMenu(menu: Menu?): Boolean { diff --git a/presentation/src/main/java/feature/main/MainActivity.kt b/presentation/src/main/java/feature/main/MainActivity.kt index 3fd91cd2..43ba5c5c 100644 --- a/presentation/src/main/java/feature/main/MainActivity.kt +++ b/presentation/src/main/java/feature/main/MainActivity.kt @@ -26,7 +26,6 @@ import android.os.Bundle import android.support.design.widget.Snackbar import android.support.v7.app.ActionBarDrawerToggle import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView import android.support.v7.widget.helper.ItemTouchHelper import android.view.Gravity import android.view.Menu @@ -37,12 +36,11 @@ import com.jakewharton.rxbinding2.widget.textChanges import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable -import common.MenuItemAdapter import common.Navigator +import common.QkDialog import common.base.QkThemedActivity import common.util.extensions.autoScrollToStart import common.util.extensions.dismissKeyboard -import common.util.extensions.dpToPx import common.util.extensions.setBackgroundTint import common.util.extensions.setTint import common.util.extensions.setVisible @@ -62,8 +60,8 @@ class MainActivity : QkThemedActivity(), MainView { @Inject lateinit var navigator: Navigator @Inject lateinit var conversationsAdapter: ConversationsAdapter + @Inject lateinit var dialog: QkDialog @Inject lateinit var itemTouchCallback: ConversationItemTouchCallback - @Inject lateinit var menuItemAdapter: MenuItemAdapter override val viewModelClass = MainViewModel::class override val queryChangedIntent by lazy { toolbarSearch.textChanges() } @@ -85,7 +83,7 @@ class MainActivity : QkThemedActivity(), MainView { } override val conversationClickIntent by lazy { conversationsAdapter.clicks } override val conversationLongClickIntent by lazy { conversationsAdapter.longClicks } - override val conversationMenuItemIntent by lazy { menuItemAdapter.menuItemClicks } + override val conversationMenuItemIntent by lazy { dialog.adapter.menuItemClicks } override val confirmDeleteIntent: Subject = PublishSubject.create() override val swipeConversationIntent by lazy { itemTouchCallback.swipes } override val undoSwipeConversationIntent: Subject = PublishSubject.create() @@ -96,7 +94,6 @@ class MainActivity : QkThemedActivity(), MainView { setAction(R.string.button_undo, { undoSwipeConversationIntent.onNext(Unit) }) } } - private var conversationMenuDialog: AlertDialog? = null init { appComponent.inject(this) @@ -199,7 +196,6 @@ class MainActivity : QkThemedActivity(), MainView { if (recyclerView.adapter !== conversationsAdapter) recyclerView.adapter = conversationsAdapter conversationsAdapter.flowable = state.page.data itemTouchHelper.attachToRecyclerView(recyclerView) - menuItemAdapter.data = state.page.menu empty.setText(when (state.page.showClearButton) { true -> R.string.inbox_search_empty_text false -> R.string.inbox_empty_text @@ -212,7 +208,6 @@ class MainActivity : QkThemedActivity(), MainView { if (recyclerView.adapter !== conversationsAdapter) recyclerView.adapter = conversationsAdapter conversationsAdapter.flowable = state.page.data itemTouchHelper.attachToRecyclerView(null) - menuItemAdapter.data = state.page.menu empty.setText(R.string.archived_empty_text) compose.setVisible(true) } @@ -221,7 +216,6 @@ class MainActivity : QkThemedActivity(), MainView { if (!scheduled.isSelected) toolbarSearch.setText(R.string.title_scheduled) recyclerView.adapter = null itemTouchHelper.attachToRecyclerView(null) - menuItemAdapter.data = ArrayList() empty.setText(R.string.scheduled_empty_text) compose.setVisible(false) } @@ -241,20 +235,6 @@ class MainActivity : QkThemedActivity(), MainView { if (drawerLayout.isDrawerOpen(Gravity.START) && !state.drawerOpen) drawerLayout.closeDrawer(Gravity.START) else if (!drawerLayout.isDrawerVisible(Gravity.START) && state.drawerOpen) drawerLayout.openDrawer(Gravity.START) - - if (conversationMenuDialog?.isShowing == true && menuItemAdapter.data.isEmpty()) { - conversationMenuDialog?.dismiss() - conversationMenuDialog = null - } else if (conversationMenuDialog?.isShowing != true && menuItemAdapter.data.isNotEmpty()) { - val recyclerView = RecyclerView(this) - recyclerView.layoutManager = LinearLayoutManager(this) - recyclerView.adapter = menuItemAdapter - recyclerView.setPadding(0, 8.dpToPx(this), 0, 8.dpToPx(this)) - conversationMenuDialog = AlertDialog.Builder(this).setView(recyclerView).create().apply { - setOnDismissListener { conversationMenuItemIntent.onNext(-1) } - show() - } - } } override fun clearSearch() { @@ -262,6 +242,11 @@ class MainActivity : QkThemedActivity(), MainView { toolbarSearch.text = null } + override fun showDialog(menuItems: List) { + dialog.adapter.data = menuItems + dialog.show(this) + } + override fun showDeleteDialog() { AlertDialog.Builder(this) .setTitle(R.string.dialog_delete_title) diff --git a/presentation/src/main/java/feature/main/MainState.kt b/presentation/src/main/java/feature/main/MainState.kt index 50bdaa35..e1451da1 100644 --- a/presentation/src/main/java/feature/main/MainState.kt +++ b/presentation/src/main/java/feature/main/MainState.kt @@ -18,7 +18,6 @@ */ package feature.main -import common.MenuItem import io.reactivex.Flowable import model.Conversation @@ -33,12 +32,10 @@ sealed class MainPage data class Inbox( val showClearButton: Boolean = false, val data: Flowable>? = null, - val menu: List = ArrayList(), val showArchivedSnackbar: Boolean = false) : MainPage() data class Archived( - val data: Flowable>? = null, - val menu: List = ArrayList()) : MainPage() + val data: Flowable>? = null) : MainPage() data class Scheduled( val data: Any? = null) : MainPage() \ No newline at end of file diff --git a/presentation/src/main/java/feature/main/MainView.kt b/presentation/src/main/java/feature/main/MainView.kt index 0c2598c8..3bfd59c3 100644 --- a/presentation/src/main/java/feature/main/MainView.kt +++ b/presentation/src/main/java/feature/main/MainView.kt @@ -18,6 +18,7 @@ */ package feature.main +import common.MenuItem import common.base.QkView import io.reactivex.Observable @@ -36,6 +37,7 @@ interface MainView : QkView { val undoSwipeConversationIntent: Observable fun clearSearch() + fun showDialog(menuItems: List) fun showDeleteDialog() } diff --git a/presentation/src/main/java/feature/main/MainViewModel.kt b/presentation/src/main/java/feature/main/MainViewModel.kt index 043d9db1..9ceeff02 100644 --- a/presentation/src/main/java/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/feature/main/MainViewModel.kt @@ -171,33 +171,14 @@ class MainViewModel : QkViewModel(MainState()) { view.conversationLongClickIntent .withLatestFrom(state, { _, mainState -> when (mainState.page) { - is Inbox -> { - val page = mainState.page.copy(menu = listOf(menuArchive, menuBlock, menuDelete)) - newState { it.copy(page = page) } - } - is Archived -> { - val page = mainState.page.copy(menu = listOf(menuUnarchive, menuBlock, menuDelete)) - newState { it.copy(page = page) } - } + is Inbox -> view.showDialog(listOf(menuArchive, menuBlock, menuDelete)) + is Archived -> view.showDialog(listOf(menuUnarchive, menuBlock, menuDelete)) } }) .autoDisposable(view.scope()) .subscribe() view.conversationMenuItemIntent - .withLatestFrom(state, { actionId, mainState -> - when (mainState.page) { - is Inbox -> { - val page = mainState.page.copy(menu = ArrayList()) - newState { it.copy(page = page) } - } - is Archived -> { - val page = mainState.page.copy(menu = ArrayList()) - newState { it.copy(page = page) } - } - } - actionId - }) .withLatestFrom(view.conversationLongClickIntent, { actionId, threadId -> when (actionId) { menuArchive.actionId -> markArchived.execute(threadId) diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt index 8a3df7ac..f870fa99 100644 --- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt +++ b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt @@ -19,21 +19,17 @@ package feature.notificationprefs import android.app.Activity -import android.app.AlertDialog import android.content.Intent import android.media.RingtoneManager import android.net.Uri import android.os.Build import android.os.Bundle -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.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable -import common.MenuItemAdapter +import common.QkDialog import common.base.QkThemedActivity -import common.util.extensions.dpToPx import common.util.extensions.setVisible import common.widget.PreferenceView import injection.appComponent @@ -45,11 +41,11 @@ import javax.inject.Inject class NotificationPrefsActivity : QkThemedActivity(), NotificationPrefsView { - @Inject lateinit var notificationPreviewModeAdapter: MenuItemAdapter + @Inject lateinit var previewModeDialog: QkDialog override val viewModelClass = NotificationPrefsViewModel::class override val preferenceClickIntent: Subject = PublishSubject.create() - override val notificationPreviewModeSelectedIntent by lazy { notificationPreviewModeAdapter.menuItemClicks } + override val previewModeSelectedIntent by lazy { previewModeDialog.adapter.menuItemClicks } override val ringtoneSelectedIntent: Subject = PublishSubject.create() init { @@ -70,7 +66,8 @@ class NotificationPrefsActivity : QkThemedActivity() vibration.setVisible(!hasOreo) ringtone.setVisible(!hasOreo) - notificationPreviewModeAdapter.setData(R.array.notification_preview_options) + previewModeDialog.setTitle(R.string.settings_notification_previews_title) + previewModeDialog.adapter.setData(R.array.notification_preview_options) colors.background .autoDisposable(scope()) @@ -101,21 +98,7 @@ class NotificationPrefsActivity : QkThemedActivity() qkreplyTapDismiss.checkbox.isChecked = state.qkReplyTapDismiss } - override fun showNotificationPreviewModeDialog() { - val recyclerView = RecyclerView(this) - recyclerView.layoutManager = LinearLayoutManager(this) - recyclerView.adapter = notificationPreviewModeAdapter - recyclerView.setPadding(0, 8.dpToPx(this), 0, 8.dpToPx(this)) - - val dialog = AlertDialog.Builder(this) - .setView(recyclerView) - .create() - .apply { show() } - - notificationPreviewModeAdapter.menuItemClicks - .autoDisposable(scope()) - .subscribe { dialog.dismiss() } - } + override fun showPreviewModeDialog() = previewModeDialog.show(this) override fun showRingtonePicker(default: Uri) { val intent = Intent(RingtoneManager.ACTION_RINGTONE_PICKER) diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsView.kt b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsView.kt index 3ebb4a20..ab9f559c 100644 --- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsView.kt +++ b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsView.kt @@ -27,9 +27,9 @@ import io.reactivex.subjects.Subject interface NotificationPrefsView : QkView { val preferenceClickIntent: Subject - val notificationPreviewModeSelectedIntent: Subject + val previewModeSelectedIntent: Subject val ringtoneSelectedIntent: Observable - fun showNotificationPreviewModeDialog() + fun showPreviewModeDialog() fun showRingtonePicker(default: Uri) } diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt index dc40f64a..aefae71f 100644 --- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt +++ b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt @@ -97,7 +97,7 @@ class NotificationPrefsViewModel(intent: Intent) : QkViewModel notifications.set(!notifications.get()) - R.id.notificationPreviews -> view.showNotificationPreviewModeDialog() + R.id.notificationPreviews -> view.showPreviewModeDialog() R.id.vibration -> vibration.set(!vibration.get()) @@ -109,7 +109,7 @@ class NotificationPrefsViewModel(intent: Intent) : QkViewModel(), SettingsView { - @Inject lateinit var nightModeAdapter: MenuItemAdapter - @Inject lateinit var textSizeAdapter: MenuItemAdapter - @Inject lateinit var mmsSizeAdapter: MenuItemAdapter + @Inject lateinit var nightModeDialog: QkDialog + @Inject lateinit var textSizeDialog: QkDialog + @Inject lateinit var mmsSizeDialog: QkDialog override val viewModelClass = SettingsViewModel::class override val preferenceClickIntent: Subject = PublishSubject.create() - override val nightModeSelectedIntent by lazy { nightModeAdapter.menuItemClicks } + override val nightModeSelectedIntent by lazy { nightModeDialog.adapter.menuItemClicks } override val viewQksmsPlusIntent: Subject = PublishSubject.create() override val startTimeSelectedIntent: Subject> = PublishSubject.create() override val endTimeSelectedIntent: Subject> = PublishSubject.create() - override val textSizeSelectedIntent by lazy { textSizeAdapter.menuItemClicks } - override val mmsSizeSelectedIntent: Subject by lazy { mmsSizeAdapter.menuItemClicks } + override val textSizeSelectedIntent by lazy { textSizeDialog.adapter.menuItemClicks } + override val mmsSizeSelectedIntent: Subject by lazy { mmsSizeDialog.adapter.menuItemClicks } // TODO remove this private val progressDialog by lazy { @@ -69,10 +65,6 @@ class SettingsActivity : QkThemedActivity(), SettingsView { } } - private var nightModeDialog: AlertDialog? = null - private var textSizeDialog: AlertDialog? = null - private var mmsSizeDialog: AlertDialog? = null - init { appComponent.inject(this) } @@ -84,9 +76,9 @@ class SettingsActivity : QkThemedActivity(), SettingsView { showBackButton(true) viewModel.bindView(this) - nightModeAdapter.setData(R.array.night_modes) - textSizeAdapter.setData(R.array.text_sizes) - mmsSizeAdapter.setData(R.array.mms_sizes, R.array.mms_sizes_ids) + nightModeDialog.adapter.setData(R.array.night_modes) + textSizeDialog.adapter.setData(R.array.text_sizes) + mmsSizeDialog.adapter.setData(R.array.mms_sizes, R.array.mms_sizes_ids) version.text = getString(R.string.settings_version, BuildConfig.VERSION_NAME) @@ -133,25 +125,11 @@ class SettingsActivity : QkThemedActivity(), SettingsView { unicode.checkbox.isChecked = state.stripUnicodeEnabled mmsSize.summary = state.maxMmsSizeSummary - mmsSizeAdapter.selectedItem = state.maxMmsSizeId + mmsSizeDialog.adapter.selectedItem = state.maxMmsSizeId } // TODO change this to a PopupWindow - override fun showNightModeDialog() { - val recyclerView = RecyclerView(this) - recyclerView.layoutManager = LinearLayoutManager(this) - recyclerView.adapter = nightModeAdapter - recyclerView.setPadding(0, 8.dpToPx(this), 0, 8.dpToPx(this)) - nightModeDialog = AlertDialog.Builder(this) - .setTitle(R.string.settings_night_title) - .setView(recyclerView) - .create().apply { show() } - } - - override fun dismissNightModeDialog() { - nightModeDialog?.dismiss() - nightModeDialog = null - } + override fun showNightModeDialog() = nightModeDialog.show(this) override fun showQksmsPlusSnackbar() { Snackbar.make(contentView, R.string.toast_qksms_plus, Snackbar.LENGTH_LONG).run { @@ -172,37 +150,8 @@ class SettingsActivity : QkThemedActivity(), SettingsView { }, hour, minute, false).show() } - override fun showTextSizePicker() { - val recyclerView = RecyclerView(this) - recyclerView.layoutManager = LinearLayoutManager(this) - recyclerView.adapter = textSizeAdapter - recyclerView.setPadding(0, 8.dpToPx(this), 0, 8.dpToPx(this)) - textSizeDialog = AlertDialog.Builder(this) - .setTitle(R.string.settings_text_size_title) - .setView(recyclerView) - .create().apply { show() } - } + override fun showTextSizePicker() = textSizeDialog.show(this) - override fun dismissTextSizePicker() { - textSizeDialog?.dismiss() - textSizeDialog = null - } - - override fun showMmsSizePicker() { - val recyclerView = RecyclerView(this) - recyclerView.layoutManager = LinearLayoutManager(this) - recyclerView.adapter = mmsSizeAdapter - recyclerView.setPadding(0, 8.dpToPx(this), 0, 8.dpToPx(this)) - mmsSizeDialog = AlertDialog.Builder(this) - .setTitle(R.string.settings_mms_size_title) - .setNegativeButton(R.string.button_cancel, null) - .setView(recyclerView) - .create().apply { show() } - } - - override fun dismissMmsSizePicker() { - mmsSizeDialog?.dismiss() - mmsSizeDialog = null - } + override fun showMmsSizePicker() = mmsSizeDialog.show(this) } \ No newline at end of file diff --git a/presentation/src/main/java/feature/settings/SettingsView.kt b/presentation/src/main/java/feature/settings/SettingsView.kt index 4287131c..0253bcfb 100644 --- a/presentation/src/main/java/feature/settings/SettingsView.kt +++ b/presentation/src/main/java/feature/settings/SettingsView.kt @@ -34,12 +34,9 @@ interface SettingsView : QkView { val mmsSizeSelectedIntent: Observable fun showNightModeDialog() - fun dismissNightModeDialog() fun showQksmsPlusSnackbar() fun showStartTimePicker(hour: Int, minute: Int) fun showEndTimePicker(hour: Int, minute: Int) fun showTextSizePicker() - fun dismissTextSizePicker() fun showMmsSizePicker() - fun dismissMmsSizePicker() } diff --git a/presentation/src/main/java/feature/settings/SettingsViewModel.kt b/presentation/src/main/java/feature/settings/SettingsViewModel.kt index adb896ac..61455876 100644 --- a/presentation/src/main/java/feature/settings/SettingsViewModel.kt +++ b/presentation/src/main/java/feature/settings/SettingsViewModel.kt @@ -158,7 +158,6 @@ class SettingsViewModel : QkViewModel(SettingsState } view.nightModeSelectedIntent - .doOnNext { view.dismissNightModeDialog() } .withLatestFrom(billingManager.upgradeStatus, { mode, upgraded -> if (!upgraded && mode == Preferences.NIGHT_MODE_AUTO) { view.showQksmsPlusSnackbar() @@ -186,12 +185,10 @@ class SettingsViewModel : QkViewModel(SettingsState .subscribe { prefs.nightEnd.set(it) } view.textSizeSelectedIntent - .doOnNext { view.dismissTextSizePicker() } .autoDisposable(view.scope()) .subscribe { prefs.textSize.set(it) } view.mmsSizeSelectedIntent - .doOnNext { view.dismissMmsSizePicker() } .autoDisposable(view.scope()) .subscribe { prefs.mmsSize.set(it) } } diff --git a/presentation/src/main/java/injection/AppComponent.kt b/presentation/src/main/java/injection/AppComponent.kt index d6ac1009..ad7b0cfe 100644 --- a/presentation/src/main/java/injection/AppComponent.kt +++ b/presentation/src/main/java/injection/AppComponent.kt @@ -19,6 +19,7 @@ package injection import common.QKApplication +import common.QkDialog import common.util.ContactImageLoader import common.widget.AvatarView import common.widget.MmsPreviewView @@ -86,6 +87,10 @@ interface AppComponent { fun inject(activity: SettingsActivity) fun inject(activity: ThemePickerActivity) + fun inject(dialog: QkDialog) + + fun inject(fetcher: ContactImageLoader.ContactImageFetcher) + fun inject(receiver: DefaultSmsChangedReceiver) fun inject(receiver: SmsDeliveredReceiver) fun inject(receiver: SmsSentReceiver) @@ -124,6 +129,4 @@ interface AppComponent { fun inject(viewModel: SettingsViewModel) fun inject(viewModel: ThemePickerViewModel) - fun inject(fetcher: ContactImageLoader.ContactImageFetcher) - } \ No newline at end of file