Optimize all imports

common/src/main/java/com/bumptech/glide/gifencoder/AnimatedGifEncoder.java

@@ -4,15 +4,17 @@ package com.bumptech.glide.gifencoder;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import timber.log.Timber;
 
 import java.io.BufferedOutputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
+import timber.log.Timber;
+
 public class AnimatedGifEncoder {
 
     // The minimum % of an images pixels that must be transparent for us to set a transparent index

data/src/androidTest/java/com/moez/QKSMS/repository/PhoneNumberUtilsTest.kt

@@ -26,7 +26,7 @@ import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.util.*
+import java.util.Locale
 
 @RunWith(AndroidJUnit4::class)
 class PhoneNumberUtilsTest {

data/src/main/java/com/moez/QKSMS/blocking/CallBlockerBlockingClient.kt

@@ -28,7 +28,6 @@ import dev.octoshrimpy.quik.extensions.map
 import io.reactivex.Completable
 import io.reactivex.Single
 import timber.log.Timber
-import java.util.*
 import javax.inject.Inject
 
 class CallBlockerBlockingClient @Inject constructor(

data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt

@@ -18,8 +18,6 @@
  */
 package dev.octoshrimpy.quik.compat
 
-import android.annotation.TargetApi
-import android.os.Build
 import android.telephony.SubscriptionInfo
 
 data class SubscriptionInfoCompat(private val subscriptionInfo: SubscriptionInfo) {

data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt

@@ -19,7 +19,6 @@
 package dev.octoshrimpy.quik.compat
 
 import android.content.Context
-import android.os.Build
 import android.telephony.SubscriptionManager
 import dev.octoshrimpy.quik.manager.PermissionManager
 import javax.inject.Inject

data/src/main/java/com/moez/QKSMS/manager/AlarmManagerImpl.kt

@@ -21,7 +21,6 @@ package dev.octoshrimpy.quik.manager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import android.os.Build
 import dev.octoshrimpy.quik.receiver.SendScheduledMessageReceiver
 import javax.inject.Inject
 

data/src/main/java/com/moez/QKSMS/manager/ChangelogManagerImpl.kt

@@ -20,21 +20,14 @@ package dev.octoshrimpy.quik.manager
 
 import android.content.Context
 import android.util.Log
-import dev.octoshrimpy.quik.common.util.extensions.versionCode
-import dev.octoshrimpy.quik.util.Preferences
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types
-import io.reactivex.Single
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
+import dev.octoshrimpy.quik.common.util.extensions.versionCode
+import dev.octoshrimpy.quik.util.Preferences
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import okhttp3.Call
-import okhttp3.Callback
-import okhttp3.Response
-import java.io.IOException
 import javax.inject.Inject
 
 class ChangelogManagerImpl @Inject constructor(

data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt

@@ -21,11 +21,12 @@ package dev.octoshrimpy.quik.mapper
 import android.content.Context
 import android.database.Cursor
 import android.net.Uri
-import android.provider.Telephony.*
+import android.provider.Telephony.Mms
+import android.provider.Telephony.MmsSms
+import android.provider.Telephony.Sms
 import com.google.android.mms.pdu_alt.EncodedStringValue
 import com.google.android.mms.pdu_alt.PduHeaders
 import com.google.android.mms.pdu_alt.PduPersister
-import dev.octoshrimpy.quik.extensions.map
 import dev.octoshrimpy.quik.manager.KeyManager
 import dev.octoshrimpy.quik.manager.PermissionManager
 import dev.octoshrimpy.quik.model.Message

data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt

@@ -21,11 +21,11 @@ package dev.octoshrimpy.quik.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import dagger.android.AndroidInjection
 import dev.octoshrimpy.quik.blocking.BlockingClient
 import dev.octoshrimpy.quik.interactor.MarkBlocked
 import dev.octoshrimpy.quik.repository.ConversationRepository
 import dev.octoshrimpy.quik.util.Preferences
-import dagger.android.AndroidInjection
 import io.reactivex.schedulers.Schedulers
 import javax.inject.Inject
 

data/src/main/java/com/moez/QKSMS/receiver/BootReceiver.kt

@@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import dev.octoshrimpy.quik.interactor.UpdateScheduledMessageAlarms
 import dagger.android.AndroidInjection
+import dev.octoshrimpy.quik.interactor.UpdateScheduledMessageAlarms
 import javax.inject.Inject
 
 class BootReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt

@@ -24,9 +24,9 @@ import android.content.Intent
 import android.os.Build
 import android.provider.Telephony
 import androidx.annotation.RequiresApi
+import dagger.android.AndroidInjection
 import dev.octoshrimpy.quik.interactor.SyncMessages
 import dev.octoshrimpy.quik.util.Preferences
-import dagger.android.AndroidInjection
 import javax.inject.Inject
 
 class DefaultSmsChangedReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/DeleteMessagesReceiver.kt

@@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import dev.octoshrimpy.quik.interactor.DeleteMessages
 import dagger.android.AndroidInjection
+import dev.octoshrimpy.quik.interactor.DeleteMessages
 import javax.inject.Inject
 
 class DeleteMessagesReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/MarkArchivedReceiver.kt

@@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import dev.octoshrimpy.quik.interactor.MarkArchived
 import dagger.android.AndroidInjection
+import dev.octoshrimpy.quik.interactor.MarkArchived
 import javax.inject.Inject
 
 class MarkArchivedReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt

@@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import dev.octoshrimpy.quik.interactor.MarkRead
 import dagger.android.AndroidInjection
+import dev.octoshrimpy.quik.interactor.MarkRead
 import javax.inject.Inject
 
 class MarkReadReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt

@@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import dev.octoshrimpy.quik.interactor.MarkSeen
 import dagger.android.AndroidInjection
+import dev.octoshrimpy.quik.interactor.MarkSeen
 import javax.inject.Inject
 
 class MarkSeenReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/MmsReceivedReceiver.kt

@@ -22,8 +22,8 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import com.klinker.android.send_message.MmsReceivedReceiver
-import dev.octoshrimpy.quik.interactor.ReceiveMms
 import dagger.android.AndroidInjection
+import dev.octoshrimpy.quik.interactor.ReceiveMms
 import javax.inject.Inject
 
 class MmsReceivedReceiver : MmsReceivedReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/MmsSentReceiver.kt

@@ -29,8 +29,8 @@ import android.provider.Telephony
 import com.google.android.mms.MmsException
 import com.google.android.mms.util_alt.SqliteWrapper
 import com.klinker.android.send_message.Transaction
-import dev.octoshrimpy.quik.interactor.SyncMessage
 import dagger.android.AndroidInjection
+import dev.octoshrimpy.quik.interactor.SyncMessage
 import timber.log.Timber
 import java.io.File
 import javax.inject.Inject

data/src/main/java/com/moez/QKSMS/receiver/MmsUpdatedReceiver.kt

@@ -22,8 +22,8 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import dev.octoshrimpy.quik.interactor.SyncMessage
 import dagger.android.AndroidInjection
+import dev.octoshrimpy.quik.interactor.SyncMessage
 import javax.inject.Inject
 
 class MmsUpdatedReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt

@@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import dev.octoshrimpy.quik.util.NightModeManager
 import dagger.android.AndroidInjection
+import dev.octoshrimpy.quik.util.NightModeManager
 import javax.inject.Inject
 
 class NightModeReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt

@@ -22,12 +22,12 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import androidx.core.app.RemoteInput
+import dagger.android.AndroidInjection
 import dev.octoshrimpy.quik.compat.SubscriptionManagerCompat
 import dev.octoshrimpy.quik.interactor.MarkRead
 import dev.octoshrimpy.quik.interactor.SendMessage
 import dev.octoshrimpy.quik.repository.ConversationRepository
 import dev.octoshrimpy.quik.repository.MessageRepository
-import dagger.android.AndroidInjection
 import javax.inject.Inject
 
 class RemoteMessagingReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/SendScheduledMessageReceiver.kt

@@ -21,9 +21,9 @@ package dev.octoshrimpy.quik.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import dagger.android.AndroidInjection
 import dev.octoshrimpy.quik.interactor.SendScheduledMessage
 import dev.octoshrimpy.quik.repository.MessageRepository
-import dagger.android.AndroidInjection
 import javax.inject.Inject
 
 class SendScheduledMessageReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/SendSmsReceiver.kt

@@ -21,9 +21,9 @@ package dev.octoshrimpy.quik.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import dagger.android.AndroidInjection
 import dev.octoshrimpy.quik.interactor.RetrySending
 import dev.octoshrimpy.quik.repository.MessageRepository
-import dagger.android.AndroidInjection
 import javax.inject.Inject
 
 class SendSmsReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/SmsDeliveredReceiver.kt

@@ -22,9 +22,9 @@ import android.app.Activity
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import dagger.android.AndroidInjection
 import dev.octoshrimpy.quik.interactor.MarkDelivered
 import dev.octoshrimpy.quik.interactor.MarkDeliveryFailed
-import dagger.android.AndroidInjection
 import javax.inject.Inject
 
 class SmsDeliveredReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt

@@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import dev.octoshrimpy.quik.interactor.SyncMessage
 import dagger.android.AndroidInjection
+import dev.octoshrimpy.quik.interactor.SyncMessage
 import javax.inject.Inject
 
 /**

data/src/main/java/com/moez/QKSMS/receiver/SmsSentReceiver.kt

@@ -22,9 +22,9 @@ import android.app.Activity
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import dagger.android.AndroidInjection
 import dev.octoshrimpy.quik.interactor.MarkFailed
 import dev.octoshrimpy.quik.interactor.MarkSent
-import dagger.android.AndroidInjection
 import javax.inject.Inject
 
 class SmsSentReceiver : BroadcastReceiver() {

data/src/main/java/com/moez/QKSMS/receiver/SpeakThreadsReceiver.kt

@@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import dev.octoshrimpy.quik.interactor.SpeakThreads
 import dagger.android.AndroidInjection
+import dev.octoshrimpy.quik.interactor.SpeakThreads
 import dev.octoshrimpy.quik.repository.ConversationRepository
 import javax.inject.Inject
 

data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt

@@ -27,11 +27,11 @@ import android.provider.Telephony
 import androidx.core.content.contentValuesOf
 import androidx.core.net.toUri
 import androidx.documentfile.provider.DocumentFile
+import com.squareup.moshi.Moshi
 import dev.octoshrimpy.quik.common.util.extensions.now
 import dev.octoshrimpy.quik.model.BackupFile
 import dev.octoshrimpy.quik.model.Message
 import dev.octoshrimpy.quik.util.Preferences
-import com.squareup.moshi.Moshi
 import io.reactivex.Observable
 import io.reactivex.subjects.BehaviorSubject
 import io.reactivex.subjects.Subject
@@ -40,7 +40,8 @@ import okio.buffer
 import okio.source
 import timber.log.Timber
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Locale
+import java.util.Timer
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.concurrent.schedule

data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt

@@ -68,7 +68,6 @@ import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.inject.Singleton
-import kotlin.collections.ArrayList
 import kotlin.math.sqrt
 
 @Singleton

data/src/main/java/com/moez/QKSMS/service/AutoDeleteService.kt

@@ -6,13 +6,11 @@ import android.app.job.JobParameters
 import android.app.job.JobService
 import android.content.ComponentName
 import android.content.Context
-import androidx.core.content.getSystemService
+import dagger.android.AndroidInjection
 import dev.octoshrimpy.quik.common.util.extensions.jobScheduler
 import dev.octoshrimpy.quik.interactor.DeleteOldMessages
-import dagger.android.AndroidInjection
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.plusAssign
-import kotlinx.coroutines.Job
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject

data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt

@@ -22,9 +22,9 @@ import android.app.IntentService
 import android.content.Intent
 import android.net.Uri
 import android.telephony.TelephonyManager
+import dagger.android.AndroidInjection
 import dev.octoshrimpy.quik.interactor.SendMessage
 import dev.octoshrimpy.quik.repository.ConversationRepository
-import dagger.android.AndroidInjection
 import javax.inject.Inject
 
 class HeadlessSmsSendService : IntentService("HeadlessSmsSendService") {

data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt

@@ -26,7 +26,8 @@ import androidx.appcompat.app.AppCompatDelegate
 import dev.octoshrimpy.quik.manager.WidgetManager
 import dev.octoshrimpy.quik.receiver.NightModeReceiver
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Calendar
+import java.util.Locale
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.inject.Singleton

data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt

@@ -22,7 +22,7 @@ import android.content.Context
 import android.telephony.PhoneNumberUtils
 import io.michaelrocks.libphonenumber.android.PhoneNumberUtil
 import io.michaelrocks.libphonenumber.android.Phonenumber
-import java.util.*
+import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Singleton
 

data/src/main/java/com/moez/QKSMS/worker/HousekeepingWorker.kt

@@ -25,8 +25,8 @@ import androidx.work.PeriodicWorkRequest
 import androidx.work.WorkManager
 import androidx.work.Worker
 import androidx.work.WorkerParameters
-import com.moez.QKSMS.util.Constants
 import com.moez.QKSMS.manager.MediaRecorderManager
+import com.moez.QKSMS.util.Constants
 import dev.octoshrimpy.quik.repository.ScheduledMessageRepository
 import java.io.File
 import java.util.concurrent.TimeUnit

data/src/noAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt

@@ -19,11 +19,7 @@
 
 package dev.octoshrimpy.quik.manager
 
-import android.content.Context
-import dev.octoshrimpy.quik.util.Preferences
-import kotlinx.coroutines.suspendCancellableCoroutine
 import javax.inject.Inject
-import kotlin.coroutines.resume
 
 class ReferralManagerImpl @Inject constructor() : ReferralManager {
 

domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt

@@ -21,7 +21,8 @@ package dev.octoshrimpy.quik.experiment
 import android.content.Context
 import android.preference.PreferenceManager
 import dev.octoshrimpy.quik.manager.AnalyticsManager
-import java.util.*
+import java.util.Locale
+import java.util.Random
 
 abstract class Experiment<T>(val context: Context, val analytics: AnalyticsManager) {
 

domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt

@@ -23,7 +23,6 @@ import android.content.Context
 import android.net.Uri
 import androidx.core.net.toUri
 import dev.octoshrimpy.quik.extensions.getName
-import dev.octoshrimpy.quik.extensions.mapNotNull
 import dev.octoshrimpy.quik.repository.ScheduledMessageRepository
 import io.reactivex.Flowable
 import io.realm.RealmList

domain/src/main/java/com/moez/QKSMS/interactor/SpeakThreads.kt

@@ -18,9 +18,7 @@
  */
 package dev.octoshrimpy.quik.interactor
 
-import android.content.res.Resources
 import com.moez.QKSMS.manager.SpeakManager
-import dev.octoshrimpy.quik.domain.R
 import dev.octoshrimpy.quik.extensions.mapNotNull
 import dev.octoshrimpy.quik.repository.ConversationRepository
 import dev.octoshrimpy.quik.repository.MessageRepository

domain/src/main/java/com/moez/QKSMS/manager/ShortcutManager.kt

@@ -18,7 +18,6 @@
  */
 package dev.octoshrimpy.quik.manager
 
-import android.content.pm.ShortcutInfo
 import androidx.core.content.pm.ShortcutInfoCompat
 
 interface ShortcutManager {

domain/src/main/java/com/moez/QKSMS/mapper/CursorToMessage.kt

@@ -19,10 +19,12 @@
 package dev.octoshrimpy.quik.mapper
 
 import android.database.Cursor
-import android.provider.Telephony.*
+import android.provider.Telephony.Mms
+import android.provider.Telephony.MmsSms
+import android.provider.Telephony.Sms
 import dev.octoshrimpy.quik.model.Message
 import timber.log.Timber
-import java.util.*
+import java.util.Arrays
 
 interface CursorToMessage : Mapper<Pair<Cursor, CursorToMessage.MessageColumns>, Message> {
 

domain/src/main/java/com/moez/QKSMS/model/Message.kt

@@ -20,7 +20,9 @@ package dev.octoshrimpy.quik.model
 
 import android.content.ContentUris
 import android.net.Uri
-import android.provider.Telephony.*
+import android.provider.Telephony.Mms
+import android.provider.Telephony.MmsSms
+import android.provider.Telephony.Sms
 import dev.octoshrimpy.quik.extensions.joinTo
 import io.realm.RealmList
 import io.realm.RealmObject

domain/src/main/java/com/moez/QKSMS/model/MmsPart.kt

@@ -19,10 +19,8 @@
 package dev.octoshrimpy.quik.model
 
 import android.content.ContentResolver
-import android.content.ContentResolver.MimeTypeInfo
 import android.net.Uri
 import android.webkit.MimeTypeMap
-import androidx.core.net.toUri
 import io.realm.RealmObject
 import io.realm.RealmResults
 import io.realm.annotations.Index

domain/src/main/java/com/moez/QKSMS/model/Recipient.kt

@@ -21,7 +21,7 @@ package dev.octoshrimpy.quik.model
 import android.telephony.PhoneNumberUtils
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
-import java.util.*
+import java.util.Locale
 
 open class Recipient(
     @PrimaryKey var id: Long = 0,

domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt

@@ -23,7 +23,6 @@ import dev.octoshrimpy.quik.model.Attachment
 import dev.octoshrimpy.quik.model.Message
 import dev.octoshrimpy.quik.model.MmsPart
 import io.realm.RealmResults
-import java.io.File
 
 interface MessageRepository {
 

domain/src/main/res/xml/messages_text_file_provider_paths.xml

@@ -1,3 +1,3 @@
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
+<paths>
     <cache-path name="messages_text" path="." />
 </paths>

presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt

@@ -45,7 +45,6 @@ import dev.octoshrimpy.quik.manager.BillingManager
 import dev.octoshrimpy.quik.manager.NotificationManager
 import dev.octoshrimpy.quik.manager.PermissionManager
 import dev.octoshrimpy.quik.model.ScheduledMessage
-import java.io.File
 import javax.inject.Inject
 import javax.inject.Singleton
 

presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt

@@ -28,17 +28,6 @@ import androidx.work.Configuration
 import androidx.work.WorkManager
 import androidx.work.WorkerFactory
 import com.moez.QKSMS.manager.SpeakManager
-import dev.octoshrimpy.quik.R
-import dev.octoshrimpy.quik.common.util.CrashlyticsTree
-import dev.octoshrimpy.quik.common.util.FileLoggingTree
-import dev.octoshrimpy.quik.injection.AppComponentManager
-import dev.octoshrimpy.quik.injection.appComponent
-import dev.octoshrimpy.quik.manager.AnalyticsManager
-import dev.octoshrimpy.quik.manager.BillingManager
-import dev.octoshrimpy.quik.manager.ReferralManager
-import dev.octoshrimpy.quik.migration.QkMigration
-import dev.octoshrimpy.quik.migration.QkRealmMigration
-import dev.octoshrimpy.quik.util.NightModeManager
 import com.uber.rxdogtag.RxDogTag
 import com.uber.rxdogtag.autodispose.AutoDisposeConfigurer
 import dagger.android.AndroidInjector
@@ -46,7 +35,18 @@ import dagger.android.DispatchingAndroidInjector
 import dagger.android.HasActivityInjector
 import dagger.android.HasBroadcastReceiverInjector
 import dagger.android.HasServiceInjector
+import dev.octoshrimpy.quik.R
+import dev.octoshrimpy.quik.common.util.CrashlyticsTree
+import dev.octoshrimpy.quik.common.util.FileLoggingTree
+import dev.octoshrimpy.quik.injection.AppComponentManager
+import dev.octoshrimpy.quik.injection.appComponent
 import dev.octoshrimpy.quik.interactor.SpeakThreads
+import dev.octoshrimpy.quik.manager.AnalyticsManager
+import dev.octoshrimpy.quik.manager.BillingManager
+import dev.octoshrimpy.quik.manager.ReferralManager
+import dev.octoshrimpy.quik.migration.QkMigration
+import dev.octoshrimpy.quik.migration.QkRealmMigration
+import dev.octoshrimpy.quik.util.NightModeManager
 import dev.octoshrimpy.quik.worker.HousekeepingWorker
 import io.realm.Realm
 import io.realm.RealmConfiguration

presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/DrawerLayoutDrawerOpenedObservable.java

@@ -18,14 +18,17 @@
  */
 package dev.octoshrimpy.quik.common.androidxcompat;
 
+import static com.jakewharton.rxbinding2.internal.Preconditions.checkMainThread;
+
 import android.view.View;
+
 import androidx.drawerlayout.widget.DrawerLayout;
+
 import com.jakewharton.rxbinding2.InitialValueObservable;
+
 import io.reactivex.Observer;
 import io.reactivex.android.MainThreadDisposable;
 
-import static com.jakewharton.rxbinding2.internal.Preconditions.checkMainThread;
-
 final class DrawerLayoutDrawerOpenedObservable extends InitialValueObservable<Boolean> {
   private final DrawerLayout view;
   private final int gravity;

presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt

@@ -26,6 +26,8 @@ import android.os.Bundle
 import android.view.View
 import androidx.core.view.iterator
 import androidx.lifecycle.Lifecycle
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.common.util.Colors
 import dev.octoshrimpy.quik.common.util.extensions.resolveThemeBoolean
@@ -36,8 +38,6 @@ import dev.octoshrimpy.quik.extensions.mapNotNull
 import dev.octoshrimpy.quik.repository.ConversationRepository
 import dev.octoshrimpy.quik.repository.MessageRepository
 import dev.octoshrimpy.quik.util.PhoneNumberUtils
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.rxkotlin.Observables

presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt

@@ -24,7 +24,8 @@ import dev.octoshrimpy.quik.common.util.extensions.isSameDay
 import dev.octoshrimpy.quik.common.util.extensions.isSameWeek
 import dev.octoshrimpy.quik.common.util.extensions.isSameYear
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Calendar
+import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Singleton
 

presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt

@@ -21,13 +21,13 @@ package dev.octoshrimpy.quik.common.util
 import android.content.Context
 import android.net.Uri
 import android.util.Log
-import dev.octoshrimpy.quik.util.Preferences
 import dev.octoshrimpy.quik.util.FileUtils
+import dev.octoshrimpy.quik.util.Preferences
 import io.reactivex.schedulers.Schedulers
 import timber.log.Timber
 import java.io.FileNotFoundException
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Singleton
 

presentation/src/main/java/com/moez/QKSMS/common/util/QkChooserTargetService.kt

@@ -21,10 +21,8 @@ package dev.octoshrimpy.quik.common.util
 import android.content.ComponentName
 import android.content.IntentFilter
 import android.graphics.drawable.Icon
-import android.os.Build
 import android.service.chooser.ChooserTarget
 import android.service.chooser.ChooserTargetService
-import androidx.annotation.RequiresApi
 import androidx.core.os.bundleOf
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.feature.compose.ComposeActivity

presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt

@@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.common.util
 import android.annotation.TargetApi
 import android.content.Context
 import android.content.Intent
-import android.os.Build
 import android.content.pm.ShortcutManager
+import android.os.Build
 import androidx.core.app.Person
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat

presentation/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt

@@ -18,7 +18,7 @@
  */
 package dev.octoshrimpy.quik.common.util.extensions
 
-import java.util.*
+import java.util.Calendar
 
 fun Calendar.isSameDay(other: Calendar): Boolean {
     return get(Calendar.YEAR) == other.get(Calendar.YEAR) && get(Calendar.DAY_OF_YEAR) == other.get(Calendar.DAY_OF_YEAR)

presentation/src/main/java/com/moez/QKSMS/common/util/extensions/RecipientExtensions.kt

@@ -8,7 +8,9 @@ import android.provider.ContactsContract
 import android.util.TypedValue
 import android.view.Gravity
 import android.view.LayoutInflater
-import android.view.View.*
+import android.view.View.GONE
+import android.view.View.MeasureSpec
+import android.view.View.VISIBLE
 import android.widget.FrameLayout
 import android.widget.ImageView
 import androidx.core.app.Person

presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt

@@ -25,6 +25,8 @@ import android.view.LayoutInflater
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.viewpager.widget.ViewPager
+import com.uber.autodispose.android.ViewScopeProvider
+import com.uber.autodispose.autoDisposable
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.common.util.Colors
 import dev.octoshrimpy.quik.common.util.extensions.forEach
@@ -32,8 +34,6 @@ import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor
 import dev.octoshrimpy.quik.extensions.Optional
 import dev.octoshrimpy.quik.injection.appComponent
 import dev.octoshrimpy.quik.repository.ConversationRepository
-import com.uber.autodispose.android.ViewScopeProvider
-import com.uber.autodispose.autoDisposable
 import io.reactivex.subjects.BehaviorSubject
 import io.reactivex.subjects.Subject
 import kotlinx.android.synthetic.main.tab_view.view.*

presentation/src/main/java/com/moez/QKSMS/common/widget/QkContextMenuRecyclerView.kt

@@ -1,7 +1,6 @@
 package dev.octoshrimpy.quik.common.widget
 
 import android.content.Context
-import android.net.Uri
 import android.util.AttributeSet
 import android.view.ContextMenu
 import android.view.View

presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt

@@ -22,9 +22,9 @@ import android.os.Bundle
 import com.bluelinelabs.conductor.Conductor
 import com.bluelinelabs.conductor.Router
 import com.bluelinelabs.conductor.RouterTransaction
+import dagger.android.AndroidInjection
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.common.base.QkThemedActivity
-import dagger.android.AndroidInjection
 import kotlinx.android.synthetic.main.container_activity.*
 
 

presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt

@@ -19,7 +19,8 @@
 package dev.octoshrimpy.quik.feature.backup
 
 import android.content.Context
-import androidx.core.net.toUri
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.common.Navigator
 import dev.octoshrimpy.quik.common.base.QkPresenter
@@ -28,13 +29,9 @@ import dev.octoshrimpy.quik.common.util.extensions.makeToast
 import dev.octoshrimpy.quik.interactor.PerformBackup
 import dev.octoshrimpy.quik.manager.BillingManager
 import dev.octoshrimpy.quik.repository.BackupRepository
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.rxkotlin.withLatestFrom
 import io.reactivex.schedulers.Schedulers
-import timber.log.Timber
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 

presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt

@@ -26,10 +26,10 @@ import android.net.Uri
 import android.os.IBinder
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
+import dagger.android.AndroidInjection
 import dev.octoshrimpy.quik.common.util.extensions.getLabel
 import dev.octoshrimpy.quik.manager.NotificationManager
 import dev.octoshrimpy.quik.repository.BackupRepository
-import dagger.android.AndroidInjection
 import io.reactivex.Observable
 import io.reactivex.schedulers.Schedulers
 import timber.log.Timber

presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt

@@ -22,9 +22,9 @@ import android.os.Bundle
 import com.bluelinelabs.conductor.Conductor
 import com.bluelinelabs.conductor.Router
 import com.bluelinelabs.conductor.RouterTransaction
+import dagger.android.AndroidInjection
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.common.base.QkThemedActivity
-import dagger.android.AndroidInjection
 import kotlinx.android.synthetic.main.container_activity.*
 
 class BlockingActivity : QkThemedActivity() {

presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingPresenter.kt

@@ -19,12 +19,12 @@
 package dev.octoshrimpy.quik.feature.blocking
 
 import android.content.Context
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.blocking.BlockingClient
 import dev.octoshrimpy.quik.common.base.QkPresenter
 import dev.octoshrimpy.quik.util.Preferences
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
 import io.reactivex.rxkotlin.plusAssign
 import javax.inject.Inject
 

presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPreferenceView.kt

@@ -27,7 +27,6 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import dev.octoshrimpy.quik.R
-import dev.octoshrimpy.quik.common.util.extensions.animateLayoutChanges
 import dev.octoshrimpy.quik.common.util.extensions.resolveThemeAttribute
 import dev.octoshrimpy.quik.common.util.extensions.setVisible
 import kotlinx.android.synthetic.main.blocking_manager_preference_view.view.*

presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt

@@ -1,6 +1,8 @@
 package dev.octoshrimpy.quik.feature.blocking.manager
 
 import android.content.Context
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.blocking.BlockingClient
 import dev.octoshrimpy.quik.blocking.CallBlockerBlockingClient
@@ -12,8 +14,6 @@ import dev.octoshrimpy.quik.common.base.QkPresenter
 import dev.octoshrimpy.quik.manager.AnalyticsManager
 import dev.octoshrimpy.quik.repository.ConversationRepository
 import dev.octoshrimpy.quik.util.Preferences
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.rxkotlin.plusAssign

presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt

@@ -18,15 +18,14 @@
  */
 package dev.octoshrimpy.quik.feature.blocking.messages
 
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.blocking.BlockingClient
 import dev.octoshrimpy.quik.common.Navigator
 import dev.octoshrimpy.quik.common.base.QkPresenter
 import dev.octoshrimpy.quik.interactor.DeleteConversations
 import dev.octoshrimpy.quik.repository.ConversationRepository
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import io.reactivex.rxkotlin.withLatestFrom
 import javax.inject.Inject
 
 class BlockedMessagesPresenter @Inject constructor(

presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersPresenter.kt

@@ -18,12 +18,12 @@
  */
 package dev.octoshrimpy.quik.feature.blocking.numbers
 
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
 import dev.octoshrimpy.quik.common.base.QkPresenter
 import dev.octoshrimpy.quik.interactor.MarkUnblocked
 import dev.octoshrimpy.quik.repository.BlockingRepository
 import dev.octoshrimpy.quik.repository.ConversationRepository
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
 import io.reactivex.schedulers.Schedulers
 import javax.inject.Inject
 

presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersState.kt

@@ -19,7 +19,6 @@
 package dev.octoshrimpy.quik.feature.blocking.numbers
 
 import dev.octoshrimpy.quik.model.BlockedNumber
-import io.realm.RealmList
 import io.realm.RealmResults
 
 data class BlockedNumbersState(

presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt

@@ -43,11 +43,9 @@ import android.view.DragEvent.ACTION_DROP
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.widget.Toast
 import android.widget.SeekBar
-import androidx.activity.result.contract.ActivityResultContracts
+import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
-import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.constraintlayout.widget.ConstraintSet
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
@@ -78,7 +76,6 @@ import dev.octoshrimpy.quik.common.util.extensions.setVisible
 import dev.octoshrimpy.quik.common.util.extensions.showKeyboard
 import dev.octoshrimpy.quik.common.widget.MicInputCloudView
 import dev.octoshrimpy.quik.common.widget.QkEditText
-import dev.octoshrimpy.quik.common.widget.TextInputDialog
 import dev.octoshrimpy.quik.extensions.mapNotNull
 import dev.octoshrimpy.quik.feature.compose.editing.ChipsAdapter
 import dev.octoshrimpy.quik.feature.contacts.ContactsActivity
@@ -93,11 +90,14 @@ import io.reactivex.subjects.Subject
 import kotlinx.android.synthetic.main.compose_activity.attach
 import kotlinx.android.synthetic.main.compose_activity.attachAFileIcon
 import kotlinx.android.synthetic.main.compose_activity.attachAFileLabel
+import kotlinx.android.synthetic.main.compose_activity.attachAnAudioMessageIcon
+import kotlinx.android.synthetic.main.compose_activity.attachAnAudioMessageLabel
 import kotlinx.android.synthetic.main.compose_activity.attaching
-import kotlinx.android.synthetic.main.compose_activity.shadeBackground
 import kotlinx.android.synthetic.main.compose_activity.audioMsgAbort
 import kotlinx.android.synthetic.main.compose_activity.audioMsgAttach
 import kotlinx.android.synthetic.main.compose_activity.audioMsgBackground
+import kotlinx.android.synthetic.main.compose_activity.audioMsgBluetooth
+import kotlinx.android.synthetic.main.compose_activity.audioMsgDuration
 import kotlinx.android.synthetic.main.compose_activity.audioMsgPlayerBackground
 import kotlinx.android.synthetic.main.compose_activity.audioMsgPlayerPlayPause
 import kotlinx.android.synthetic.main.compose_activity.audioMsgPlayerSeekBar
@@ -114,14 +114,10 @@ import kotlinx.android.synthetic.main.compose_activity.gallery
 import kotlinx.android.synthetic.main.compose_activity.galleryLabel
 import kotlinx.android.synthetic.main.compose_activity.loading
 import kotlinx.android.synthetic.main.compose_activity.message
+import kotlinx.android.synthetic.main.compose_activity.messageAttachments
 import kotlinx.android.synthetic.main.compose_activity.messageList
 import kotlinx.android.synthetic.main.compose_activity.messagesEmpty
 import kotlinx.android.synthetic.main.compose_activity.noValidRecipients
-import kotlinx.android.synthetic.main.compose_activity.messageAttachments
-import kotlinx.android.synthetic.main.compose_activity.attachAnAudioMessageIcon
-import kotlinx.android.synthetic.main.compose_activity.attachAnAudioMessageLabel
-import kotlinx.android.synthetic.main.compose_activity.audioMsgBluetooth
-import kotlinx.android.synthetic.main.compose_activity.audioMsgDuration
 import kotlinx.android.synthetic.main.compose_activity.recordAudioMsg
 import kotlinx.android.synthetic.main.compose_activity.schedule
 import kotlinx.android.synthetic.main.compose_activity.scheduleLabel
@@ -132,6 +128,7 @@ import kotlinx.android.synthetic.main.compose_activity.send
 import kotlinx.android.synthetic.main.compose_activity.sendAsGroup
 import kotlinx.android.synthetic.main.compose_activity.sendAsGroupBackground
 import kotlinx.android.synthetic.main.compose_activity.sendAsGroupSwitch
+import kotlinx.android.synthetic.main.compose_activity.shadeBackground
 import kotlinx.android.synthetic.main.compose_activity.sim
 import kotlinx.android.synthetic.main.compose_activity.simIndex
 import kotlinx.android.synthetic.main.compose_activity.speechToTextFrame

presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt

@@ -21,12 +21,11 @@ package dev.octoshrimpy.quik.feature.compose
 import android.content.Intent
 import android.net.Uri
 import androidx.lifecycle.ViewModel
-import dev.octoshrimpy.quik.injection.ViewModelKey
-import dev.octoshrimpy.quik.model.Attachment
 import dagger.Module
 import dagger.Provides
 import dagger.multibindings.IntoMap
-import java.net.URLDecoder
+import dev.octoshrimpy.quik.injection.ViewModelKey
+import dev.octoshrimpy.quik.model.Attachment
 import javax.inject.Named
 
 @Module

presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt

@@ -26,8 +26,8 @@ import android.net.Uri
 import android.os.Vibrator
 import android.telephony.SmsMessage
 import android.widget.Toast
-import androidx.core.content.getSystemService
 import androidx.core.content.FileProvider
+import androidx.core.content.getSystemService
 import androidx.core.net.toFile
 import com.google.android.exoplayer2.util.MimeTypes
 import com.moez.QKSMS.common.QkMediaPlayer
@@ -48,7 +48,6 @@ import dev.octoshrimpy.quik.common.util.extensions.makeToast
 import dev.octoshrimpy.quik.common.widget.MicInputCloudView
 import dev.octoshrimpy.quik.common.widget.QkContextMenuRecyclerView
 import dev.octoshrimpy.quik.compat.SubscriptionManagerCompat
-import dev.octoshrimpy.quik.compat.TelephonyCompat
 import dev.octoshrimpy.quik.extensions.asObservable
 import dev.octoshrimpy.quik.extensions.isImage
 import dev.octoshrimpy.quik.extensions.isSmil
@@ -74,9 +73,9 @@ import dev.octoshrimpy.quik.repository.ContactRepository
 import dev.octoshrimpy.quik.repository.ConversationRepository
 import dev.octoshrimpy.quik.repository.MessageRepository
 import dev.octoshrimpy.quik.util.ActiveSubscriptionObservable
+import dev.octoshrimpy.quik.util.FileUtils
 import dev.octoshrimpy.quik.util.PhoneNumberUtils
 import dev.octoshrimpy.quik.util.Preferences
-import dev.octoshrimpy.quik.util.FileUtils
 import dev.octoshrimpy.quik.util.tryOrNull
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -89,7 +88,8 @@ import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject
 import timber.log.Timber
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Locale
+import java.util.UUID
 import javax.inject.Inject
 import javax.inject.Named
 

presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt

@@ -20,7 +20,6 @@ package dev.octoshrimpy.quik.feature.compose
 
 import android.app.Activity
 import android.graphics.Rect
-import android.os.Build
 import android.view.ActionMode
 import android.view.KeyEvent
 import android.view.Menu
@@ -31,7 +30,6 @@ import android.view.View
 import android.view.Window
 import android.view.WindowManager
 import android.view.accessibility.AccessibilityEvent
-import androidx.annotation.RequiresApi
 import dev.octoshrimpy.quik.feature.compose.editing.DetailedChipView
 
 class ComposeWindowCallback(

presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt

@@ -73,8 +73,8 @@ import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject
 import io.realm.RealmResults
 import kotlinx.android.synthetic.main.message_list_item_in.*
-import kotlinx.android.synthetic.main.message_list_item_in.parts
 import kotlinx.android.synthetic.main.message_list_item_in.body
+import kotlinx.android.synthetic.main.message_list_item_in.parts
 import kotlinx.android.synthetic.main.message_list_item_in.sim
 import kotlinx.android.synthetic.main.message_list_item_in.simIndex
 import kotlinx.android.synthetic.main.message_list_item_in.status

presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt

@@ -19,7 +19,6 @@
 package dev.octoshrimpy.quik.feature.compose.editing
 
 import android.content.Context
-import android.os.Build
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.RelativeLayout
@@ -28,8 +27,6 @@ import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.common.base.QkAdapter
 import dev.octoshrimpy.quik.common.base.QkViewHolder
 import dev.octoshrimpy.quik.common.util.extensions.dpToPx
-import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor
-import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint
 import dev.octoshrimpy.quik.model.Recipient
 import io.reactivex.subjects.PublishSubject
 import kotlinx.android.synthetic.main.contact_chip.*

presentation/src/main/java/com/moez/QKSMS/feature/compose/part/AudioBinder.kt

@@ -25,7 +25,6 @@ import android.media.MediaMetadataRetriever
 import android.view.View
 import android.widget.SeekBar
 import com.moez.QKSMS.common.QkMediaPlayer
-import com.moez.QKSMS.contentproviders.MmsPartProvider
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.common.Navigator
 import dev.octoshrimpy.quik.common.base.QkViewHolder

presentation/src/main/java/com/moez/QKSMS/feature/compose/part/FileBinder.kt

@@ -20,9 +20,6 @@ package dev.octoshrimpy.quik.feature.compose.part
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.view.Gravity
-import android.widget.FrameLayout
-import com.moez.QKSMS.contentproviders.MmsPartProvider
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.common.Navigator
 import dev.octoshrimpy.quik.common.base.QkViewHolder

presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartsAdapter.kt

@@ -18,7 +18,6 @@
  */
 package dev.octoshrimpy.quik.feature.compose.part
 
-import android.net.Uri
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup

presentation/src/main/java/com/moez/QKSMS/feature/compose/part/VCardBinder.kt

@@ -19,8 +19,6 @@
 package dev.octoshrimpy.quik.feature.compose.part
 
 import android.content.Context
-import android.view.Gravity
-import android.widget.FrameLayout
 import androidx.core.view.isVisible
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.common.base.QkViewHolder

presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt

@@ -20,19 +20,17 @@ package dev.octoshrimpy.quik.feature.contacts
 
 import android.app.Activity
 import android.content.Intent
-import android.os.Build
 import android.os.Bundle
 import androidx.core.view.isVisible
 import androidx.lifecycle.ViewModelProviders
 import com.jakewharton.rxbinding2.view.clicks
 import com.jakewharton.rxbinding2.widget.editorActions
 import com.jakewharton.rxbinding2.widget.textChanges
+import dagger.android.AndroidInjection
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.common.ViewModelFactory
 import dev.octoshrimpy.quik.common.base.QkThemedActivity
 import dev.octoshrimpy.quik.common.util.extensions.hideKeyboard
-import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor
-import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint
 import dev.octoshrimpy.quik.common.util.extensions.showKeyboard
 import dev.octoshrimpy.quik.common.widget.QkDialog
 import dev.octoshrimpy.quik.extensions.Optional
@@ -40,7 +38,6 @@ import dev.octoshrimpy.quik.feature.compose.editing.ComposeItem
 import dev.octoshrimpy.quik.feature.compose.editing.ComposeItemAdapter
 import dev.octoshrimpy.quik.feature.compose.editing.PhoneNumberAction
 import dev.octoshrimpy.quik.feature.compose.editing.PhoneNumberPickerAdapter
-import dagger.android.AndroidInjection
 import io.reactivex.Observable
 import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject

presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivityModule.kt

@@ -19,10 +19,10 @@
 package dev.octoshrimpy.quik.feature.contacts
 
 import androidx.lifecycle.ViewModel
-import dev.octoshrimpy.quik.injection.ViewModelKey
 import dagger.Module
 import dagger.Provides
 import dagger.multibindings.IntoMap
+import dev.octoshrimpy.quik.injection.ViewModelKey
 
 @Module
 class ContactsActivityModule {

presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsViewModel.kt

@@ -19,6 +19,8 @@
 package dev.octoshrimpy.quik.feature.contacts
 
 import android.view.inputmethod.EditorInfo
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
 import dev.octoshrimpy.quik.common.base.QkViewModel
 import dev.octoshrimpy.quik.extensions.mapNotNull
 import dev.octoshrimpy.quik.extensions.removeAccents
@@ -35,12 +37,9 @@ import dev.octoshrimpy.quik.model.Recipient
 import dev.octoshrimpy.quik.repository.ContactRepository
 import dev.octoshrimpy.quik.repository.ConversationRepository
 import dev.octoshrimpy.quik.util.PhoneNumberUtils
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.rxkotlin.Observables
-import io.reactivex.rxkotlin.withLatestFrom
 import io.reactivex.schedulers.Schedulers
 import io.realm.RealmList
 import kotlinx.coroutines.runBlocking

presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt

@@ -22,9 +22,9 @@ import android.os.Bundle
 import com.bluelinelabs.conductor.Conductor
 import com.bluelinelabs.conductor.Router
 import com.bluelinelabs.conductor.RouterTransaction
+import dagger.android.AndroidInjection
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.common.base.QkThemedActivity
-import dagger.android.AndroidInjection
 import kotlinx.android.synthetic.main.container_activity.*
 
 class ConversationInfoActivity : QkThemedActivity() {

presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt

@@ -22,6 +22,8 @@ import android.view.View
 import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.GridLayoutManager
 import com.bluelinelabs.conductor.RouterTransaction
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.common.Navigator
 import dev.octoshrimpy.quik.common.QkChangeHandler
@@ -32,8 +34,6 @@ import dev.octoshrimpy.quik.feature.blocking.BlockingDialog
 import dev.octoshrimpy.quik.feature.conversationinfo.injection.ConversationInfoModule
 import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController
 import dev.octoshrimpy.quik.injection.appComponent
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
 import io.reactivex.Observable
 import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject

presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt

@@ -20,6 +20,8 @@ package dev.octoshrimpy.quik.feature.conversationinfo
 
 import android.content.Context
 import androidx.lifecycle.Lifecycle
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.common.Navigator
 import dev.octoshrimpy.quik.common.base.QkPresenter
@@ -36,12 +38,9 @@ import dev.octoshrimpy.quik.manager.PermissionManager
 import dev.octoshrimpy.quik.model.Conversation
 import dev.octoshrimpy.quik.repository.ConversationRepository
 import dev.octoshrimpy.quik.repository.MessageRepository
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.rxkotlin.Observables
 import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.rxkotlin.withLatestFrom
 import io.reactivex.schedulers.Schedulers
 import io.reactivex.subjects.BehaviorSubject
 import io.reactivex.subjects.Subject

presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoComponent.kt

@@ -18,9 +18,9 @@
  */
 package dev.octoshrimpy.quik.feature.conversationinfo.injection
 
+import dagger.Subcomponent
 import dev.octoshrimpy.quik.feature.conversationinfo.ConversationInfoController
 import dev.octoshrimpy.quik.injection.scope.ControllerScope
-import dagger.Subcomponent
 
 @ControllerScope
 @Subcomponent(modules = [ConversationInfoModule::class])

presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoModule.kt

@@ -18,10 +18,10 @@
  */
 package dev.octoshrimpy.quik.feature.conversationinfo.injection
 
-import dev.octoshrimpy.quik.feature.conversationinfo.ConversationInfoController
-import dev.octoshrimpy.quik.injection.scope.ControllerScope
 import dagger.Module
 import dagger.Provides
+import dev.octoshrimpy.quik.feature.conversationinfo.ConversationInfoController
+import dev.octoshrimpy.quik.injection.scope.ControllerScope
 import javax.inject.Named
 
 @Module

presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt

@@ -22,10 +22,7 @@ import android.content.Context
 import android.graphics.Typeface
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.core.text.bold
 import androidx.core.text.buildSpannedString
-import androidx.core.text.color
-import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.common.Navigator

presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt

@@ -29,12 +29,12 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
+import dagger.android.AndroidInjection
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.common.base.QkActivity
 import dev.octoshrimpy.quik.common.util.DateFormatter
 import dev.octoshrimpy.quik.common.util.extensions.setVisible
 import dev.octoshrimpy.quik.model.MmsPart
-import dagger.android.AndroidInjection
 import io.reactivex.Observable
 import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject

presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivityModule.kt

@@ -20,10 +20,10 @@ package dev.octoshrimpy.quik.feature.gallery
 
 import android.content.Intent
 import androidx.lifecycle.ViewModel
-import dev.octoshrimpy.quik.injection.ViewModelKey
 import dagger.Module
 import dagger.Provides
 import dagger.multibindings.IntoMap
+import dev.octoshrimpy.quik.injection.ViewModelKey
 import javax.inject.Named
 
 @Module

presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt

@@ -20,6 +20,8 @@ package dev.octoshrimpy.quik.feature.gallery
 
 import android.content.Context
 import com.moez.QKSMS.contentproviders.MmsPartProvider
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.common.Navigator
 import dev.octoshrimpy.quik.common.base.QkViewModel
@@ -29,13 +31,8 @@ import dev.octoshrimpy.quik.interactor.SaveImage
 import dev.octoshrimpy.quik.manager.PermissionManager
 import dev.octoshrimpy.quik.repository.ConversationRepository
 import dev.octoshrimpy.quik.repository.MessageRepository
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import dev.octoshrimpy.quik.common.widget.QkContextMenuRecyclerView
-import dev.octoshrimpy.quik.model.MmsPart
 import io.reactivex.Flowable
 import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.rxkotlin.withLatestFrom
 import javax.inject.Inject
 import javax.inject.Named
 

presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt

@@ -41,6 +41,9 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import com.google.android.material.snackbar.Snackbar
 import com.jakewharton.rxbinding2.view.clicks
 import com.jakewharton.rxbinding2.widget.textChanges
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import dagger.android.AndroidInjection
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.common.Navigator
 import dev.octoshrimpy.quik.common.androidxcompat.drawerOpen
@@ -52,16 +55,13 @@ import dev.octoshrimpy.quik.common.util.extensions.scrapViews
 import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint
 import dev.octoshrimpy.quik.common.util.extensions.setTint
 import dev.octoshrimpy.quik.common.util.extensions.setVisible
+import dev.octoshrimpy.quik.common.widget.TextInputDialog
 import dev.octoshrimpy.quik.feature.blocking.BlockingDialog
 import dev.octoshrimpy.quik.feature.changelog.ChangelogDialog
 import dev.octoshrimpy.quik.feature.conversations.ConversationItemTouchCallback
 import dev.octoshrimpy.quik.feature.conversations.ConversationsAdapter
 import dev.octoshrimpy.quik.manager.ChangelogManager
 import dev.octoshrimpy.quik.repository.SyncRepository
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import dagger.android.AndroidInjection
-import dev.octoshrimpy.quik.common.widget.TextInputDialog
 import io.reactivex.Observable
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.subjects.PublishSubject

presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt

@@ -19,11 +19,11 @@
 package dev.octoshrimpy.quik.feature.main
 
 import androidx.lifecycle.ViewModel
-import dev.octoshrimpy.quik.injection.ViewModelKey
-import dev.octoshrimpy.quik.injection.scope.ActivityScope
 import dagger.Module
 import dagger.Provides
 import dagger.multibindings.IntoMap
+import dev.octoshrimpy.quik.injection.ViewModelKey
+import dev.octoshrimpy.quik.injection.scope.ActivityScope
 import io.reactivex.disposables.CompositeDisposable
 
 @Module

presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt

@@ -19,6 +19,8 @@
 package dev.octoshrimpy.quik.feature.main
 
 import androidx.recyclerview.widget.ItemTouchHelper
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.common.Navigator
 import dev.octoshrimpy.quik.common.base.QkViewModel
@@ -32,6 +34,7 @@ import dev.octoshrimpy.quik.interactor.MarkUnarchived
 import dev.octoshrimpy.quik.interactor.MarkUnpinned
 import dev.octoshrimpy.quik.interactor.MarkUnread
 import dev.octoshrimpy.quik.interactor.MigratePreferences
+import dev.octoshrimpy.quik.interactor.SpeakThreads
 import dev.octoshrimpy.quik.interactor.SyncContacts
 import dev.octoshrimpy.quik.interactor.SyncMessages
 import dev.octoshrimpy.quik.listener.ContactAddedListener
@@ -41,21 +44,17 @@ import dev.octoshrimpy.quik.manager.PermissionManager
 import dev.octoshrimpy.quik.manager.RatingManager
 import dev.octoshrimpy.quik.model.SyncLog
 import dev.octoshrimpy.quik.repository.ConversationRepository
+import dev.octoshrimpy.quik.repository.MessageRepository
 import dev.octoshrimpy.quik.repository.SyncRepository
 import dev.octoshrimpy.quik.util.Preferences
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import dev.octoshrimpy.quik.interactor.SpeakThreads
-import dev.octoshrimpy.quik.repository.MessageRepository
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.rxkotlin.withLatestFrom
 import io.reactivex.schedulers.Schedulers
 import io.realm.Realm
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import java.util.*
+import java.util.Locale
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 

presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt

@@ -28,15 +28,15 @@ import androidx.core.view.isVisible
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelProviders
 import com.jakewharton.rxbinding2.view.clicks
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
+import dagger.android.AndroidInjection
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.common.QkDialog
 import dev.octoshrimpy.quik.common.base.QkThemedActivity
 import dev.octoshrimpy.quik.common.util.extensions.animateLayoutChanges
 import dev.octoshrimpy.quik.common.util.extensions.setVisible
 import dev.octoshrimpy.quik.common.widget.PreferenceView
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
-import dagger.android.AndroidInjection
 import io.reactivex.Observable
 import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject

presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivityModule.kt

@@ -19,10 +19,10 @@
 package dev.octoshrimpy.quik.feature.notificationprefs
 
 import androidx.lifecycle.ViewModel
-import dev.octoshrimpy.quik.injection.ViewModelKey
 import dagger.Module
 import dagger.Provides
 import dagger.multibindings.IntoMap
+import dev.octoshrimpy.quik.injection.ViewModelKey
 import javax.inject.Named
 
 @Module

presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt

@@ -21,17 +21,16 @@ package dev.octoshrimpy.quik.feature.notificationprefs
 import android.content.Context
 import android.media.RingtoneManager
 import android.net.Uri
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.common.Navigator
 import dev.octoshrimpy.quik.common.base.QkViewModel
 import dev.octoshrimpy.quik.extensions.mapNotNull
 import dev.octoshrimpy.quik.repository.ConversationRepository
 import dev.octoshrimpy.quik.util.Preferences
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
 import io.reactivex.Flowable
 import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.rxkotlin.withLatestFrom
 import io.reactivex.schedulers.Schedulers
 import javax.inject.Inject
 import javax.inject.Named

presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt

@@ -24,6 +24,7 @@ import androidx.core.view.children
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelProviders
 import com.jakewharton.rxbinding2.view.clicks
+import dagger.android.AndroidInjection
 import dev.octoshrimpy.quik.BuildConfig
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.common.base.QkThemedActivity
@@ -36,7 +37,6 @@ import dev.octoshrimpy.quik.common.util.extensions.setVisible
 import dev.octoshrimpy.quik.common.widget.PreferenceView
 import dev.octoshrimpy.quik.feature.plus.experiment.UpgradeButtonExperiment
 import dev.octoshrimpy.quik.manager.BillingManager
-import dagger.android.AndroidInjection
 import kotlinx.android.synthetic.main.collapsing_toolbar.*
 import kotlinx.android.synthetic.main.preference_view.view.*
 import kotlinx.android.synthetic.main.qksms_plus_activity.*

presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivityModule.kt

@@ -19,10 +19,10 @@
 package dev.octoshrimpy.quik.feature.plus
 
 import androidx.lifecycle.ViewModel
-import dev.octoshrimpy.quik.injection.ViewModelKey
 import dagger.Module
 import dagger.Provides
 import dagger.multibindings.IntoMap
+import dev.octoshrimpy.quik.injection.ViewModelKey
 
 @Module
 class PlusActivityModule {

presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt

@@ -18,12 +18,12 @@
  */
 package dev.octoshrimpy.quik.feature.plus
 
+import com.uber.autodispose.android.lifecycle.scope
+import com.uber.autodispose.autoDisposable
 import dev.octoshrimpy.quik.common.Navigator
 import dev.octoshrimpy.quik.common.base.QkViewModel
 import dev.octoshrimpy.quik.manager.AnalyticsManager
 import dev.octoshrimpy.quik.manager.BillingManager
-import com.uber.autodispose.android.lifecycle.scope
-import com.uber.autodispose.autoDisposable
 import io.reactivex.Observable
 import io.reactivex.rxkotlin.plusAssign
 import javax.inject.Inject

presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt

@@ -19,7 +19,6 @@
 package dev.octoshrimpy.quik.feature.plus.experiment
 
 import android.content.Context
-import androidx.annotation.StringRes
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.experiment.Experiment
 import dev.octoshrimpy.quik.experiment.Variant

presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt

@@ -38,14 +38,14 @@ import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.RecyclerView
 import com.jakewharton.rxbinding2.view.clicks
 import com.jakewharton.rxbinding2.widget.textChanges
+import dagger.android.AndroidInjection
 import dev.octoshrimpy.quik.R
 import dev.octoshrimpy.quik.common.base.QkThemedActivity
 import dev.octoshrimpy.quik.common.util.extensions.autoScrollToStart
 import dev.octoshrimpy.quik.common.util.extensions.setVisible
-import dev.octoshrimpy.quik.feature.compose.MessagesAdapter
-import dagger.android.AndroidInjection
 import dev.octoshrimpy.quik.common.util.extensions.showKeyboard
 import dev.octoshrimpy.quik.common.widget.QkEditText
+import dev.octoshrimpy.quik.feature.compose.MessagesAdapter
 import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject
 import kotlinx.android.synthetic.main.compose_activity.message

presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivityModule.kt

@@ -19,10 +19,10 @@
 package dev.octoshrimpy.quik.feature.qkreply
 
 import androidx.lifecycle.ViewModel
-import dev.octoshrimpy.quik.injection.ViewModelKey
 import dagger.Module
 import dagger.Provides
 import dagger.multibindings.IntoMap
+import dev.octoshrimpy.quik.injection.ViewModelKey
 import javax.inject.Named
 
 @Module