diff --git a/common/src/main/java/com/bumptech/glide/gifencoder/AnimatedGifEncoder.java b/common/src/main/java/com/bumptech/glide/gifencoder/AnimatedGifEncoder.java index c49c8c76..7f1d8593 100644 --- a/common/src/main/java/com/bumptech/glide/gifencoder/AnimatedGifEncoder.java +++ b/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 diff --git a/data/src/androidTest/java/com/moez/QKSMS/repository/PhoneNumberUtilsTest.kt b/data/src/androidTest/java/com/moez/QKSMS/repository/PhoneNumberUtilsTest.kt index ce68ceee..01b6b188 100644 --- a/data/src/androidTest/java/com/moez/QKSMS/repository/PhoneNumberUtilsTest.kt +++ b/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 { diff --git a/data/src/main/java/com/moez/QKSMS/blocking/CallBlockerBlockingClient.kt b/data/src/main/java/com/moez/QKSMS/blocking/CallBlockerBlockingClient.kt index 76befb70..d1a62ba1 100644 --- a/data/src/main/java/com/moez/QKSMS/blocking/CallBlockerBlockingClient.kt +++ b/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( diff --git a/data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt b/data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt index 1278dedb..80119270 100644 --- a/data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt +++ b/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) { diff --git a/data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt b/data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt index 3580da6d..5b4d7e20 100644 --- a/data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt +++ b/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 diff --git a/data/src/main/java/com/moez/QKSMS/manager/AlarmManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/AlarmManagerImpl.kt index 82790999..509fff82 100644 --- a/data/src/main/java/com/moez/QKSMS/manager/AlarmManagerImpl.kt +++ b/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 diff --git a/data/src/main/java/com/moez/QKSMS/manager/ChangelogManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/ChangelogManagerImpl.kt index ee9a87a8..b49c0c18 100644 --- a/data/src/main/java/com/moez/QKSMS/manager/ChangelogManagerImpl.kt +++ b/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( diff --git a/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt index e6371462..e237d268 100644 --- a/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt +++ b/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 diff --git a/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt index 441a0a6a..ea2c2193 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt +++ b/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 diff --git a/data/src/main/java/com/moez/QKSMS/receiver/BootReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/BootReceiver.kt index 67f57e51..f20ccf68 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/BootReceiver.kt +++ b/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() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt index 796bed0d..0edce8b0 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt +++ b/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() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/DeleteMessagesReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/DeleteMessagesReceiver.kt index 98a862d6..d8b63b06 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/DeleteMessagesReceiver.kt +++ b/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() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/MarkArchivedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MarkArchivedReceiver.kt index 64767646..2521c34c 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/MarkArchivedReceiver.kt +++ b/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() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt index 507e2b65..1302e5cb 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt +++ b/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() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt index 9a645ab0..eabdb931 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt +++ b/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() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/MmsReceivedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MmsReceivedReceiver.kt index 112e31a9..b0865f8b 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/MmsReceivedReceiver.kt +++ b/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() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/MmsSentReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MmsSentReceiver.kt index 7041ad88..ab03334b 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/MmsSentReceiver.kt +++ b/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 diff --git a/data/src/main/java/com/moez/QKSMS/receiver/MmsUpdatedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MmsUpdatedReceiver.kt index 04d39960..d92eff08 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/MmsUpdatedReceiver.kt +++ b/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() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt index 9167def3..5d0a23af 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt +++ b/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() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt index b6323e23..3d124d67 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt +++ b/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() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/SendScheduledMessageReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SendScheduledMessageReceiver.kt index abfbde20..036f2aac 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/SendScheduledMessageReceiver.kt +++ b/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() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/SendSmsReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SendSmsReceiver.kt index a2c3c3c8..dab2d3a0 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/SendSmsReceiver.kt +++ b/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() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/SmsDeliveredReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SmsDeliveredReceiver.kt index 3faa694e..7d0990a0 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/SmsDeliveredReceiver.kt +++ b/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() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt index 67438325..d4113280 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt +++ b/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 /** diff --git a/data/src/main/java/com/moez/QKSMS/receiver/SmsSentReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SmsSentReceiver.kt index 6c4fe35b..ce9adac7 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/SmsSentReceiver.kt +++ b/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() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/SpeakThreadsReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SpeakThreadsReceiver.kt index d51fec09..2f4b0e95 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/SpeakThreadsReceiver.kt +++ b/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 diff --git a/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt index ef5469a1..02808d97 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt +++ b/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 diff --git a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt index 67e31cba..5a85406d 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt +++ b/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 diff --git a/data/src/main/java/com/moez/QKSMS/service/AutoDeleteService.kt b/data/src/main/java/com/moez/QKSMS/service/AutoDeleteService.kt index 537a0fef..b9daaa7e 100644 --- a/data/src/main/java/com/moez/QKSMS/service/AutoDeleteService.kt +++ b/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 diff --git a/data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt b/data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt index ff6ed935..bb2ef5bd 100644 --- a/data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt +++ b/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") { diff --git a/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt b/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt index 0414661e..ccb419e1 100644 --- a/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt +++ b/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 diff --git a/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt b/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt index 408fd84a..474b779f 100644 --- a/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt +++ b/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 diff --git a/data/src/main/java/com/moez/QKSMS/worker/HousekeepingWorker.kt b/data/src/main/java/com/moez/QKSMS/worker/HousekeepingWorker.kt index d5949a0e..bdc74513 100644 --- a/data/src/main/java/com/moez/QKSMS/worker/HousekeepingWorker.kt +++ b/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 diff --git a/data/src/noAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt b/data/src/noAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt index ef4dbd1c..2f81c87a 100644 --- a/data/src/noAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt +++ b/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 { diff --git a/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt b/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt index 51fa95ca..f99e095a 100644 --- a/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt +++ b/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(val context: Context, val analytics: AnalyticsManager) { diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt index 1c4c7ac2..54096873 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt +++ b/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 diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/SpeakThreads.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SpeakThreads.kt index 900d5a0b..b1557d8f 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/SpeakThreads.kt +++ b/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 diff --git a/domain/src/main/java/com/moez/QKSMS/manager/ShortcutManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/ShortcutManager.kt index 9b7814ff..c6d67395 100644 --- a/domain/src/main/java/com/moez/QKSMS/manager/ShortcutManager.kt +++ b/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 { diff --git a/domain/src/main/java/com/moez/QKSMS/mapper/CursorToMessage.kt b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToMessage.kt index fb6fbad1..936864ed 100644 --- a/domain/src/main/java/com/moez/QKSMS/mapper/CursorToMessage.kt +++ b/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, Message> { diff --git a/domain/src/main/java/com/moez/QKSMS/model/Message.kt b/domain/src/main/java/com/moez/QKSMS/model/Message.kt index b7091448..25300368 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/Message.kt +++ b/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 diff --git a/domain/src/main/java/com/moez/QKSMS/model/MmsPart.kt b/domain/src/main/java/com/moez/QKSMS/model/MmsPart.kt index 0e13988c..015a71e5 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/MmsPart.kt +++ b/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 diff --git a/domain/src/main/java/com/moez/QKSMS/model/Recipient.kt b/domain/src/main/java/com/moez/QKSMS/model/Recipient.kt index 93ad077e..9cc298a0 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/Recipient.kt +++ b/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, diff --git a/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt index ba31079a..fa4558bb 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt +++ b/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 { diff --git a/domain/src/main/res/xml/messages_text_file_provider_paths.xml b/domain/src/main/res/xml/messages_text_file_provider_paths.xml index a7b340a3..c9f50c92 100644 --- a/domain/src/main/res/xml/messages_text_file_provider_paths.xml +++ b/domain/src/main/res/xml/messages_text_file_provider_paths.xml @@ -1,3 +1,3 @@ - + diff --git a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt index 42bb477d..77a8ff33 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt index 51eaf1da..d2a41b94 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/DrawerLayoutDrawerOpenedObservable.java b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/DrawerLayoutDrawerOpenedObservable.java index 0ed38ae8..fba29ebc 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/DrawerLayoutDrawerOpenedObservable.java +++ b/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 { private final DrawerLayout view; private final int gravity; diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt index d1a3efe3..edd3b493 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt index 66eca516..f9d4253e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt index 9660d4f5..bead7e56 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/QkChooserTargetService.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/QkChooserTargetService.kt index e25d10e4..652e3c46 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/QkChooserTargetService.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt index 44872678..983c480b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt index 358d5ece..e772b795 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt +++ b/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) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/RecipientExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/RecipientExtensions.kt index 06d1ee92..0cbad1c3 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/RecipientExtensions.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt index ac620afe..3b8a3031 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt +++ b/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.* diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/QkContextMenuRecyclerView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkContextMenuRecyclerView.kt index 91844393..b748146e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/QkContextMenuRecyclerView.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt index b35c901d..8c7e7ba5 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt +++ b/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.* diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt index b8f03570..a2eaefd7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt index 15bd9925..063ed4a4 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt index 850f4b7e..a30f4863 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt +++ b/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() { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingPresenter.kt index cf15688d..147d2a63 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingPresenter.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPreferenceView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPreferenceView.kt index 9a777070..c1576ec7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPreferenceView.kt +++ b/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.* diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt index deda746b..f5d5a815 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt index f92ebb09..ab4e1a33 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt +++ b/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( diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersPresenter.kt index 1045aeb9..af749104 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersPresenter.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersState.kt index e59d3668..d9ae7337 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersState.kt +++ b/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( diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt index 81a50fba..9c07846f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt index d04f5cf2..5afc54bc 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt index 9a0fa998..572bd434 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt index 514cd9e3..3cc37569 100755 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt +++ b/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( diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt index c5f7153a..7aa6ea93 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt index 9ac1f07f..67489994 100755 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt +++ b/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.* diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/AudioBinder.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/AudioBinder.kt index 4c10e10d..8e10e288 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/AudioBinder.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/FileBinder.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/FileBinder.kt index a5990a09..da54cfdd 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/FileBinder.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartsAdapter.kt index f5491e5f..292def32 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartsAdapter.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/VCardBinder.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/VCardBinder.kt index 1bf1cd74..9d0eb635 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/VCardBinder.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt index f1a3e85a..4792d559 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivityModule.kt index 5a3f62fe..12783cf0 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivityModule.kt +++ b/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 { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsViewModel.kt index 3dbcad44..80fe0ec6 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsViewModel.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt index bf8cb5b0..16069617 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt +++ b/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() { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt index 032e59ac..e8a6c66a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt index fcd3a6c5..f642444f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoComponent.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoComponent.kt index 35cfdb03..80255a12 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoComponent.kt +++ b/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]) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoModule.kt index 7edc22ec..7fde018b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoModule.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt index b7fcdcda..ec51803f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt index 1329b315..2189035b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivityModule.kt index a0d28c03..09a77518 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivityModule.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt index 1438bf0a..1d5e46eb 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt index 458282cd..fed83338 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt index 41e8358a..b877251b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt index fb4c108f..5da9edcf 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt index 37ecdbf5..0d5cac73 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivityModule.kt index fe5d93e3..ce1873d1 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivityModule.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt index 39b531bb..101ae910 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt index 4434362e..a2277f86 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt +++ b/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.* diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivityModule.kt index b0b1f814..b1ec4d7b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivityModule.kt +++ b/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 { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt index 8b18658f..53e9c68f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt index 8bd11468..1d38c371 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt index ab20b9b4..9362fc76 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivityModule.kt index 0f5639d9..3dcb5785 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivityModule.kt +++ b/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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt index 318265c0..dc96cf9b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt @@ -19,6 +19,8 @@ package dev.octoshrimpy.quik.feature.qkreply import android.telephony.SmsMessage +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,8 +34,6 @@ import dev.octoshrimpy.quik.model.Message import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.MessageRepository import dev.octoshrimpy.quik.util.ActiveSubscriptionObservable -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt index 6319c13c..73aaa7df 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt @@ -18,7 +18,6 @@ */ package dev.octoshrimpy.quik.feature.scheduled -import android.graphics.Typeface import android.os.Bundle import android.view.Menu import android.view.MenuItem @@ -26,11 +25,11 @@ import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProviders import com.jakewharton.rxbinding2.view.clicks +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkThemedActivity import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint import dev.octoshrimpy.quik.common.util.extensions.setTint -import dagger.android.AndroidInjection import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.main_activity.toolbar diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt index 7938364e..03735b05 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt @@ -19,10 +19,10 @@ package dev.octoshrimpy.quik.feature.scheduled 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 ScheduledActivityModule { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt index 5c6c50f3..035c414c 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt @@ -1,19 +1,18 @@ package dev.octoshrimpy.quik.feature.scheduled 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.common.Navigator import dev.octoshrimpy.quik.common.base.QkViewModel +import dev.octoshrimpy.quik.common.util.ClipboardUtils +import dev.octoshrimpy.quik.interactor.DeleteScheduledMessages import dev.octoshrimpy.quik.interactor.SendScheduledMessage import dev.octoshrimpy.quik.manager.BillingManager import dev.octoshrimpy.quik.repository.ScheduledMessageRepository -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable -import dev.octoshrimpy.quik.common.util.ClipboardUtils -import dev.octoshrimpy.quik.interactor.DeleteScheduledMessages import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.schedulers.Schedulers import javax.inject.Inject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivity.kt index 8af3e12e..c41ce9d6 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivity.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 SettingsActivity : QkThemedActivity() { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt index 2e93f785..e8a2812c 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt @@ -30,6 +30,8 @@ import com.bluelinelabs.conductor.RouterTransaction import com.google.android.material.snackbar.Snackbar import com.jakewharton.rxbinding2.view.clicks import com.jakewharton.rxbinding2.view.longClicks +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.BuildConfig import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.MenuItem @@ -49,18 +51,16 @@ import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController import dev.octoshrimpy.quik.injection.appComponent 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 io.reactivex.Observable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.suspendCancellableCoroutine -import kotlinx.coroutines.withContext import kotlinx.android.synthetic.main.settings_controller.* import kotlinx.android.synthetic.main.settings_controller.view.* import kotlinx.android.synthetic.main.settings_switch_widget.view.* import kotlinx.android.synthetic.main.settings_theme_widget.* +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.suspendCancellableCoroutine +import kotlinx.coroutines.withContext import javax.inject.Inject import kotlin.coroutines.resume diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt index 22bb75c9..154dd666 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt @@ -19,6 +19,8 @@ package dev.octoshrimpy.quik.feature.settings 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.common.Navigator import dev.octoshrimpy.quik.common.base.QkPresenter @@ -34,14 +36,11 @@ import dev.octoshrimpy.quik.repository.SyncRepository import dev.octoshrimpy.quik.service.AutoDeleteService import dev.octoshrimpy.quik.util.NightModeManager import dev.octoshrimpy.quik.util.Preferences -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.schedulers.Schedulers import kotlinx.coroutines.runBlocking import timber.log.Timber -import java.util.* +import java.util.Calendar import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutPresenter.kt index 70a9a358..6e0716d6 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutPresenter.kt @@ -18,11 +18,11 @@ */ package dev.octoshrimpy.quik.feature.settings.about +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 -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import javax.inject.Inject class AboutPresenter @Inject constructor( diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt index 04d0d2a2..b8ac743d 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt @@ -21,6 +21,8 @@ package dev.octoshrimpy.quik.feature.settings.swipe import android.view.View import androidx.core.view.isVisible import com.jakewharton.rxbinding2.view.clicks +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.QkDialog import dev.octoshrimpy.quik.common.base.QkController @@ -29,8 +31,6 @@ import dev.octoshrimpy.quik.common.util.extensions.animateLayoutChanges import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint import dev.octoshrimpy.quik.common.util.extensions.setTint 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 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt index 704c351a..6d4e729a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt @@ -20,13 +20,12 @@ package dev.octoshrimpy.quik.feature.settings.swipe import android.content.Context import androidx.annotation.DrawableRes +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R 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 io.reactivex.rxkotlin.withLatestFrom import javax.inject.Inject class SwipeActionsPresenter @Inject constructor( diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt index f0b417ac..7c7ab313 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt @@ -19,16 +19,15 @@ package dev.octoshrimpy.quik.feature.themepicker import com.f2prateek.rx.preferences2.Preference +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkPresenter import dev.octoshrimpy.quik.common.util.Colors import dev.octoshrimpy.quik.manager.BillingManager import dev.octoshrimpy.quik.manager.WidgetManager import dev.octoshrimpy.quik.util.Preferences -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.rxkotlin.Observables -import io.reactivex.rxkotlin.withLatestFrom import javax.inject.Inject import javax.inject.Named diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerComponent.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerComponent.kt index 3dc5dc81..43efb701 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerComponent.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerComponent.kt @@ -18,9 +18,9 @@ */ package dev.octoshrimpy.quik.feature.themepicker.injection +import dagger.Subcomponent import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController import dev.octoshrimpy.quik.injection.scope.ControllerScope -import dagger.Subcomponent @ControllerScope @Subcomponent(modules = [ThemePickerModule::class]) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerModule.kt index baccefcf..9336025e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerModule.kt @@ -18,10 +18,10 @@ */ package dev.octoshrimpy.quik.feature.themepicker.injection -import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController -import dev.octoshrimpy.quik.injection.scope.ControllerScope import dagger.Module import dagger.Provides +import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController +import dev.octoshrimpy.quik.injection.scope.ControllerScope import javax.inject.Named @Module diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt index 1a5f91c8..14e4c00a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt @@ -27,7 +27,6 @@ import android.widget.RemoteViews import android.widget.RemoteViewsService import androidx.core.text.bold import androidx.core.text.buildSpannedString -import androidx.core.text.color import androidx.core.text.italic import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.util.Colors diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt index b5596cab..2fe2a806 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt @@ -18,6 +18,8 @@ */ package dev.octoshrimpy.quik.injection +import dagger.Component +import dagger.android.support.AndroidSupportInjectionModule import dev.octoshrimpy.quik.common.QKApplication import dev.octoshrimpy.quik.common.QkDialog import dev.octoshrimpy.quik.common.util.QkChooserTargetService @@ -43,8 +45,6 @@ import dev.octoshrimpy.quik.feature.widget.WidgetAdapter import dev.octoshrimpy.quik.injection.android.ActivityBuilderModule import dev.octoshrimpy.quik.injection.android.BroadcastReceiverBuilderModule import dev.octoshrimpy.quik.injection.android.ServiceBuilderModule -import dagger.Component -import dagger.android.support.AndroidSupportInjectionModule import javax.inject.Singleton @Singleton diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt index a37cf052..d34cd3a2 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt @@ -26,6 +26,10 @@ import android.preference.PreferenceManager import androidx.lifecycle.ViewModelProvider import androidx.work.WorkerFactory import com.f2prateek.rx.preferences2.RxSharedPreferences +import com.squareup.moshi.Moshi +import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory +import dagger.Module +import dagger.Provides import dev.octoshrimpy.quik.blocking.BlockingClient import dev.octoshrimpy.quik.blocking.BlockingManager import dev.octoshrimpy.quik.common.ViewModelFactory @@ -85,10 +89,6 @@ import dev.octoshrimpy.quik.repository.ScheduledMessageRepository import dev.octoshrimpy.quik.repository.ScheduledMessageRepositoryImpl import dev.octoshrimpy.quik.repository.SyncRepository import dev.octoshrimpy.quik.repository.SyncRepositoryImpl -import com.squareup.moshi.Moshi -import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory -import dagger.Module -import dagger.Provides import dev.octoshrimpy.quik.worker.InjectionWorkerFactory import javax.inject.Singleton diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt index 516372d4..69eda914 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt @@ -18,6 +18,8 @@ */ package dev.octoshrimpy.quik.injection.android +import dagger.Module +import dagger.android.ContributesAndroidInjector import dev.octoshrimpy.quik.feature.backup.BackupActivity import dev.octoshrimpy.quik.feature.blocking.BlockingActivity import dev.octoshrimpy.quik.feature.compose.ComposeActivity @@ -39,8 +41,6 @@ import dev.octoshrimpy.quik.feature.scheduled.ScheduledActivity import dev.octoshrimpy.quik.feature.scheduled.ScheduledActivityModule import dev.octoshrimpy.quik.feature.settings.SettingsActivity import dev.octoshrimpy.quik.injection.scope.ActivityScope -import dagger.Module -import dagger.android.ContributesAndroidInjector @Module abstract class ActivityBuilderModule { diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt index c9019938..f8ef1057 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt @@ -18,6 +18,8 @@ */ package dev.octoshrimpy.quik.injection.android +import dagger.Module +import dagger.android.ContributesAndroidInjector import dev.octoshrimpy.quik.feature.widget.WidgetProvider import dev.octoshrimpy.quik.injection.scope.ActivityScope import dev.octoshrimpy.quik.receiver.BlockThreadReceiver @@ -38,8 +40,6 @@ import dev.octoshrimpy.quik.receiver.SmsDeliveredReceiver import dev.octoshrimpy.quik.receiver.SmsProviderChangedReceiver import dev.octoshrimpy.quik.receiver.SmsReceiver import dev.octoshrimpy.quik.receiver.SmsSentReceiver -import dagger.Module -import dagger.android.ContributesAndroidInjector import dev.octoshrimpy.quik.receiver.SpeakThreadsReceiver import dev.octoshrimpy.quik.receiver.StartActivityFromWidgetReceiver diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt index 36fa1e90..b8e38fc7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt @@ -18,13 +18,13 @@ */ package dev.octoshrimpy.quik.injection.android -import dev.octoshrimpy.quik.feature.backup.RestoreBackupService -import dev.octoshrimpy.quik.injection.scope.ActivityScope -import dev.octoshrimpy.quik.service.HeadlessSmsSendService -import dev.octoshrimpy.quik.receiver.SendSmsReceiver -import dev.octoshrimpy.quik.service.AutoDeleteService import dagger.Module import dagger.android.ContributesAndroidInjector +import dev.octoshrimpy.quik.feature.backup.RestoreBackupService +import dev.octoshrimpy.quik.injection.scope.ActivityScope +import dev.octoshrimpy.quik.receiver.SendSmsReceiver +import dev.octoshrimpy.quik.service.AutoDeleteService +import dev.octoshrimpy.quik.service.HeadlessSmsSendService @Module abstract class ServiceBuilderModule { diff --git a/presentation/src/main/res/drawable/ic_speech_to_text_black.xml b/presentation/src/main/res/drawable/ic_speech_to_text_black.xml index 48de1c61..2339d38d 100644 --- a/presentation/src/main/res/drawable/ic_speech_to_text_black.xml +++ b/presentation/src/main/res/drawable/ic_speech_to_text_black.xml @@ -1,6 +1,5 @@ - . --> diff --git a/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt b/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt index 6beae05f..da897ad9 100644 --- a/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt +++ b/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt @@ -19,7 +19,6 @@ package dev.octoshrimpy.quik.common.util import timber.log.Timber -import javax.inject.Inject class CrashlyticsTree : Timber.Tree() {