diff --git a/data/src/main/java/compat/SubscriptionInfoCompat.kt b/data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt
similarity index 97%
rename from data/src/main/java/compat/SubscriptionInfoCompat.kt
rename to data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt
index 08369c53..f6674e4c 100644
--- a/data/src/main/java/compat/SubscriptionInfoCompat.kt
+++ b/data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package compat
+package com.moez.QKSMS.compat
import android.annotation.TargetApi
import android.os.Build
diff --git a/data/src/main/java/compat/SubscriptionManagerCompat.kt b/data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt
similarity index 96%
rename from data/src/main/java/compat/SubscriptionManagerCompat.kt
rename to data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt
index a564e242..fb6174ff 100644
--- a/data/src/main/java/compat/SubscriptionManagerCompat.kt
+++ b/data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package compat
+package com.moez.QKSMS.compat
import android.content.Context
import android.os.Build
import android.telephony.SubscriptionManager
-import manager.PermissionManager
+import com.moez.QKSMS.manager.PermissionManager
import javax.inject.Inject
class SubscriptionManagerCompat @Inject constructor(context: Context, private val permissions: PermissionManager) {
diff --git a/data/src/main/java/compat/TelephonyCompat.kt b/data/src/main/java/com/moez/QKSMS/compat/TelephonyCompat.kt
similarity index 99%
rename from data/src/main/java/compat/TelephonyCompat.kt
rename to data/src/main/java/com/moez/QKSMS/compat/TelephonyCompat.kt
index f07d50e6..c8fa84bd 100644
--- a/data/src/main/java/compat/TelephonyCompat.kt
+++ b/data/src/main/java/com/moez/QKSMS/compat/TelephonyCompat.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package compat
+package com.moez.QKSMS.compat
import android.content.Context
import android.database.sqlite.SqliteWrapper
diff --git a/data/src/main/java/util/extensions/CursorExtensions.kt b/data/src/main/java/com/moez/QKSMS/extensions/CursorExtensions.kt
similarity index 98%
rename from data/src/main/java/util/extensions/CursorExtensions.kt
rename to data/src/main/java/com/moez/QKSMS/extensions/CursorExtensions.kt
index 48be27be..81af40c8 100644
--- a/data/src/main/java/util/extensions/CursorExtensions.kt
+++ b/data/src/main/java/com/moez/QKSMS/extensions/CursorExtensions.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package util.extensions
+package com.moez.QKSMS.extensions
import android.database.Cursor
import io.reactivex.Flowable
diff --git a/data/src/main/java/util/extensions/MmsPartExtensions.kt b/data/src/main/java/com/moez/QKSMS/extensions/MmsPartExtensions.kt
similarity index 93%
rename from data/src/main/java/util/extensions/MmsPartExtensions.kt
rename to data/src/main/java/com/moez/QKSMS/extensions/MmsPartExtensions.kt
index 192f1716..a4d2135c 100644
--- a/data/src/main/java/util/extensions/MmsPartExtensions.kt
+++ b/data/src/main/java/com/moez/QKSMS/extensions/MmsPartExtensions.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package util.extensions
+package com.moez.QKSMS.extensions
import com.google.android.mms.ContentType
-import model.MmsPart
+import com.moez.QKSMS.model.MmsPart
fun MmsPart.isSmil() = ContentType.APP_SMIL == type
diff --git a/data/src/main/java/util/extensions/RealmExtensions.kt b/data/src/main/java/com/moez/QKSMS/extensions/RealmExtensions.kt
similarity index 98%
rename from data/src/main/java/util/extensions/RealmExtensions.kt
rename to data/src/main/java/com/moez/QKSMS/extensions/RealmExtensions.kt
index 21e4d70b..eb82cf4b 100644
--- a/data/src/main/java/util/extensions/RealmExtensions.kt
+++ b/data/src/main/java/com/moez/QKSMS/extensions/RealmExtensions.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package util.extensions
+package com.moez.QKSMS.extensions
import io.reactivex.Observable
import io.realm.Realm
diff --git a/data/src/main/java/util/extensions/StringExtensions.kt b/data/src/main/java/com/moez/QKSMS/extensions/StringExtensions.kt
similarity index 96%
rename from data/src/main/java/util/extensions/StringExtensions.kt
rename to data/src/main/java/com/moez/QKSMS/extensions/StringExtensions.kt
index bb1f8699..3c2dbd01 100644
--- a/data/src/main/java/util/extensions/StringExtensions.kt
+++ b/data/src/main/java/com/moez/QKSMS/extensions/StringExtensions.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package util.extensions
+package com.moez.QKSMS.extensions
import java.text.Normalizer
diff --git a/data/src/main/java/filter/ContactFilter.kt b/data/src/main/java/com/moez/QKSMS/filter/ContactFilter.kt
similarity index 90%
rename from data/src/main/java/filter/ContactFilter.kt
rename to data/src/main/java/com/moez/QKSMS/filter/ContactFilter.kt
index a6cf02e2..8e77da1a 100644
--- a/data/src/main/java/filter/ContactFilter.kt
+++ b/data/src/main/java/com/moez/QKSMS/filter/ContactFilter.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package filter
+package com.moez.QKSMS.filter
-import model.Contact
-import util.extensions.removeAccents
+import com.moez.QKSMS.extensions.removeAccents
+import com.moez.QKSMS.model.Contact
import javax.inject.Inject
class ContactFilter @Inject constructor(private val phoneNumberFilter: PhoneNumberFilter) : Filter() {
diff --git a/data/src/main/java/filter/ConversationFilter.kt b/data/src/main/java/com/moez/QKSMS/filter/ConversationFilter.kt
similarity index 93%
rename from data/src/main/java/filter/ConversationFilter.kt
rename to data/src/main/java/com/moez/QKSMS/filter/ConversationFilter.kt
index 6fdc8532..712ad3de 100644
--- a/data/src/main/java/filter/ConversationFilter.kt
+++ b/data/src/main/java/com/moez/QKSMS/filter/ConversationFilter.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package filter
+package com.moez.QKSMS.filter
-import model.Conversation
+import com.moez.QKSMS.model.Conversation
import javax.inject.Inject
class ConversationFilter @Inject constructor(private val recipientFilter: RecipientFilter) : Filter() {
diff --git a/data/src/main/java/filter/Filter.kt b/data/src/main/java/com/moez/QKSMS/filter/Filter.kt
similarity index 96%
rename from data/src/main/java/filter/Filter.kt
rename to data/src/main/java/com/moez/QKSMS/filter/Filter.kt
index 3188a002..e839ad53 100644
--- a/data/src/main/java/filter/Filter.kt
+++ b/data/src/main/java/com/moez/QKSMS/filter/Filter.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package filter
+package com.moez.QKSMS.filter
abstract class Filter {
diff --git a/data/src/main/java/filter/PhoneNumberFilter.kt b/data/src/main/java/com/moez/QKSMS/filter/PhoneNumberFilter.kt
similarity index 97%
rename from data/src/main/java/filter/PhoneNumberFilter.kt
rename to data/src/main/java/com/moez/QKSMS/filter/PhoneNumberFilter.kt
index 891803b5..6a677939 100644
--- a/data/src/main/java/filter/PhoneNumberFilter.kt
+++ b/data/src/main/java/com/moez/QKSMS/filter/PhoneNumberFilter.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package filter
+package com.moez.QKSMS.filter
import android.telephony.PhoneNumberUtils
import javax.inject.Inject
diff --git a/data/src/main/java/filter/RecipientFilter.kt b/data/src/main/java/com/moez/QKSMS/filter/RecipientFilter.kt
similarity index 94%
rename from data/src/main/java/filter/RecipientFilter.kt
rename to data/src/main/java/com/moez/QKSMS/filter/RecipientFilter.kt
index f38a7e78..291ebe71 100644
--- a/data/src/main/java/filter/RecipientFilter.kt
+++ b/data/src/main/java/com/moez/QKSMS/filter/RecipientFilter.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package filter
+package com.moez.QKSMS.filter
-import model.Recipient
+import com.moez.QKSMS.model.Recipient
import javax.inject.Inject
class RecipientFilter @Inject constructor(
diff --git a/data/src/main/java/manager/ExternalBlockingManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/ExternalBlockingManagerImpl.kt
similarity index 97%
rename from data/src/main/java/manager/ExternalBlockingManagerImpl.kt
rename to data/src/main/java/com/moez/QKSMS/manager/ExternalBlockingManagerImpl.kt
index 57c86ac5..805b88fc 100644
--- a/data/src/main/java/manager/ExternalBlockingManagerImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/manager/ExternalBlockingManagerImpl.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package manager
+package com.moez.QKSMS.manager
import android.content.ComponentName
import android.content.Context
@@ -27,11 +27,11 @@ import android.os.IBinder
import android.os.Message
import android.os.Messenger
import androidx.os.bundleOf
+import com.moez.QKSMS.util.Preferences
+import com.moez.QKSMS.util.tryOrNull
import io.reactivex.Single
import io.reactivex.subjects.SingleSubject
import timber.log.Timber
-import util.Preferences
-import util.tryOrNull
import javax.inject.Inject
class ExternalBlockingManagerImpl @Inject constructor(
diff --git a/data/src/main/java/manager/KeyManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/KeyManagerImpl.kt
similarity index 95%
rename from data/src/main/java/manager/KeyManagerImpl.kt
rename to data/src/main/java/com/moez/QKSMS/manager/KeyManagerImpl.kt
index 3ec85f3e..6b22866d 100644
--- a/data/src/main/java/manager/KeyManagerImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/manager/KeyManagerImpl.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package manager
+package com.moez.QKSMS.manager
+import com.moez.QKSMS.model.Message
import io.realm.Realm
-import model.Message
import javax.inject.Inject
import javax.inject.Singleton
diff --git a/data/src/main/java/manager/PermissionManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/PermissionManagerImpl.kt
similarity index 98%
rename from data/src/main/java/manager/PermissionManagerImpl.kt
rename to data/src/main/java/com/moez/QKSMS/manager/PermissionManagerImpl.kt
index 8b7dc578..e4c50338 100644
--- a/data/src/main/java/manager/PermissionManagerImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/manager/PermissionManagerImpl.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package manager
+package com.moez.QKSMS.manager
import android.Manifest
import android.content.Context
diff --git a/data/src/main/java/manager/WidgetManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/WidgetManagerImpl.kt
similarity index 97%
rename from data/src/main/java/manager/WidgetManagerImpl.kt
rename to data/src/main/java/com/moez/QKSMS/manager/WidgetManagerImpl.kt
index 0dab948d..70cc6368 100644
--- a/data/src/main/java/manager/WidgetManagerImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/manager/WidgetManagerImpl.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package manager
+package com.moez.QKSMS.manager
import android.content.Context
import android.content.Intent
diff --git a/data/src/main/java/mapper/CursorToContactImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/CursorToContactImpl.kt
similarity index 92%
rename from data/src/main/java/mapper/CursorToContactImpl.kt
rename to data/src/main/java/com/moez/QKSMS/mapper/CursorToContactImpl.kt
index bcb3e070..9820f663 100644
--- a/data/src/main/java/mapper/CursorToContactImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/mapper/CursorToContactImpl.kt
@@ -16,14 +16,14 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package mapper
+package com.moez.QKSMS.mapper
import android.content.Context
import android.database.Cursor
import android.provider.ContactsContract.CommonDataKinds.Phone.*
-import manager.PermissionManager
-import model.Contact
-import model.PhoneNumber
+import com.moez.QKSMS.manager.PermissionManager
+import com.moez.QKSMS.model.Contact
+import com.moez.QKSMS.model.PhoneNumber
import javax.inject.Inject
class CursorToContactImpl @Inject constructor(
diff --git a/data/src/main/java/mapper/CursorToConversationImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/CursorToConversationImpl.kt
similarity index 94%
rename from data/src/main/java/mapper/CursorToConversationImpl.kt
rename to data/src/main/java/com/moez/QKSMS/mapper/CursorToConversationImpl.kt
index 925e2eaf..b30db96f 100644
--- a/data/src/main/java/mapper/CursorToConversationImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/mapper/CursorToConversationImpl.kt
@@ -16,15 +16,15 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package mapper
+package com.moez.QKSMS.mapper
import android.content.Context
import android.database.Cursor
import android.net.Uri
import android.provider.Telephony.Threads
-import manager.PermissionManager
-import model.Conversation
-import model.Recipient
+import com.moez.QKSMS.manager.PermissionManager
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Recipient
import javax.inject.Inject
class CursorToConversationImpl @Inject constructor(
diff --git a/data/src/main/java/mapper/CursorToMessageImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt
similarity index 96%
rename from data/src/main/java/mapper/CursorToMessageImpl.kt
rename to data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt
index 3d956962..cec8e3b7 100644
--- a/data/src/main/java/mapper/CursorToMessageImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt
@@ -16,17 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package mapper
+package com.moez.QKSMS.mapper
import android.content.Context
import android.database.Cursor
import android.net.Uri
import android.provider.Telephony.*
import com.google.android.mms.pdu_alt.PduHeaders
-import manager.KeyManager
-import manager.PermissionManager
-import model.Message
-import util.extensions.map
+import com.moez.QKSMS.extensions.map
+import com.moez.QKSMS.manager.KeyManager
+import com.moez.QKSMS.manager.PermissionManager
+import com.moez.QKSMS.model.Message
import javax.inject.Inject
class CursorToMessageImpl @Inject constructor(
diff --git a/data/src/main/java/mapper/CursorToPartImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/CursorToPartImpl.kt
similarity index 92%
rename from data/src/main/java/mapper/CursorToPartImpl.kt
rename to data/src/main/java/com/moez/QKSMS/mapper/CursorToPartImpl.kt
index 1b56e24f..a1c13a72 100644
--- a/data/src/main/java/mapper/CursorToPartImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/mapper/CursorToPartImpl.kt
@@ -16,19 +16,19 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package mapper
+package com.moez.QKSMS.mapper
import android.content.ContentUris
import android.content.Context
import android.database.Cursor
import android.net.Uri
import android.provider.Telephony
-import model.MmsPart
+import com.moez.QKSMS.extensions.isImage
+import com.moez.QKSMS.extensions.isSmil
+import com.moez.QKSMS.extensions.isText
+import com.moez.QKSMS.extensions.isVideo
+import com.moez.QKSMS.model.MmsPart
import timber.log.Timber
-import util.extensions.isImage
-import util.extensions.isSmil
-import util.extensions.isText
-import util.extensions.isVideo
import java.io.BufferedReader
import java.io.InputStreamReader
import javax.inject.Inject
diff --git a/data/src/main/java/mapper/CursorToRecipientImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/CursorToRecipientImpl.kt
similarity index 93%
rename from data/src/main/java/mapper/CursorToRecipientImpl.kt
rename to data/src/main/java/com/moez/QKSMS/mapper/CursorToRecipientImpl.kt
index ff89e07f..bb652cb5 100644
--- a/data/src/main/java/mapper/CursorToRecipientImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/mapper/CursorToRecipientImpl.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package mapper
+package com.moez.QKSMS.mapper
import android.content.Context
import android.database.Cursor
import android.net.Uri
-import manager.PermissionManager
-import model.Recipient
+import com.moez.QKSMS.manager.PermissionManager
+import com.moez.QKSMS.model.Recipient
import javax.inject.Inject
class CursorToRecipientImpl @Inject constructor(
diff --git a/data/src/main/java/mapper/RatingManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/RatingManagerImpl.kt
similarity index 93%
rename from data/src/main/java/mapper/RatingManagerImpl.kt
rename to data/src/main/java/com/moez/QKSMS/mapper/RatingManagerImpl.kt
index 1ded4219..b3c0a322 100644
--- a/data/src/main/java/mapper/RatingManagerImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/mapper/RatingManagerImpl.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package mapper
+package com.moez.QKSMS.mapper
import com.f2prateek.rx.preferences2.RxSharedPreferences
+import com.moez.QKSMS.manager.AnalyticsManager
+import com.moez.QKSMS.manager.RatingManager
import io.reactivex.rxkotlin.Observables
-import manager.AnalyticsManager
-import manager.RatingManager
import javax.inject.Inject
class RatingManagerImpl @Inject constructor(
diff --git a/data/src/main/java/migration/QkRealmMigration.kt b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt
similarity index 98%
rename from data/src/main/java/migration/QkRealmMigration.kt
rename to data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt
index 24cc0598..40772045 100644
--- a/data/src/main/java/migration/QkRealmMigration.kt
+++ b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package migration
+package com.moez.QKSMS.migration
import io.realm.DynamicRealm
import io.realm.FieldAttribute
diff --git a/data/src/main/java/receiver/DefaultSmsChangedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt
similarity index 92%
rename from data/src/main/java/receiver/DefaultSmsChangedReceiver.kt
rename to data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt
index edbf9276..6ed41a82 100644
--- a/data/src/main/java/receiver/DefaultSmsChangedReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package receiver
+package com.moez.QKSMS.receiver
import android.content.BroadcastReceiver
import android.content.Context
@@ -24,9 +24,9 @@ import android.content.Intent
import android.os.Build
import android.provider.Telephony
import android.support.annotation.RequiresApi
+import com.moez.QKSMS.interactor.SyncMessages
+import com.moez.QKSMS.util.Preferences
import dagger.android.AndroidInjection
-import interactor.SyncMessages
-import util.Preferences
import javax.inject.Inject
class DefaultSmsChangedReceiver : BroadcastReceiver() {
diff --git a/data/src/main/java/receiver/MarkReadReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt
similarity index 94%
rename from data/src/main/java/receiver/MarkReadReceiver.kt
rename to data/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt
index 8a177c2f..77052ae1 100644
--- a/data/src/main/java/receiver/MarkReadReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package receiver
+package com.moez.QKSMS.receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
+import com.moez.QKSMS.interactor.MarkRead
import dagger.android.AndroidInjection
-import interactor.MarkRead
import javax.inject.Inject
class MarkReadReceiver : BroadcastReceiver() {
diff --git a/data/src/main/java/receiver/MarkSeenReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt
similarity index 94%
rename from data/src/main/java/receiver/MarkSeenReceiver.kt
rename to data/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt
index b7fc71e5..4be2f1e2 100644
--- a/data/src/main/java/receiver/MarkSeenReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package receiver
+package com.moez.QKSMS.receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
+import com.moez.QKSMS.interactor.MarkSeen
import dagger.android.AndroidInjection
-import interactor.MarkSeen
import javax.inject.Inject
class MarkSeenReceiver : BroadcastReceiver() {
diff --git a/data/src/main/java/receiver/MmsReceivedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MmsReceivedReceiver.kt
similarity index 94%
rename from data/src/main/java/receiver/MmsReceivedReceiver.kt
rename to data/src/main/java/com/moez/QKSMS/receiver/MmsReceivedReceiver.kt
index 44fd84c7..fecf096a 100644
--- a/data/src/main/java/receiver/MmsReceivedReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/MmsReceivedReceiver.kt
@@ -16,14 +16,14 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package receiver
+package com.moez.QKSMS.receiver
import android.content.Context
import android.content.Intent
import android.net.Uri
import com.klinker.android.send_message.MmsReceivedReceiver
+import com.moez.QKSMS.interactor.ReceiveMms
import dagger.android.AndroidInjection
-import interactor.ReceiveMms
import javax.inject.Inject
class MmsReceivedReceiver : MmsReceivedReceiver() {
diff --git a/data/src/main/java/receiver/MmsReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.kt
similarity index 96%
rename from data/src/main/java/receiver/MmsReceiver.kt
rename to data/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.kt
index e432493b..63e57a7e 100644
--- a/data/src/main/java/receiver/MmsReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package receiver
+package com.moez.QKSMS.receiver
import com.android.mms.transaction.PushReceiver
diff --git a/data/src/main/java/receiver/MmsSentReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MmsSentReceiver.kt
similarity index 97%
rename from data/src/main/java/receiver/MmsSentReceiver.kt
rename to data/src/main/java/com/moez/QKSMS/receiver/MmsSentReceiver.kt
index e3ba7959..a7b2c136 100644
--- a/data/src/main/java/receiver/MmsSentReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/MmsSentReceiver.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package receiver
+package com.moez.QKSMS.receiver
import android.app.Activity
import android.content.BroadcastReceiver
@@ -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 com.moez.QKSMS.interactor.SyncMessage
import dagger.android.AndroidInjection
-import interactor.SyncMessage
import timber.log.Timber
import java.io.File
import javax.inject.Inject
diff --git a/data/src/main/java/receiver/MmsUpdatedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MmsUpdatedReceiver.kt
similarity index 94%
rename from data/src/main/java/receiver/MmsUpdatedReceiver.kt
rename to data/src/main/java/com/moez/QKSMS/receiver/MmsUpdatedReceiver.kt
index 42bba4c3..2891a1b0 100644
--- a/data/src/main/java/receiver/MmsUpdatedReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/MmsUpdatedReceiver.kt
@@ -16,14 +16,14 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package receiver
+package com.moez.QKSMS.receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.net.Uri
+import com.moez.QKSMS.interactor.SyncMessage
import dagger.android.AndroidInjection
-import interactor.SyncMessage
import javax.inject.Inject
class MmsUpdatedReceiver : BroadcastReceiver() {
diff --git a/data/src/main/java/receiver/NightModeReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt
similarity index 93%
rename from data/src/main/java/receiver/NightModeReceiver.kt
rename to data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt
index c8e09819..aec5836d 100644
--- a/data/src/main/java/receiver/NightModeReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package receiver
+package com.moez.QKSMS.receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
+import com.moez.QKSMS.util.NightModeManager
import dagger.android.AndroidInjection
-import util.NightModeManager
import javax.inject.Inject
class NightModeReceiver : BroadcastReceiver() {
diff --git a/data/src/main/java/receiver/RemoteMessagingReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt
similarity index 88%
rename from data/src/main/java/receiver/RemoteMessagingReceiver.kt
rename to data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt
index 698180b1..0722f19f 100644
--- a/data/src/main/java/receiver/RemoteMessagingReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt
@@ -16,18 +16,18 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package receiver
+package com.moez.QKSMS.receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.support.v4.app.RemoteInput
-import compat.SubscriptionManagerCompat
+import com.moez.QKSMS.compat.SubscriptionManagerCompat
+import com.moez.QKSMS.interactor.MarkRead
+import com.moez.QKSMS.interactor.SendMessage
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
import dagger.android.AndroidInjection
-import interactor.MarkRead
-import interactor.SendMessage
-import repository.ConversationRepository
-import repository.MessageRepository
import javax.inject.Inject
class RemoteMessagingReceiver : BroadcastReceiver() {
diff --git a/data/src/main/java/receiver/SendSmsReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SendSmsReceiver.kt
similarity index 91%
rename from data/src/main/java/receiver/SendSmsReceiver.kt
rename to data/src/main/java/com/moez/QKSMS/receiver/SendSmsReceiver.kt
index 9f6c154a..d7a55720 100644
--- a/data/src/main/java/receiver/SendSmsReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/SendSmsReceiver.kt
@@ -16,14 +16,14 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package receiver
+package com.moez.QKSMS.receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
+import com.moez.QKSMS.interactor.RetrySending
+import com.moez.QKSMS.repository.MessageRepository
import dagger.android.AndroidInjection
-import interactor.RetrySending
-import repository.MessageRepository
import javax.inject.Inject
class SendSmsReceiver : BroadcastReceiver() {
diff --git a/data/src/main/java/receiver/SmsDeliveredReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SmsDeliveredReceiver.kt
similarity index 93%
rename from data/src/main/java/receiver/SmsDeliveredReceiver.kt
rename to data/src/main/java/com/moez/QKSMS/receiver/SmsDeliveredReceiver.kt
index 41f4675d..1fa162a4 100644
--- a/data/src/main/java/receiver/SmsDeliveredReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/SmsDeliveredReceiver.kt
@@ -16,15 +16,15 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package receiver
+package com.moez.QKSMS.receiver
import android.app.Activity
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
+import com.moez.QKSMS.interactor.MarkDelivered
+import com.moez.QKSMS.interactor.MarkDeliveryFailed
import dagger.android.AndroidInjection
-import interactor.MarkDelivered
-import interactor.MarkDeliveryFailed
import javax.inject.Inject
class SmsDeliveredReceiver : BroadcastReceiver() {
diff --git a/data/src/main/java/receiver/SmsProviderChangedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt
similarity index 96%
rename from data/src/main/java/receiver/SmsProviderChangedReceiver.kt
rename to data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt
index 877abe56..dcdc53fb 100644
--- a/data/src/main/java/receiver/SmsProviderChangedReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package receiver
+package com.moez.QKSMS.receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
+import com.moez.QKSMS.interactor.SyncMessage
import dagger.android.AndroidInjection
-import interactor.SyncMessage
import javax.inject.Inject
/**
diff --git a/data/src/main/java/receiver/SmsReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt
similarity index 94%
rename from data/src/main/java/receiver/SmsReceiver.kt
rename to data/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt
index 18ec968b..ca94b094 100644
--- a/data/src/main/java/receiver/SmsReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt
@@ -16,14 +16,14 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package receiver
+package com.moez.QKSMS.receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.provider.Telephony.Sms
+import com.moez.QKSMS.interactor.ReceiveSms
import dagger.android.AndroidInjection
-import interactor.ReceiveSms
import javax.inject.Inject
class SmsReceiver : BroadcastReceiver() {
diff --git a/data/src/main/java/receiver/SmsSentReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SmsSentReceiver.kt
similarity index 93%
rename from data/src/main/java/receiver/SmsSentReceiver.kt
rename to data/src/main/java/com/moez/QKSMS/receiver/SmsSentReceiver.kt
index 733fec75..ffc6e550 100644
--- a/data/src/main/java/receiver/SmsSentReceiver.kt
+++ b/data/src/main/java/com/moez/QKSMS/receiver/SmsSentReceiver.kt
@@ -16,16 +16,16 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package receiver
+package com.moez.QKSMS.receiver
import android.app.Activity
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.telephony.SmsManager
+import com.moez.QKSMS.interactor.MarkFailed
+import com.moez.QKSMS.interactor.MarkSent
import dagger.android.AndroidInjection
-import interactor.MarkFailed
-import interactor.MarkSent
import javax.inject.Inject
class SmsSentReceiver : BroadcastReceiver() {
diff --git a/data/src/main/java/repository/ContactRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ContactRepositoryImpl.kt
similarity index 94%
rename from data/src/main/java/repository/ContactRepositoryImpl.kt
rename to data/src/main/java/com/moez/QKSMS/repository/ContactRepositoryImpl.kt
index ca8adf9f..24c3c2e0 100644
--- a/data/src/main/java/repository/ContactRepositoryImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/repository/ContactRepositoryImpl.kt
@@ -16,20 +16,20 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package repository
+package com.moez.QKSMS.repository
import android.content.Context
import android.net.Uri
import android.provider.BaseColumns
import android.provider.ContactsContract
+import com.moez.QKSMS.extensions.asFlowable
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.model.Contact
import io.reactivex.Flowable
import io.reactivex.Single
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import io.realm.Realm
-import model.Contact
-import util.extensions.asFlowable
-import util.extensions.mapNotNull
import javax.inject.Inject
import javax.inject.Singleton
diff --git a/data/src/main/java/repository/ConversationRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt
similarity index 95%
rename from data/src/main/java/repository/ConversationRepositoryImpl.kt
rename to data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt
index 04b140e5..a8bee73b 100644
--- a/data/src/main/java/repository/ConversationRepositoryImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt
@@ -1,24 +1,24 @@
-package repository
+package com.moez.QKSMS.repository
import android.content.ContentUris
import android.content.Context
import android.provider.Telephony
import android.telephony.PhoneNumberUtils
-import compat.TelephonyCompat
-import filter.ConversationFilter
+import com.moez.QKSMS.compat.TelephonyCompat
+import com.moez.QKSMS.extensions.anyOf
+import com.moez.QKSMS.extensions.map
+import com.moez.QKSMS.filter.ConversationFilter
+import com.moez.QKSMS.mapper.CursorToConversation
+import com.moez.QKSMS.mapper.CursorToRecipient
+import com.moez.QKSMS.model.Contact
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.SearchResult
+import com.moez.QKSMS.util.tryOrNull
import io.realm.Case
import io.realm.Realm
import io.realm.RealmResults
import io.realm.Sort
-import mapper.CursorToConversation
-import mapper.CursorToRecipient
-import model.Contact
-import model.Conversation
-import model.Message
-import model.SearchResult
-import util.extensions.anyOf
-import util.extensions.map
-import util.tryOrNull
import javax.inject.Inject
class ConversationRepositoryImpl @Inject constructor(
diff --git a/data/src/main/java/repository/ImageRepostoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ImageRepostoryImpl.kt
similarity index 98%
rename from data/src/main/java/repository/ImageRepostoryImpl.kt
rename to data/src/main/java/com/moez/QKSMS/repository/ImageRepostoryImpl.kt
index 7d038906..71d81d1a 100644
--- a/data/src/main/java/repository/ImageRepostoryImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/repository/ImageRepostoryImpl.kt
@@ -1,4 +1,4 @@
-package repository
+package com.moez.QKSMS.repository
import android.content.ContentResolver
import android.content.ContentUris
@@ -11,7 +11,7 @@ import android.net.Uri
import android.provider.MediaStore
import android.provider.MediaStore.Images
import android.support.media.ExifInterface
-import util.tryOrNull
+import com.moez.QKSMS.util.tryOrNull
import javax.inject.Inject
class ImageRepostoryImpl @Inject constructor(private val context: Context) : ImageRepository {
diff --git a/data/src/main/java/repository/MessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt
similarity index 97%
rename from data/src/main/java/repository/MessageRepositoryImpl.kt
rename to data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt
index 8d44d262..3e58d6f4 100644
--- a/data/src/main/java/repository/MessageRepositoryImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package repository
+package com.moez.QKSMS.repository
import android.app.AlarmManager
import android.app.PendingIntent
@@ -27,37 +27,25 @@ import android.content.Intent
import android.graphics.Bitmap
import android.os.Build
import android.provider.Telephony
-import android.telephony.PhoneNumberUtils
import android.telephony.SmsManager
import com.google.android.mms.ContentType
import com.klinker.android.send_message.BroadcastUtils
import com.klinker.android.send_message.Settings
import com.klinker.android.send_message.StripAccents
import com.klinker.android.send_message.Transaction
-import compat.TelephonyCompat
-import filter.ConversationFilter
+import com.moez.QKSMS.extensions.anyOf
+import com.moez.QKSMS.extensions.insertOrUpdate
+import com.moez.QKSMS.manager.KeyManager
+import com.moez.QKSMS.model.Attachment
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.MmsPart
+import com.moez.QKSMS.util.Preferences
import io.realm.Case
import io.realm.Realm
-import io.realm.RealmList
import io.realm.RealmResults
import io.realm.Sort
-import manager.KeyManager
-import mapper.CursorToConversation
-import mapper.CursorToRecipient
-import model.Attachment
-import model.Contact
-import model.Conversation
-import model.Message
-import model.MmsPart
-import model.Recipient
-import model.SearchResult
import timber.log.Timber
-import util.Preferences
-import util.extensions.anyOf
-import util.extensions.forEach
-import util.extensions.insertOrUpdate
-import util.extensions.map
-import util.tryOrNull
import java.io.ByteArrayOutputStream
import javax.inject.Inject
import javax.inject.Singleton
diff --git a/data/src/main/java/repository/SyncRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt
similarity index 93%
rename from data/src/main/java/repository/SyncRepositoryImpl.kt
rename to data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt
index cb32617a..1e835ab3 100644
--- a/data/src/main/java/repository/SyncRepositoryImpl.kt
+++ b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package repository
+package com.moez.QKSMS.repository
import android.content.ContentResolver
import android.content.ContentUris
@@ -24,23 +24,23 @@ import android.net.Uri
import android.provider.Telephony
import android.telephony.PhoneNumberUtils
import com.f2prateek.rx.preferences2.RxSharedPreferences
+import com.moez.QKSMS.extensions.insertOrUpdate
+import com.moez.QKSMS.extensions.map
+import com.moez.QKSMS.manager.KeyManager
+import com.moez.QKSMS.mapper.CursorToContact
+import com.moez.QKSMS.mapper.CursorToConversation
+import com.moez.QKSMS.mapper.CursorToMessage
+import com.moez.QKSMS.mapper.CursorToRecipient
+import com.moez.QKSMS.model.Contact
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.MmsPart
+import com.moez.QKSMS.model.Recipient
+import com.moez.QKSMS.model.SyncLog
+import com.moez.QKSMS.util.tryOrNull
import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.Subject
import io.realm.Realm
-import manager.KeyManager
-import mapper.CursorToContact
-import mapper.CursorToConversation
-import mapper.CursorToMessage
-import mapper.CursorToRecipient
-import model.Contact
-import model.Conversation
-import model.Message
-import model.MmsPart
-import model.Recipient
-import model.SyncLog
-import util.extensions.insertOrUpdate
-import util.extensions.map
-import util.tryOrNull
import javax.inject.Inject
import javax.inject.Singleton
diff --git a/data/src/main/java/service/HeadlessSmsSendService.kt b/data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt
similarity index 93%
rename from data/src/main/java/service/HeadlessSmsSendService.kt
rename to data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt
index 64af9f6c..f653d72a 100644
--- a/data/src/main/java/service/HeadlessSmsSendService.kt
+++ b/data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt
@@ -16,15 +16,15 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package service
+package com.moez.QKSMS.service
import android.app.IntentService
import android.content.Intent
import android.net.Uri
import android.telephony.TelephonyManager
+import com.moez.QKSMS.interactor.SendMessage
+import com.moez.QKSMS.repository.ConversationRepository
import dagger.android.AndroidInjection
-import interactor.SendMessage
-import repository.ConversationRepository
import javax.inject.Inject
class HeadlessSmsSendService : IntentService("HeadlessSmsSendService") {
diff --git a/data/src/main/java/util/ActiveSubscriptionObservable.kt b/data/src/main/java/com/moez/QKSMS/util/ActiveSubscriptionObservable.kt
similarity index 90%
rename from data/src/main/java/util/ActiveSubscriptionObservable.kt
rename to data/src/main/java/com/moez/QKSMS/util/ActiveSubscriptionObservable.kt
index 075a57b7..2b49881b 100644
--- a/data/src/main/java/util/ActiveSubscriptionObservable.kt
+++ b/data/src/main/java/com/moez/QKSMS/util/ActiveSubscriptionObservable.kt
@@ -1,7 +1,7 @@
-package util
+package com.moez.QKSMS.util
-import compat.SubscriptionInfoCompat
-import compat.SubscriptionManagerCompat
+import com.moez.QKSMS.compat.SubscriptionInfoCompat
+import com.moez.QKSMS.compat.SubscriptionManagerCompat
import io.reactivex.Observable
import io.reactivex.Observer
import io.reactivex.disposables.Disposable
diff --git a/data/src/main/java/util/NightModeManager.kt b/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt
similarity index 98%
rename from data/src/main/java/util/NightModeManager.kt
rename to data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt
index 9c7a8e0f..4f38f584 100644
--- a/data/src/main/java/util/NightModeManager.kt
+++ b/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package util
+package com.moez.QKSMS.util
import android.app.AlarmManager
import android.app.PendingIntent
import android.content.Context
import android.content.Intent
-import receiver.NightModeReceiver
+import com.moez.QKSMS.receiver.NightModeReceiver
import java.text.SimpleDateFormat
import java.util.*
import java.util.concurrent.TimeUnit
diff --git a/data/src/main/java/util/Preferences.kt b/data/src/main/java/com/moez/QKSMS/util/Preferences.kt
similarity index 99%
rename from data/src/main/java/util/Preferences.kt
rename to data/src/main/java/com/moez/QKSMS/util/Preferences.kt
index a527e4ca..d7fbd553 100644
--- a/data/src/main/java/util/Preferences.kt
+++ b/data/src/main/java/com/moez/QKSMS/util/Preferences.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package util
+package com.moez.QKSMS.util
import android.os.Build
import android.provider.Settings
diff --git a/data/src/main/java/util/Utils.kt b/data/src/main/java/com/moez/QKSMS/util/Utils.kt
similarity index 96%
rename from data/src/main/java/util/Utils.kt
rename to data/src/main/java/com/moez/QKSMS/util/Utils.kt
index 9b624930..5c133b21 100644
--- a/data/src/main/java/util/Utils.kt
+++ b/data/src/main/java/com/moez/QKSMS/util/Utils.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package util
+package com.moez.QKSMS.util
fun tryOrNull(body: () -> T?): T? {
return try {
diff --git a/domain/src/main/java/util/extensions/RxExtensions.kt b/domain/src/main/java/com/moez/QKSMS/extensions/RxExtensions.kt
similarity index 97%
rename from domain/src/main/java/util/extensions/RxExtensions.kt
rename to domain/src/main/java/com/moez/QKSMS/extensions/RxExtensions.kt
index eb0581f3..f53759d7 100644
--- a/domain/src/main/java/util/extensions/RxExtensions.kt
+++ b/domain/src/main/java/com/moez/QKSMS/extensions/RxExtensions.kt
@@ -17,7 +17,7 @@
* along with QKSMS. If not, see .
*/
-package util.extensions
+package com.moez.QKSMS.extensions
import io.reactivex.Flowable
import io.reactivex.Observable
diff --git a/domain/src/main/java/interactor/CancelDelayedMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/CancelDelayedMessage.kt
similarity index 93%
rename from domain/src/main/java/interactor/CancelDelayedMessage.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/CancelDelayedMessage.kt
index 33442f74..4c37e3fc 100644
--- a/domain/src/main/java/interactor/CancelDelayedMessage.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/CancelDelayedMessage.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
+import com.moez.QKSMS.repository.MessageRepository
import io.reactivex.Flowable
-import repository.MessageRepository
import javax.inject.Inject
class CancelDelayedMessage @Inject constructor(private val messageRepo: MessageRepository) : Interactor() {
diff --git a/domain/src/main/java/interactor/ContactSync.kt b/domain/src/main/java/com/moez/QKSMS/interactor/ContactSync.kt
similarity index 94%
rename from domain/src/main/java/interactor/ContactSync.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/ContactSync.kt
index de402bcf..7cd97fc7 100644
--- a/domain/src/main/java/interactor/ContactSync.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/ContactSync.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
+import com.moez.QKSMS.repository.SyncRepository
import io.reactivex.Flowable
-import repository.SyncRepository
import timber.log.Timber
import java.util.concurrent.TimeUnit
import javax.inject.Inject
diff --git a/domain/src/main/java/interactor/DeleteConversations.kt b/domain/src/main/java/com/moez/QKSMS/interactor/DeleteConversations.kt
similarity index 93%
rename from domain/src/main/java/interactor/DeleteConversations.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/DeleteConversations.kt
index a5e7a5b5..dfa6a6bf 100644
--- a/domain/src/main/java/interactor/DeleteConversations.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/DeleteConversations.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
+import com.moez.QKSMS.repository.ConversationRepository
import io.reactivex.Flowable
-import repository.ConversationRepository
import javax.inject.Inject
class DeleteConversations @Inject constructor(
diff --git a/domain/src/main/java/interactor/DeleteMessages.kt b/domain/src/main/java/com/moez/QKSMS/interactor/DeleteMessages.kt
similarity index 91%
rename from domain/src/main/java/interactor/DeleteMessages.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/DeleteMessages.kt
index 56a5e6b1..a3db035e 100644
--- a/domain/src/main/java/interactor/DeleteMessages.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/DeleteMessages.kt
@@ -16,11 +16,11 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
import io.reactivex.Flowable
-import repository.ConversationRepository
-import repository.MessageRepository
import javax.inject.Inject
class DeleteMessages @Inject constructor(
diff --git a/domain/src/main/java/interactor/Interactor.kt b/domain/src/main/java/com/moez/QKSMS/interactor/Interactor.kt
similarity index 98%
rename from domain/src/main/java/interactor/Interactor.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/Interactor.kt
index 913aedf4..309ddfe9 100644
--- a/domain/src/main/java/interactor/Interactor.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/Interactor.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
import io.reactivex.Flowable
import io.reactivex.android.schedulers.AndroidSchedulers
diff --git a/domain/src/main/java/interactor/MarkAllSeen.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkAllSeen.kt
similarity index 92%
rename from domain/src/main/java/interactor/MarkAllSeen.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkAllSeen.kt
index e2c44b4f..c1c2a201 100644
--- a/domain/src/main/java/interactor/MarkAllSeen.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkAllSeen.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
+import com.moez.QKSMS.repository.MessageRepository
import io.reactivex.Flowable
-import repository.MessageRepository
import javax.inject.Inject
class MarkAllSeen @Inject constructor(private val messageRepo: MessageRepository) : Interactor() {
diff --git a/domain/src/main/java/interactor/MarkArchived.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkArchived.kt
similarity index 92%
rename from domain/src/main/java/interactor/MarkArchived.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkArchived.kt
index 56aa4081..a2c3ea2a 100644
--- a/domain/src/main/java/interactor/MarkArchived.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkArchived.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
+import com.moez.QKSMS.repository.ConversationRepository
import io.reactivex.Flowable
-import repository.ConversationRepository
import javax.inject.Inject
class MarkArchived @Inject constructor(private val conversationRepo: ConversationRepository) : Interactor>() {
diff --git a/domain/src/main/java/interactor/MarkBlocked.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkBlocked.kt
similarity index 92%
rename from domain/src/main/java/interactor/MarkBlocked.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkBlocked.kt
index 8b2d694c..4e7400d2 100644
--- a/domain/src/main/java/interactor/MarkBlocked.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkBlocked.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
+import com.moez.QKSMS.repository.ConversationRepository
import io.reactivex.Flowable
-import repository.ConversationRepository
import javax.inject.Inject
class MarkBlocked @Inject constructor(private val conversationRepo: ConversationRepository) : Interactor>() {
diff --git a/domain/src/main/java/interactor/MarkDelivered.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkDelivered.kt
similarity index 92%
rename from domain/src/main/java/interactor/MarkDelivered.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkDelivered.kt
index 8aac3603..c36cb82a 100644
--- a/domain/src/main/java/interactor/MarkDelivered.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkDelivered.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
+import com.moez.QKSMS.repository.MessageRepository
import io.reactivex.Flowable
-import repository.MessageRepository
import javax.inject.Inject
class MarkDelivered @Inject constructor(private val messageRepo: MessageRepository) : Interactor() {
diff --git a/domain/src/main/java/interactor/MarkDeliveryFailed.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkDeliveryFailed.kt
similarity index 93%
rename from domain/src/main/java/interactor/MarkDeliveryFailed.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkDeliveryFailed.kt
index 9eb67802..431e0eae 100644
--- a/domain/src/main/java/interactor/MarkDeliveryFailed.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkDeliveryFailed.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
+import com.moez.QKSMS.repository.MessageRepository
import io.reactivex.Flowable
-import repository.MessageRepository
import javax.inject.Inject
class MarkDeliveryFailed @Inject constructor(
diff --git a/domain/src/main/java/interactor/MarkFailed.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkFailed.kt
similarity index 90%
rename from domain/src/main/java/interactor/MarkFailed.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkFailed.kt
index 8e798753..ec3152c1 100644
--- a/domain/src/main/java/interactor/MarkFailed.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkFailed.kt
@@ -16,11 +16,11 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
+import com.moez.QKSMS.manager.NotificationManager
+import com.moez.QKSMS.repository.MessageRepository
import io.reactivex.Flowable
-import manager.NotificationManager
-import repository.MessageRepository
import javax.inject.Inject
class MarkFailed @Inject constructor(
diff --git a/domain/src/main/java/interactor/MarkRead.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkRead.kt
similarity index 89%
rename from domain/src/main/java/interactor/MarkRead.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkRead.kt
index 71867b0b..97c656db 100644
--- a/domain/src/main/java/interactor/MarkRead.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkRead.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
+import com.moez.QKSMS.manager.NotificationManager
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
import io.reactivex.Flowable
-import manager.NotificationManager
-import repository.ConversationRepository
-import repository.MessageRepository
import javax.inject.Inject
class MarkRead @Inject constructor(
diff --git a/domain/src/main/java/interactor/MarkSeen.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkSeen.kt
similarity index 92%
rename from domain/src/main/java/interactor/MarkSeen.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkSeen.kt
index 3afc4ab7..6f58e8cc 100644
--- a/domain/src/main/java/interactor/MarkSeen.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkSeen.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
+import com.moez.QKSMS.repository.MessageRepository
import io.reactivex.Flowable
-import repository.MessageRepository
import javax.inject.Inject
class MarkSeen @Inject constructor(private val messageRepo: MessageRepository) : Interactor() {
diff --git a/domain/src/main/java/interactor/MarkSent.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkSent.kt
similarity index 92%
rename from domain/src/main/java/interactor/MarkSent.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkSent.kt
index 42ec9d1d..135b597a 100644
--- a/domain/src/main/java/interactor/MarkSent.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkSent.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
+import com.moez.QKSMS.repository.MessageRepository
import io.reactivex.Flowable
-import repository.MessageRepository
import javax.inject.Inject
class MarkSent @Inject constructor(private val messageRepo: MessageRepository) : Interactor() {
diff --git a/domain/src/main/java/interactor/MarkUnarchived.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnarchived.kt
similarity index 92%
rename from domain/src/main/java/interactor/MarkUnarchived.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkUnarchived.kt
index 0f7395d2..19aecf4f 100644
--- a/domain/src/main/java/interactor/MarkUnarchived.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnarchived.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
+import com.moez.QKSMS.repository.ConversationRepository
import io.reactivex.Flowable
-import repository.ConversationRepository
import javax.inject.Inject
class MarkUnarchived @Inject constructor(private val conversationRepo: ConversationRepository) : Interactor>() {
diff --git a/domain/src/main/java/interactor/MarkUnblocked.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnblocked.kt
similarity index 92%
rename from domain/src/main/java/interactor/MarkUnblocked.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkUnblocked.kt
index 85a567ae..e92e6090 100644
--- a/domain/src/main/java/interactor/MarkUnblocked.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnblocked.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
+import com.moez.QKSMS.repository.ConversationRepository
import io.reactivex.Flowable
-import repository.ConversationRepository
import javax.inject.Inject
class MarkUnblocked @Inject constructor(private val conversationRepo: ConversationRepository) : Interactor>() {
diff --git a/domain/src/main/java/interactor/MarkUnread.kt b/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnread.kt
similarity index 93%
rename from domain/src/main/java/interactor/MarkUnread.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/MarkUnread.kt
index 121f2791..cb292fc2 100644
--- a/domain/src/main/java/interactor/MarkUnread.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/MarkUnread.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
+import com.moez.QKSMS.repository.MessageRepository
import io.reactivex.Flowable
-import repository.MessageRepository
import javax.inject.Inject
class MarkUnread @Inject constructor(
diff --git a/domain/src/main/java/interactor/ReceiveMms.kt b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt
similarity index 89%
rename from domain/src/main/java/interactor/ReceiveMms.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt
index 900a6e59..786a9db5 100644
--- a/domain/src/main/java/interactor/ReceiveMms.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt
@@ -16,16 +16,16 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
import android.net.Uri
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.manager.ExternalBlockingManager
+import com.moez.QKSMS.manager.NotificationManager
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
+import com.moez.QKSMS.repository.SyncRepository
import io.reactivex.Flowable
-import manager.ExternalBlockingManager
-import manager.NotificationManager
-import repository.ConversationRepository
-import repository.MessageRepository
-import repository.SyncRepository
-import util.extensions.mapNotNull
import java.util.concurrent.TimeUnit
import javax.inject.Inject
diff --git a/domain/src/main/java/interactor/ReceiveSms.kt b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt
similarity index 91%
rename from domain/src/main/java/interactor/ReceiveSms.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt
index 3e7f56e3..f8298ee5 100644
--- a/domain/src/main/java/interactor/ReceiveSms.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt
@@ -16,15 +16,15 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
import android.telephony.SmsMessage
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.manager.ExternalBlockingManager
+import com.moez.QKSMS.manager.NotificationManager
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
import io.reactivex.Flowable
-import manager.ExternalBlockingManager
-import manager.NotificationManager
-import repository.ConversationRepository
-import repository.MessageRepository
-import util.extensions.mapNotNull
import java.util.concurrent.TimeUnit
import javax.inject.Inject
diff --git a/domain/src/main/java/interactor/RetrySending.kt b/domain/src/main/java/com/moez/QKSMS/interactor/RetrySending.kt
similarity index 93%
rename from domain/src/main/java/interactor/RetrySending.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/RetrySending.kt
index 2ffb52f5..2f646b3d 100644
--- a/domain/src/main/java/interactor/RetrySending.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/RetrySending.kt
@@ -16,11 +16,11 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.repository.MessageRepository
import io.reactivex.Flowable
-import model.Message
-import repository.MessageRepository
import javax.inject.Inject
class RetrySending @Inject constructor(private val messageRepo: MessageRepository) : Interactor() {
diff --git a/domain/src/main/java/interactor/SaveImage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SaveImage.kt
similarity index 90%
rename from domain/src/main/java/interactor/SaveImage.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/SaveImage.kt
index cf84f2b0..808b71d4 100644
--- a/domain/src/main/java/interactor/SaveImage.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/SaveImage.kt
@@ -16,11 +16,11 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
+import com.moez.QKSMS.repository.ImageRepository
+import com.moez.QKSMS.repository.MessageRepository
import io.reactivex.Flowable
-import repository.ImageRepository
-import repository.MessageRepository
import javax.inject.Inject
class SaveImage @Inject constructor(
diff --git a/domain/src/main/java/interactor/SendMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SendMessage.kt
similarity index 92%
rename from domain/src/main/java/interactor/SendMessage.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/SendMessage.kt
index 5a75c68d..ebde7224 100644
--- a/domain/src/main/java/interactor/SendMessage.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/SendMessage.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
+import com.moez.QKSMS.model.Attachment
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
import io.reactivex.Flowable
-import model.Attachment
-import repository.ConversationRepository
-import repository.MessageRepository
import javax.inject.Inject
class SendMessage @Inject constructor(
diff --git a/domain/src/main/java/interactor/SyncMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SyncMessage.kt
similarity index 88%
rename from domain/src/main/java/interactor/SyncMessage.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/SyncMessage.kt
index cacf2788..4eaa1191 100644
--- a/domain/src/main/java/interactor/SyncMessage.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/SyncMessage.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
import android.net.Uri
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.SyncRepository
import io.reactivex.Flowable
-import repository.ConversationRepository
-import repository.SyncRepository
-import util.extensions.mapNotNull
import javax.inject.Inject
class SyncMessage @Inject constructor(
diff --git a/domain/src/main/java/interactor/SyncMessages.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SyncMessages.kt
similarity index 94%
rename from domain/src/main/java/interactor/SyncMessages.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/SyncMessages.kt
index 968383ae..8357ff01 100644
--- a/domain/src/main/java/interactor/SyncMessages.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/SyncMessages.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
+import com.moez.QKSMS.repository.SyncRepository
import io.reactivex.Flowable
-import repository.SyncRepository
import timber.log.Timber
import java.util.concurrent.TimeUnit
import javax.inject.Inject
diff --git a/domain/src/main/java/interactor/UpdateBadge.kt b/domain/src/main/java/com/moez/QKSMS/interactor/UpdateBadge.kt
similarity index 90%
rename from domain/src/main/java/interactor/UpdateBadge.kt
rename to domain/src/main/java/com/moez/QKSMS/interactor/UpdateBadge.kt
index 68774094..a5aefcd6 100644
--- a/domain/src/main/java/interactor/UpdateBadge.kt
+++ b/domain/src/main/java/com/moez/QKSMS/interactor/UpdateBadge.kt
@@ -16,11 +16,11 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
+import com.moez.QKSMS.manager.WidgetManager
+import com.moez.QKSMS.repository.MessageRepository
import io.reactivex.Flowable
-import manager.WidgetManager
-import repository.MessageRepository
import javax.inject.Inject
class UpdateBadge @Inject constructor(
diff --git a/domain/src/main/java/manager/AnalyticsManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/AnalyticsManager.kt
similarity index 96%
rename from domain/src/main/java/manager/AnalyticsManager.kt
rename to domain/src/main/java/com/moez/QKSMS/manager/AnalyticsManager.kt
index 89ed3935..37c4ecc6 100644
--- a/domain/src/main/java/manager/AnalyticsManager.kt
+++ b/domain/src/main/java/com/moez/QKSMS/manager/AnalyticsManager.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package manager
+package com.moez.QKSMS.manager
interface AnalyticsManager {
diff --git a/domain/src/main/java/manager/ExternalBlockingManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/ExternalBlockingManager.kt
similarity index 96%
rename from domain/src/main/java/manager/ExternalBlockingManager.kt
rename to domain/src/main/java/com/moez/QKSMS/manager/ExternalBlockingManager.kt
index 386e169b..21cdbe50 100644
--- a/domain/src/main/java/manager/ExternalBlockingManager.kt
+++ b/domain/src/main/java/com/moez/QKSMS/manager/ExternalBlockingManager.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package manager
+package com.moez.QKSMS.manager
import io.reactivex.Single
diff --git a/domain/src/main/java/manager/KeyManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/KeyManager.kt
similarity index 97%
rename from domain/src/main/java/manager/KeyManager.kt
rename to domain/src/main/java/com/moez/QKSMS/manager/KeyManager.kt
index 2347a54a..c3d27b9b 100644
--- a/domain/src/main/java/manager/KeyManager.kt
+++ b/domain/src/main/java/com/moez/QKSMS/manager/KeyManager.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package manager
+package com.moez.QKSMS.manager
/**
* Helper class for generating incrementing ids for messages
diff --git a/domain/src/main/java/manager/NotificationManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/NotificationManager.kt
similarity index 96%
rename from domain/src/main/java/manager/NotificationManager.kt
rename to domain/src/main/java/com/moez/QKSMS/manager/NotificationManager.kt
index d2f9a4f7..5ebbdc02 100644
--- a/domain/src/main/java/manager/NotificationManager.kt
+++ b/domain/src/main/java/com/moez/QKSMS/manager/NotificationManager.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package manager
+package com.moez.QKSMS.manager
interface NotificationManager {
diff --git a/domain/src/main/java/manager/PermissionManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/PermissionManager.kt
similarity index 96%
rename from domain/src/main/java/manager/PermissionManager.kt
rename to domain/src/main/java/com/moez/QKSMS/manager/PermissionManager.kt
index b1a98aca..5d1af585 100644
--- a/domain/src/main/java/manager/PermissionManager.kt
+++ b/domain/src/main/java/com/moez/QKSMS/manager/PermissionManager.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package manager
+package com.moez.QKSMS.manager
interface PermissionManager {
diff --git a/domain/src/main/java/manager/RatingManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/RatingManager.kt
similarity index 96%
rename from domain/src/main/java/manager/RatingManager.kt
rename to domain/src/main/java/com/moez/QKSMS/manager/RatingManager.kt
index c9ecba0d..9ea89e4a 100644
--- a/domain/src/main/java/manager/RatingManager.kt
+++ b/domain/src/main/java/com/moez/QKSMS/manager/RatingManager.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package manager
+package com.moez.QKSMS.manager
import io.reactivex.Observable
diff --git a/domain/src/main/java/manager/WidgetManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/WidgetManager.kt
similarity index 96%
rename from domain/src/main/java/manager/WidgetManager.kt
rename to domain/src/main/java/com/moez/QKSMS/manager/WidgetManager.kt
index b777aa49..aac1ad13 100644
--- a/domain/src/main/java/manager/WidgetManager.kt
+++ b/domain/src/main/java/com/moez/QKSMS/manager/WidgetManager.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package manager
+package com.moez.QKSMS.manager
interface WidgetManager {
diff --git a/domain/src/main/java/mapper/CursorToContact.kt b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToContact.kt
similarity index 92%
rename from domain/src/main/java/mapper/CursorToContact.kt
rename to domain/src/main/java/com/moez/QKSMS/mapper/CursorToContact.kt
index 17035758..c56d4660 100644
--- a/domain/src/main/java/mapper/CursorToContact.kt
+++ b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToContact.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package mapper
+package com.moez.QKSMS.mapper
import android.database.Cursor
-import model.Contact
+import com.moez.QKSMS.model.Contact
interface CursorToContact : Mapper {
diff --git a/domain/src/main/java/mapper/CursorToConversation.kt b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToConversation.kt
similarity index 92%
rename from domain/src/main/java/mapper/CursorToConversation.kt
rename to domain/src/main/java/com/moez/QKSMS/mapper/CursorToConversation.kt
index 6a86b520..75eaa489 100644
--- a/domain/src/main/java/mapper/CursorToConversation.kt
+++ b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToConversation.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package mapper
+package com.moez.QKSMS.mapper
import android.database.Cursor
-import model.Conversation
+import com.moez.QKSMS.model.Conversation
interface CursorToConversation : Mapper {
diff --git a/domain/src/main/java/mapper/CursorToMessage.kt b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToMessage.kt
similarity index 97%
rename from domain/src/main/java/mapper/CursorToMessage.kt
rename to domain/src/main/java/com/moez/QKSMS/mapper/CursorToMessage.kt
index 4ed8df2c..47891327 100644
--- a/domain/src/main/java/mapper/CursorToMessage.kt
+++ b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToMessage.kt
@@ -16,11 +16,11 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package mapper
+package com.moez.QKSMS.mapper
import android.database.Cursor
import android.provider.Telephony.*
-import model.Message
+import com.moez.QKSMS.model.Message
import timber.log.Timber
import java.util.*
diff --git a/domain/src/main/java/mapper/CursorToPart.kt b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToPart.kt
similarity index 92%
rename from domain/src/main/java/mapper/CursorToPart.kt
rename to domain/src/main/java/com/moez/QKSMS/mapper/CursorToPart.kt
index a9273313..bb392203 100644
--- a/domain/src/main/java/mapper/CursorToPart.kt
+++ b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToPart.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package mapper
+package com.moez.QKSMS.mapper
import android.database.Cursor
-import model.MmsPart
+import com.moez.QKSMS.model.MmsPart
interface CursorToPart : Mapper {
diff --git a/domain/src/main/java/mapper/CursorToRecipient.kt b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToRecipient.kt
similarity index 93%
rename from domain/src/main/java/mapper/CursorToRecipient.kt
rename to domain/src/main/java/com/moez/QKSMS/mapper/CursorToRecipient.kt
index 4587a6f5..2f3b267e 100644
--- a/domain/src/main/java/mapper/CursorToRecipient.kt
+++ b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToRecipient.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package mapper
+package com.moez.QKSMS.mapper
import android.database.Cursor
-import model.Recipient
+import com.moez.QKSMS.model.Recipient
interface CursorToRecipient : Mapper {
diff --git a/domain/src/main/java/mapper/Mapper.kt b/domain/src/main/java/com/moez/QKSMS/mapper/Mapper.kt
similarity index 96%
rename from domain/src/main/java/mapper/Mapper.kt
rename to domain/src/main/java/com/moez/QKSMS/mapper/Mapper.kt
index 3c8ec609..7f726e8c 100644
--- a/domain/src/main/java/mapper/Mapper.kt
+++ b/domain/src/main/java/com/moez/QKSMS/mapper/Mapper.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package mapper
+package com.moez.QKSMS.mapper
interface Mapper {
diff --git a/domain/src/main/java/model/Attachment.kt b/domain/src/main/java/com/moez/QKSMS/model/Attachment.kt
similarity index 98%
rename from domain/src/main/java/model/Attachment.kt
rename to domain/src/main/java/com/moez/QKSMS/model/Attachment.kt
index f7401ec4..d6a62413 100644
--- a/domain/src/main/java/model/Attachment.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/Attachment.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package model
+package com.moez.QKSMS.model
import android.content.Context
import android.net.Uri
diff --git a/domain/src/main/java/model/Contact.kt b/domain/src/main/java/com/moez/QKSMS/model/Contact.kt
similarity index 97%
rename from domain/src/main/java/model/Contact.kt
rename to domain/src/main/java/com/moez/QKSMS/model/Contact.kt
index d97ee772..d3dfb941 100644
--- a/domain/src/main/java/model/Contact.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/Contact.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package model
+package com.moez.QKSMS.model
import io.realm.RealmList
import io.realm.RealmObject
diff --git a/domain/src/main/java/model/Conversation.kt b/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt
similarity index 98%
rename from domain/src/main/java/model/Conversation.kt
rename to domain/src/main/java/com/moez/QKSMS/model/Conversation.kt
index 6e9e77ae..f90f1278 100644
--- a/domain/src/main/java/model/Conversation.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package model
+package com.moez.QKSMS.model
import io.realm.RealmList
import io.realm.RealmObject
diff --git a/domain/src/main/java/model/Message.kt b/domain/src/main/java/com/moez/QKSMS/model/Message.kt
similarity index 99%
rename from domain/src/main/java/model/Message.kt
rename to domain/src/main/java/com/moez/QKSMS/model/Message.kt
index 414cb364..5bd99803 100644
--- a/domain/src/main/java/model/Message.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/Message.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package model
+package com.moez.QKSMS.model
import android.content.ContentUris
import android.net.Uri
diff --git a/domain/src/main/java/model/MmsPart.kt b/domain/src/main/java/com/moez/QKSMS/model/MmsPart.kt
similarity index 97%
rename from domain/src/main/java/model/MmsPart.kt
rename to domain/src/main/java/com/moez/QKSMS/model/MmsPart.kt
index 4298b582..1dfb2c6f 100644
--- a/domain/src/main/java/model/MmsPart.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/MmsPart.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package model
+package com.moez.QKSMS.model
import androidx.net.toUri
import io.realm.RealmObject
diff --git a/domain/src/main/java/model/PhoneNumber.kt b/domain/src/main/java/com/moez/QKSMS/model/PhoneNumber.kt
similarity index 96%
rename from domain/src/main/java/model/PhoneNumber.kt
rename to domain/src/main/java/com/moez/QKSMS/model/PhoneNumber.kt
index 5a641ff6..652fd097 100644
--- a/domain/src/main/java/model/PhoneNumber.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/PhoneNumber.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package model
+package com.moez.QKSMS.model
import io.realm.RealmObject
diff --git a/domain/src/main/java/model/Recipient.kt b/domain/src/main/java/com/moez/QKSMS/model/Recipient.kt
similarity index 97%
rename from domain/src/main/java/model/Recipient.kt
rename to domain/src/main/java/com/moez/QKSMS/model/Recipient.kt
index 5074c3dc..962b392a 100644
--- a/domain/src/main/java/model/Recipient.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/Recipient.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package model
+package com.moez.QKSMS.model
import android.telephony.PhoneNumberUtils
import io.realm.RealmObject
diff --git a/domain/src/main/java/model/SearchResult.kt b/domain/src/main/java/com/moez/QKSMS/model/SearchResult.kt
similarity index 76%
rename from domain/src/main/java/model/SearchResult.kt
rename to domain/src/main/java/com/moez/QKSMS/model/SearchResult.kt
index a1cbcd76..4b68f58b 100644
--- a/domain/src/main/java/model/SearchResult.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/SearchResult.kt
@@ -1,3 +1,3 @@
-package model
+package com.moez.QKSMS.model
data class SearchResult(val query: String, val conversation: Conversation, val messages: Int)
\ No newline at end of file
diff --git a/domain/src/main/java/model/SyncLog.kt b/domain/src/main/java/com/moez/QKSMS/model/SyncLog.kt
similarity index 96%
rename from domain/src/main/java/model/SyncLog.kt
rename to domain/src/main/java/com/moez/QKSMS/model/SyncLog.kt
index 2e017ef5..e6a63f5e 100644
--- a/domain/src/main/java/model/SyncLog.kt
+++ b/domain/src/main/java/com/moez/QKSMS/model/SyncLog.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package model
+package com.moez.QKSMS.model
import io.realm.RealmObject
diff --git a/domain/src/main/java/repository/ContactRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/ContactRepository.kt
similarity index 93%
rename from domain/src/main/java/repository/ContactRepository.kt
rename to domain/src/main/java/com/moez/QKSMS/repository/ContactRepository.kt
index bbdf968b..3f40d148 100644
--- a/domain/src/main/java/repository/ContactRepository.kt
+++ b/domain/src/main/java/com/moez/QKSMS/repository/ContactRepository.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package repository
+package com.moez.QKSMS.repository
import android.net.Uri
+import com.moez.QKSMS.model.Contact
import io.reactivex.Flowable
import io.reactivex.Single
-import model.Contact
interface ContactRepository {
diff --git a/domain/src/main/java/repository/ConversationRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt
similarity index 91%
rename from domain/src/main/java/repository/ConversationRepository.kt
rename to domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt
index c3824a9a..0eddb458 100644
--- a/domain/src/main/java/repository/ConversationRepository.kt
+++ b/domain/src/main/java/com/moez/QKSMS/repository/ConversationRepository.kt
@@ -1,8 +1,8 @@
-package repository
+package com.moez.QKSMS.repository
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.SearchResult
import io.realm.RealmResults
-import model.Conversation
-import model.SearchResult
interface ConversationRepository {
diff --git a/domain/src/main/java/repository/ImageRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/ImageRepository.kt
similarity index 81%
rename from domain/src/main/java/repository/ImageRepository.kt
rename to domain/src/main/java/com/moez/QKSMS/repository/ImageRepository.kt
index 17c5aeb5..5f18a763 100644
--- a/domain/src/main/java/repository/ImageRepository.kt
+++ b/domain/src/main/java/com/moez/QKSMS/repository/ImageRepository.kt
@@ -1,4 +1,4 @@
-package repository
+package com.moez.QKSMS.repository
import android.graphics.Bitmap
import android.net.Uri
diff --git a/domain/src/main/java/repository/MessageRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt
similarity index 94%
rename from domain/src/main/java/repository/MessageRepository.kt
rename to domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt
index 7d8eed5f..37066768 100644
--- a/domain/src/main/java/repository/MessageRepository.kt
+++ b/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package repository
+package com.moez.QKSMS.repository
+import com.moez.QKSMS.model.Attachment
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.MmsPart
import io.realm.RealmResults
-import model.Attachment
-import model.Message
-import model.MmsPart
interface MessageRepository {
diff --git a/domain/src/main/java/repository/SyncRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/SyncRepository.kt
similarity index 93%
rename from domain/src/main/java/repository/SyncRepository.kt
rename to domain/src/main/java/com/moez/QKSMS/repository/SyncRepository.kt
index 16d5e484..c563366a 100644
--- a/domain/src/main/java/repository/SyncRepository.kt
+++ b/domain/src/main/java/com/moez/QKSMS/repository/SyncRepository.kt
@@ -16,11 +16,11 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package repository
+package com.moez.QKSMS.repository
import android.net.Uri
+import com.moez.QKSMS.model.Message
import io.reactivex.Observable
-import model.Message
interface SyncRepository {
diff --git a/presentation/src/androidTest/java/feature/main/MainViewModelTest.kt b/presentation/src/androidTest/java/com/moez/QKSMS/feature/main/MainViewModelTest.kt
similarity index 87%
rename from presentation/src/androidTest/java/feature/main/MainViewModelTest.kt
rename to presentation/src/androidTest/java/com/moez/QKSMS/feature/main/MainViewModelTest.kt
index f6968486..ec3a7823 100644
--- a/presentation/src/androidTest/java/feature/main/MainViewModelTest.kt
+++ b/presentation/src/androidTest/java/com/moez/QKSMS/feature/main/MainViewModelTest.kt
@@ -1,4 +1,4 @@
-package feature.main
+package com.moez.QKSMS.feature.main
import android.support.test.runner.AndroidJUnit4
import org.junit.Test
diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
index c161bfea..327f996e 100644
--- a/presentation/src/main/AndroidManifest.xml
+++ b/presentation/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
@@ -30,8 +30,8 @@
+ android:name=".feature.compose.ComposeActivity"
+ android:parentActivityName=".feature.main.MainActivity">
@@ -58,36 +58,36 @@
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
+
@@ -95,33 +95,33 @@
-
-
-
-
-
+
+
+
+
+
-
+
@@ -136,7 +136,7 @@
@@ -150,7 +150,7 @@
.
*/
-package common
+package com.moez.QKSMS.common
import com.bumptech.glide.load.DataSource
import com.bumptech.glide.load.engine.GlideException
diff --git a/presentation/src/main/java/common/MenuItemAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt
similarity index 92%
rename from presentation/src/main/java/common/MenuItemAdapter.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt
index 87f49d32..949ead55 100644
--- a/presentation/src/main/java/common/MenuItemAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common
+package com.moez.QKSMS.common
import android.content.Context
import android.content.res.ColorStateList
@@ -26,11 +26,11 @@ import android.view.LayoutInflater
import android.view.ViewGroup
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
-import common.base.QkAdapter
-import common.base.QkViewHolder
-import common.util.Colors
-import common.util.extensions.resolveThemeColor
-import common.util.extensions.setVisible
+import com.moez.QKSMS.common.base.QkAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.util.extensions.setVisible
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
diff --git a/presentation/src/main/java/common/Navigator.kt b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt
similarity index 92%
rename from presentation/src/main/java/common/Navigator.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt
index b4b4f608..b421755b 100644
--- a/presentation/src/main/java/common/Navigator.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common
+package com.moez.QKSMS.common
import android.app.Activity
import android.app.ActivityOptions
@@ -30,16 +30,16 @@ import android.provider.Settings
import android.provider.Telephony
import android.view.View
import com.moez.QKSMS.BuildConfig
-import feature.blocked.BlockedActivity
-import feature.compose.ComposeActivity
-import feature.conversationinfo.ConversationInfoActivity
-import feature.gallery.GalleryActivity
-import feature.notificationprefs.NotificationPrefsActivity
-import feature.plus.PlusActivity
-import feature.settings.SettingsActivity
-import feature.settings.about.AboutActivity
-import feature.themepicker.ThemePickerActivity
-import manager.NotificationManager
+import com.moez.QKSMS.feature.blocked.BlockedActivity
+import com.moez.QKSMS.feature.compose.ComposeActivity
+import com.moez.QKSMS.feature.conversationinfo.ConversationInfoActivity
+import com.moez.QKSMS.feature.gallery.GalleryActivity
+import com.moez.QKSMS.feature.notificationprefs.NotificationPrefsActivity
+import com.moez.QKSMS.feature.plus.PlusActivity
+import com.moez.QKSMS.feature.settings.SettingsActivity
+import com.moez.QKSMS.feature.settings.about.AboutActivity
+import com.moez.QKSMS.feature.themepicker.ThemePickerActivity
+import com.moez.QKSMS.manager.NotificationManager
import javax.inject.Inject
import javax.inject.Singleton
diff --git a/presentation/src/main/java/common/QKApplication.kt b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt
similarity index 89%
rename from presentation/src/main/java/common/QKApplication.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt
index 6363e6ce..0f74d3cd 100644
--- a/presentation/src/main/java/common/QKApplication.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt
@@ -1,4 +1,4 @@
-package common
+package com.moez.QKSMS.common
/*
* Copyright (C) 2017 Moez Bhatti
@@ -30,20 +30,20 @@ import com.bugsnag.android.Bugsnag
import com.bugsnag.android.Configuration
import com.moez.QKSMS.BuildConfig
import com.moez.QKSMS.R
-import common.util.BugsnagTree
+import com.moez.QKSMS.common.util.BugsnagTree
+import com.moez.QKSMS.injection.AppComponentManager
+import com.moez.QKSMS.injection.appComponent
+import com.moez.QKSMS.manager.AnalyticsManager
+import com.moez.QKSMS.migration.QkRealmMigration
+import com.moez.QKSMS.util.NightModeManager
import dagger.android.AndroidInjector
import dagger.android.DispatchingAndroidInjector
import dagger.android.HasActivityInjector
import dagger.android.HasBroadcastReceiverInjector
import dagger.android.HasServiceInjector
-import injection.AppComponentManager
-import injection.appComponent
import io.realm.Realm
import io.realm.RealmConfiguration
-import manager.AnalyticsManager
-import migration.QkRealmMigration
import timber.log.Timber
-import util.NightModeManager
import javax.inject.Inject
class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverInjector, HasServiceInjector {
@@ -59,8 +59,7 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn
@Inject lateinit var dispatchingServiceInjector: DispatchingAndroidInjector
@Inject lateinit var nightModeManager: NightModeManager
- private val packages = arrayOf("common", "feature", "injection", "filter", "interactor", "manager", "mapper",
- "migration", "model", "receiver", "repository", "service", "util")
+ private val packages = arrayOf("com.moez.QKSMS")
override fun onCreate() {
super.onCreate()
diff --git a/presentation/src/main/java/common/QkDialog.kt b/presentation/src/main/java/com/moez/QKSMS/common/QkDialog.kt
similarity index 87%
rename from presentation/src/main/java/common/QkDialog.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/QkDialog.kt
index 679fafa1..0cca5f26 100644
--- a/presentation/src/main/java/common/QkDialog.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/QkDialog.kt
@@ -1,4 +1,4 @@
-package common
+package com.moez.QKSMS.common
import android.app.Activity
import android.content.Context
@@ -6,9 +6,9 @@ import android.support.annotation.StringRes
import android.support.v7.app.AlertDialog
import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
-import common.util.extensions.dpToPx
-import common.util.extensions.setPadding
-import injection.appComponent
+import com.moez.QKSMS.common.util.extensions.dpToPx
+import com.moez.QKSMS.common.util.extensions.setPadding
+import com.moez.QKSMS.injection.appComponent
import javax.inject.Inject
/**
diff --git a/presentation/src/main/java/common/ViewModelFactory.kt b/presentation/src/main/java/com/moez/QKSMS/common/ViewModelFactory.kt
similarity index 93%
rename from presentation/src/main/java/common/ViewModelFactory.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/ViewModelFactory.kt
index d4a309dc..3f90e5ce 100644
--- a/presentation/src/main/java/common/ViewModelFactory.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/ViewModelFactory.kt
@@ -1,4 +1,4 @@
-package common
+package com.moez.QKSMS.common
import android.arch.lifecycle.ViewModel
import android.arch.lifecycle.ViewModelProvider
diff --git a/presentation/src/main/java/common/base/FlowableAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/FlowableAdapter.kt
similarity index 98%
rename from presentation/src/main/java/common/base/FlowableAdapter.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/base/FlowableAdapter.kt
index bf312bff..5dc6c09e 100644
--- a/presentation/src/main/java/common/base/FlowableAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/base/FlowableAdapter.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.base
+package com.moez.QKSMS.common.base
import android.support.annotation.CallSuper
import android.support.v7.widget.RecyclerView
diff --git a/presentation/src/main/java/common/base/QkActivity.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkActivity.kt
similarity index 98%
rename from presentation/src/main/java/common/base/QkActivity.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/base/QkActivity.kt
index ad2f5581..8e1d0c55 100644
--- a/presentation/src/main/java/common/base/QkActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkActivity.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.base
+package com.moez.QKSMS.common.base
import android.annotation.SuppressLint
import android.os.Bundle
diff --git a/presentation/src/main/java/common/base/QkAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkAdapter.kt
similarity index 97%
rename from presentation/src/main/java/common/base/QkAdapter.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/base/QkAdapter.kt
index 77d63c08..43406026 100644
--- a/presentation/src/main/java/common/base/QkAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkAdapter.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.base
+package com.moez.QKSMS.common.base
import android.support.v7.util.DiffUtil
import android.support.v7.widget.RecyclerView
import android.view.View
-import common.util.extensions.setVisible
+import com.moez.QKSMS.common.util.extensions.setVisible
import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.Subject
diff --git a/presentation/src/main/java/common/base/QkRealmAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt
similarity index 96%
rename from presentation/src/main/java/common/base/QkRealmAdapter.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt
index 65143f31..e20e3331 100644
--- a/presentation/src/main/java/common/base/QkRealmAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt
@@ -1,8 +1,8 @@
-package common.base
+package com.moez.QKSMS.common.base
import android.support.v7.widget.RecyclerView
import android.view.View
-import common.util.extensions.setVisible
+import com.moez.QKSMS.common.util.extensions.setVisible
import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.Subject
import io.realm.OrderedRealmCollection
diff --git a/presentation/src/main/java/common/base/QkThemedActivity.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt
similarity index 96%
rename from presentation/src/main/java/common/base/QkThemedActivity.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt
index abfe59a9..6d836ff5 100644
--- a/presentation/src/main/java/common/base/QkThemedActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.base
+package com.moez.QKSMS.common.base
import android.annotation.SuppressLint
import android.app.ActivityManager
@@ -26,16 +26,16 @@ import android.os.Build
import android.os.Bundle
import android.view.View
import com.moez.QKSMS.R
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.util.Preferences
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
-import common.util.Colors
-import common.util.extensions.resolveThemeColor
import io.reactivex.Observable
import io.reactivex.rxkotlin.Observables
import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.toolbar.*
-import util.Preferences
import javax.inject.Inject
/**
diff --git a/presentation/src/main/java/common/base/QkView.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkView.kt
similarity index 96%
rename from presentation/src/main/java/common/base/QkView.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/base/QkView.kt
index 68fcf2c1..2f4d73a3 100644
--- a/presentation/src/main/java/common/base/QkView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkView.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.base
+package com.moez.QKSMS.common.base
import android.arch.lifecycle.LifecycleOwner
diff --git a/presentation/src/main/java/common/base/QkViewHolder.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewHolder.kt
similarity index 96%
rename from presentation/src/main/java/common/base/QkViewHolder.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/base/QkViewHolder.kt
index 9627f530..a2fbdf56 100644
--- a/presentation/src/main/java/common/base/QkViewHolder.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewHolder.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.base
+package com.moez.QKSMS.common.base
import android.support.v7.widget.RecyclerView
import android.view.View
diff --git a/presentation/src/main/java/common/base/QkViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewModel.kt
similarity index 98%
rename from presentation/src/main/java/common/base/QkViewModel.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/base/QkViewModel.kt
index eae23d7a..f5dbbfa5 100644
--- a/presentation/src/main/java/common/base/QkViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewModel.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.base
+package com.moez.QKSMS.common.base
import android.arch.lifecycle.ViewModel
import android.support.annotation.CallSuper
diff --git a/presentation/src/main/java/common/util/BillingManager.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/BillingManager.kt
similarity index 98%
rename from presentation/src/main/java/common/util/BillingManager.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/util/BillingManager.kt
index eab78cdf..f85ee72e 100644
--- a/presentation/src/main/java/common/util/BillingManager.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/BillingManager.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util
+package com.moez.QKSMS.common.util
import android.app.Activity
import android.content.Context
@@ -30,10 +30,10 @@ import com.android.billingclient.api.PurchasesUpdatedListener
import com.android.billingclient.api.SkuDetails
import com.android.billingclient.api.SkuDetailsParams
import com.moez.QKSMS.BuildConfig
+import com.moez.QKSMS.manager.AnalyticsManager
import io.reactivex.Observable
import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.Subject
-import manager.AnalyticsManager
import javax.inject.Inject
class BillingManager @Inject constructor(
diff --git a/presentation/src/main/java/common/util/BugsnagTree.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/BugsnagTree.kt
similarity index 94%
rename from presentation/src/main/java/common/util/BugsnagTree.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/util/BugsnagTree.kt
index b811cb7a..a2a9b76c 100644
--- a/presentation/src/main/java/common/util/BugsnagTree.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/BugsnagTree.kt
@@ -1,4 +1,4 @@
-package common.util
+package com.moez.QKSMS.common.util
import android.util.Log
import com.bugsnag.android.Bugsnag
diff --git a/presentation/src/main/java/common/util/ClipboardUtils.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/ClipboardUtils.kt
similarity index 96%
rename from presentation/src/main/java/common/util/ClipboardUtils.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/util/ClipboardUtils.kt
index 1be16fe3..53eb0996 100644
--- a/presentation/src/main/java/common/util/ClipboardUtils.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/ClipboardUtils.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util
+package com.moez.QKSMS.common.util
import android.content.ClipData
import android.content.ClipboardManager
diff --git a/presentation/src/main/java/common/util/Colors.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/Colors.kt
similarity index 98%
rename from presentation/src/main/java/common/util/Colors.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/util/Colors.kt
index ec8da3d2..fd0d9f1b 100644
--- a/presentation/src/main/java/common/util/Colors.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/Colors.kt
@@ -16,14 +16,14 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util
+package com.moez.QKSMS.common.util
import android.content.Context
import android.graphics.Color
import com.moez.QKSMS.R
-import common.util.extensions.getColorCompat
+import com.moez.QKSMS.common.util.extensions.getColorCompat
+import com.moez.QKSMS.util.Preferences
import io.reactivex.Observable
-import util.Preferences
import javax.inject.Inject
import javax.inject.Singleton
diff --git a/presentation/src/main/java/common/util/ContactImageLoader.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/ContactImageLoader.kt
similarity index 96%
rename from presentation/src/main/java/common/util/ContactImageLoader.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/util/ContactImageLoader.kt
index 4649de89..a0319654 100644
--- a/presentation/src/main/java/common/util/ContactImageLoader.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/ContactImageLoader.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util
+package com.moez.QKSMS.common.util
import android.content.Context
import android.provider.ContactsContract
@@ -29,10 +29,10 @@ import com.bumptech.glide.load.data.DataFetcher
import com.bumptech.glide.load.model.ModelLoader
import com.bumptech.glide.load.model.ModelLoaderFactory
import com.bumptech.glide.load.model.MultiModelLoaderFactory
-import injection.appComponent
+import com.moez.QKSMS.injection.appComponent
+import com.moez.QKSMS.repository.ContactRepository
import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers
-import repository.ContactRepository
import java.io.InputStream
import java.security.MessageDigest
import javax.inject.Inject
diff --git a/presentation/src/main/java/common/util/DateFormatter.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt
similarity index 92%
rename from presentation/src/main/java/common/util/DateFormatter.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt
index 430b06c2..22f56a74 100644
--- a/presentation/src/main/java/common/util/DateFormatter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util
+package com.moez.QKSMS.common.util
import android.content.Context
import android.text.format.DateFormat
-import common.util.extensions.isSameDay
-import common.util.extensions.isSameWeek
-import common.util.extensions.isSameYear
+import com.moez.QKSMS.common.util.extensions.isSameDay
+import com.moez.QKSMS.common.util.extensions.isSameWeek
+import com.moez.QKSMS.common.util.extensions.isSameYear
import java.text.SimpleDateFormat
import java.util.*
import javax.inject.Inject
diff --git a/presentation/src/main/java/common/util/FontProvider.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/FontProvider.kt
similarity index 98%
rename from presentation/src/main/java/common/util/FontProvider.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/util/FontProvider.kt
index 1faa79a0..f914a17a 100644
--- a/presentation/src/main/java/common/util/FontProvider.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/FontProvider.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util
+package com.moez.QKSMS.common.util
import android.content.Context
import android.graphics.Typeface
diff --git a/presentation/src/main/java/common/util/GlideAppModule.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/GlideAppModule.kt
similarity index 97%
rename from presentation/src/main/java/common/util/GlideAppModule.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/util/GlideAppModule.kt
index 426fc36d..1336c0da 100644
--- a/presentation/src/main/java/common/util/GlideAppModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/GlideAppModule.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util
+package com.moez.QKSMS.common.util
import android.content.Context
import android.util.Log
diff --git a/presentation/src/main/java/common/util/LiveRealmData.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/LiveRealmData.kt
similarity index 97%
rename from presentation/src/main/java/common/util/LiveRealmData.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/util/LiveRealmData.kt
index c76777f8..5a7cf488 100644
--- a/presentation/src/main/java/common/util/LiveRealmData.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/LiveRealmData.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util
+package com.moez.QKSMS.common.util
import android.arch.lifecycle.LiveData
import io.realm.RealmChangeListener
diff --git a/presentation/src/main/java/common/util/MessageDetailsFormatter.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/MessageDetailsFormatter.kt
similarity index 96%
rename from presentation/src/main/java/common/util/MessageDetailsFormatter.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/util/MessageDetailsFormatter.kt
index c99ca29a..08ba7cd5 100644
--- a/presentation/src/main/java/common/util/MessageDetailsFormatter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/MessageDetailsFormatter.kt
@@ -1,12 +1,12 @@
-package common.util
+package com.moez.QKSMS.common.util
import android.content.Context
import com.google.android.mms.pdu_alt.EncodedStringValue
import com.google.android.mms.pdu_alt.MultimediaMessagePdu
import com.google.android.mms.pdu_alt.PduPersister
import com.moez.QKSMS.R
-import model.Message
-import util.tryOrNull
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.util.tryOrNull
import javax.inject.Inject
class MessageDetailsFormatter @Inject constructor(
diff --git a/presentation/src/main/java/common/util/NotificationManagerImpl.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt
similarity index 95%
rename from presentation/src/main/java/common/util/NotificationManagerImpl.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt
index ddf17cd4..04565d2c 100644
--- a/presentation/src/main/java/common/util/NotificationManagerImpl.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util
+package com.moez.QKSMS.common.util
import android.annotation.SuppressLint
import android.app.NotificationChannel
@@ -34,18 +34,18 @@ import android.support.v4.app.RemoteInput
import android.support.v4.app.TaskStackBuilder
import android.telephony.PhoneNumberUtils
import com.moez.QKSMS.R
-import common.util.extensions.dpToPx
-import feature.compose.ComposeActivity
-import feature.qkreply.QkReplyActivity
-import mapper.CursorToPartImpl
-import receiver.MarkReadReceiver
-import receiver.MarkSeenReceiver
-import receiver.RemoteMessagingReceiver
-import repository.ConversationRepository
-import repository.MessageRepository
-import util.Preferences
-import util.extensions.isImage
-import util.tryOrNull
+import com.moez.QKSMS.common.util.extensions.dpToPx
+import com.moez.QKSMS.extensions.isImage
+import com.moez.QKSMS.feature.compose.ComposeActivity
+import com.moez.QKSMS.feature.qkreply.QkReplyActivity
+import com.moez.QKSMS.mapper.CursorToPartImpl
+import com.moez.QKSMS.receiver.MarkReadReceiver
+import com.moez.QKSMS.receiver.MarkSeenReceiver
+import com.moez.QKSMS.receiver.RemoteMessagingReceiver
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
+import com.moez.QKSMS.util.Preferences
+import com.moez.QKSMS.util.tryOrNull
import javax.inject.Inject
import javax.inject.Singleton
@@ -56,7 +56,7 @@ class NotificationManagerImpl @Inject constructor(
private val conversationRepo: ConversationRepository,
private val prefs: Preferences,
private val messageRepo: MessageRepository
-) : manager.NotificationManager {
+) : com.moez.QKSMS.manager.NotificationManager {
companion object {
const val DEFAULT_CHANNEL_ID = "notifications_default"
diff --git a/presentation/src/main/java/common/util/TextViewStyler.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/TextViewStyler.kt
similarity index 92%
rename from presentation/src/main/java/common/util/TextViewStyler.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/util/TextViewStyler.kt
index c7bf34d0..387848f7 100644
--- a/presentation/src/main/java/common/util/TextViewStyler.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/TextViewStyler.kt
@@ -16,21 +16,21 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util
+package com.moez.QKSMS.common.util
import android.graphics.Typeface
import android.util.AttributeSet
import android.widget.TextView
import com.moez.QKSMS.R
-import common.util.TextViewStyler.Companion.SIZE_PRIMARY
-import common.util.TextViewStyler.Companion.SIZE_SECONDARY
-import common.util.TextViewStyler.Companion.SIZE_TERTIARY
-import common.util.TextViewStyler.Companion.SIZE_TOOLBAR
-import common.util.extensions.getColorCompat
-import common.util.extensions.resolveThemeColor
-import common.widget.QkEditText
-import common.widget.QkTextView
-import util.Preferences
+import com.moez.QKSMS.common.util.TextViewStyler.Companion.SIZE_PRIMARY
+import com.moez.QKSMS.common.util.TextViewStyler.Companion.SIZE_SECONDARY
+import com.moez.QKSMS.common.util.TextViewStyler.Companion.SIZE_TERTIARY
+import com.moez.QKSMS.common.util.TextViewStyler.Companion.SIZE_TOOLBAR
+import com.moez.QKSMS.common.util.extensions.getColorCompat
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.widget.QkEditText
+import com.moez.QKSMS.common.widget.QkTextView
+import com.moez.QKSMS.util.Preferences
import javax.inject.Inject
class TextViewStyler @Inject constructor(
diff --git a/presentation/src/main/java/common/util/extensions/AdapterExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/AdapterExtensions.kt
similarity index 97%
rename from presentation/src/main/java/common/util/extensions/AdapterExtensions.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/util/extensions/AdapterExtensions.kt
index 1aa77221..e6c4b15d 100644
--- a/presentation/src/main/java/common/util/extensions/AdapterExtensions.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/AdapterExtensions.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util.extensions
+package com.moez.QKSMS.common.util.extensions
import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
diff --git a/presentation/src/main/java/common/util/extensions/CalendarExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt
similarity index 96%
rename from presentation/src/main/java/common/util/extensions/CalendarExtensions.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt
index 0c2446dd..6228b47e 100644
--- a/presentation/src/main/java/common/util/extensions/CalendarExtensions.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util.extensions
+package com.moez.QKSMS.common.util.extensions
import java.util.*
diff --git a/presentation/src/main/java/common/util/extensions/ContextExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt
similarity index 97%
rename from presentation/src/main/java/common/util/extensions/ContextExtensions.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt
index f67b2f86..a6523a71 100644
--- a/presentation/src/main/java/common/util/extensions/ContextExtensions.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util.extensions
+package com.moez.QKSMS.common.util.extensions
import android.app.Activity
import android.content.Context
diff --git a/presentation/src/main/java/common/util/extensions/NumberExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/NumberExtensions.kt
similarity index 96%
rename from presentation/src/main/java/common/util/extensions/NumberExtensions.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/util/extensions/NumberExtensions.kt
index 240de11f..d4aff478 100644
--- a/presentation/src/main/java/common/util/extensions/NumberExtensions.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/NumberExtensions.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util.extensions
+package com.moez.QKSMS.common.util.extensions
import android.content.Context
import android.graphics.Color
diff --git a/presentation/src/main/java/common/util/extensions/ViewExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt
similarity index 98%
rename from presentation/src/main/java/common/util/extensions/ViewExtensions.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt
index 8f51b614..18f55584 100644
--- a/presentation/src/main/java/common/util/extensions/ViewExtensions.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util.extensions
+package com.moez.QKSMS.common.util.extensions
import android.animation.LayoutTransition
import android.content.Context
diff --git a/presentation/src/main/java/common/widget/AvatarView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt
similarity index 90%
rename from presentation/src/main/java/common/widget/AvatarView.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt
index 73c15891..6cb66a88 100644
--- a/presentation/src/main/java/common/widget/AvatarView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.widget
+package com.moez.QKSMS.common.widget
import android.content.Context
import android.net.Uri
@@ -26,15 +26,15 @@ import android.util.AttributeSet
import android.view.View
import android.widget.FrameLayout
import com.moez.QKSMS.R
-import common.Navigator
-import common.util.Colors
-import common.util.GlideApp
-import common.util.extensions.setBackgroundTint
-import common.util.extensions.setTint
-import injection.appComponent
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.GlideApp
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.injection.appComponent
+import com.moez.QKSMS.model.Contact
+import com.moez.QKSMS.model.Recipient
import kotlinx.android.synthetic.main.avatar_view.view.*
-import model.Contact
-import model.Recipient
import javax.inject.Inject
class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : FrameLayout(context, attrs) {
diff --git a/presentation/src/main/java/common/widget/BubbleImageView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/BubbleImageView.kt
similarity index 97%
rename from presentation/src/main/java/common/widget/BubbleImageView.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/widget/BubbleImageView.kt
index 8ae82656..a37c3964 100644
--- a/presentation/src/main/java/common/widget/BubbleImageView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/BubbleImageView.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.widget
+package com.moez.QKSMS.common.widget
import android.content.Context
import android.graphics.Canvas
@@ -24,7 +24,7 @@ import android.graphics.Path
import android.graphics.RectF
import android.util.AttributeSet
import android.widget.ImageView
-import common.util.extensions.dpToPx
+import com.moez.QKSMS.common.util.extensions.dpToPx
class BubbleImageView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : ImageView(context, attrs) {
diff --git a/presentation/src/main/java/common/widget/GroupAvatarView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/GroupAvatarView.kt
similarity index 96%
rename from presentation/src/main/java/common/widget/GroupAvatarView.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/widget/GroupAvatarView.kt
index 2d0f3352..0c656621 100644
--- a/presentation/src/main/java/common/widget/GroupAvatarView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/GroupAvatarView.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.widget
+package com.moez.QKSMS.common.widget
import android.content.Context
import android.os.Build
@@ -24,8 +24,8 @@ import android.support.constraint.ConstraintLayout
import android.util.AttributeSet
import android.view.View
import com.moez.QKSMS.R
+import com.moez.QKSMS.model.Recipient
import kotlinx.android.synthetic.main.group_avatar_view.view.*
-import model.Recipient
class GroupAvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : ConstraintLayout(context, attrs) {
diff --git a/presentation/src/main/java/common/widget/PagerTitleView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt
similarity index 93%
rename from presentation/src/main/java/common/widget/PagerTitleView.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt
index e2e11a95..0aa306ab 100644
--- a/presentation/src/main/java/common/widget/PagerTitleView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.widget
+package com.moez.QKSMS.common.widget
import android.content.Context
import android.content.res.ColorStateList
@@ -26,12 +26,12 @@ import android.view.LayoutInflater
import android.widget.LinearLayout
import android.widget.TextView
import com.moez.QKSMS.R
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.forEach
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.injection.appComponent
import com.uber.autodispose.android.scope
import com.uber.autodispose.kotlin.autoDisposable
-import common.util.Colors
-import common.util.extensions.forEach
-import common.util.extensions.resolveThemeColor
-import injection.appComponent
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/common/widget/PreferenceView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt
similarity index 90%
rename from presentation/src/main/java/common/widget/PreferenceView.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt
index 8390dfdd..338c3a79 100644
--- a/presentation/src/main/java/common/widget/PreferenceView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.widget
+package com.moez.QKSMS.common.widget
import android.content.Context
import android.support.v7.widget.LinearLayoutCompat
@@ -25,11 +25,11 @@ import android.view.Gravity
import android.view.View
import android.widget.TextView
import com.moez.QKSMS.R
-import common.util.extensions.resolveThemeAttribute
-import common.util.extensions.resolveThemeColor
-import common.util.extensions.setTint
-import common.util.extensions.setVisible
-import injection.appComponent
+import com.moez.QKSMS.common.util.extensions.resolveThemeAttribute
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.injection.appComponent
import kotlinx.android.synthetic.main.preference_view.view.*
class PreferenceView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : LinearLayoutCompat(context, attrs) {
diff --git a/presentation/src/main/java/common/widget/QkEditText.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkEditText.kt
similarity index 95%
rename from presentation/src/main/java/common/widget/QkEditText.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/widget/QkEditText.kt
index 0259710f..ae6d7788 100644
--- a/presentation/src/main/java/common/widget/QkEditText.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkEditText.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.widget
+package com.moez.QKSMS.common.widget
import android.content.Context
import android.os.Build
@@ -30,11 +30,11 @@ import android.view.inputmethod.InputConnection
import android.view.inputmethod.InputConnectionWrapper
import android.widget.EditText
import com.google.android.mms.ContentType
-import common.util.TextViewStyler
-import injection.appComponent
+import com.moez.QKSMS.common.util.TextViewStyler
+import com.moez.QKSMS.injection.appComponent
+import com.moez.QKSMS.util.tryOrNull
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
-import util.tryOrNull
import javax.inject.Inject
diff --git a/presentation/src/main/java/common/widget/QkSwitch.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkSwitch.kt
similarity index 91%
rename from presentation/src/main/java/common/widget/QkSwitch.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/widget/QkSwitch.kt
index 9b56e4e8..ecccc212 100644
--- a/presentation/src/main/java/common/widget/QkSwitch.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkSwitch.kt
@@ -16,18 +16,18 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.widget
+package com.moez.QKSMS.common.widget
import android.content.Context
import android.content.res.ColorStateList
import android.support.v7.widget.SwitchCompat
import android.util.AttributeSet
import com.moez.QKSMS.R
-import common.util.Colors
-import common.util.extensions.getColorCompat
-import common.util.extensions.withAlpha
-import injection.appComponent
-import util.Preferences
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.getColorCompat
+import com.moez.QKSMS.common.util.extensions.withAlpha
+import com.moez.QKSMS.injection.appComponent
+import com.moez.QKSMS.util.Preferences
import javax.inject.Inject
class QkSwitch @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : SwitchCompat(context, attrs) {
diff --git a/presentation/src/main/java/common/widget/QkTextView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkTextView.kt
similarity index 91%
rename from presentation/src/main/java/common/widget/QkTextView.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/widget/QkTextView.kt
index 171b5c68..3a10bbe4 100644
--- a/presentation/src/main/java/common/widget/QkTextView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkTextView.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.widget
+package com.moez.QKSMS.common.widget
import android.content.Context
import android.support.text.emoji.widget.EmojiAppCompatTextView
import android.util.AttributeSet
-import common.util.TextViewStyler
-import injection.appComponent
+import com.moez.QKSMS.common.util.TextViewStyler
+import com.moez.QKSMS.injection.appComponent
import javax.inject.Inject
open class QkTextView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null)
diff --git a/presentation/src/main/java/common/widget/SquareImageView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/SquareImageView.kt
similarity index 96%
rename from presentation/src/main/java/common/widget/SquareImageView.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/widget/SquareImageView.kt
index a935dac4..c166a741 100644
--- a/presentation/src/main/java/common/widget/SquareImageView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/SquareImageView.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.widget
+package com.moez.QKSMS.common.widget
import android.content.Context
import android.util.AttributeSet
diff --git a/presentation/src/main/java/common/widget/TightTextView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/TightTextView.kt
similarity index 97%
rename from presentation/src/main/java/common/widget/TightTextView.kt
rename to presentation/src/main/java/com/moez/QKSMS/common/widget/TightTextView.kt
index acfb6dc3..6f5e9fc5 100644
--- a/presentation/src/main/java/common/widget/TightTextView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/TightTextView.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.widget
+package com.moez.QKSMS.common.widget
import android.content.Context
import android.util.AttributeSet
diff --git a/presentation/src/main/java/feature/blocked/BlockedActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedActivity.kt
similarity index 96%
rename from presentation/src/main/java/feature/blocked/BlockedActivity.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedActivity.kt
index 7422b487..e6c87d0a 100644
--- a/presentation/src/main/java/feature/blocked/BlockedActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedActivity.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.blocked
+package com.moez.QKSMS.feature.blocked
import android.app.AlertDialog
import android.arch.lifecycle.ViewModelProvider
@@ -24,7 +24,7 @@ import android.arch.lifecycle.ViewModelProviders
import android.os.Bundle
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
-import common.base.QkThemedActivity
+import com.moez.QKSMS.common.base.QkThemedActivity
import dagger.android.AndroidInjection
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
diff --git a/presentation/src/main/java/feature/blocked/BlockedActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedActivityModule.kt
similarity index 79%
rename from presentation/src/main/java/feature/blocked/BlockedActivityModule.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedActivityModule.kt
index 0bafd4b3..6641ebd2 100644
--- a/presentation/src/main/java/feature/blocked/BlockedActivityModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedActivityModule.kt
@@ -1,10 +1,10 @@
-package feature.blocked
+package com.moez.QKSMS.feature.blocked
import android.arch.lifecycle.ViewModel
+import com.moez.QKSMS.injection.ViewModelKey
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
-import injection.ViewModelKey
@Module
class BlockedActivityModule {
diff --git a/presentation/src/main/java/feature/blocked/BlockedAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedAdapter.kt
similarity index 90%
rename from presentation/src/main/java/feature/blocked/BlockedAdapter.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedAdapter.kt
index dbe83795..fa9b8f7d 100644
--- a/presentation/src/main/java/feature/blocked/BlockedAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedAdapter.kt
@@ -16,16 +16,16 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.blocked
+package com.moez.QKSMS.feature.blocked
import android.view.LayoutInflater
import android.view.ViewGroup
import com.moez.QKSMS.R
-import common.base.QkRealmAdapter
-import common.base.QkViewHolder
+import com.moez.QKSMS.common.base.QkRealmAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.model.Conversation
import io.reactivex.subjects.PublishSubject
import kotlinx.android.synthetic.main.blocked_list_item.view.*
-import model.Conversation
import javax.inject.Inject
class BlockedAdapter @Inject constructor() : QkRealmAdapter() {
diff --git a/presentation/src/main/java/feature/blocked/BlockedState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedState.kt
similarity index 91%
rename from presentation/src/main/java/feature/blocked/BlockedState.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedState.kt
index 41fae68e..26d358e6 100644
--- a/presentation/src/main/java/feature/blocked/BlockedState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedState.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.blocked
+package com.moez.QKSMS.feature.blocked
+import com.moez.QKSMS.model.Conversation
import io.realm.RealmResults
-import model.Conversation
data class BlockedState(
val siaEnabled: Boolean = false,
diff --git a/presentation/src/main/java/feature/blocked/BlockedView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedView.kt
similarity index 92%
rename from presentation/src/main/java/feature/blocked/BlockedView.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedView.kt
index 0f5c1561..cf514bd3 100644
--- a/presentation/src/main/java/feature/blocked/BlockedView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedView.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.blocked
+package com.moez.QKSMS.feature.blocked
-import common.base.QkView
+import com.moez.QKSMS.common.base.QkView
import io.reactivex.Observable
interface BlockedView : QkView {
diff --git a/presentation/src/main/java/feature/blocked/BlockedViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedViewModel.kt
similarity index 90%
rename from presentation/src/main/java/feature/blocked/BlockedViewModel.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedViewModel.kt
index 18a52098..72864cca 100644
--- a/presentation/src/main/java/feature/blocked/BlockedViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocked/BlockedViewModel.kt
@@ -16,19 +16,19 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.blocked
+package com.moez.QKSMS.feature.blocked
import android.content.Context
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkViewModel
+import com.moez.QKSMS.interactor.MarkUnblocked
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.util.Preferences
+import com.moez.QKSMS.util.tryOrNull
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
-import common.Navigator
-import common.base.QkViewModel
-import interactor.MarkUnblocked
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.rxkotlin.withLatestFrom
-import repository.ConversationRepository
-import util.Preferences
-import util.tryOrNull
import javax.inject.Inject
class BlockedViewModel @Inject constructor(
diff --git a/presentation/src/main/java/feature/compose/AttachmentAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/AttachmentAdapter.kt
similarity index 92%
rename from presentation/src/main/java/feature/compose/AttachmentAdapter.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/AttachmentAdapter.kt
index 903d8a56..769aacd4 100644
--- a/presentation/src/main/java/feature/compose/AttachmentAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/AttachmentAdapter.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.compose
+package com.moez.QKSMS.feature.compose
import android.content.Context
import android.support.v7.widget.RecyclerView
@@ -25,13 +25,13 @@ import android.view.ViewGroup
import com.bumptech.glide.Glide
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
-import common.base.QkAdapter
-import common.base.QkViewHolder
+import com.moez.QKSMS.common.base.QkAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.model.Attachment
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.attachment_list_item.view.*
-import model.Attachment
import javax.inject.Inject
class AttachmentAdapter @Inject constructor(
diff --git a/presentation/src/main/java/feature/compose/BubbleUtils.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt
similarity index 92%
rename from presentation/src/main/java/feature/compose/BubbleUtils.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt
index 0234ef8e..7d7995d8 100644
--- a/presentation/src/main/java/feature/compose/BubbleUtils.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt
@@ -1,7 +1,7 @@
-package feature.compose
+package com.moez.QKSMS.feature.compose
import com.moez.QKSMS.R
-import model.Message
+import com.moez.QKSMS.model.Message
import java.util.concurrent.TimeUnit
object BubbleUtils {
diff --git a/presentation/src/main/java/feature/compose/ChipsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ChipsAdapter.kt
similarity index 92%
rename from presentation/src/main/java/feature/compose/ChipsAdapter.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/ChipsAdapter.kt
index 88152969..e4026bb1 100755
--- a/presentation/src/main/java/feature/compose/ChipsAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ChipsAdapter.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.compose
+package com.moez.QKSMS.feature.compose
import android.content.Context
import android.support.v7.widget.RecyclerView
@@ -28,15 +28,15 @@ import com.google.android.flexbox.FlexboxLayoutManager
import com.jakewharton.rxbinding2.widget.editorActions
import com.jakewharton.rxbinding2.widget.textChanges
import com.moez.QKSMS.R
-import common.base.QkAdapter
-import common.base.QkViewHolder
-import common.util.extensions.dpToPx
-import common.util.extensions.resolveThemeColor
-import common.util.extensions.showKeyboard
-import common.widget.QkEditText
+import com.moez.QKSMS.common.base.QkAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.extensions.dpToPx
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.util.extensions.showKeyboard
+import com.moez.QKSMS.common.widget.QkEditText
+import com.moez.QKSMS.model.Contact
import io.reactivex.subjects.PublishSubject
import kotlinx.android.synthetic.main.contact_chip.view.*
-import model.Contact
import javax.inject.Inject
class ChipsAdapter @Inject constructor(private val context: Context) : QkAdapter() {
diff --git a/presentation/src/main/java/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt
similarity index 95%
rename from presentation/src/main/java/feature/compose/ComposeActivity.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt
index 162931b6..22d827c3 100644
--- a/presentation/src/main/java/feature/compose/ComposeActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.compose
+package com.moez.QKSMS.feature.compose
import android.Manifest
import android.app.Activity
@@ -38,24 +38,24 @@ import com.google.android.flexbox.FlexboxLayoutManager
import com.jakewharton.rxbinding2.view.clicks
import com.jakewharton.rxbinding2.widget.textChanges
import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkThemedActivity
+import com.moez.QKSMS.common.util.extensions.autoScrollToStart
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.util.extensions.scrapViews
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.common.util.extensions.showKeyboard
+import com.moez.QKSMS.model.Attachment
+import com.moez.QKSMS.model.Contact
+import com.moez.QKSMS.model.Message
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
-import common.base.QkThemedActivity
-import common.util.extensions.autoScrollToStart
-import common.util.extensions.resolveThemeColor
-import common.util.extensions.scrapViews
-import common.util.extensions.setBackgroundTint
-import common.util.extensions.setTint
-import common.util.extensions.setVisible
-import common.util.extensions.showKeyboard
import dagger.android.AndroidInjection
import io.reactivex.Observable
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.compose_activity.*
-import model.Attachment
-import model.Contact
-import model.Message
import java.text.SimpleDateFormat
import java.util.*
import javax.inject.Inject
diff --git a/presentation/src/main/java/feature/compose/ComposeActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt
similarity index 94%
rename from presentation/src/main/java/feature/compose/ComposeActivityModule.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt
index 0a69f6b0..94dac041 100644
--- a/presentation/src/main/java/feature/compose/ComposeActivityModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt
@@ -1,13 +1,13 @@
-package feature.compose
+package com.moez.QKSMS.feature.compose
import android.arch.lifecycle.ViewModel
import android.content.Intent
import android.net.Uri
+import com.moez.QKSMS.injection.ViewModelKey
+import com.moez.QKSMS.model.Attachment
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
-import injection.ViewModelKey
-import model.Attachment
import java.net.URLDecoder
import javax.inject.Named
diff --git a/presentation/src/main/java/feature/compose/ComposeState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt
similarity index 87%
rename from presentation/src/main/java/feature/compose/ComposeState.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt
index dddd2777..6297b93e 100644
--- a/presentation/src/main/java/feature/compose/ComposeState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt
@@ -16,14 +16,14 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.compose
+package com.moez.QKSMS.feature.compose
-import compat.SubscriptionInfoCompat
+import com.moez.QKSMS.compat.SubscriptionInfoCompat
+import com.moez.QKSMS.model.Attachment
+import com.moez.QKSMS.model.Contact
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Message
import io.realm.RealmResults
-import model.Attachment
-import model.Contact
-import model.Conversation
-import model.Message
data class ComposeState(
val hasError: Boolean = false,
diff --git a/presentation/src/main/java/feature/compose/ComposeView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt
similarity index 91%
rename from presentation/src/main/java/feature/compose/ComposeView.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt
index a35dba2b..89d0b5bd 100644
--- a/presentation/src/main/java/feature/compose/ComposeView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt
@@ -16,16 +16,16 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.compose
+package com.moez.QKSMS.feature.compose
import android.net.Uri
import android.support.v13.view.inputmethod.InputContentInfoCompat
-import common.base.QkView
+import com.moez.QKSMS.common.base.QkView
+import com.moez.QKSMS.model.Attachment
+import com.moez.QKSMS.model.Contact
+import com.moez.QKSMS.model.Message
import io.reactivex.Observable
import io.reactivex.subjects.Subject
-import model.Attachment
-import model.Contact
-import model.Message
interface ComposeView : QkView {
diff --git a/presentation/src/main/java/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt
similarity index 95%
rename from presentation/src/main/java/feature/compose/ComposeViewModel.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt
index 1ec67017..f47fbc0f 100644
--- a/presentation/src/main/java/feature/compose/ComposeViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt
@@ -16,29 +16,44 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.compose
+package com.moez.QKSMS.feature.compose
import android.content.Context
import android.telephony.PhoneNumberUtils
import android.telephony.SmsMessage
import android.view.inputmethod.EditorInfo
import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkViewModel
+import com.moez.QKSMS.common.util.ClipboardUtils
+import com.moez.QKSMS.common.util.MessageDetailsFormatter
+import com.moez.QKSMS.common.util.extensions.makeToast
+import com.moez.QKSMS.compat.SubscriptionManagerCompat
+import com.moez.QKSMS.compat.TelephonyCompat
+import com.moez.QKSMS.extensions.asObservable
+import com.moez.QKSMS.extensions.isImage
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.extensions.removeAccents
+import com.moez.QKSMS.filter.ContactFilter
+import com.moez.QKSMS.interactor.CancelDelayedMessage
+import com.moez.QKSMS.interactor.ContactSync
+import com.moez.QKSMS.interactor.DeleteMessages
+import com.moez.QKSMS.interactor.MarkRead
+import com.moez.QKSMS.interactor.RetrySending
+import com.moez.QKSMS.interactor.SendMessage
+import com.moez.QKSMS.manager.PermissionManager
+import com.moez.QKSMS.model.Attachment
+import com.moez.QKSMS.model.Contact
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.PhoneNumber
+import com.moez.QKSMS.repository.ContactRepository
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
+import com.moez.QKSMS.util.ActiveSubscriptionObservable
+import com.moez.QKSMS.util.tryOrNull
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
-import common.Navigator
-import common.base.QkViewModel
-import common.util.ClipboardUtils
-import common.util.MessageDetailsFormatter
-import common.util.extensions.makeToast
-import compat.SubscriptionManagerCompat
-import compat.TelephonyCompat
-import filter.ContactFilter
-import interactor.CancelDelayedMessage
-import interactor.ContactSync
-import interactor.DeleteMessages
-import interactor.MarkRead
-import interactor.RetrySending
-import interactor.SendMessage
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.rxkotlin.Observables
@@ -49,21 +64,6 @@ import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import io.realm.RealmList
-import manager.PermissionManager
-import model.Attachment
-import model.Contact
-import model.Conversation
-import model.Message
-import model.PhoneNumber
-import repository.ContactRepository
-import repository.ConversationRepository
-import repository.MessageRepository
-import util.ActiveSubscriptionObservable
-import util.extensions.asObservable
-import util.extensions.isImage
-import util.extensions.mapNotNull
-import util.extensions.removeAccents
-import util.tryOrNull
import java.util.*
import java.util.concurrent.TimeUnit
import javax.inject.Inject
diff --git a/presentation/src/main/java/feature/compose/ComposeWindowCallback.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt
similarity index 99%
rename from presentation/src/main/java/feature/compose/ComposeWindowCallback.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt
index 610fb91a..efe22d71 100755
--- a/presentation/src/main/java/feature/compose/ComposeWindowCallback.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.compose
+package com.moez.QKSMS.feature.compose
import android.app.Activity
import android.graphics.Rect
diff --git a/presentation/src/main/java/feature/compose/ContactAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ContactAdapter.kt
similarity index 93%
rename from presentation/src/main/java/feature/compose/ContactAdapter.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/ContactAdapter.kt
index f558c1d9..2a9cb750 100644
--- a/presentation/src/main/java/feature/compose/ContactAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ContactAdapter.kt
@@ -16,20 +16,20 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.compose
+package com.moez.QKSMS.feature.compose
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
-import common.base.QkAdapter
-import common.base.QkViewHolder
-import common.util.extensions.setVisible
+import com.moez.QKSMS.common.base.QkAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.model.Contact
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.contact_list_item.view.*
-import model.Contact
import javax.inject.Inject
class ContactAdapter @Inject constructor() : QkAdapter() {
diff --git a/presentation/src/main/java/feature/compose/DetailedChipView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/DetailedChipView.kt
similarity index 90%
rename from presentation/src/main/java/feature/compose/DetailedChipView.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/DetailedChipView.kt
index 4a88fa2b..f7391f76 100755
--- a/presentation/src/main/java/feature/compose/DetailedChipView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/DetailedChipView.kt
@@ -16,18 +16,18 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.compose
+package com.moez.QKSMS.feature.compose
import android.content.Context
import android.view.View
import android.view.animation.AlphaAnimation
import android.widget.RelativeLayout
import com.moez.QKSMS.R
-import common.util.Colors
-import common.util.extensions.setBackgroundTint
-import injection.appComponent
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.injection.appComponent
+import com.moez.QKSMS.model.Contact
import kotlinx.android.synthetic.main.contact_chip_detailed.view.*
-import model.Contact
import javax.inject.Inject
diff --git a/presentation/src/main/java/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt
similarity index 90%
rename from presentation/src/main/java/feature/compose/MessagesAdapter.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt
index 969fe1a4..d111690c 100644
--- a/presentation/src/main/java/feature/compose/MessagesAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.compose
+package com.moez.QKSMS.feature.compose
import android.animation.ObjectAnimator
import android.content.Context
@@ -33,32 +33,32 @@ import android.widget.ImageView
import android.widget.ProgressBar
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
-import common.Navigator
-import common.base.QkRealmAdapter
-import common.base.QkViewHolder
-import common.util.Colors
-import common.util.DateFormatter
-import common.util.extensions.dpToPx
-import common.util.extensions.forwardTouches
-import common.util.extensions.setBackgroundTint
-import common.util.extensions.setPadding
-import common.util.extensions.setTint
-import common.util.extensions.setVisible
-import compat.SubscriptionManagerCompat
-import feature.compose.BubbleUtils.canGroup
-import feature.compose.BubbleUtils.getBubble
-import feature.compose.part.PartsAdapter
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkRealmAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.DateFormatter
+import com.moez.QKSMS.common.util.extensions.dpToPx
+import com.moez.QKSMS.common.util.extensions.forwardTouches
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setPadding
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.compat.SubscriptionManagerCompat
+import com.moez.QKSMS.extensions.isImage
+import com.moez.QKSMS.extensions.isVCard
+import com.moez.QKSMS.extensions.isVideo
+import com.moez.QKSMS.feature.compose.BubbleUtils.canGroup
+import com.moez.QKSMS.feature.compose.BubbleUtils.getBubble
+import com.moez.QKSMS.feature.compose.part.PartsAdapter
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.Recipient
+import com.moez.QKSMS.util.Preferences
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import io.realm.RealmResults
import kotlinx.android.synthetic.main.message_list_item_in.view.*
-import model.Conversation
-import model.Message
-import model.Recipient
-import util.Preferences
-import util.extensions.isImage
-import util.extensions.isVCard
-import util.extensions.isVideo
import java.util.*
import java.util.concurrent.TimeUnit
import javax.inject.Inject
diff --git a/presentation/src/main/java/feature/compose/part/MediaBinder.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/MediaBinder.kt
similarity index 76%
rename from presentation/src/main/java/feature/compose/part/MediaBinder.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/part/MediaBinder.kt
index 2721a3aa..2958740a 100644
--- a/presentation/src/main/java/feature/compose/part/MediaBinder.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/MediaBinder.kt
@@ -1,17 +1,17 @@
-package feature.compose.part
+package com.moez.QKSMS.feature.compose.part
import android.content.Context
import android.view.View
import com.moez.QKSMS.R
-import common.Navigator
-import common.util.GlideApp
-import common.util.extensions.setVisible
-import common.widget.BubbleImageView
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.util.GlideApp
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.common.widget.BubbleImageView
+import com.moez.QKSMS.extensions.isImage
+import com.moez.QKSMS.extensions.isVideo
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.MmsPart
import kotlinx.android.synthetic.main.mms_preview_list_item.view.*
-import model.Message
-import model.MmsPart
-import util.extensions.isImage
-import util.extensions.isVideo
class MediaBinder(private val context: Context, private val navigator: Navigator) : PartBinder {
diff --git a/presentation/src/main/java/feature/compose/part/PartBinder.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartBinder.kt
similarity index 67%
rename from presentation/src/main/java/feature/compose/part/PartBinder.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartBinder.kt
index bf55604c..21f7a19d 100644
--- a/presentation/src/main/java/feature/compose/part/PartBinder.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartBinder.kt
@@ -1,8 +1,8 @@
-package feature.compose.part
+package com.moez.QKSMS.feature.compose.part
import android.view.View
-import model.Message
-import model.MmsPart
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.MmsPart
interface PartBinder {
diff --git a/presentation/src/main/java/feature/compose/part/PartsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartsAdapter.kt
similarity index 79%
rename from presentation/src/main/java/feature/compose/part/PartsAdapter.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartsAdapter.kt
index f344fed6..95be1211 100644
--- a/presentation/src/main/java/feature/compose/part/PartsAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartsAdapter.kt
@@ -1,21 +1,21 @@
-package feature.compose.part
+package com.moez.QKSMS.feature.compose.part
import android.content.Context
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
-import common.Navigator
-import common.base.QkAdapter
-import common.base.QkViewHolder
-import common.util.Colors
-import common.util.extensions.forwardTouches
-import feature.compose.BubbleUtils.canGroup
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.forwardTouches
+import com.moez.QKSMS.extensions.isImage
+import com.moez.QKSMS.extensions.isVCard
+import com.moez.QKSMS.extensions.isVideo
+import com.moez.QKSMS.feature.compose.BubbleUtils.canGroup
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.MmsPart
import kotlinx.android.synthetic.main.message_list_item_in.view.*
-import model.Message
-import model.MmsPart
-import util.extensions.isImage
-import util.extensions.isVCard
-import util.extensions.isVideo
class PartsAdapter(context: Context, navigator: Navigator, theme: Colors.Theme) : QkAdapter() {
diff --git a/presentation/src/main/java/feature/compose/part/VCardBinder.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/VCardBinder.kt
similarity index 77%
rename from presentation/src/main/java/feature/compose/part/VCardBinder.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/compose/part/VCardBinder.kt
index f708bba5..fc785601 100644
--- a/presentation/src/main/java/feature/compose/part/VCardBinder.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/VCardBinder.kt
@@ -1,24 +1,24 @@
-package feature.compose.part
+package com.moez.QKSMS.feature.compose.part
import android.content.ContentUris
import android.content.Context
import android.view.View
import com.moez.QKSMS.R
-import common.Navigator
-import common.util.Colors
-import common.util.extensions.setBackgroundTint
-import common.util.extensions.setTint
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.extensions.isVCard
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.feature.compose.BubbleUtils
+import com.moez.QKSMS.mapper.CursorToPartImpl
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.model.MmsPart
import ezvcard.Ezvcard
-import feature.compose.BubbleUtils
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.mms_vcard_list_item.view.*
-import mapper.CursorToPartImpl
-import model.Message
-import model.MmsPart
-import util.extensions.isVCard
-import util.extensions.mapNotNull
class VCardBinder(
private val context: Context,
diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt
similarity index 91%
rename from presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt
index f8e8284c..559936a6 100644
--- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.conversationinfo
+package com.moez.QKSMS.feature.conversationinfo
import android.arch.lifecycle.ViewModelProvider
import android.arch.lifecycle.ViewModelProviders
@@ -25,16 +25,16 @@ import android.support.v7.app.AlertDialog
import android.text.InputFilter
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkThemedActivity
+import com.moez.QKSMS.common.util.extensions.animateLayoutChanges
+import com.moez.QKSMS.common.util.extensions.dpToPx
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.util.extensions.scrapViews
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.common.widget.QkEditText
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
-import common.Navigator
-import common.base.QkThemedActivity
-import common.util.extensions.animateLayoutChanges
-import common.util.extensions.dpToPx
-import common.util.extensions.resolveThemeColor
-import common.util.extensions.scrapViews
-import common.util.extensions.setVisible
-import common.widget.QkEditText
import dagger.android.AndroidInjection
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivityModule.kt
similarity index 85%
rename from presentation/src/main/java/feature/conversationinfo/ConversationInfoActivityModule.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivityModule.kt
index f020f077..2dea21a0 100644
--- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivityModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivityModule.kt
@@ -1,10 +1,10 @@
-package feature.conversationinfo
+package com.moez.QKSMS.feature.conversationinfo
import android.arch.lifecycle.ViewModel
+import com.moez.QKSMS.injection.ViewModelKey
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
-import injection.ViewModelKey
import javax.inject.Named
@Module
diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoState.kt
similarity index 90%
rename from presentation/src/main/java/feature/conversationinfo/ConversationInfoState.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoState.kt
index eeedb5e0..16db13e1 100644
--- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoState.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.conversationinfo
+package com.moez.QKSMS.feature.conversationinfo
+import com.moez.QKSMS.model.MmsPart
+import com.moez.QKSMS.model.Recipient
import io.realm.RealmList
import io.realm.RealmResults
-import model.MmsPart
-import model.Recipient
data class ConversationInfoState(
val name: String = "",
diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt
similarity index 93%
rename from presentation/src/main/java/feature/conversationinfo/ConversationInfoView.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt
index 3425fd9a..6e3bbbd9 100644
--- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.conversationinfo
+package com.moez.QKSMS.feature.conversationinfo
-import common.base.QkView
+import com.moez.QKSMS.common.base.QkView
import io.reactivex.Observable
interface ConversationInfoView : QkView {
diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoViewModel.kt
similarity index 92%
rename from presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoViewModel.kt
index 6f02dd9a..23891e6c 100644
--- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoViewModel.kt
@@ -16,25 +16,25 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.conversationinfo
+package com.moez.QKSMS.feature.conversationinfo
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkViewModel
+import com.moez.QKSMS.extensions.asObservable
+import com.moez.QKSMS.interactor.DeleteConversations
+import com.moez.QKSMS.interactor.MarkArchived
+import com.moez.QKSMS.interactor.MarkBlocked
+import com.moez.QKSMS.interactor.MarkUnarchived
+import com.moez.QKSMS.interactor.MarkUnblocked
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
-import common.Navigator
-import common.base.QkViewModel
-import interactor.DeleteConversations
-import interactor.MarkArchived
-import interactor.MarkBlocked
-import interactor.MarkUnarchived
-import interactor.MarkUnblocked
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.rxkotlin.withLatestFrom
import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.Subject
-import model.Conversation
-import repository.ConversationRepository
-import repository.MessageRepository
-import util.extensions.asObservable
import javax.inject.Inject
import javax.inject.Named
diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationMediaAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationMediaAdapter.kt
similarity index 85%
rename from presentation/src/main/java/feature/conversationinfo/ConversationMediaAdapter.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationMediaAdapter.kt
index afeda1dd..31166dba 100644
--- a/presentation/src/main/java/feature/conversationinfo/ConversationMediaAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationMediaAdapter.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.conversationinfo
+package com.moez.QKSMS.feature.conversationinfo
import android.content.Context
import android.support.v7.widget.RecyclerView
@@ -24,17 +24,17 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.moez.QKSMS.R
-import common.Navigator
-import common.base.QkRealmAdapter
-import common.base.QkViewHolder
-import common.util.GlideApp
-import common.util.extensions.setVisible
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkRealmAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.GlideApp
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.extensions.isImage
+import com.moez.QKSMS.extensions.isVideo
+import com.moez.QKSMS.model.MmsPart
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.subjects.PublishSubject
import kotlinx.android.synthetic.main.conversation_media_list_item.view.*
-import model.MmsPart
-import util.extensions.isImage
-import util.extensions.isVideo
import javax.inject.Inject
class ConversationMediaAdapter @Inject constructor(
diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationRecipientAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationRecipientAdapter.kt
similarity index 89%
rename from presentation/src/main/java/feature/conversationinfo/ConversationRecipientAdapter.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationRecipientAdapter.kt
index 732c91ca..6edd5592 100644
--- a/presentation/src/main/java/feature/conversationinfo/ConversationRecipientAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationRecipientAdapter.kt
@@ -16,19 +16,19 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.conversationinfo
+package com.moez.QKSMS.feature.conversationinfo
import android.support.v7.widget.RecyclerView
import android.view.LayoutInflater
import android.view.ViewGroup
import com.moez.QKSMS.R
-import common.Navigator
-import common.base.QkRealmAdapter
-import common.base.QkViewHolder
-import common.util.extensions.setVisible
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkRealmAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.model.Recipient
import io.reactivex.disposables.CompositeDisposable
import kotlinx.android.synthetic.main.conversation_recipient_list_item.view.*
-import model.Recipient
import javax.inject.Inject
class ConversationRecipientAdapter @Inject constructor(
diff --git a/presentation/src/main/java/feature/conversationinfo/GridSpacingItemDecoration.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/GridSpacingItemDecoration.kt
similarity index 93%
rename from presentation/src/main/java/feature/conversationinfo/GridSpacingItemDecoration.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/GridSpacingItemDecoration.kt
index 0f17a9ec..2f779ce4 100644
--- a/presentation/src/main/java/feature/conversationinfo/GridSpacingItemDecoration.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/GridSpacingItemDecoration.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.conversationinfo
+package com.moez.QKSMS.feature.conversationinfo
import android.content.Context
import android.graphics.Rect
import android.support.v7.widget.RecyclerView
import android.view.View
-import common.util.extensions.dpToPx
+import com.moez.QKSMS.common.util.extensions.dpToPx
import javax.inject.Inject
class GridSpacingItemDecoration @Inject constructor(context: Context) : RecyclerView.ItemDecoration() {
diff --git a/presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt
similarity index 97%
rename from presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt
index 69e3aa03..13d0aa3a 100644
--- a/presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.conversations
+package com.moez.QKSMS.feature.conversations
import android.content.Context
import android.graphics.Bitmap
@@ -26,7 +26,7 @@ import android.support.v7.widget.RecyclerView
import android.support.v7.widget.helper.ItemTouchHelper
import androidx.graphics.drawable.toBitmap
import com.moez.QKSMS.R
-import common.util.extensions.dpToPx
+import com.moez.QKSMS.common.util.extensions.dpToPx
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import javax.inject.Inject
diff --git a/presentation/src/main/java/feature/conversations/ConversationsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt
similarity index 90%
rename from presentation/src/main/java/feature/conversations/ConversationsAdapter.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt
index 2e694558..dcc0e3a0 100644
--- a/presentation/src/main/java/feature/conversations/ConversationsAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt
@@ -16,20 +16,20 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.conversations
+package com.moez.QKSMS.feature.conversations
import android.content.Context
import android.graphics.Typeface
import android.view.LayoutInflater
import android.view.ViewGroup
import com.moez.QKSMS.R
-import common.Navigator
-import common.base.QkRealmAdapter
-import common.base.QkViewHolder
-import common.util.DateFormatter
-import common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkRealmAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.DateFormatter
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.model.Conversation
import kotlinx.android.synthetic.main.conversation_list_item.view.*
-import model.Conversation
import javax.inject.Inject
class ConversationsAdapter @Inject constructor(
diff --git a/presentation/src/main/java/feature/gallery/GalleryActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt
similarity index 96%
rename from presentation/src/main/java/feature/gallery/GalleryActivity.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt
index 3b19defa..ef56d0ee 100644
--- a/presentation/src/main/java/feature/gallery/GalleryActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.gallery
+package com.moez.QKSMS.feature.gallery
import android.arch.lifecycle.ViewModelProvider
import android.arch.lifecycle.ViewModelProviders
@@ -37,10 +37,10 @@ import com.google.android.exoplayer2.util.Util
import com.google.android.mms.ContentType
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
-import common.GlideCompletionListener
-import common.base.QkActivity
-import common.util.GlideApp
-import common.util.extensions.setVisible
+import com.moez.QKSMS.common.GlideCompletionListener
+import com.moez.QKSMS.common.base.QkActivity
+import com.moez.QKSMS.common.util.GlideApp
+import com.moez.QKSMS.common.util.extensions.setVisible
import dagger.android.AndroidInjection
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
diff --git a/presentation/src/main/java/feature/gallery/GalleryActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivityModule.kt
similarity index 83%
rename from presentation/src/main/java/feature/gallery/GalleryActivityModule.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivityModule.kt
index fee76512..9e33fb30 100644
--- a/presentation/src/main/java/feature/gallery/GalleryActivityModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivityModule.kt
@@ -1,11 +1,11 @@
-package feature.gallery
+package com.moez.QKSMS.feature.gallery
import android.arch.lifecycle.ViewModel
import android.content.Intent
+import com.moez.QKSMS.injection.ViewModelKey
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
-import injection.ViewModelKey
@Module
class GalleryActivityModule {
diff --git a/presentation/src/main/java/feature/gallery/GalleryState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryState.kt
similarity index 95%
rename from presentation/src/main/java/feature/gallery/GalleryState.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryState.kt
index b65dcd12..bd9f269a 100644
--- a/presentation/src/main/java/feature/gallery/GalleryState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryState.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.gallery
+package com.moez.QKSMS.feature.gallery
import android.net.Uri
diff --git a/presentation/src/main/java/feature/gallery/GalleryView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryView.kt
similarity index 91%
rename from presentation/src/main/java/feature/gallery/GalleryView.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryView.kt
index df2cd204..05b686b3 100644
--- a/presentation/src/main/java/feature/gallery/GalleryView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryView.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.gallery
+package com.moez.QKSMS.feature.gallery
+import com.moez.QKSMS.common.base.QkView
import io.reactivex.Observable
-import common.base.QkView
interface GalleryView : QkView {
diff --git a/presentation/src/main/java/feature/gallery/GalleryViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt
similarity index 89%
rename from presentation/src/main/java/feature/gallery/GalleryViewModel.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt
index d174efbc..c949e4df 100644
--- a/presentation/src/main/java/feature/gallery/GalleryViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt
@@ -16,22 +16,22 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.gallery
+package com.moez.QKSMS.feature.gallery
import android.content.Context
import android.content.Intent
import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkViewModel
+import com.moez.QKSMS.common.util.extensions.makeToast
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.interactor.SaveImage
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
-import common.base.QkViewModel
-import common.util.extensions.makeToast
-import interactor.SaveImage
import io.reactivex.Flowable
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.rxkotlin.withLatestFrom
-import repository.ConversationRepository
-import repository.MessageRepository
-import util.extensions.mapNotNull
import javax.inject.Inject
class GalleryViewModel @Inject constructor(
diff --git a/presentation/src/main/java/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt
similarity index 94%
rename from presentation/src/main/java/feature/main/MainActivity.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt
index 4e922792..2e964a3d 100644
--- a/presentation/src/main/java/feature/main/MainActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.main
+package com.moez.QKSMS.feature.main
import android.Manifest
import android.app.AlertDialog
@@ -37,26 +37,26 @@ import com.jakewharton.rxbinding2.support.v4.widget.drawerOpen
import com.jakewharton.rxbinding2.view.clicks
import com.jakewharton.rxbinding2.widget.textChanges
import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkThemedActivity
+import com.moez.QKSMS.common.util.extensions.autoScrollToStart
+import com.moez.QKSMS.common.util.extensions.dismissKeyboard
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.util.extensions.scrapViews
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.feature.conversations.ConversationItemTouchCallback
+import com.moez.QKSMS.feature.conversations.ConversationsAdapter
+import com.moez.QKSMS.repository.SyncRepository
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
-import common.Navigator
-import common.base.QkThemedActivity
-import common.util.extensions.autoScrollToStart
-import common.util.extensions.dismissKeyboard
-import common.util.extensions.resolveThemeColor
-import common.util.extensions.scrapViews
-import common.util.extensions.setBackgroundTint
-import common.util.extensions.setTint
-import common.util.extensions.setVisible
import dagger.android.AndroidInjection
-import feature.conversations.ConversationItemTouchCallback
-import feature.conversations.ConversationsAdapter
import io.reactivex.Observable
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.drawer_view.*
import kotlinx.android.synthetic.main.main_activity.*
-import repository.SyncRepository
import javax.inject.Inject
class MainActivity : QkThemedActivity(), MainView {
diff --git a/presentation/src/main/java/feature/main/MainActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt
similarity index 79%
rename from presentation/src/main/java/feature/main/MainActivityModule.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt
index d3a77497..8d02ac5a 100644
--- a/presentation/src/main/java/feature/main/MainActivityModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt
@@ -1,10 +1,10 @@
-package feature.main
+package com.moez.QKSMS.feature.main
import android.arch.lifecycle.ViewModel
+import com.moez.QKSMS.injection.ViewModelKey
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
-import injection.ViewModelKey
@Module
class MainActivityModule {
diff --git a/presentation/src/main/java/feature/main/MainState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt
similarity index 91%
rename from presentation/src/main/java/feature/main/MainState.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt
index 14d0cbc9..75fa7221 100644
--- a/presentation/src/main/java/feature/main/MainState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.main
+package com.moez.QKSMS.feature.main
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.SearchResult
+import com.moez.QKSMS.repository.SyncRepository
import io.realm.RealmResults
-import model.Conversation
-import model.SearchResult
-import repository.SyncRepository
data class MainState(
val hasError: Boolean = false,
diff --git a/presentation/src/main/java/feature/main/MainView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt
similarity index 95%
rename from presentation/src/main/java/feature/main/MainView.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt
index 63db3e57..3efccd44 100644
--- a/presentation/src/main/java/feature/main/MainView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.main
+package com.moez.QKSMS.feature.main
-import common.base.QkView
+import com.moez.QKSMS.common.base.QkView
import io.reactivex.Observable
interface MainView : QkView {
diff --git a/presentation/src/main/java/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt
similarity index 93%
rename from presentation/src/main/java/feature/main/MainViewModel.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt
index ada79b3b..996dc144 100644
--- a/presentation/src/main/java/feature/main/MainViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt
@@ -16,22 +16,29 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.main
+package com.moez.QKSMS.feature.main
import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkViewModel
+import com.moez.QKSMS.extensions.removeAccents
+import com.moez.QKSMS.interactor.DeleteConversations
+import com.moez.QKSMS.interactor.MarkAllSeen
+import com.moez.QKSMS.interactor.MarkArchived
+import com.moez.QKSMS.interactor.MarkBlocked
+import com.moez.QKSMS.interactor.MarkRead
+import com.moez.QKSMS.interactor.MarkUnarchived
+import com.moez.QKSMS.interactor.MarkUnread
+import com.moez.QKSMS.interactor.MigratePreferences
+import com.moez.QKSMS.interactor.SyncMessages
+import com.moez.QKSMS.manager.PermissionManager
+import com.moez.QKSMS.manager.RatingManager
+import com.moez.QKSMS.model.SyncLog
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
+import com.moez.QKSMS.repository.SyncRepository
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
-import common.Navigator
-import common.base.QkViewModel
-import interactor.DeleteConversations
-import interactor.MarkAllSeen
-import interactor.MarkArchived
-import interactor.MarkBlocked
-import interactor.MarkRead
-import interactor.MarkUnarchived
-import interactor.MarkUnread
-import interactor.MigratePreferences
-import interactor.SyncMessages
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.rxkotlin.Observables
@@ -39,13 +46,6 @@ import io.reactivex.rxkotlin.plusAssign
import io.reactivex.rxkotlin.withLatestFrom
import io.reactivex.schedulers.Schedulers
import io.realm.Realm
-import manager.PermissionManager
-import manager.RatingManager
-import model.SyncLog
-import repository.ConversationRepository
-import repository.MessageRepository
-import repository.SyncRepository
-import util.extensions.removeAccents
import java.util.concurrent.TimeUnit
import javax.inject.Inject
diff --git a/presentation/src/main/java/feature/main/SearchAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt
similarity index 91%
rename from presentation/src/main/java/feature/main/SearchAdapter.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt
index ef9f010d..1eb35584 100644
--- a/presentation/src/main/java/feature/main/SearchAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.main
+package com.moez.QKSMS.feature.main
import android.content.Context
import android.text.SpannableString
@@ -26,14 +26,14 @@ import android.view.LayoutInflater
import android.view.ViewGroup
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
-import common.Navigator
-import common.base.QkAdapter
-import common.base.QkViewHolder
-import common.util.Colors
-import common.util.DateFormatter
-import common.util.extensions.setVisible
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.DateFormatter
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.model.SearchResult
import kotlinx.android.synthetic.main.search_list_item.view.*
-import model.SearchResult
import javax.inject.Inject
class SearchAdapter @Inject constructor(
diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt
similarity index 93%
rename from presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt
index ebf78c33..d0b07f23 100644
--- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.notificationprefs
+package com.moez.QKSMS.feature.notificationprefs
import android.app.Activity
import android.arch.lifecycle.ViewModelProvider
@@ -28,11 +28,11 @@ import android.os.Build
import android.os.Bundle
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
-import common.QkDialog
-import common.base.QkThemedActivity
-import common.util.extensions.animateLayoutChanges
-import common.util.extensions.setVisible
-import common.widget.PreferenceView
+import com.moez.QKSMS.common.QkDialog
+import com.moez.QKSMS.common.base.QkThemedActivity
+import com.moez.QKSMS.common.util.extensions.animateLayoutChanges
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.common.widget.PreferenceView
import dagger.android.AndroidInjection
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivityModule.kt
similarity index 83%
rename from presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivityModule.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivityModule.kt
index c62592c3..ab673c3d 100644
--- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivityModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivityModule.kt
@@ -1,11 +1,11 @@
-package feature.notificationprefs
+package com.moez.QKSMS.feature.notificationprefs
import android.arch.lifecycle.ViewModel
import android.content.Intent
+import com.moez.QKSMS.injection.ViewModelKey
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
-import injection.ViewModelKey
@Module
class NotificationPrefsActivityModule {
diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsState.kt
similarity index 93%
rename from presentation/src/main/java/feature/notificationprefs/NotificationPrefsState.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsState.kt
index 2a631910..9235ffea 100644
--- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsState.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.notificationprefs
+package com.moez.QKSMS.feature.notificationprefs
import android.os.Build
-import util.Preferences
+import com.moez.QKSMS.util.Preferences
data class NotificationPrefsState(
val conversationTitle: String = "",
diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsView.kt
similarity index 88%
rename from presentation/src/main/java/feature/notificationprefs/NotificationPrefsView.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsView.kt
index 9d3d9413..d2693afa 100644
--- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsView.kt
@@ -16,11 +16,11 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.notificationprefs
+package com.moez.QKSMS.feature.notificationprefs
import android.net.Uri
-import common.base.QkView
-import common.widget.PreferenceView
+import com.moez.QKSMS.common.base.QkView
+import com.moez.QKSMS.common.widget.PreferenceView
import io.reactivex.Observable
import io.reactivex.subjects.Subject
diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt
similarity index 94%
rename from presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt
index dbf30608..8ab583d4 100644
--- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.notificationprefs
+package com.moez.QKSMS.feature.notificationprefs
import android.content.Context
import android.content.Intent
@@ -24,16 +24,16 @@ import android.media.RingtoneManager
import android.net.Uri
import com.f2prateek.rx.preferences2.Preference
import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkViewModel
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.util.Preferences
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
-import common.Navigator
-import common.base.QkViewModel
import io.reactivex.Flowable
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.schedulers.Schedulers
-import repository.ConversationRepository
-import util.Preferences
-import util.extensions.mapNotNull
import javax.inject.Inject
class NotificationPrefsViewModel @Inject constructor(
diff --git a/presentation/src/main/java/feature/plus/PlusActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt
similarity index 88%
rename from presentation/src/main/java/feature/plus/PlusActivity.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt
index 80680249..a0122355 100644
--- a/presentation/src/main/java/feature/plus/PlusActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.plus
+package com.moez.QKSMS.feature.plus
import android.arch.lifecycle.ViewModelProvider
import android.arch.lifecycle.ViewModelProviders
@@ -25,13 +25,13 @@ import android.os.Bundle
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.BuildConfig
import com.moez.QKSMS.R
-import common.base.QkThemedActivity
-import common.util.BillingManager
-import common.util.FontProvider
-import common.util.extensions.resolveThemeColor
-import common.util.extensions.setBackgroundTint
-import common.util.extensions.setTint
-import common.util.extensions.setVisible
+import com.moez.QKSMS.common.base.QkThemedActivity
+import com.moez.QKSMS.common.util.BillingManager
+import com.moez.QKSMS.common.util.FontProvider
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.common.util.extensions.setVisible
import dagger.android.AndroidInjection
import kotlinx.android.synthetic.main.qksms_plus_activity.*
import javax.inject.Inject
diff --git a/presentation/src/main/java/feature/plus/PlusActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivityModule.kt
similarity index 79%
rename from presentation/src/main/java/feature/plus/PlusActivityModule.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivityModule.kt
index c03b15ac..a521cfda 100644
--- a/presentation/src/main/java/feature/plus/PlusActivityModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivityModule.kt
@@ -1,10 +1,10 @@
-package feature.plus
+package com.moez.QKSMS.feature.plus
import android.arch.lifecycle.ViewModel
+import com.moez.QKSMS.injection.ViewModelKey
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
-import injection.ViewModelKey
@Module
class PlusActivityModule {
diff --git a/presentation/src/main/java/feature/plus/PlusState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusState.kt
similarity index 96%
rename from presentation/src/main/java/feature/plus/PlusState.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusState.kt
index 861c499b..fa08ab87 100644
--- a/presentation/src/main/java/feature/plus/PlusState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusState.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.plus
+package com.moez.QKSMS.feature.plus
data class PlusState(
val upgraded: Boolean = false,
diff --git a/presentation/src/main/java/feature/plus/PlusView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusView.kt
similarity index 88%
rename from presentation/src/main/java/feature/plus/PlusView.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusView.kt
index 7267ea5c..a1040328 100644
--- a/presentation/src/main/java/feature/plus/PlusView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusView.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.plus
+package com.moez.QKSMS.feature.plus
-import common.base.QkView
-import common.util.BillingManager
+import com.moez.QKSMS.common.base.QkView
+import com.moez.QKSMS.common.util.BillingManager
import io.reactivex.Observable
interface PlusView : QkView {
diff --git a/presentation/src/main/java/feature/plus/PlusViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt
similarity index 92%
rename from presentation/src/main/java/feature/plus/PlusViewModel.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt
index 75bb2f50..2069cf8a 100644
--- a/presentation/src/main/java/feature/plus/PlusViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt
@@ -16,16 +16,16 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.plus
+package com.moez.QKSMS.feature.plus
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkViewModel
+import com.moez.QKSMS.common.util.BillingManager
+import com.moez.QKSMS.manager.AnalyticsManager
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
-import common.Navigator
-import common.base.QkViewModel
-import common.util.BillingManager
import io.reactivex.Observable
import io.reactivex.rxkotlin.plusAssign
-import manager.AnalyticsManager
import javax.inject.Inject
class PlusViewModel @Inject constructor(
diff --git a/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt
similarity index 91%
rename from presentation/src/main/java/feature/qkreply/QkReplyActivity.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt
index 81cfa355..6f404ee9 100644
--- a/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.qkreply
+package com.moez.QKSMS.feature.qkreply
import android.arch.lifecycle.ViewModelProvider
import android.arch.lifecycle.ViewModelProviders
@@ -31,16 +31,16 @@ import android.view.WindowManager
import com.jakewharton.rxbinding2.view.clicks
import com.jakewharton.rxbinding2.widget.textChanges
import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkThemedActivity
+import com.moez.QKSMS.common.util.extensions.autoScrollToStart
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.feature.compose.MessagesAdapter
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
-import common.base.QkThemedActivity
-import common.util.extensions.autoScrollToStart
-import common.util.extensions.resolveThemeColor
-import common.util.extensions.setBackgroundTint
-import common.util.extensions.setTint
-import common.util.extensions.setVisible
import dagger.android.AndroidInjection
-import feature.compose.MessagesAdapter
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.qkreply_activity.*
diff --git a/presentation/src/main/java/feature/qkreply/QkReplyActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivityModule.kt
similarity index 85%
rename from presentation/src/main/java/feature/qkreply/QkReplyActivityModule.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivityModule.kt
index 24dbad95..6342b128 100644
--- a/presentation/src/main/java/feature/qkreply/QkReplyActivityModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivityModule.kt
@@ -1,10 +1,10 @@
-package feature.qkreply
+package com.moez.QKSMS.feature.qkreply
import android.arch.lifecycle.ViewModel
+import com.moez.QKSMS.injection.ViewModelKey
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
-import injection.ViewModelKey
import javax.inject.Named
@Module
diff --git a/presentation/src/main/java/feature/qkreply/QkReplyState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyState.kt
similarity index 86%
rename from presentation/src/main/java/feature/qkreply/QkReplyState.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyState.kt
index 78f10196..416bc386 100644
--- a/presentation/src/main/java/feature/qkreply/QkReplyState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyState.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.qkreply
+package com.moez.QKSMS.feature.qkreply
-import compat.SubscriptionInfoCompat
+import com.moez.QKSMS.compat.SubscriptionInfoCompat
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Message
import io.realm.RealmResults
-import model.Conversation
-import model.Message
data class QkReplyState(
val hasError: Boolean = false,
diff --git a/presentation/src/main/java/feature/qkreply/QkReplyView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyView.kt
similarity index 92%
rename from presentation/src/main/java/feature/qkreply/QkReplyView.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyView.kt
index 5a31fc74..19741d0f 100644
--- a/presentation/src/main/java/feature/qkreply/QkReplyView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyView.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.qkreply
+package com.moez.QKSMS.feature.qkreply
-import common.base.QkView
+import com.moez.QKSMS.common.base.QkView
import io.reactivex.Observable
interface QkReplyView : QkView {
diff --git a/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt
similarity index 94%
rename from presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt
index 405497c1..5fdd648d 100644
--- a/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt
@@ -16,17 +16,24 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.qkreply
+package com.moez.QKSMS.feature.qkreply
import android.telephony.SmsMessage
import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkViewModel
+import com.moez.QKSMS.compat.SubscriptionManagerCompat
+import com.moez.QKSMS.extensions.asObservable
+import com.moez.QKSMS.extensions.mapNotNull
+import com.moez.QKSMS.interactor.MarkRead
+import com.moez.QKSMS.interactor.SendMessage
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.Message
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.MessageRepository
+import com.moez.QKSMS.util.ActiveSubscriptionObservable
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
-import common.Navigator
-import common.base.QkViewModel
-import compat.SubscriptionManagerCompat
-import interactor.MarkRead
-import interactor.SendMessage
import io.reactivex.rxkotlin.Observables
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.rxkotlin.withLatestFrom
@@ -34,13 +41,6 @@ import io.reactivex.schedulers.Schedulers
import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.Subject
import io.realm.RealmResults
-import model.Conversation
-import model.Message
-import repository.ConversationRepository
-import repository.MessageRepository
-import util.ActiveSubscriptionObservable
-import util.extensions.asObservable
-import util.extensions.mapNotNull
import java.util.concurrent.TimeUnit
import javax.inject.Inject
import javax.inject.Named
diff --git a/presentation/src/main/java/feature/settings/SettingsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivity.kt
similarity index 94%
rename from presentation/src/main/java/feature/settings/SettingsActivity.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivity.kt
index 499a9341..54226c83 100644
--- a/presentation/src/main/java/feature/settings/SettingsActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivity.kt
@@ -16,9 +16,8 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.settings
+package com.moez.QKSMS.feature.settings
-import android.animation.LayoutTransition
import android.app.ProgressDialog
import android.app.TimePickerDialog
import android.arch.lifecycle.ViewModelProvider
@@ -29,22 +28,21 @@ import android.text.format.DateFormat
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.BuildConfig
import com.moez.QKSMS.R
-import com.uber.autodispose.AutoDispose.autoDisposable
+import com.moez.QKSMS.common.QkDialog
+import com.moez.QKSMS.common.base.QkThemedActivity
+import com.moez.QKSMS.common.util.extensions.animateLayoutChanges
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.common.widget.PreferenceView
+import com.moez.QKSMS.util.Preferences
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
-import common.QkDialog
-import common.base.QkThemedActivity
-import common.util.extensions.animateLayoutChanges
-import common.util.extensions.setBackgroundTint
-import common.util.extensions.setVisible
-import common.widget.PreferenceView
import dagger.android.AndroidInjection
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.settings_activity.*
import kotlinx.android.synthetic.main.settings_switch_widget.view.*
import kotlinx.android.synthetic.main.settings_theme_widget.*
-import util.Preferences
import javax.inject.Inject
class SettingsActivity : QkThemedActivity(), SettingsView {
diff --git a/presentation/src/main/java/feature/settings/SettingsActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivityModule.kt
similarity index 79%
rename from presentation/src/main/java/feature/settings/SettingsActivityModule.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivityModule.kt
index 025d164f..76e572ac 100644
--- a/presentation/src/main/java/feature/settings/SettingsActivityModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivityModule.kt
@@ -1,10 +1,10 @@
-package feature.settings
+package com.moez.QKSMS.feature.settings
import android.arch.lifecycle.ViewModel
+import com.moez.QKSMS.injection.ViewModelKey
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
-import injection.ViewModelKey
@Module
class SettingsActivityModule {
diff --git a/presentation/src/main/java/feature/settings/SettingsState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt
similarity index 95%
rename from presentation/src/main/java/feature/settings/SettingsState.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt
index d6ae51f8..59982dc4 100644
--- a/presentation/src/main/java/feature/settings/SettingsState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.settings
+package com.moez.QKSMS.feature.settings
-import util.Preferences
+import com.moez.QKSMS.util.Preferences
data class SettingsState(
val syncing: Boolean = false,
diff --git a/presentation/src/main/java/feature/settings/SettingsView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsView.kt
similarity index 91%
rename from presentation/src/main/java/feature/settings/SettingsView.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsView.kt
index 85747c00..6bb6f0f1 100644
--- a/presentation/src/main/java/feature/settings/SettingsView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsView.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.settings
+package com.moez.QKSMS.feature.settings
-import common.base.QkView
-import common.widget.PreferenceView
+import com.moez.QKSMS.common.base.QkView
+import com.moez.QKSMS.common.widget.PreferenceView
import io.reactivex.Observable
import io.reactivex.subjects.Subject
diff --git a/presentation/src/main/java/feature/settings/SettingsViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsViewModel.kt
similarity index 95%
rename from presentation/src/main/java/feature/settings/SettingsViewModel.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsViewModel.kt
index 64d05988..c6735b14 100644
--- a/presentation/src/main/java/feature/settings/SettingsViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsViewModel.kt
@@ -16,23 +16,23 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.settings
+package com.moez.QKSMS.feature.settings
import android.content.Context
import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkViewModel
+import com.moez.QKSMS.common.util.BillingManager
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.DateFormatter
+import com.moez.QKSMS.interactor.SyncMessages
+import com.moez.QKSMS.util.NightModeManager
+import com.moez.QKSMS.util.Preferences
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
-import common.Navigator
-import common.base.QkViewModel
-import common.util.BillingManager
-import common.util.Colors
-import common.util.DateFormatter
-import interactor.SyncMessages
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.rxkotlin.withLatestFrom
import timber.log.Timber
-import util.NightModeManager
-import util.Preferences
import java.util.*
import javax.inject.Inject
diff --git a/presentation/src/main/java/feature/settings/about/AboutActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutActivity.kt
similarity index 91%
rename from presentation/src/main/java/feature/settings/about/AboutActivity.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutActivity.kt
index 56259f87..14a222b1 100644
--- a/presentation/src/main/java/feature/settings/about/AboutActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutActivity.kt
@@ -1,4 +1,4 @@
-package feature.settings.about
+package com.moez.QKSMS.feature.settings.about
import android.arch.lifecycle.ViewModelProvider
import android.arch.lifecycle.ViewModelProviders
@@ -6,8 +6,8 @@ import android.os.Bundle
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.BuildConfig
import com.moez.QKSMS.R
-import common.base.QkThemedActivity
-import common.widget.PreferenceView
+import com.moez.QKSMS.common.base.QkThemedActivity
+import com.moez.QKSMS.common.widget.PreferenceView
import dagger.android.AndroidInjection
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
diff --git a/presentation/src/main/java/feature/settings/about/AboutActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutActivityModule.kt
similarity index 77%
rename from presentation/src/main/java/feature/settings/about/AboutActivityModule.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutActivityModule.kt
index 84e495ca..8b59bcc5 100644
--- a/presentation/src/main/java/feature/settings/about/AboutActivityModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutActivityModule.kt
@@ -1,10 +1,10 @@
-package feature.settings.about
+package com.moez.QKSMS.feature.settings.about
import android.arch.lifecycle.ViewModel
+import com.moez.QKSMS.injection.ViewModelKey
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
-import injection.ViewModelKey
@Module
class AboutActivityModule {
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutView.kt
new file mode 100644
index 00000000..104be07a
--- /dev/null
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutView.kt
@@ -0,0 +1,11 @@
+package com.moez.QKSMS.feature.settings.about
+
+import com.moez.QKSMS.common.base.QkView
+import com.moez.QKSMS.common.widget.PreferenceView
+import io.reactivex.subjects.Subject
+
+interface AboutView : QkView {
+
+ val preferenceClickIntent: Subject
+
+}
\ No newline at end of file
diff --git a/presentation/src/main/java/feature/settings/about/AboutViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutViewModel.kt
similarity index 87%
rename from presentation/src/main/java/feature/settings/about/AboutViewModel.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutViewModel.kt
index d532337c..97236bc7 100644
--- a/presentation/src/main/java/feature/settings/about/AboutViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutViewModel.kt
@@ -1,10 +1,10 @@
-package feature.settings.about
+package com.moez.QKSMS.feature.settings.about
import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkViewModel
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
-import common.Navigator
-import common.base.QkViewModel
import javax.inject.Inject
class AboutViewModel @Inject constructor(
diff --git a/presentation/src/main/java/feature/themepicker/HSVPickerView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/HSVPickerView.kt
similarity index 95%
rename from presentation/src/main/java/feature/themepicker/HSVPickerView.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/themepicker/HSVPickerView.kt
index cff247c9..ce791afb 100644
--- a/presentation/src/main/java/feature/themepicker/HSVPickerView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/HSVPickerView.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.themepicker
+package com.moez.QKSMS.feature.themepicker
import android.content.Context
import android.graphics.Color
@@ -26,9 +26,9 @@ import android.util.AttributeSet
import android.view.MotionEvent
import android.view.View
import com.moez.QKSMS.R
-import common.util.extensions.setBackgroundTint
-import common.util.extensions.setTint
-import common.util.extensions.within
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.common.util.extensions.within
import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.hsv_picker_view.view.*
diff --git a/presentation/src/main/java/feature/themepicker/ThemeAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemeAdapter.kt
similarity index 91%
rename from presentation/src/main/java/feature/themepicker/ThemeAdapter.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemeAdapter.kt
index 9cfeb245..3249884b 100644
--- a/presentation/src/main/java/feature/themepicker/ThemeAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemeAdapter.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.themepicker
+package com.moez.QKSMS.feature.themepicker
import android.content.Context
import android.content.res.Resources
@@ -26,13 +26,13 @@ import com.google.android.flexbox.FlexDirection
import com.google.android.flexbox.FlexWrap
import com.google.android.flexbox.FlexboxLayout
import com.moez.QKSMS.R
-import common.base.QkAdapter
-import common.base.QkViewHolder
-import common.util.Colors
-import common.util.extensions.dpToPx
-import common.util.extensions.setBackgroundTint
-import common.util.extensions.setTint
-import common.util.extensions.setVisible
+import com.moez.QKSMS.common.base.QkAdapter
+import com.moez.QKSMS.common.base.QkViewHolder
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.dpToPx
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setTint
+import com.moez.QKSMS.common.util.extensions.setVisible
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.theme_list_item.view.*
diff --git a/presentation/src/main/java/feature/themepicker/ThemePagerAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePagerAdapter.kt
similarity index 97%
rename from presentation/src/main/java/feature/themepicker/ThemePagerAdapter.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePagerAdapter.kt
index c692f535..ffd9ed3d 100644
--- a/presentation/src/main/java/feature/themepicker/ThemePagerAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePagerAdapter.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.themepicker
+package com.moez.QKSMS.feature.themepicker
import android.content.Context
import android.support.v4.view.PagerAdapter
diff --git a/presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerActivity.kt
similarity index 93%
rename from presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerActivity.kt
index 8de730ef..b8687150 100644
--- a/presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerActivity.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.themepicker
+package com.moez.QKSMS.feature.themepicker
import android.arch.lifecycle.ViewModelProvider
import android.arch.lifecycle.ViewModelProviders
@@ -25,9 +25,9 @@ import android.support.design.widget.Snackbar
import android.support.v7.widget.LinearLayoutManager
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
-import common.base.QkThemedActivity
-import common.util.extensions.setBackgroundTint
-import common.util.extensions.setVisible
+import com.moez.QKSMS.common.base.QkThemedActivity
+import com.moez.QKSMS.common.util.extensions.setBackgroundTint
+import com.moez.QKSMS.common.util.extensions.setVisible
import dagger.android.AndroidInjection
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
diff --git a/presentation/src/main/java/feature/themepicker/ThemePickerActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerActivityModule.kt
similarity index 85%
rename from presentation/src/main/java/feature/themepicker/ThemePickerActivityModule.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerActivityModule.kt
index 0243b404..109ac128 100644
--- a/presentation/src/main/java/feature/themepicker/ThemePickerActivityModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerActivityModule.kt
@@ -1,10 +1,10 @@
-package feature.themepicker
+package com.moez.QKSMS.feature.themepicker
import android.arch.lifecycle.ViewModel
+import com.moez.QKSMS.injection.ViewModelKey
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
-import injection.ViewModelKey
import javax.inject.Named
@Module
diff --git a/presentation/src/main/java/feature/themepicker/ThemePickerState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerState.kt
similarity index 95%
rename from presentation/src/main/java/feature/themepicker/ThemePickerState.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerState.kt
index 20ad0d31..7da63e0b 100644
--- a/presentation/src/main/java/feature/themepicker/ThemePickerState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerState.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.themepicker
+package com.moez.QKSMS.feature.themepicker
data class ThemePickerState(
val threadId: Long = 0,
diff --git a/presentation/src/main/java/feature/themepicker/ThemePickerView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerView.kt
similarity index 93%
rename from presentation/src/main/java/feature/themepicker/ThemePickerView.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerView.kt
index 3c08427f..6489f0c1 100644
--- a/presentation/src/main/java/feature/themepicker/ThemePickerView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerView.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.themepicker
+package com.moez.QKSMS.feature.themepicker
-import common.base.QkView
+import com.moez.QKSMS.common.base.QkView
import io.reactivex.Observable
import io.reactivex.subjects.Subject
diff --git a/presentation/src/main/java/feature/themepicker/ThemePickerViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerViewModel.kt
similarity index 93%
rename from presentation/src/main/java/feature/themepicker/ThemePickerViewModel.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerViewModel.kt
index 7e3a6283..a46eaefc 100644
--- a/presentation/src/main/java/feature/themepicker/ThemePickerViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerViewModel.kt
@@ -16,18 +16,18 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.themepicker
+package com.moez.QKSMS.feature.themepicker
import com.f2prateek.rx.preferences2.Preference
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkViewModel
+import com.moez.QKSMS.common.util.BillingManager
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.util.Preferences
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
-import common.Navigator
-import common.base.QkViewModel
-import common.util.BillingManager
-import common.util.Colors
import io.reactivex.rxkotlin.Observables
import io.reactivex.rxkotlin.withLatestFrom
-import util.Preferences
import javax.inject.Inject
import javax.inject.Named
diff --git a/presentation/src/main/java/feature/widget/WidgetAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt
similarity index 93%
rename from presentation/src/main/java/feature/widget/WidgetAdapter.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt
index f8716147..431de526 100644
--- a/presentation/src/main/java/feature/widget/WidgetAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package feature.widget
+package com.moez.QKSMS.feature.widget
import android.app.PendingIntent
import android.appwidget.AppWidgetManager
@@ -31,18 +31,18 @@ import android.view.View
import android.widget.RemoteViews
import android.widget.RemoteViewsService
import com.moez.QKSMS.R
-import common.util.Colors
-import common.util.DateFormatter
-import common.util.GlideApp
-import common.util.extensions.dpToPx
-import common.util.extensions.getColorCompat
-import feature.main.MainActivity
-import injection.appComponent
-import model.Contact
-import model.Conversation
-import model.PhoneNumber
-import repository.ConversationRepository
-import util.Preferences
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.DateFormatter
+import com.moez.QKSMS.common.util.GlideApp
+import com.moez.QKSMS.common.util.extensions.dpToPx
+import com.moez.QKSMS.common.util.extensions.getColorCompat
+import com.moez.QKSMS.feature.main.MainActivity
+import com.moez.QKSMS.injection.appComponent
+import com.moez.QKSMS.model.Contact
+import com.moez.QKSMS.model.Conversation
+import com.moez.QKSMS.model.PhoneNumber
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.util.Preferences
import javax.inject.Inject
class WidgetAdapter(intent: Intent) : RemoteViewsService.RemoteViewsFactory {
diff --git a/presentation/src/main/java/feature/widget/WidgetProvider.kt b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt
similarity index 94%
rename from presentation/src/main/java/feature/widget/WidgetProvider.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt
index d88478c6..2f6622ef 100644
--- a/presentation/src/main/java/feature/widget/WidgetProvider.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt
@@ -17,7 +17,7 @@
* along with QKSMS. If not, see .
*/
-package feature.widget
+package com.moez.QKSMS.feature.widget
import android.app.PendingIntent
import android.appwidget.AppWidgetManager
@@ -29,14 +29,14 @@ import android.net.Uri
import android.os.Bundle
import android.widget.RemoteViews
import com.moez.QKSMS.R
-import common.util.Colors
-import common.util.extensions.getColorCompat
+import com.moez.QKSMS.common.util.Colors
+import com.moez.QKSMS.common.util.extensions.getColorCompat
+import com.moez.QKSMS.feature.compose.ComposeActivity
+import com.moez.QKSMS.feature.main.MainActivity
+import com.moez.QKSMS.manager.WidgetManager
+import com.moez.QKSMS.util.Preferences
import dagger.android.AndroidInjection
-import feature.compose.ComposeActivity
-import feature.main.MainActivity
-import manager.WidgetManager
import timber.log.Timber
-import util.Preferences
import javax.inject.Inject
class WidgetProvider : AppWidgetProvider() {
diff --git a/presentation/src/main/java/feature/widget/WidgetService.kt b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetService.kt
similarity index 96%
rename from presentation/src/main/java/feature/widget/WidgetService.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetService.kt
index 63a53e92..17d99ebf 100644
--- a/presentation/src/main/java/feature/widget/WidgetService.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetService.kt
@@ -17,7 +17,7 @@
* along with QKSMS. If not, see .
*/
-package feature.widget
+package com.moez.QKSMS.feature.widget
import android.content.Intent
import android.widget.RemoteViewsService
diff --git a/presentation/src/main/java/injection/ActivityBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/ActivityBuilderModule.kt
similarity index 57%
rename from presentation/src/main/java/injection/ActivityBuilderModule.kt
rename to presentation/src/main/java/com/moez/QKSMS/injection/ActivityBuilderModule.kt
index 52f3f57f..9747a7af 100644
--- a/presentation/src/main/java/injection/ActivityBuilderModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/ActivityBuilderModule.kt
@@ -1,29 +1,29 @@
-package injection
+package com.moez.QKSMS.injection
+import com.moez.QKSMS.feature.blocked.BlockedActivity
+import com.moez.QKSMS.feature.blocked.BlockedActivityModule
+import com.moez.QKSMS.feature.compose.ComposeActivity
+import com.moez.QKSMS.feature.compose.ComposeActivityModule
+import com.moez.QKSMS.feature.conversationinfo.ConversationInfoActivity
+import com.moez.QKSMS.feature.conversationinfo.ConversationInfoActivityModule
+import com.moez.QKSMS.feature.gallery.GalleryActivity
+import com.moez.QKSMS.feature.gallery.GalleryActivityModule
+import com.moez.QKSMS.feature.main.MainActivity
+import com.moez.QKSMS.feature.main.MainActivityModule
+import com.moez.QKSMS.feature.notificationprefs.NotificationPrefsActivity
+import com.moez.QKSMS.feature.notificationprefs.NotificationPrefsActivityModule
+import com.moez.QKSMS.feature.plus.PlusActivity
+import com.moez.QKSMS.feature.plus.PlusActivityModule
+import com.moez.QKSMS.feature.qkreply.QkReplyActivity
+import com.moez.QKSMS.feature.qkreply.QkReplyActivityModule
+import com.moez.QKSMS.feature.settings.SettingsActivity
+import com.moez.QKSMS.feature.settings.SettingsActivityModule
+import com.moez.QKSMS.feature.settings.about.AboutActivity
+import com.moez.QKSMS.feature.settings.about.AboutActivityModule
+import com.moez.QKSMS.feature.themepicker.ThemePickerActivity
+import com.moez.QKSMS.feature.themepicker.ThemePickerActivityModule
import dagger.Module
import dagger.android.ContributesAndroidInjector
-import feature.blocked.BlockedActivity
-import feature.blocked.BlockedActivityModule
-import feature.compose.ComposeActivity
-import feature.compose.ComposeActivityModule
-import feature.conversationinfo.ConversationInfoActivity
-import feature.conversationinfo.ConversationInfoActivityModule
-import feature.gallery.GalleryActivity
-import feature.gallery.GalleryActivityModule
-import feature.main.MainActivity
-import feature.main.MainActivityModule
-import feature.notificationprefs.NotificationPrefsActivity
-import feature.notificationprefs.NotificationPrefsActivityModule
-import feature.plus.PlusActivity
-import feature.plus.PlusActivityModule
-import feature.qkreply.QkReplyActivity
-import feature.qkreply.QkReplyActivityModule
-import feature.settings.SettingsActivity
-import feature.settings.SettingsActivityModule
-import feature.settings.about.AboutActivity
-import feature.settings.about.AboutActivityModule
-import feature.themepicker.ThemePickerActivity
-import feature.themepicker.ThemePickerActivityModule
@Module
abstract class ActivityBuilderModule {
diff --git a/presentation/src/main/java/injection/ActivityScope.kt b/presentation/src/main/java/com/moez/QKSMS/injection/ActivityScope.kt
similarity index 66%
rename from presentation/src/main/java/injection/ActivityScope.kt
rename to presentation/src/main/java/com/moez/QKSMS/injection/ActivityScope.kt
index cff1c951..fce998c5 100644
--- a/presentation/src/main/java/injection/ActivityScope.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/ActivityScope.kt
@@ -1,4 +1,4 @@
-package injection
+package com.moez.QKSMS.injection
import javax.inject.Scope
diff --git a/presentation/src/main/java/injection/AppComponent.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt
similarity index 72%
rename from presentation/src/main/java/injection/AppComponent.kt
rename to presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt
index 3f8eefcd..cb0859fe 100644
--- a/presentation/src/main/java/injection/AppComponent.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt
@@ -16,21 +16,21 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package injection
+package com.moez.QKSMS.injection
-import common.QKApplication
-import common.QkDialog
-import common.util.ContactImageLoader
-import common.widget.AvatarView
-import common.widget.PagerTitleView
-import common.widget.PreferenceView
-import common.widget.QkEditText
-import common.widget.QkSwitch
-import common.widget.QkTextView
+import com.moez.QKSMS.common.QKApplication
+import com.moez.QKSMS.common.QkDialog
+import com.moez.QKSMS.common.util.ContactImageLoader
+import com.moez.QKSMS.common.widget.AvatarView
+import com.moez.QKSMS.common.widget.PagerTitleView
+import com.moez.QKSMS.common.widget.PreferenceView
+import com.moez.QKSMS.common.widget.QkEditText
+import com.moez.QKSMS.common.widget.QkSwitch
+import com.moez.QKSMS.common.widget.QkTextView
+import com.moez.QKSMS.feature.compose.DetailedChipView
+import com.moez.QKSMS.feature.widget.WidgetAdapter
import dagger.Component
import dagger.android.support.AndroidSupportInjectionModule
-import feature.compose.DetailedChipView
-import feature.widget.WidgetAdapter
import javax.inject.Singleton
@Singleton
diff --git a/presentation/src/main/java/injection/AppComponentManager.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponentManager.kt
similarity index 93%
rename from presentation/src/main/java/injection/AppComponentManager.kt
rename to presentation/src/main/java/com/moez/QKSMS/injection/AppComponentManager.kt
index 67a0e841..72608154 100644
--- a/presentation/src/main/java/injection/AppComponentManager.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponentManager.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package injection
+package com.moez.QKSMS.injection
-import common.QKApplication
+import com.moez.QKSMS.common.QKApplication
internal lateinit var appComponent: AppComponent
private set
diff --git a/presentation/src/main/java/injection/AppModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt
similarity index 66%
rename from presentation/src/main/java/injection/AppModule.kt
rename to presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt
index 48544474..904b8014 100644
--- a/presentation/src/main/java/injection/AppModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package injection
+package com.moez.QKSMS.injection
import android.app.Application
import android.arch.lifecycle.ViewModelProvider
@@ -24,43 +24,43 @@ import android.content.ContentResolver
import android.content.Context
import android.preference.PreferenceManager
import com.f2prateek.rx.preferences2.RxSharedPreferences
-import common.ViewModelFactory
-import common.util.AnalyticsManagerImpl
-import common.util.NotificationManagerImpl
+import com.moez.QKSMS.common.ViewModelFactory
+import com.moez.QKSMS.common.util.AnalyticsManagerImpl
+import com.moez.QKSMS.common.util.NotificationManagerImpl
+import com.moez.QKSMS.manager.AnalyticsManager
+import com.moez.QKSMS.manager.ExternalBlockingManager
+import com.moez.QKSMS.manager.ExternalBlockingManagerImpl
+import com.moez.QKSMS.manager.KeyManager
+import com.moez.QKSMS.manager.KeyManagerImpl
+import com.moez.QKSMS.manager.NotificationManager
+import com.moez.QKSMS.manager.PermissionManager
+import com.moez.QKSMS.manager.PermissionManagerImpl
+import com.moez.QKSMS.manager.RatingManager
+import com.moez.QKSMS.manager.WidgetManager
+import com.moez.QKSMS.manager.WidgetManagerImpl
+import com.moez.QKSMS.mapper.CursorToContact
+import com.moez.QKSMS.mapper.CursorToContactImpl
+import com.moez.QKSMS.mapper.CursorToConversation
+import com.moez.QKSMS.mapper.CursorToConversationImpl
+import com.moez.QKSMS.mapper.CursorToMessage
+import com.moez.QKSMS.mapper.CursorToMessageImpl
+import com.moez.QKSMS.mapper.CursorToPart
+import com.moez.QKSMS.mapper.CursorToPartImpl
+import com.moez.QKSMS.mapper.CursorToRecipient
+import com.moez.QKSMS.mapper.CursorToRecipientImpl
+import com.moez.QKSMS.mapper.RatingManagerImpl
+import com.moez.QKSMS.repository.ContactRepository
+import com.moez.QKSMS.repository.ContactRepositoryImpl
+import com.moez.QKSMS.repository.ConversationRepository
+import com.moez.QKSMS.repository.ConversationRepositoryImpl
+import com.moez.QKSMS.repository.ImageRepository
+import com.moez.QKSMS.repository.ImageRepostoryImpl
+import com.moez.QKSMS.repository.MessageRepository
+import com.moez.QKSMS.repository.MessageRepositoryImpl
+import com.moez.QKSMS.repository.SyncRepository
+import com.moez.QKSMS.repository.SyncRepositoryImpl
import dagger.Module
import dagger.Provides
-import manager.AnalyticsManager
-import manager.ExternalBlockingManager
-import manager.ExternalBlockingManagerImpl
-import manager.KeyManager
-import manager.KeyManagerImpl
-import manager.NotificationManager
-import manager.PermissionManager
-import manager.PermissionManagerImpl
-import manager.RatingManager
-import manager.WidgetManager
-import manager.WidgetManagerImpl
-import mapper.CursorToContact
-import mapper.CursorToContactImpl
-import mapper.CursorToConversation
-import mapper.CursorToConversationImpl
-import mapper.CursorToMessage
-import mapper.CursorToMessageImpl
-import mapper.CursorToPart
-import mapper.CursorToPartImpl
-import mapper.CursorToRecipient
-import mapper.CursorToRecipientImpl
-import mapper.RatingManagerImpl
-import repository.ContactRepository
-import repository.ContactRepositoryImpl
-import repository.ConversationRepository
-import repository.ConversationRepositoryImpl
-import repository.ImageRepository
-import repository.ImageRepostoryImpl
-import repository.MessageRepository
-import repository.MessageRepositoryImpl
-import repository.SyncRepository
-import repository.SyncRepositoryImpl
import javax.inject.Singleton
@Module
diff --git a/presentation/src/main/java/injection/BroadcastReceiverBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/BroadcastReceiverBuilderModule.kt
similarity index 76%
rename from presentation/src/main/java/injection/BroadcastReceiverBuilderModule.kt
rename to presentation/src/main/java/com/moez/QKSMS/injection/BroadcastReceiverBuilderModule.kt
index e173bce2..e42e4e09 100644
--- a/presentation/src/main/java/injection/BroadcastReceiverBuilderModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/BroadcastReceiverBuilderModule.kt
@@ -16,25 +16,25 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package injection
+package com.moez.QKSMS.injection
+import com.moez.QKSMS.feature.widget.WidgetProvider
+import com.moez.QKSMS.receiver.DefaultSmsChangedReceiver
+import com.moez.QKSMS.receiver.MarkReadReceiver
+import com.moez.QKSMS.receiver.MarkSeenReceiver
+import com.moez.QKSMS.receiver.MmsReceivedReceiver
+import com.moez.QKSMS.receiver.MmsReceiver
+import com.moez.QKSMS.receiver.MmsSentReceiver
+import com.moez.QKSMS.receiver.MmsUpdatedReceiver
+import com.moez.QKSMS.receiver.NightModeReceiver
+import com.moez.QKSMS.receiver.RemoteMessagingReceiver
+import com.moez.QKSMS.receiver.SendSmsReceiver
+import com.moez.QKSMS.receiver.SmsDeliveredReceiver
+import com.moez.QKSMS.receiver.SmsProviderChangedReceiver
+import com.moez.QKSMS.receiver.SmsReceiver
+import com.moez.QKSMS.receiver.SmsSentReceiver
import dagger.Module
import dagger.android.ContributesAndroidInjector
-import feature.widget.WidgetProvider
-import receiver.DefaultSmsChangedReceiver
-import receiver.MarkReadReceiver
-import receiver.MarkSeenReceiver
-import receiver.MmsReceivedReceiver
-import receiver.MmsReceiver
-import receiver.MmsSentReceiver
-import receiver.MmsUpdatedReceiver
-import receiver.NightModeReceiver
-import receiver.RemoteMessagingReceiver
-import receiver.SendSmsReceiver
-import receiver.SmsDeliveredReceiver
-import receiver.SmsProviderChangedReceiver
-import receiver.SmsReceiver
-import receiver.SmsSentReceiver
@Module
abstract class BroadcastReceiverBuilderModule {
diff --git a/presentation/src/main/java/injection/ServiceBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/ServiceBuilderModule.kt
similarity index 91%
rename from presentation/src/main/java/injection/ServiceBuilderModule.kt
rename to presentation/src/main/java/com/moez/QKSMS/injection/ServiceBuilderModule.kt
index 208b1772..0fbc0e2c 100644
--- a/presentation/src/main/java/injection/ServiceBuilderModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/ServiceBuilderModule.kt
@@ -16,11 +16,11 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package injection
+package com.moez.QKSMS.injection
+import com.moez.QKSMS.service.HeadlessSmsSendService
import dagger.Module
import dagger.android.ContributesAndroidInjector
-import service.HeadlessSmsSendService
@Module
abstract class ServiceBuilderModule {
diff --git a/presentation/src/main/java/injection/ViewModelKey.kt b/presentation/src/main/java/com/moez/QKSMS/injection/ViewModelKey.kt
similarity index 90%
rename from presentation/src/main/java/injection/ViewModelKey.kt
rename to presentation/src/main/java/com/moez/QKSMS/injection/ViewModelKey.kt
index 01ea5c12..7b575c18 100644
--- a/presentation/src/main/java/injection/ViewModelKey.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/ViewModelKey.kt
@@ -1,4 +1,4 @@
-package injection
+package com.moez.QKSMS.injection
import android.arch.lifecycle.ViewModel
import dagger.MapKey
diff --git a/presentation/src/main/java/interactor/MigratePreferences.kt b/presentation/src/main/java/com/moez/QKSMS/interactor/MigratePreferences.kt
similarity index 96%
rename from presentation/src/main/java/interactor/MigratePreferences.kt
rename to presentation/src/main/java/com/moez/QKSMS/interactor/MigratePreferences.kt
index ba91bfcc..45207ae4 100644
--- a/presentation/src/main/java/interactor/MigratePreferences.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/interactor/MigratePreferences.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package interactor
+package com.moez.QKSMS.interactor
import com.f2prateek.rx.preferences2.RxSharedPreferences
+import com.moez.QKSMS.util.NightModeManager
+import com.moez.QKSMS.util.Preferences
import io.reactivex.Flowable
-import util.NightModeManager
-import util.Preferences
import javax.inject.Inject
/**
diff --git a/presentation/src/main/java/feature/settings/about/AboutView.kt b/presentation/src/main/java/feature/settings/about/AboutView.kt
deleted file mode 100644
index f567c810..00000000
--- a/presentation/src/main/java/feature/settings/about/AboutView.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package feature.settings.about
-
-import common.base.QkView
-import common.widget.PreferenceView
-import io.reactivex.subjects.Subject
-
-interface AboutView : QkView {
-
- val preferenceClickIntent: Subject
-
-}
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/about_activity.xml b/presentation/src/main/res/layout/about_activity.xml
index f33e6224..2696bea5 100644
--- a/presentation/src/main/res/layout/about_activity.xml
+++ b/presentation/src/main/res/layout/about_activity.xml
@@ -28,7 +28,7 @@
style="@style/Toolbar"
app:layout_constraintTop_toTopOf="parent">
-
@@ -50,49 +50,49 @@
android:paddingBottom="8dp"
android:paddingTop="8dp">
-
-
-
-
-
-
-
+ tools:parentTag="com.moez.QKSMS.common.widget.AvatarView">
-
-
-
-
- .
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -52,7 +52,7 @@
android:src="@drawable/ic_archive_black_24dp"
tools:tint="?android:attr/textColorSecondary" />
-
@@ -69,7 +69,7 @@
android:src="@drawable/ic_event_black_24dp"
tools:tint="?android:attr/textColorSecondary" />
-
@@ -81,7 +81,7 @@
android:layout_marginTop="8dp"
android:background="?android:attr/divider" />
-
-
@@ -114,7 +114,7 @@
android:src="@drawable/ic_star_black_24dp"
tools:tint="?android:attr/textColorSecondary" />
-
@@ -130,7 +130,7 @@
android:src="@drawable/ic_help_black_24dp"
tools:tint="?android:attr/textColorSecondary" />
-
@@ -160,7 +160,7 @@
app:layout_constraintTop_toTopOf="@id/rateTitle"
tools:tint="@color/tools_theme" />
-
-
-
-
+ tools:context="com.moez.QKSMS.feature.gallery.GalleryActivity">
-
+ tools:parentTag="com.moez.QKSMS.common.widget.GroupAvatarView">
-
-
-
+ tools:parentTag="com.moez.QKSMS.feature.themepicker.HSVPickerView">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -49,7 +49,7 @@
android:paddingBottom="8dp"
android:paddingTop="8dp">
-
-
-
-
-
-
-
-
+ tools:parentTag="com.moez.QKSMS.common.widget.PreferenceView">
-
-
+ tools:context="com.moez.QKSMS.feature.qkreply.QkReplyActivity">
-
-
-
-
diff --git a/presentation/src/main/res/layout/qksms_plus_activity.xml b/presentation/src/main/res/layout/qksms_plus_activity.xml
index 835a048a..b4becc78 100644
--- a/presentation/src/main/res/layout/qksms_plus_activity.xml
+++ b/presentation/src/main/res/layout/qksms_plus_activity.xml
@@ -65,7 +65,7 @@
android:layout_marginStart="32dp"
android:orientation="vertical">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -54,11 +54,11 @@
android:paddingBottom="8dp"
android:paddingTop="8dp">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- .
-->
-.
-->
-
-
-
-
-
-
-
-
diff --git a/presentation/src/noAnalytics/java/common/util/AnalyticsManagerImpl.kt b/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/AnalyticsManagerImpl.kt
similarity index 96%
rename from presentation/src/noAnalytics/java/common/util/AnalyticsManagerImpl.kt
rename to presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/AnalyticsManagerImpl.kt
index ad13b73c..ee486505 100644
--- a/presentation/src/noAnalytics/java/common/util/AnalyticsManagerImpl.kt
+++ b/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/AnalyticsManagerImpl.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util
+package com.moez.QKSMS.common.util
import manager.AnalyticsManager
import javax.inject.Inject
diff --git a/presentation/src/withAnalytics/java/common/util/AnalyticsManagerImpl.kt b/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/AnalyticsManagerImpl.kt
similarity index 97%
rename from presentation/src/withAnalytics/java/common/util/AnalyticsManagerImpl.kt
rename to presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/AnalyticsManagerImpl.kt
index bf647155..3ef45cbd 100644
--- a/presentation/src/withAnalytics/java/common/util/AnalyticsManagerImpl.kt
+++ b/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/AnalyticsManagerImpl.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package common.util
+package com.moez.QKSMS.common.util
import android.content.Context
import com.amplitude.api.Amplitude
@@ -24,7 +24,7 @@ import com.amplitude.api.AmplitudeClient
import com.amplitude.api.Identify
import com.mixpanel.android.mpmetrics.MixpanelAPI
import com.moez.QKSMS.BuildConfig
-import manager.AnalyticsManager
+import com.moez.QKSMS.manager.AnalyticsManager
import org.json.JSONArray
import org.json.JSONObject
import timber.log.Timber