diff --git a/qksms/src/androidTest/java/com/moez/QKSMS/MessageStoreTest.kt b/qksms/src/androidTest/java/MessageStoreTest.kt
similarity index 97%
rename from qksms/src/androidTest/java/com/moez/QKSMS/MessageStoreTest.kt
rename to qksms/src/androidTest/java/MessageStoreTest.kt
index 9a3ec3a0..fd91a218 100644
--- a/qksms/src/androidTest/java/com/moez/QKSMS/MessageStoreTest.kt
+++ b/qksms/src/androidTest/java/MessageStoreTest.kt
@@ -16,7 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS
import android.support.test.filters.MediumTest
import android.support.test.runner.AndroidJUnit4
diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml
index 458bb925..a7fb5ec4 100644
--- a/qksms/src/main/AndroidManifest.xml
+++ b/qksms/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
@@ -45,39 +45,39 @@
-
-
+ android:name="presentation.compose.ComposeActivity"
+ android:parentActivityName="presentation.main.MainActivity" />
+
+
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/QKApplication.kt b/qksms/src/main/java/common/QKApplication.kt
similarity index 90%
rename from qksms/src/main/java/com/moez/QKSMS/common/QKApplication.kt
rename to qksms/src/main/java/common/QKApplication.kt
index 638e5f33..59c91e6d 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/QKApplication.kt
+++ b/qksms/src/main/java/common/QKApplication.kt
@@ -16,14 +16,14 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.common
+package common
import android.app.Application
import com.bugsnag.android.Bugsnag
import com.moez.QKSMS.BuildConfig
-import com.moez.QKSMS.common.di.AppComponentManager
-import com.moez.QKSMS.common.di.appComponent
-import com.moez.QKSMS.common.util.Analytics
+import common.di.AppComponentManager
+import common.di.appComponent
+import common.util.Analytics
import io.realm.Realm
import io.realm.RealmConfiguration
import timber.log.Timber
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt b/qksms/src/main/java/common/di/AppComponent.kt
similarity index 71%
rename from qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt
rename to qksms/src/main/java/common/di/AppComponent.kt
index 3191195a..17cc17c3 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt
+++ b/qksms/src/main/java/common/di/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 com.moez.QKSMS.common.di
+package common.di
-import com.moez.QKSMS.common.QKApplication
-import com.moez.QKSMS.common.util.ContactImageLoader
-import com.moez.QKSMS.presentation.common.widget.*
-import com.moez.QKSMS.presentation.compose.ComposeActivity
-import com.moez.QKSMS.presentation.compose.ComposeViewModel
-import com.moez.QKSMS.presentation.compose.DetailedChipView
-import com.moez.QKSMS.presentation.main.MainActivity
-import com.moez.QKSMS.presentation.main.MainViewModel
-import com.moez.QKSMS.presentation.settings.SettingsActivity
-import com.moez.QKSMS.presentation.settings.SettingsViewModel
-import com.moez.QKSMS.presentation.setup.SetupActivity
-import com.moez.QKSMS.presentation.setup.SetupViewModel
-import com.moez.QKSMS.receiver.*
+import common.QKApplication
+import common.util.ContactImageLoader
+import presentation.common.widget.*
+import presentation.compose.ComposeActivity
+import presentation.compose.ComposeViewModel
+import presentation.compose.DetailedChipView
+import presentation.main.MainActivity
+import presentation.main.MainViewModel
+import presentation.settings.SettingsActivity
+import presentation.settings.SettingsViewModel
+import presentation.setup.SetupActivity
+import presentation.setup.SetupViewModel
+import receiver.*
import dagger.Component
import javax.inject.Singleton
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponentManager.kt b/qksms/src/main/java/common/di/AppComponentManager.kt
similarity index 93%
rename from qksms/src/main/java/com/moez/QKSMS/common/di/AppComponentManager.kt
rename to qksms/src/main/java/common/di/AppComponentManager.kt
index be57e1a3..66463fa2 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponentManager.kt
+++ b/qksms/src/main/java/common/di/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 com.moez.QKSMS.common.di
+package common.di
-import com.moez.QKSMS.common.QKApplication
+import common.QKApplication
internal lateinit var appComponent: AppComponent
private set
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt b/qksms/src/main/java/common/di/AppModule.kt
similarity index 97%
rename from qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt
rename to qksms/src/main/java/common/di/AppModule.kt
index d48a5eb0..2dd33fe8 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt
+++ b/qksms/src/main/java/common/di/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 com.moez.QKSMS.common.di
+package common.di
import android.app.Application
import android.content.Context
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/Analytics.kt b/qksms/src/main/java/common/util/Analytics.kt
similarity index 97%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/Analytics.kt
rename to qksms/src/main/java/common/util/Analytics.kt
index d5707336..d3344323 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/Analytics.kt
+++ b/qksms/src/main/java/common/util/Analytics.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.common.util
+package common.util
import android.content.Context
import com.amplitude.api.Amplitude
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/ClipboardUtils.kt b/qksms/src/main/java/common/util/ClipboardUtils.kt
similarity index 96%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/ClipboardUtils.kt
rename to qksms/src/main/java/common/util/ClipboardUtils.kt
index 53eb0996..1be16fe3 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/ClipboardUtils.kt
+++ b/qksms/src/main/java/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 com.moez.QKSMS.common.util
+package common.util
import android.content.ClipData
import android.content.ClipboardManager
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt b/qksms/src/main/java/common/util/Colors.kt
similarity index 99%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt
rename to qksms/src/main/java/common/util/Colors.kt
index 25f4de85..56158ef2 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/Colors.kt
+++ b/qksms/src/main/java/common/util/Colors.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.common.util
+package common.util
import android.annotation.SuppressLint
import android.content.Context
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/ContactImageLoader.kt b/qksms/src/main/java/common/util/ContactImageLoader.kt
similarity index 96%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/ContactImageLoader.kt
rename to qksms/src/main/java/common/util/ContactImageLoader.kt
index 503693eb..361c48a2 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/ContactImageLoader.kt
+++ b/qksms/src/main/java/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 com.moez.QKSMS.common.util
+package common.util
import android.content.Context
import android.provider.ContactsContract
@@ -29,8 +29,8 @@ 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 com.moez.QKSMS.common.di.appComponent
-import com.moez.QKSMS.data.repository.ContactRepository
+import common.di.appComponent
+import data.repository.ContactRepository
import io.reactivex.disposables.Disposable
import io.reactivex.schedulers.Schedulers
import java.io.InputStream
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt b/qksms/src/main/java/common/util/DateFormatter.kt
similarity index 91%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt
rename to qksms/src/main/java/common/util/DateFormatter.kt
index 2c5e55a7..11b041b3 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt
+++ b/qksms/src/main/java/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 com.moez.QKSMS.common.util
+package common.util
import android.content.Context
import android.text.format.DateFormat
-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 common.util.extensions.isSameDay
+import common.util.extensions.isSameWeek
+import common.util.extensions.isSameYear
import java.text.SimpleDateFormat
import java.util.*
import javax.inject.Inject
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/GlideAppModule.kt b/qksms/src/main/java/common/util/GlideAppModule.kt
similarity index 97%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/GlideAppModule.kt
rename to qksms/src/main/java/common/util/GlideAppModule.kt
index 1336c0da..426fc36d 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/GlideAppModule.kt
+++ b/qksms/src/main/java/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 com.moez.QKSMS.common.util
+package common.util
import android.content.Context
import android.util.Log
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/Keys.kt b/qksms/src/main/java/common/util/Keys.kt
similarity index 94%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/Keys.kt
rename to qksms/src/main/java/common/util/Keys.kt
index 9c1ba7bb..eea2bbd9 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/Keys.kt
+++ b/qksms/src/main/java/common/util/Keys.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.common.util
+package common.util
-import com.moez.QKSMS.data.model.Message
+import data.model.Message
import io.realm.Realm
import javax.inject.Inject
import javax.inject.Singleton
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/LiveRealmData.kt b/qksms/src/main/java/common/util/LiveRealmData.kt
similarity index 97%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/LiveRealmData.kt
rename to qksms/src/main/java/common/util/LiveRealmData.kt
index 5a7cf488..c76777f8 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/LiveRealmData.kt
+++ b/qksms/src/main/java/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 com.moez.QKSMS.common.util
+package common.util
import android.arch.lifecycle.LiveData
import io.realm.RealmChangeListener
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/MessageUtils.kt b/qksms/src/main/java/common/util/MessageUtils.kt
similarity index 97%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/MessageUtils.kt
rename to qksms/src/main/java/common/util/MessageUtils.kt
index 0ca2758b..92397eb1 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/MessageUtils.kt
+++ b/qksms/src/main/java/common/util/MessageUtils.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.common.util
+package common.util
import android.text.TextUtils
import android.util.Patterns
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt b/qksms/src/main/java/common/util/NotificationManager.kt
similarity index 94%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt
rename to qksms/src/main/java/common/util/NotificationManager.kt
index 59960ef1..eb3fc384 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/NotificationManager.kt
+++ b/qksms/src/main/java/common/util/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 com.moez.QKSMS.common.util
+package common.util
import android.annotation.SuppressLint
import android.app.NotificationChannel
@@ -31,12 +31,12 @@ import android.support.v4.app.NotificationManagerCompat
import android.support.v4.app.RemoteInput
import android.support.v4.app.TaskStackBuilder
import com.moez.QKSMS.R
-import com.moez.QKSMS.data.repository.MessageRepository
-import com.moez.QKSMS.domain.interactor.MarkUnarchived
-import com.moez.QKSMS.presentation.compose.ComposeActivity
-import com.moez.QKSMS.receiver.MarkReadReceiver
-import com.moez.QKSMS.receiver.MarkSeenReceiver
-import com.moez.QKSMS.receiver.RemoteMessagingReceiver
+import data.repository.MessageRepository
+import interactor.MarkUnarchived
+import presentation.compose.ComposeActivity
+import receiver.MarkReadReceiver
+import receiver.MarkSeenReceiver
+import receiver.RemoteMessagingReceiver
import javax.inject.Inject
import javax.inject.Singleton
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/Optional.kt b/qksms/src/main/java/common/util/Optional.kt
similarity index 95%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/Optional.kt
rename to qksms/src/main/java/common/util/Optional.kt
index c177ec26..98150640 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/Optional.kt
+++ b/qksms/src/main/java/common/util/Optional.kt
@@ -17,7 +17,7 @@
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.common.util
+package common.util
data class Optional(val value: T?) {
fun notNull() = value != null
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/Permissions.kt b/qksms/src/main/java/common/util/Permissions.kt
similarity index 97%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/Permissions.kt
rename to qksms/src/main/java/common/util/Permissions.kt
index f144d776..4dc0cb87 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/Permissions.kt
+++ b/qksms/src/main/java/common/util/Permissions.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.common.util
+package common.util
import android.Manifest
import android.content.Context
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/Preferences.kt b/qksms/src/main/java/common/util/Preferences.kt
similarity index 97%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/Preferences.kt
rename to qksms/src/main/java/common/util/Preferences.kt
index 285cef53..c9c4f1e8 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/Preferences.kt
+++ b/qksms/src/main/java/common/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 com.moez.QKSMS.common.util
+package common.util
import android.provider.Settings
import com.f2prateek.rx.preferences2.RxSharedPreferences
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/SyncManager.kt b/qksms/src/main/java/common/util/SyncManager.kt
similarity index 87%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/SyncManager.kt
rename to qksms/src/main/java/common/util/SyncManager.kt
index ef785319..43b58a6b 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/SyncManager.kt
+++ b/qksms/src/main/java/common/util/SyncManager.kt
@@ -16,18 +16,18 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.common.util
+package common.util
import android.content.Context
-import com.moez.QKSMS.common.util.extensions.map
-import com.moez.QKSMS.common.util.extensions.mapWhile
-import com.moez.QKSMS.data.mapper.CursorToConversation
-import com.moez.QKSMS.data.mapper.CursorToMessage
-import com.moez.QKSMS.data.mapper.CursorToRecipient
-import com.moez.QKSMS.data.model.Conversation
-import com.moez.QKSMS.data.model.Message
-import com.moez.QKSMS.data.model.Recipient
-import com.moez.QKSMS.data.model.SyncLog
+import common.util.extensions.map
+import common.util.extensions.mapWhile
+import data.mapper.CursorToConversation
+import data.mapper.CursorToMessage
+import data.mapper.CursorToRecipient
+import data.model.Conversation
+import data.model.Message
+import data.model.Recipient
+import data.model.SyncLog
import io.realm.Realm
import javax.inject.Inject
import javax.inject.Singleton
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt b/qksms/src/main/java/common/util/extensions/CalendarExtensions.kt
similarity index 96%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt
rename to qksms/src/main/java/common/util/extensions/CalendarExtensions.kt
index 6228b47e..0c2446dd 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt
+++ b/qksms/src/main/java/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 com.moez.QKSMS.common.util.extensions
+package common.util.extensions
import java.util.*
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt b/qksms/src/main/java/common/util/extensions/ContextExtensions.kt
similarity index 96%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt
rename to qksms/src/main/java/common/util/extensions/ContextExtensions.kt
index 6f600d95..b0aaa29a 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt
+++ b/qksms/src/main/java/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 com.moez.QKSMS.common.util.extensions
+package common.util.extensions
import android.content.Context
import android.support.annotation.StringRes
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/extensions/CursorExtensions.kt b/qksms/src/main/java/common/util/extensions/CursorExtensions.kt
similarity index 98%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/extensions/CursorExtensions.kt
rename to qksms/src/main/java/common/util/extensions/CursorExtensions.kt
index 32eb7de6..58e9f5b9 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/extensions/CursorExtensions.kt
+++ b/qksms/src/main/java/common/util/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 com.moez.QKSMS.common.util.extensions
+package common.util.extensions
import android.database.Cursor
import io.reactivex.Flowable
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/extensions/NumberExtensions.kt b/qksms/src/main/java/common/util/extensions/NumberExtensions.kt
similarity index 96%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/extensions/NumberExtensions.kt
rename to qksms/src/main/java/common/util/extensions/NumberExtensions.kt
index 0b305519..ffbd4816 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/extensions/NumberExtensions.kt
+++ b/qksms/src/main/java/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 com.moez.QKSMS.common.util.extensions
+package common.util.extensions
import android.content.Context
import android.graphics.Color
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/extensions/RealmExtensions.kt b/qksms/src/main/java/common/util/extensions/RealmExtensions.kt
similarity index 96%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/extensions/RealmExtensions.kt
rename to qksms/src/main/java/common/util/extensions/RealmExtensions.kt
index 62a35a7e..db6184c6 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/extensions/RealmExtensions.kt
+++ b/qksms/src/main/java/common/util/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 com.moez.QKSMS.common.util.extensions
+package common.util.extensions
import io.reactivex.Observable
import io.realm.Realm
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/extensions/RxExtensions.kt b/qksms/src/main/java/common/util/extensions/RxExtensions.kt
similarity index 91%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/extensions/RxExtensions.kt
rename to qksms/src/main/java/common/util/extensions/RxExtensions.kt
index 33ab1ced..6fec7092 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/extensions/RxExtensions.kt
+++ b/qksms/src/main/java/common/util/extensions/RxExtensions.kt
@@ -17,9 +17,9 @@
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.common.util.extensions
+package common.util.extensions
-import com.moez.QKSMS.common.util.Optional
+import common.util.Optional
import io.reactivex.Flowable
fun Flowable.mapNotNull(mapper: (T) -> R?): Flowable
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt b/qksms/src/main/java/common/util/extensions/ViewExtensions.kt
similarity index 97%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt
rename to qksms/src/main/java/common/util/extensions/ViewExtensions.kt
index fbc171cc..58975362 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt
+++ b/qksms/src/main/java/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 com.moez.QKSMS.common.util.extensions
+package common.util.extensions
import android.content.Context
import android.content.res.ColorStateList
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/filter/ContactFilter.kt b/qksms/src/main/java/common/util/filter/ContactFilter.kt
similarity index 93%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/filter/ContactFilter.kt
rename to qksms/src/main/java/common/util/filter/ContactFilter.kt
index c2c27f1c..e2d8aebd 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/filter/ContactFilter.kt
+++ b/qksms/src/main/java/common/util/filter/ContactFilter.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.common.util.filter
+package common.util.filter
-import com.moez.QKSMS.data.model.Contact
+import data.model.Contact
import javax.inject.Inject
class ContactFilter @Inject constructor(private val phoneNumberFilter: PhoneNumberFilter) : Filter() {
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/filter/ConversationFilter.kt b/qksms/src/main/java/common/util/filter/ConversationFilter.kt
similarity index 92%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/filter/ConversationFilter.kt
rename to qksms/src/main/java/common/util/filter/ConversationFilter.kt
index 262a6cd2..4ec55f9c 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/filter/ConversationFilter.kt
+++ b/qksms/src/main/java/common/util/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 com.moez.QKSMS.common.util.filter
+package common.util.filter
-import com.moez.QKSMS.data.model.Conversation
+import data.model.Conversation
import javax.inject.Inject
class ConversationFilter @Inject constructor(private val recipientFilter: RecipientFilter) : Filter() {
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/filter/Filter.kt b/qksms/src/main/java/common/util/filter/Filter.kt
similarity index 95%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/filter/Filter.kt
rename to qksms/src/main/java/common/util/filter/Filter.kt
index 5b0136af..5cfe9f47 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/filter/Filter.kt
+++ b/qksms/src/main/java/common/util/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 com.moez.QKSMS.common.util.filter
+package common.util.filter
abstract class Filter {
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/filter/PhoneNumberFilter.kt b/qksms/src/main/java/common/util/filter/PhoneNumberFilter.kt
similarity index 96%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/filter/PhoneNumberFilter.kt
rename to qksms/src/main/java/common/util/filter/PhoneNumberFilter.kt
index 42c94169..81067216 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/filter/PhoneNumberFilter.kt
+++ b/qksms/src/main/java/common/util/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 com.moez.QKSMS.common.util.filter
+package common.util.filter
import android.telephony.PhoneNumberUtils
import javax.inject.Inject
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/filter/RecipientFilter.kt b/qksms/src/main/java/common/util/filter/RecipientFilter.kt
similarity index 93%
rename from qksms/src/main/java/com/moez/QKSMS/common/util/filter/RecipientFilter.kt
rename to qksms/src/main/java/common/util/filter/RecipientFilter.kt
index f3430422..630487ea 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/util/filter/RecipientFilter.kt
+++ b/qksms/src/main/java/common/util/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 com.moez.QKSMS.common.util.filter
+package common.util.filter
-import com.moez.QKSMS.data.model.Recipient
+import data.model.Recipient
import javax.inject.Inject
class RecipientFilter @Inject constructor(
diff --git a/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToContact.kt b/qksms/src/main/java/data/mapper/CursorToContact.kt
similarity index 92%
rename from qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToContact.kt
rename to qksms/src/main/java/data/mapper/CursorToContact.kt
index 29f3af48..0d87a5ae 100644
--- a/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToContact.kt
+++ b/qksms/src/main/java/data/mapper/CursorToContact.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.data.mapper
+package data.mapper
import android.database.Cursor
import android.provider.ContactsContract
-import com.moez.QKSMS.data.model.Contact
-import com.moez.QKSMS.data.model.PhoneNumber
+import data.model.Contact
+import data.model.PhoneNumber
import javax.inject.Inject
class CursorToContact @Inject constructor() : Mapper {
diff --git a/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToConversation.kt b/qksms/src/main/java/data/mapper/CursorToConversation.kt
similarity index 92%
rename from qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToConversation.kt
rename to qksms/src/main/java/data/mapper/CursorToConversation.kt
index 22c8c364..0089aaaa 100644
--- a/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToConversation.kt
+++ b/qksms/src/main/java/data/mapper/CursorToConversation.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.data.mapper
+package data.mapper
import android.database.Cursor
import android.net.Uri
import android.provider.Telephony.Threads
-import com.moez.QKSMS.data.model.Conversation
-import com.moez.QKSMS.data.model.Recipient
+import data.model.Conversation
+import data.model.Recipient
import javax.inject.Inject
class CursorToConversation @Inject constructor() : Mapper {
diff --git a/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToMessage.kt b/qksms/src/main/java/data/mapper/CursorToMessage.kt
similarity index 98%
rename from qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToMessage.kt
rename to qksms/src/main/java/data/mapper/CursorToMessage.kt
index 5df7ede2..8450b366 100644
--- a/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToMessage.kt
+++ b/qksms/src/main/java/data/mapper/CursorToMessage.kt
@@ -16,14 +16,14 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.data.mapper
+package data.mapper
import android.content.Context
import android.database.Cursor
import android.net.Uri
import android.provider.Telephony.*
-import com.moez.QKSMS.data.model.Message
-import com.moez.QKSMS.data.model.Message.DeliveryStatus
+import data.model.Message
+import data.model.Message.DeliveryStatus
import timber.log.Timber
import javax.inject.Inject
diff --git a/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToRecipient.kt b/qksms/src/main/java/data/mapper/CursorToRecipient.kt
similarity index 91%
rename from qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToRecipient.kt
rename to qksms/src/main/java/data/mapper/CursorToRecipient.kt
index 811d63d6..f57939b5 100644
--- a/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToRecipient.kt
+++ b/qksms/src/main/java/data/mapper/CursorToRecipient.kt
@@ -16,12 +16,12 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.data.mapper
+package data.mapper
import android.database.Cursor
import android.net.Uri
-import com.moez.QKSMS.data.model.Recipient
-import com.moez.QKSMS.data.repository.ContactRepository
+import data.model.Recipient
+import data.repository.ContactRepository
import javax.inject.Inject
class CursorToRecipient @Inject constructor(private val contactRepository: ContactRepository) : Mapper {
diff --git a/qksms/src/main/java/com/moez/QKSMS/data/mapper/Mapper.kt b/qksms/src/main/java/data/mapper/Mapper.kt
similarity index 95%
rename from qksms/src/main/java/com/moez/QKSMS/data/mapper/Mapper.kt
rename to qksms/src/main/java/data/mapper/Mapper.kt
index d2b28927..7cbac38e 100644
--- a/qksms/src/main/java/com/moez/QKSMS/data/mapper/Mapper.kt
+++ b/qksms/src/main/java/data/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 com.moez.QKSMS.data.mapper
+package data.mapper
interface Mapper {
diff --git a/qksms/src/main/java/com/moez/QKSMS/data/model/Contact.kt b/qksms/src/main/java/data/model/Contact.kt
similarity index 96%
rename from qksms/src/main/java/com/moez/QKSMS/data/model/Contact.kt
rename to qksms/src/main/java/data/model/Contact.kt
index 8b3c2c5a..30c962d8 100644
--- a/qksms/src/main/java/com/moez/QKSMS/data/model/Contact.kt
+++ b/qksms/src/main/java/data/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 com.moez.QKSMS.data.model
+package data.model
import io.realm.RealmList
import io.realm.RealmObject
diff --git a/qksms/src/main/java/com/moez/QKSMS/data/model/Conversation.kt b/qksms/src/main/java/data/model/Conversation.kt
similarity index 97%
rename from qksms/src/main/java/com/moez/QKSMS/data/model/Conversation.kt
rename to qksms/src/main/java/data/model/Conversation.kt
index dc3f442b..2333aac3 100644
--- a/qksms/src/main/java/com/moez/QKSMS/data/model/Conversation.kt
+++ b/qksms/src/main/java/data/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 com.moez.QKSMS.data.model
+package data.model
import io.realm.RealmList
import io.realm.RealmObject
diff --git a/qksms/src/main/java/com/moez/QKSMS/data/model/InboxItem.kt b/qksms/src/main/java/data/model/InboxItem.kt
similarity index 96%
rename from qksms/src/main/java/com/moez/QKSMS/data/model/InboxItem.kt
rename to qksms/src/main/java/data/model/InboxItem.kt
index 0f7299a4..78360e35 100644
--- a/qksms/src/main/java/com/moez/QKSMS/data/model/InboxItem.kt
+++ b/qksms/src/main/java/data/model/InboxItem.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.data.model
+package data.model
/**
* Groups a conversation with its latest message into a single model
diff --git a/qksms/src/main/java/com/moez/QKSMS/data/model/MenuItem.kt b/qksms/src/main/java/data/model/MenuItem.kt
similarity index 96%
rename from qksms/src/main/java/com/moez/QKSMS/data/model/MenuItem.kt
rename to qksms/src/main/java/data/model/MenuItem.kt
index afdfb319..c8fc9872 100644
--- a/qksms/src/main/java/com/moez/QKSMS/data/model/MenuItem.kt
+++ b/qksms/src/main/java/data/model/MenuItem.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.data.model
+package data.model
import android.support.annotation.StringRes
diff --git a/qksms/src/main/java/com/moez/QKSMS/data/model/Message.kt b/qksms/src/main/java/data/model/Message.kt
similarity index 99%
rename from qksms/src/main/java/com/moez/QKSMS/data/model/Message.kt
rename to qksms/src/main/java/data/model/Message.kt
index 1c0d9270..052867c7 100644
--- a/qksms/src/main/java/com/moez/QKSMS/data/model/Message.kt
+++ b/qksms/src/main/java/data/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 com.moez.QKSMS.data.model
+package data.model
import android.content.ContentUris
import android.net.Uri
diff --git a/qksms/src/main/java/com/moez/QKSMS/data/model/MmsPart.kt b/qksms/src/main/java/data/model/MmsPart.kt
similarity index 96%
rename from qksms/src/main/java/com/moez/QKSMS/data/model/MmsPart.kt
rename to qksms/src/main/java/data/model/MmsPart.kt
index 4fb6a4a0..ae6c5534 100644
--- a/qksms/src/main/java/com/moez/QKSMS/data/model/MmsPart.kt
+++ b/qksms/src/main/java/data/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 com.moez.QKSMS.data.model
+package data.model
import android.net.Uri
diff --git a/qksms/src/main/java/com/moez/QKSMS/data/model/PhoneNumber.kt b/qksms/src/main/java/data/model/PhoneNumber.kt
similarity index 96%
rename from qksms/src/main/java/com/moez/QKSMS/data/model/PhoneNumber.kt
rename to qksms/src/main/java/data/model/PhoneNumber.kt
index 42413bea..53a5d9f0 100644
--- a/qksms/src/main/java/com/moez/QKSMS/data/model/PhoneNumber.kt
+++ b/qksms/src/main/java/data/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 com.moez.QKSMS.data.model
+package data.model
import io.realm.RealmObject
diff --git a/qksms/src/main/java/com/moez/QKSMS/data/model/Recipient.kt b/qksms/src/main/java/data/model/Recipient.kt
similarity index 96%
rename from qksms/src/main/java/com/moez/QKSMS/data/model/Recipient.kt
rename to qksms/src/main/java/data/model/Recipient.kt
index c7040524..ed164cbf 100644
--- a/qksms/src/main/java/com/moez/QKSMS/data/model/Recipient.kt
+++ b/qksms/src/main/java/data/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 com.moez.QKSMS.data.model
+package data.model
import io.realm.RealmObject
import io.realm.annotations.PrimaryKey
diff --git a/qksms/src/main/java/com/moez/QKSMS/data/model/SyncLog.kt b/qksms/src/main/java/data/model/SyncLog.kt
similarity index 96%
rename from qksms/src/main/java/com/moez/QKSMS/data/model/SyncLog.kt
rename to qksms/src/main/java/data/model/SyncLog.kt
index 29060c5a..2b4152c7 100644
--- a/qksms/src/main/java/com/moez/QKSMS/data/model/SyncLog.kt
+++ b/qksms/src/main/java/data/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 com.moez.QKSMS.data.model
+package data.model
import io.realm.RealmObject
diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/ContactRepository.kt b/qksms/src/main/java/data/repository/ContactRepository.kt
similarity index 95%
rename from qksms/src/main/java/com/moez/QKSMS/data/repository/ContactRepository.kt
rename to qksms/src/main/java/data/repository/ContactRepository.kt
index 1445790b..4562ee10 100644
--- a/qksms/src/main/java/com/moez/QKSMS/data/repository/ContactRepository.kt
+++ b/qksms/src/main/java/data/repository/ContactRepository.kt
@@ -16,15 +16,15 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.data.repository
+package data.repository
import android.content.Context
import android.net.Uri
import android.provider.BaseColumns
import android.provider.ContactsContract
-import com.moez.QKSMS.common.util.extensions.asFlowable
-import com.moez.QKSMS.data.model.Contact
-import com.moez.QKSMS.data.model.PhoneNumber
+import common.util.extensions.asFlowable
+import data.model.Contact
+import data.model.PhoneNumber
import io.reactivex.Flowable
import io.reactivex.Single
import io.realm.Realm
diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/data/repository/MessageRepository.kt
similarity index 96%
rename from qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt
rename to qksms/src/main/java/data/repository/MessageRepository.kt
index 63753201..3da724ea 100644
--- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt
+++ b/qksms/src/main/java/data/repository/MessageRepository.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.data.repository
+package data.repository
import android.content.ContentValues
import android.content.Context
@@ -25,17 +25,17 @@ import android.provider.BaseColumns
import android.provider.Telephony
import android.provider.Telephony.Sms
import android.provider.Telephony.TextBasedSmsColumns
-import com.moez.QKSMS.common.util.Keys
-import com.moez.QKSMS.common.util.MessageUtils
-import com.moez.QKSMS.common.util.extensions.asFlowable
-import com.moez.QKSMS.common.util.extensions.asMaybe
-import com.moez.QKSMS.common.util.extensions.insertOrUpdate
-import com.moez.QKSMS.common.util.extensions.mapNotNull
-import com.moez.QKSMS.data.mapper.CursorToConversation
-import com.moez.QKSMS.data.mapper.CursorToRecipient
-import com.moez.QKSMS.data.model.Conversation
-import com.moez.QKSMS.data.model.InboxItem
-import com.moez.QKSMS.data.model.Message
+import common.util.Keys
+import common.util.MessageUtils
+import common.util.extensions.asFlowable
+import common.util.extensions.asMaybe
+import common.util.extensions.insertOrUpdate
+import common.util.extensions.mapNotNull
+import data.mapper.CursorToConversation
+import data.mapper.CursorToRecipient
+import data.model.Conversation
+import data.model.InboxItem
+import data.model.Message
import io.reactivex.Flowable
import io.reactivex.Maybe
import io.reactivex.android.schedulers.AndroidSchedulers
diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ContactSync.kt b/qksms/src/main/java/interactor/ContactSync.kt
similarity index 89%
rename from qksms/src/main/java/com/moez/QKSMS/domain/interactor/ContactSync.kt
rename to qksms/src/main/java/interactor/ContactSync.kt
index f13fee4d..236c6c72 100644
--- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ContactSync.kt
+++ b/qksms/src/main/java/interactor/ContactSync.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.domain.interactor
+package interactor
import android.content.Context
-import com.moez.QKSMS.common.util.extensions.asFlowable
-import com.moez.QKSMS.common.util.extensions.insertOrUpdate
-import com.moez.QKSMS.data.mapper.CursorToContact
-import com.moez.QKSMS.data.model.Contact
+import common.util.extensions.asFlowable
+import common.util.extensions.insertOrUpdate
+import data.mapper.CursorToContact
+import data.model.Contact
import io.reactivex.Flowable
import timber.log.Timber
import java.util.concurrent.TimeUnit
diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/DeleteConversation.kt b/qksms/src/main/java/interactor/DeleteConversation.kt
similarity index 91%
rename from qksms/src/main/java/com/moez/QKSMS/domain/interactor/DeleteConversation.kt
rename to qksms/src/main/java/interactor/DeleteConversation.kt
index 65c180bb..21738d5e 100644
--- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/DeleteConversation.kt
+++ b/qksms/src/main/java/interactor/DeleteConversation.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.domain.interactor
+package interactor
-import com.moez.QKSMS.data.repository.MessageRepository
+import data.repository.MessageRepository
import io.reactivex.Flowable
import javax.inject.Inject
diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/DeleteMessage.kt b/qksms/src/main/java/interactor/DeleteMessage.kt
similarity index 91%
rename from qksms/src/main/java/com/moez/QKSMS/domain/interactor/DeleteMessage.kt
rename to qksms/src/main/java/interactor/DeleteMessage.kt
index 792502a8..537a17c5 100644
--- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/DeleteMessage.kt
+++ b/qksms/src/main/java/interactor/DeleteMessage.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.domain.interactor
+package interactor
-import com.moez.QKSMS.data.repository.MessageRepository
+import data.repository.MessageRepository
import io.reactivex.Flowable
import javax.inject.Inject
diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/FullSync.kt b/qksms/src/main/java/interactor/FullSync.kt
similarity index 94%
rename from qksms/src/main/java/com/moez/QKSMS/domain/interactor/FullSync.kt
rename to qksms/src/main/java/interactor/FullSync.kt
index 315ff6b7..2636bf9c 100644
--- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/FullSync.kt
+++ b/qksms/src/main/java/interactor/FullSync.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.domain.interactor
+package interactor
-import com.moez.QKSMS.common.util.SyncManager
+import common.util.SyncManager
import io.reactivex.Flowable
import timber.log.Timber
import java.util.concurrent.TimeUnit
diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/Interactor.kt b/qksms/src/main/java/interactor/Interactor.kt
similarity index 97%
rename from qksms/src/main/java/com/moez/QKSMS/domain/interactor/Interactor.kt
rename to qksms/src/main/java/interactor/Interactor.kt
index f37d16d7..d8eef8e4 100644
--- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/Interactor.kt
+++ b/qksms/src/main/java/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 com.moez.QKSMS.domain.interactor
+package interactor
import io.reactivex.Flowable
import io.reactivex.android.schedulers.AndroidSchedulers
diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkAllSeen.kt b/qksms/src/main/java/interactor/MarkAllSeen.kt
similarity index 91%
rename from qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkAllSeen.kt
rename to qksms/src/main/java/interactor/MarkAllSeen.kt
index 57d09944..c2ba5097 100644
--- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkAllSeen.kt
+++ b/qksms/src/main/java/interactor/MarkAllSeen.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.domain.interactor
+package interactor
-import com.moez.QKSMS.data.repository.MessageRepository
+import data.repository.MessageRepository
import io.reactivex.Flowable
import javax.inject.Inject
diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkArchived.kt b/qksms/src/main/java/interactor/MarkArchived.kt
similarity index 91%
rename from qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkArchived.kt
rename to qksms/src/main/java/interactor/MarkArchived.kt
index ccf90eff..ee9f51e6 100644
--- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkArchived.kt
+++ b/qksms/src/main/java/interactor/MarkArchived.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.domain.interactor
+package interactor
-import com.moez.QKSMS.data.repository.MessageRepository
+import data.repository.MessageRepository
import io.reactivex.Flowable
import javax.inject.Inject
diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkDelivered.kt b/qksms/src/main/java/interactor/MarkDelivered.kt
similarity index 92%
rename from qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkDelivered.kt
rename to qksms/src/main/java/interactor/MarkDelivered.kt
index d0245378..be5069dc 100644
--- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkDelivered.kt
+++ b/qksms/src/main/java/interactor/MarkDelivered.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.domain.interactor
+package interactor
-import com.moez.QKSMS.data.repository.MessageRepository
+import data.repository.MessageRepository
import io.reactivex.Flowable
import io.reactivex.android.schedulers.AndroidSchedulers
import javax.inject.Inject
diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkDeliveryFailed.kt b/qksms/src/main/java/interactor/MarkDeliveryFailed.kt
similarity index 93%
rename from qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkDeliveryFailed.kt
rename to qksms/src/main/java/interactor/MarkDeliveryFailed.kt
index 7f9e7653..48e44afc 100644
--- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkDeliveryFailed.kt
+++ b/qksms/src/main/java/interactor/MarkDeliveryFailed.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.domain.interactor
+package interactor
-import com.moez.QKSMS.data.repository.MessageRepository
+import data.repository.MessageRepository
import io.reactivex.Flowable
import io.reactivex.android.schedulers.AndroidSchedulers
import javax.inject.Inject
diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkFailed.kt b/qksms/src/main/java/interactor/MarkFailed.kt
similarity index 92%
rename from qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkFailed.kt
rename to qksms/src/main/java/interactor/MarkFailed.kt
index f45e3d33..24def240 100644
--- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkFailed.kt
+++ b/qksms/src/main/java/interactor/MarkFailed.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.domain.interactor
+package interactor
-import com.moez.QKSMS.data.repository.MessageRepository
+import data.repository.MessageRepository
import io.reactivex.Flowable
import io.reactivex.android.schedulers.AndroidSchedulers
import javax.inject.Inject
diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkRead.kt b/qksms/src/main/java/interactor/MarkRead.kt
similarity index 88%
rename from qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkRead.kt
rename to qksms/src/main/java/interactor/MarkRead.kt
index d08f42a2..8000d2ba 100644
--- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkRead.kt
+++ b/qksms/src/main/java/interactor/MarkRead.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.domain.interactor
+package interactor
-import com.moez.QKSMS.common.util.NotificationManager
-import com.moez.QKSMS.data.repository.MessageRepository
+import common.util.NotificationManager
+import data.repository.MessageRepository
import io.reactivex.Flowable
import javax.inject.Inject
diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSeen.kt b/qksms/src/main/java/interactor/MarkSeen.kt
similarity index 91%
rename from qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSeen.kt
rename to qksms/src/main/java/interactor/MarkSeen.kt
index 06b69f70..341487fb 100644
--- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSeen.kt
+++ b/qksms/src/main/java/interactor/MarkSeen.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.domain.interactor
+package interactor
-import com.moez.QKSMS.data.repository.MessageRepository
+import data.repository.MessageRepository
import io.reactivex.Flowable
import javax.inject.Inject
diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSent.kt b/qksms/src/main/java/interactor/MarkSent.kt
similarity index 92%
rename from qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSent.kt
rename to qksms/src/main/java/interactor/MarkSent.kt
index 7f892bcb..c01984e0 100644
--- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSent.kt
+++ b/qksms/src/main/java/interactor/MarkSent.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.domain.interactor
+package interactor
-import com.moez.QKSMS.data.repository.MessageRepository
+import data.repository.MessageRepository
import io.reactivex.Flowable
import io.reactivex.android.schedulers.AndroidSchedulers
import javax.inject.Inject
diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkUnarchived.kt b/qksms/src/main/java/interactor/MarkUnarchived.kt
similarity index 91%
rename from qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkUnarchived.kt
rename to qksms/src/main/java/interactor/MarkUnarchived.kt
index 8dbd7735..3db71a25 100644
--- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkUnarchived.kt
+++ b/qksms/src/main/java/interactor/MarkUnarchived.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.domain.interactor
+package interactor
-import com.moez.QKSMS.data.repository.MessageRepository
+import data.repository.MessageRepository
import io.reactivex.Flowable
import javax.inject.Inject
diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/PartialSync.kt b/qksms/src/main/java/interactor/PartialSync.kt
similarity index 90%
rename from qksms/src/main/java/com/moez/QKSMS/domain/interactor/PartialSync.kt
rename to qksms/src/main/java/interactor/PartialSync.kt
index df327316..e046eafe 100644
--- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/PartialSync.kt
+++ b/qksms/src/main/java/interactor/PartialSync.kt
@@ -16,11 +16,11 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.domain.interactor
+package interactor
-import com.moez.QKSMS.common.util.Keys
-import com.moez.QKSMS.common.util.Permissions
-import com.moez.QKSMS.common.util.SyncManager
+import common.util.Keys
+import common.util.Permissions
+import common.util.SyncManager
import io.reactivex.Flowable
import timber.log.Timber
import java.util.concurrent.TimeUnit
diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt b/qksms/src/main/java/interactor/ReceiveMessage.kt
similarity index 89%
rename from qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt
rename to qksms/src/main/java/interactor/ReceiveMessage.kt
index 51242a96..07fba70e 100644
--- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt
+++ b/qksms/src/main/java/interactor/ReceiveMessage.kt
@@ -16,11 +16,11 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.domain.interactor
+package interactor
-import com.moez.QKSMS.common.util.NotificationManager
-import com.moez.QKSMS.common.util.extensions.mapNotNull
-import com.moez.QKSMS.data.repository.MessageRepository
+import common.util.NotificationManager
+import common.util.extensions.mapNotNull
+import data.repository.MessageRepository
import io.reactivex.Flowable
import javax.inject.Inject
diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt b/qksms/src/main/java/interactor/SendMessage.kt
similarity index 92%
rename from qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt
rename to qksms/src/main/java/interactor/SendMessage.kt
index de943a24..6b6526f1 100644
--- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt
+++ b/qksms/src/main/java/interactor/SendMessage.kt
@@ -16,16 +16,16 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.domain.interactor
+package interactor
import android.app.PendingIntent
import android.content.Context
import android.content.Intent
import android.telephony.SmsManager
-import com.moez.QKSMS.common.util.Preferences
-import com.moez.QKSMS.data.repository.MessageRepository
-import com.moez.QKSMS.receiver.MessageDeliveredReceiver
-import com.moez.QKSMS.receiver.MessageSentReceiver
+import common.util.Preferences
+import data.repository.MessageRepository
+import receiver.MessageDeliveredReceiver
+import receiver.MessageSentReceiver
import io.reactivex.Flowable
import io.reactivex.rxkotlin.toFlowable
import javax.inject.Inject
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt b/qksms/src/main/java/presentation/Navigator.kt
similarity index 88%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt
rename to qksms/src/main/java/presentation/Navigator.kt
index c985ebe6..7c7d889e 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt
+++ b/qksms/src/main/java/presentation/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 com.moez.QKSMS.presentation
+package presentation
import android.annotation.TargetApi
import android.arch.lifecycle.ViewModel
@@ -27,14 +27,14 @@ import android.net.Uri
import android.os.Build
import android.provider.Settings
import android.provider.Telephony
-import com.moez.QKSMS.common.util.NotificationManager
-import com.moez.QKSMS.presentation.compose.ComposeActivity
-import com.moez.QKSMS.presentation.compose.ComposeViewModel
-import com.moez.QKSMS.presentation.main.MainViewModel
-import com.moez.QKSMS.presentation.settings.SettingsActivity
-import com.moez.QKSMS.presentation.settings.SettingsViewModel
-import com.moez.QKSMS.presentation.setup.SetupActivity
-import com.moez.QKSMS.presentation.setup.SetupViewModel
+import common.util.NotificationManager
+import presentation.compose.ComposeActivity
+import presentation.compose.ComposeViewModel
+import presentation.main.MainViewModel
+import presentation.settings.SettingsActivity
+import presentation.settings.SettingsViewModel
+import presentation.setup.SetupActivity
+import presentation.setup.SetupViewModel
import javax.inject.Inject
import javax.inject.Singleton
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/common/MenuItemAdapter.kt b/qksms/src/main/java/presentation/common/MenuItemAdapter.kt
similarity index 89%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/common/MenuItemAdapter.kt
rename to qksms/src/main/java/presentation/common/MenuItemAdapter.kt
index c2119f6d..ba1f3fea 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/common/MenuItemAdapter.kt
+++ b/qksms/src/main/java/presentation/common/MenuItemAdapter.kt
@@ -16,16 +16,16 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.common
+package presentation.common
import android.content.Context
import android.view.View
import android.view.ViewGroup
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
-import com.moez.QKSMS.data.model.MenuItem
-import com.moez.QKSMS.presentation.common.base.QkAdapter
-import com.moez.QKSMS.presentation.common.base.QkViewHolder
+import data.model.MenuItem
+import presentation.common.base.QkAdapter
+import presentation.common.base.QkViewHolder
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.menu_list_item.view.*
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/FlowableAdapter.kt b/qksms/src/main/java/presentation/common/base/FlowableAdapter.kt
similarity index 98%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/common/base/FlowableAdapter.kt
rename to qksms/src/main/java/presentation/common/base/FlowableAdapter.kt
index 996bf3e1..380d3736 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/FlowableAdapter.kt
+++ b/qksms/src/main/java/presentation/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 com.moez.QKSMS.presentation.common.base
+package presentation.common.base
import android.support.annotation.CallSuper
import android.support.v7.widget.RecyclerView
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkActivity.kt b/qksms/src/main/java/presentation/common/base/QkActivity.kt
similarity index 96%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkActivity.kt
rename to qksms/src/main/java/presentation/common/base/QkActivity.kt
index bf985b2e..248515d1 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkActivity.kt
+++ b/qksms/src/main/java/presentation/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 com.moez.QKSMS.presentation.common.base
+package presentation.common.base
import android.annotation.SuppressLint
import android.arch.lifecycle.ViewModelProviders
@@ -24,8 +24,8 @@ import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import android.view.Menu
import android.view.MenuItem
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.presentation.Navigator
+import common.util.Colors
+import presentation.Navigator
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.Observables
import io.reactivex.rxkotlin.plusAssign
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkAdapter.kt b/qksms/src/main/java/presentation/common/base/QkAdapter.kt
similarity index 98%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkAdapter.kt
rename to qksms/src/main/java/presentation/common/base/QkAdapter.kt
index 7f92e65a..ec917a35 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkAdapter.kt
+++ b/qksms/src/main/java/presentation/common/base/QkAdapter.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.common.base
+package presentation.common.base
import android.support.v7.util.DiffUtil
import android.support.v7.widget.RecyclerView
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkView.kt b/qksms/src/main/java/presentation/common/base/QkView.kt
similarity index 94%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkView.kt
rename to qksms/src/main/java/presentation/common/base/QkView.kt
index 50ff7f1f..7521c46e 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkView.kt
+++ b/qksms/src/main/java/presentation/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 com.moez.QKSMS.presentation.common.base
+package presentation.common.base
interface QkView {
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkViewHolder.kt b/qksms/src/main/java/presentation/common/base/QkViewHolder.kt
similarity index 94%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkViewHolder.kt
rename to qksms/src/main/java/presentation/common/base/QkViewHolder.kt
index 3b057e73..612d08a0 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkViewHolder.kt
+++ b/qksms/src/main/java/presentation/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 com.moez.QKSMS.presentation.common.base
+package presentation.common.base
import android.support.v7.widget.RecyclerView
import android.view.View
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkViewModel.kt b/qksms/src/main/java/presentation/common/base/QkViewModel.kt
similarity index 97%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkViewModel.kt
rename to qksms/src/main/java/presentation/common/base/QkViewModel.kt
index b8cf0d8a..e4fcff14 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/common/base/QkViewModel.kt
+++ b/qksms/src/main/java/presentation/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 com.moez.QKSMS.presentation.common.base
+package presentation.common.base
import android.arch.lifecycle.ViewModel
import android.support.annotation.CallSuper
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/AvatarView.kt b/qksms/src/main/java/presentation/common/widget/AvatarView.kt
similarity index 91%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/AvatarView.kt
rename to qksms/src/main/java/presentation/common/widget/AvatarView.kt
index af128daf..e12a6826 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/AvatarView.kt
+++ b/qksms/src/main/java/presentation/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 com.moez.QKSMS.presentation.common.widget
+package presentation.common.widget
import android.content.Context
import android.net.Uri
@@ -27,12 +27,12 @@ import android.view.View
import android.widget.FrameLayout
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
-import com.moez.QKSMS.common.di.appComponent
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.GlideApp
-import com.moez.QKSMS.common.util.extensions.setTint
-import com.moez.QKSMS.data.model.Contact
-import com.moez.QKSMS.presentation.Navigator
+import common.di.appComponent
+import common.util.Colors
+import common.util.GlideApp
+import common.util.extensions.setTint
+import data.model.Contact
+import presentation.Navigator
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.plusAssign
import kotlinx.android.synthetic.main.avatar_view.view.*
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/GroupAvatarView.kt b/qksms/src/main/java/presentation/common/widget/GroupAvatarView.kt
similarity index 95%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/GroupAvatarView.kt
rename to qksms/src/main/java/presentation/common/widget/GroupAvatarView.kt
index c34d8765..57c03fd3 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/GroupAvatarView.kt
+++ b/qksms/src/main/java/presentation/common/widget/GroupAvatarView.kt
@@ -16,14 +16,14 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.common.widget
+package presentation.common.widget
import android.content.Context
import android.support.constraint.ConstraintLayout
import android.util.AttributeSet
import android.view.View
import com.moez.QKSMS.R
-import com.moez.QKSMS.data.model.Contact
+import data.model.Contact
import kotlinx.android.synthetic.main.group_avatar_view.view.*
class GroupAvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : ConstraintLayout(context, attrs) {
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/PreferenceView.kt b/qksms/src/main/java/presentation/common/widget/PreferenceView.kt
similarity index 94%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/PreferenceView.kt
rename to qksms/src/main/java/presentation/common/widget/PreferenceView.kt
index 0dd12592..331eaf12 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/PreferenceView.kt
+++ b/qksms/src/main/java/presentation/common/widget/PreferenceView.kt
@@ -16,14 +16,14 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.common.widget
+package presentation.common.widget
import android.content.Context
import android.support.v7.widget.LinearLayoutCompat
import android.util.AttributeSet
import android.view.View
import com.moez.QKSMS.R
-import com.moez.QKSMS.common.util.extensions.setVisible
+import common.util.extensions.setVisible
import kotlinx.android.synthetic.main.preference_view.view.*
class PreferenceView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : LinearLayoutCompat(context, attrs) {
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/QkEditText.kt b/qksms/src/main/java/presentation/common/widget/QkEditText.kt
similarity index 95%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/QkEditText.kt
rename to qksms/src/main/java/presentation/common/widget/QkEditText.kt
index 3192a7c3..1af1db79 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/QkEditText.kt
+++ b/qksms/src/main/java/presentation/common/widget/QkEditText.kt
@@ -16,14 +16,14 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.common.widget
+package presentation.common.widget
import android.content.Context
import android.util.AttributeSet
import android.widget.EditText
import com.moez.QKSMS.R
-import com.moez.QKSMS.common.di.appComponent
-import com.moez.QKSMS.common.util.Colors
+import common.di.appComponent
+import common.util.Colors
import io.reactivex.Observable
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.plusAssign
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/QkSwitch.kt b/qksms/src/main/java/presentation/common/widget/QkSwitch.kt
similarity index 92%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/QkSwitch.kt
rename to qksms/src/main/java/presentation/common/widget/QkSwitch.kt
index 6d98bfa9..e596d01c 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/QkSwitch.kt
+++ b/qksms/src/main/java/presentation/common/widget/QkSwitch.kt
@@ -16,15 +16,15 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.common.widget
+package presentation.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.common.di.appComponent
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.withAlpha
+import common.di.appComponent
+import common.util.Colors
+import common.util.extensions.withAlpha
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.Observables
import io.reactivex.rxkotlin.plusAssign
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/QkTextView.kt b/qksms/src/main/java/presentation/common/widget/QkTextView.kt
similarity index 94%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/QkTextView.kt
rename to qksms/src/main/java/presentation/common/widget/QkTextView.kt
index 388b0bd6..39c823eb 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/QkTextView.kt
+++ b/qksms/src/main/java/presentation/common/widget/QkTextView.kt
@@ -16,14 +16,14 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.common.widget
+package presentation.common.widget
import android.content.Context
import android.util.AttributeSet
import android.widget.TextView
import com.moez.QKSMS.R
-import com.moez.QKSMS.common.di.appComponent
-import com.moez.QKSMS.common.util.Colors
+import common.di.appComponent
+import common.util.Colors
import io.reactivex.Observable
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.plusAssign
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/Separator.kt b/qksms/src/main/java/presentation/common/widget/Separator.kt
similarity index 91%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/Separator.kt
rename to qksms/src/main/java/presentation/common/widget/Separator.kt
index ab056d1e..3493625f 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/Separator.kt
+++ b/qksms/src/main/java/presentation/common/widget/Separator.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.common.widget
+package presentation.common.widget
import android.content.Context
import android.util.AttributeSet
import android.view.View
-import com.moez.QKSMS.common.di.appComponent
-import com.moez.QKSMS.common.util.Colors
+import common.di.appComponent
+import common.util.Colors
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.plusAssign
import javax.inject.Inject
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/TightTextView.kt b/qksms/src/main/java/presentation/common/widget/TightTextView.kt
similarity index 96%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/TightTextView.kt
rename to qksms/src/main/java/presentation/common/widget/TightTextView.kt
index 77b5b944..01489bd6 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/TightTextView.kt
+++ b/qksms/src/main/java/presentation/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 com.moez.QKSMS.presentation.common.widget
+package presentation.common.widget
import android.content.Context
import android.util.AttributeSet
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt b/qksms/src/main/java/presentation/compose/ChipsAdapter.kt
similarity index 91%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt
rename to qksms/src/main/java/presentation/compose/ChipsAdapter.kt
index eef3babd..cbc64be4 100755
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt
+++ b/qksms/src/main/java/presentation/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 com.moez.QKSMS.presentation.compose
+package presentation.compose
import android.content.Context
import android.support.v7.widget.RecyclerView
@@ -30,13 +30,13 @@ import com.google.android.flexbox.FlexboxLayoutManager
import com.jakewharton.rxbinding2.view.keys
import com.jakewharton.rxbinding2.widget.textChanges
import com.moez.QKSMS.R
-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.showKeyboard
-import com.moez.QKSMS.data.model.Contact
-import com.moez.QKSMS.presentation.common.base.QkAdapter
-import com.moez.QKSMS.presentation.common.base.QkViewHolder
+import common.util.Colors
+import common.util.extensions.dpToPx
+import common.util.extensions.setBackgroundTint
+import common.util.extensions.showKeyboard
+import data.model.Contact
+import presentation.common.base.QkAdapter
+import presentation.common.base.QkViewHolder
import io.reactivex.subjects.PublishSubject
import kotlinx.android.synthetic.main.contact_chip.view.*
import javax.inject.Inject
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt b/qksms/src/main/java/presentation/compose/ComposeActivity.kt
similarity index 94%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt
rename to qksms/src/main/java/presentation/compose/ComposeActivity.kt
index ef34c311..d1c5f9f2 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt
+++ b/qksms/src/main/java/presentation/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 com.moez.QKSMS.presentation.compose
+package presentation.compose
import android.app.AlertDialog
import android.content.res.ColorStateList
@@ -30,14 +30,14 @@ 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.di.appComponent
-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.data.model.Contact
-import com.moez.QKSMS.data.model.Message
-import com.moez.QKSMS.presentation.common.base.QkActivity
+import common.di.appComponent
+import common.util.extensions.setBackgroundTint
+import common.util.extensions.setTint
+import common.util.extensions.setVisible
+import common.util.extensions.showKeyboard
+import data.model.Contact
+import data.model.Message
+import presentation.common.base.QkActivity
import io.reactivex.Observable
import io.reactivex.rxkotlin.Observables
import io.reactivex.rxkotlin.plusAssign
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt b/qksms/src/main/java/presentation/compose/ComposeState.kt
similarity index 90%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt
rename to qksms/src/main/java/presentation/compose/ComposeState.kt
index 3bbd5444..5ea57403 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt
+++ b/qksms/src/main/java/presentation/compose/ComposeState.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.compose
+package presentation.compose
-import com.moez.QKSMS.data.model.Contact
-import com.moez.QKSMS.data.model.Message
+import data.model.Contact
+import data.model.Message
import io.realm.RealmResults
data class ComposeState(
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt b/qksms/src/main/java/presentation/compose/ComposeView.kt
similarity index 88%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt
rename to qksms/src/main/java/presentation/compose/ComposeView.kt
index a7d00fbb..2d148b0c 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt
+++ b/qksms/src/main/java/presentation/compose/ComposeView.kt
@@ -16,11 +16,11 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.compose
+package presentation.compose
-import com.moez.QKSMS.data.model.Contact
-import com.moez.QKSMS.data.model.Message
-import com.moez.QKSMS.presentation.common.base.QkView
+import data.model.Contact
+import data.model.Message
+import presentation.common.base.QkView
import io.reactivex.Observable
import io.reactivex.subjects.Subject
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt b/qksms/src/main/java/presentation/compose/ComposeViewModel.kt
similarity index 94%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt
rename to qksms/src/main/java/presentation/compose/ComposeViewModel.kt
index 0b9e8336..0da73dc9 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt
+++ b/qksms/src/main/java/presentation/compose/ComposeViewModel.kt
@@ -16,22 +16,22 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.compose
+package presentation.compose
import android.content.Context
import com.moez.QKSMS.R
-import com.moez.QKSMS.common.di.appComponent
-import com.moez.QKSMS.common.util.ClipboardUtils
-import com.moez.QKSMS.common.util.extensions.asObservable
-import com.moez.QKSMS.common.util.extensions.makeToast
-import com.moez.QKSMS.common.util.filter.ContactFilter
-import com.moez.QKSMS.data.model.Contact
-import com.moez.QKSMS.data.model.Conversation
-import com.moez.QKSMS.data.repository.ContactRepository
-import com.moez.QKSMS.data.repository.MessageRepository
-import com.moez.QKSMS.domain.interactor.*
-import com.moez.QKSMS.presentation.Navigator
-import com.moez.QKSMS.presentation.common.base.QkViewModel
+import common.di.appComponent
+import common.util.ClipboardUtils
+import common.util.extensions.asObservable
+import common.util.extensions.makeToast
+import common.util.filter.ContactFilter
+import data.model.Contact
+import data.model.Conversation
+import data.repository.ContactRepository
+import data.repository.MessageRepository
+import interactor.*
+import presentation.Navigator
+import presentation.common.base.QkViewModel
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.rxkotlin.Observables
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeWindowCallback.kt b/qksms/src/main/java/presentation/compose/ComposeWindowCallback.kt
similarity index 99%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeWindowCallback.kt
rename to qksms/src/main/java/presentation/compose/ComposeWindowCallback.kt
index 24cf9c1e..44a9c372 100755
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeWindowCallback.kt
+++ b/qksms/src/main/java/presentation/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 com.moez.QKSMS.presentation.compose
+package presentation.compose
import android.app.Activity
import android.graphics.Rect
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt b/qksms/src/main/java/presentation/compose/ContactAdapter.kt
similarity index 90%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt
rename to qksms/src/main/java/presentation/compose/ContactAdapter.kt
index 8c423f3e..8a9cb3dc 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt
+++ b/qksms/src/main/java/presentation/compose/ContactAdapter.kt
@@ -16,16 +16,16 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.compose
+package presentation.compose
import android.content.Context
import android.view.LayoutInflater
import android.view.ViewGroup
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
-import com.moez.QKSMS.data.model.Contact
-import com.moez.QKSMS.presentation.common.base.QkAdapter
-import com.moez.QKSMS.presentation.common.base.QkViewHolder
+import data.model.Contact
+import presentation.common.base.QkAdapter
+import presentation.common.base.QkViewHolder
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.contact_list_item.view.*
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/DetailedChipView.kt b/qksms/src/main/java/presentation/compose/DetailedChipView.kt
similarity index 91%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/compose/DetailedChipView.kt
rename to qksms/src/main/java/presentation/compose/DetailedChipView.kt
index d7f812dd..e15fc125 100755
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/DetailedChipView.kt
+++ b/qksms/src/main/java/presentation/compose/DetailedChipView.kt
@@ -16,17 +16,17 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.compose
+package presentation.compose
import android.content.Context
import android.view.View
import android.view.animation.AlphaAnimation
import android.widget.RelativeLayout
import com.moez.QKSMS.R
-import com.moez.QKSMS.common.di.appComponent
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.data.model.Contact
+import common.di.appComponent
+import common.util.Colors
+import common.util.extensions.setBackgroundTint
+import data.model.Contact
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.plusAssign
import kotlinx.android.synthetic.main.contact_chip_detailed.view.*
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt b/qksms/src/main/java/presentation/compose/MessagesAdapter.kt
similarity index 92%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt
rename to qksms/src/main/java/presentation/compose/MessagesAdapter.kt
index d7f01e76..f8e46530 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt
+++ b/qksms/src/main/java/presentation/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 com.moez.QKSMS.presentation.compose
+package presentation.compose
import android.content.Context
import android.support.v7.widget.RecyclerView
@@ -25,16 +25,16 @@ import android.view.View
import android.view.ViewGroup
import com.jakewharton.rxbinding2.view.RxView
import com.moez.QKSMS.R
-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.setBackgroundTint
-import com.moez.QKSMS.common.util.extensions.setPadding
-import com.moez.QKSMS.common.util.extensions.setVisible
-import com.moez.QKSMS.data.model.Contact
-import com.moez.QKSMS.data.model.Message
-import com.moez.QKSMS.data.model.PhoneNumber
-import com.moez.QKSMS.presentation.common.base.QkViewHolder
+import common.util.Colors
+import common.util.DateFormatter
+import common.util.extensions.dpToPx
+import common.util.extensions.setBackgroundTint
+import common.util.extensions.setPadding
+import common.util.extensions.setVisible
+import data.model.Contact
+import data.model.Message
+import data.model.PhoneNumber
+import presentation.common.base.QkViewHolder
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.subjects.PublishSubject
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationItemTouchCallback.kt b/qksms/src/main/java/presentation/main/ConversationItemTouchCallback.kt
similarity index 97%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationItemTouchCallback.kt
rename to qksms/src/main/java/presentation/main/ConversationItemTouchCallback.kt
index adaf57d1..8d59752a 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationItemTouchCallback.kt
+++ b/qksms/src/main/java/presentation/main/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 com.moez.QKSMS.presentation.main
+package presentation.main
import android.support.v7.widget.RecyclerView
import android.support.v7.widget.helper.ItemTouchHelper
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt b/qksms/src/main/java/presentation/main/ConversationsAdapter.kt
similarity index 88%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt
rename to qksms/src/main/java/presentation/main/ConversationsAdapter.kt
index 558cf848..307cb247 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt
+++ b/qksms/src/main/java/presentation/main/ConversationsAdapter.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.main
+package presentation.main
import android.content.Context
import android.support.v7.widget.RecyclerView
@@ -25,15 +25,15 @@ import android.view.ViewGroup
import com.jakewharton.rxbinding2.view.clicks
import com.jakewharton.rxbinding2.view.longClicks
import com.moez.QKSMS.R
-import com.moez.QKSMS.common.util.Colors
-import com.moez.QKSMS.common.util.DateFormatter
-import com.moez.QKSMS.data.model.Contact
-import com.moez.QKSMS.data.model.InboxItem
-import com.moez.QKSMS.data.model.PhoneNumber
-import com.moez.QKSMS.data.repository.MessageRepository
-import com.moez.QKSMS.presentation.Navigator
-import com.moez.QKSMS.presentation.common.base.FlowableAdapter
-import com.moez.QKSMS.presentation.common.base.QkViewHolder
+import common.util.Colors
+import common.util.DateFormatter
+import data.model.Contact
+import data.model.InboxItem
+import data.model.PhoneNumber
+import data.repository.MessageRepository
+import presentation.Navigator
+import presentation.common.base.FlowableAdapter
+import presentation.common.base.QkViewHolder
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.subjects.PublishSubject
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt b/qksms/src/main/java/presentation/main/MainActivity.kt
similarity index 96%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt
rename to qksms/src/main/java/presentation/main/MainActivity.kt
index ffed0372..84cd19c2 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainActivity.kt
+++ b/qksms/src/main/java/presentation/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 com.moez.QKSMS.presentation.main
+package presentation.main
import android.app.AlertDialog
import android.content.Intent
@@ -36,13 +36,10 @@ 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.di.appComponent
-import com.moez.QKSMS.common.util.extensions.dpToPx
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.common.util.extensions.setVisible
-import com.moez.QKSMS.presentation.Navigator
-import com.moez.QKSMS.presentation.common.MenuItemAdapter
-import com.moez.QKSMS.presentation.common.base.QkActivity
+import common.di.appComponent
+import common.util.extensions.dpToPx
+import common.util.extensions.setBackgroundTint
+import common.util.extensions.setVisible
import io.reactivex.Observable
import io.reactivex.rxkotlin.Observables
import io.reactivex.rxkotlin.plusAssign
@@ -51,6 +48,9 @@ import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.drawer_view.*
import kotlinx.android.synthetic.main.main_activity.*
import kotlinx.android.synthetic.main.toolbar_search.*
+import presentation.Navigator
+import presentation.common.MenuItemAdapter
+import presentation.common.base.QkActivity
import javax.inject.Inject
class MainActivity : QkActivity(), MainView {
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt b/qksms/src/main/java/presentation/main/MainState.kt
similarity index 91%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt
rename to qksms/src/main/java/presentation/main/MainState.kt
index 79eab82f..ff2e332b 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainState.kt
+++ b/qksms/src/main/java/presentation/main/MainState.kt
@@ -16,10 +16,10 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.main
+package presentation.main
-import com.moez.QKSMS.data.model.InboxItem
-import com.moez.QKSMS.data.model.MenuItem
+import data.model.InboxItem
+import data.model.MenuItem
import io.reactivex.Flowable
data class MainState(
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt b/qksms/src/main/java/presentation/main/MainView.kt
similarity index 93%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt
rename to qksms/src/main/java/presentation/main/MainView.kt
index 9cc5d90a..22a5ab3f 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainView.kt
+++ b/qksms/src/main/java/presentation/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 com.moez.QKSMS.presentation.main
+package presentation.main
-import com.moez.QKSMS.presentation.common.base.QkView
+import presentation.common.base.QkView
import io.reactivex.Observable
import io.reactivex.subjects.Subject
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt b/qksms/src/main/java/presentation/main/MainViewModel.kt
similarity index 95%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt
rename to qksms/src/main/java/presentation/main/MainViewModel.kt
index fa2912ca..7043ce65 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt
+++ b/qksms/src/main/java/presentation/main/MainViewModel.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.main
+package presentation.main
import android.Manifest
import android.content.Context
@@ -24,14 +24,14 @@ import android.content.pm.PackageManager
import android.provider.Telephony
import android.support.v4.content.ContextCompat
import com.moez.QKSMS.R
-import com.moez.QKSMS.common.di.appComponent
-import com.moez.QKSMS.common.util.filter.ConversationFilter
-import com.moez.QKSMS.data.model.MenuItem
-import com.moez.QKSMS.data.model.SyncLog
-import com.moez.QKSMS.data.repository.MessageRepository
-import com.moez.QKSMS.domain.interactor.*
-import com.moez.QKSMS.presentation.Navigator
-import com.moez.QKSMS.presentation.common.base.QkViewModel
+import common.di.appComponent
+import common.util.filter.ConversationFilter
+import data.model.MenuItem
+import data.model.SyncLog
+import data.repository.MessageRepository
+import interactor.*
+import presentation.Navigator
+import presentation.common.base.QkViewModel
import io.reactivex.Observable
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.rxkotlin.withLatestFrom
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt b/qksms/src/main/java/presentation/settings/SettingsActivity.kt
similarity index 95%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt
rename to qksms/src/main/java/presentation/settings/SettingsActivity.kt
index 4b60afb4..973c7b0e 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt
+++ b/qksms/src/main/java/presentation/settings/SettingsActivity.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.settings
+package presentation.settings
import android.app.AlertDialog
import android.app.ProgressDialog
@@ -26,11 +26,11 @@ import android.support.v7.widget.RecyclerView
import com.google.android.flexbox.FlexboxLayoutManager
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
-import com.moez.QKSMS.common.di.appComponent
-import com.moez.QKSMS.common.util.extensions.dpToPx
-import com.moez.QKSMS.common.util.extensions.setVisible
-import com.moez.QKSMS.presentation.common.base.QkActivity
-import com.moez.QKSMS.presentation.common.widget.PreferenceView
+import common.di.appComponent
+import common.util.extensions.dpToPx
+import common.util.extensions.setVisible
+import presentation.common.base.QkActivity
+import presentation.common.widget.PreferenceView
import io.reactivex.Observable
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.subjects.PublishSubject
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsState.kt b/qksms/src/main/java/presentation/settings/SettingsState.kt
similarity index 96%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsState.kt
rename to qksms/src/main/java/presentation/settings/SettingsState.kt
index 6c39fae9..6469ebfe 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsState.kt
+++ b/qksms/src/main/java/presentation/settings/SettingsState.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.settings
+package presentation.settings
data class SettingsState(
val selectingTheme: Boolean = false,
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsView.kt b/qksms/src/main/java/presentation/settings/SettingsView.kt
similarity index 85%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsView.kt
rename to qksms/src/main/java/presentation/settings/SettingsView.kt
index cd4878b5..5f084273 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsView.kt
+++ b/qksms/src/main/java/presentation/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 com.moez.QKSMS.presentation.settings
+package presentation.settings
-import com.moez.QKSMS.presentation.common.base.QkView
-import com.moez.QKSMS.presentation.common.widget.PreferenceView
+import presentation.common.base.QkView
+import presentation.common.widget.PreferenceView
import io.reactivex.Observable
import io.reactivex.subjects.Subject
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt b/qksms/src/main/java/presentation/settings/SettingsViewModel.kt
similarity index 94%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt
rename to qksms/src/main/java/presentation/settings/SettingsViewModel.kt
index 290b5415..a6cab283 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsViewModel.kt
+++ b/qksms/src/main/java/presentation/settings/SettingsViewModel.kt
@@ -16,15 +16,15 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.settings
+package presentation.settings
import android.content.Context
import com.moez.QKSMS.R
-import com.moez.QKSMS.common.di.appComponent
-import com.moez.QKSMS.common.util.Preferences
-import com.moez.QKSMS.domain.interactor.FullSync
-import com.moez.QKSMS.presentation.Navigator
-import com.moez.QKSMS.presentation.common.base.QkViewModel
+import common.di.appComponent
+import common.util.Preferences
+import interactor.FullSync
+import presentation.Navigator
+import presentation.common.base.QkViewModel
import io.reactivex.rxkotlin.plusAssign
import timber.log.Timber
import javax.inject.Inject
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/ThemeAdapter.kt b/qksms/src/main/java/presentation/settings/ThemeAdapter.kt
similarity index 87%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/settings/ThemeAdapter.kt
rename to qksms/src/main/java/presentation/settings/ThemeAdapter.kt
index 6a425a01..0204e707 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/ThemeAdapter.kt
+++ b/qksms/src/main/java/presentation/settings/ThemeAdapter.kt
@@ -16,15 +16,15 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.settings
+package presentation.settings
import android.content.Context
import android.view.LayoutInflater
import android.view.ViewGroup
import com.moez.QKSMS.R
-import com.moez.QKSMS.common.util.extensions.setBackgroundTint
-import com.moez.QKSMS.presentation.common.base.QkAdapter
-import com.moez.QKSMS.presentation.common.base.QkViewHolder
+import common.util.extensions.setBackgroundTint
+import presentation.common.base.QkAdapter
+import presentation.common.base.QkViewHolder
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.theme_list_item.view.*
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/setup/SetupActivity.kt b/qksms/src/main/java/presentation/setup/SetupActivity.kt
similarity index 92%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/setup/SetupActivity.kt
rename to qksms/src/main/java/presentation/setup/SetupActivity.kt
index 5267f5ac..5a9aabfc 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/setup/SetupActivity.kt
+++ b/qksms/src/main/java/presentation/setup/SetupActivity.kt
@@ -16,16 +16,16 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.setup
+package presentation.setup
import android.Manifest
import android.os.Bundle
import android.support.v4.app.ActivityCompat
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
-import com.moez.QKSMS.common.di.appComponent
-import com.moez.QKSMS.presentation.Navigator
-import com.moez.QKSMS.presentation.common.base.QkActivity
+import common.di.appComponent
+import presentation.Navigator
+import presentation.common.base.QkActivity
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/setup/SetupState.kt b/qksms/src/main/java/presentation/setup/SetupState.kt
similarity index 94%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/setup/SetupState.kt
rename to qksms/src/main/java/presentation/setup/SetupState.kt
index 9d9c0c1d..92c622cc 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/setup/SetupState.kt
+++ b/qksms/src/main/java/presentation/setup/SetupState.kt
@@ -16,6 +16,6 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.setup
+package presentation.setup
class SetupState
\ No newline at end of file
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/setup/SetupView.kt b/qksms/src/main/java/presentation/setup/SetupView.kt
similarity index 91%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/setup/SetupView.kt
rename to qksms/src/main/java/presentation/setup/SetupView.kt
index 44c4e861..1ff6acec 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/setup/SetupView.kt
+++ b/qksms/src/main/java/presentation/setup/SetupView.kt
@@ -16,9 +16,9 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.setup
+package presentation.setup
-import com.moez.QKSMS.presentation.common.base.QkView
+import presentation.common.base.QkView
import io.reactivex.Observable
interface SetupView : QkView {
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/setup/SetupViewModel.kt b/qksms/src/main/java/presentation/setup/SetupViewModel.kt
similarity index 89%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/setup/SetupViewModel.kt
rename to qksms/src/main/java/presentation/setup/SetupViewModel.kt
index 581a4d85..b6fa4ae8 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/setup/SetupViewModel.kt
+++ b/qksms/src/main/java/presentation/setup/SetupViewModel.kt
@@ -16,13 +16,13 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.presentation.setup
+package presentation.setup
import android.content.Context
import android.provider.Telephony
-import com.moez.QKSMS.common.di.appComponent
-import com.moez.QKSMS.common.util.Permissions
-import com.moez.QKSMS.presentation.common.base.QkViewModel
+import common.di.appComponent
+import common.util.Permissions
+import presentation.common.base.QkViewModel
import io.reactivex.rxkotlin.plusAssign
import javax.inject.Inject
diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt b/qksms/src/main/java/receiver/DefaultSmsChangedReceiver.kt
similarity index 89%
rename from qksms/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt
rename to qksms/src/main/java/receiver/DefaultSmsChangedReceiver.kt
index c8266eac..b454babb 100644
--- a/qksms/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt
+++ b/qksms/src/main/java/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 com.moez.QKSMS.receiver
+package 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.common.di.appComponent
-import com.moez.QKSMS.common.util.Preferences
-import com.moez.QKSMS.domain.interactor.PartialSync
+import common.di.appComponent
+import common.util.Preferences
+import interactor.PartialSync
import javax.inject.Inject
class DefaultSmsChangedReceiver : BroadcastReceiver() {
diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt b/qksms/src/main/java/receiver/MarkReadReceiver.kt
similarity index 90%
rename from qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt
rename to qksms/src/main/java/receiver/MarkReadReceiver.kt
index 97fba116..94bd522a 100644
--- a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt
+++ b/qksms/src/main/java/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 com.moez.QKSMS.receiver
+package receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
-import com.moez.QKSMS.common.di.appComponent
-import com.moez.QKSMS.domain.interactor.MarkRead
+import common.di.appComponent
+import interactor.MarkRead
import javax.inject.Inject
class MarkReadReceiver : BroadcastReceiver() {
diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt b/qksms/src/main/java/receiver/MarkSeenReceiver.kt
similarity index 90%
rename from qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt
rename to qksms/src/main/java/receiver/MarkSeenReceiver.kt
index 3a225884..fdc1e01e 100644
--- a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt
+++ b/qksms/src/main/java/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 com.moez.QKSMS.receiver
+package receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
-import com.moez.QKSMS.common.di.appComponent
-import com.moez.QKSMS.domain.interactor.MarkSeen
+import common.di.appComponent
+import interactor.MarkSeen
import javax.inject.Inject
class MarkSeenReceiver : BroadcastReceiver() {
diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/MessageDeliveredReceiver.kt b/qksms/src/main/java/receiver/MessageDeliveredReceiver.kt
similarity index 90%
rename from qksms/src/main/java/com/moez/QKSMS/receiver/MessageDeliveredReceiver.kt
rename to qksms/src/main/java/receiver/MessageDeliveredReceiver.kt
index e43f32b7..a0d1014f 100644
--- a/qksms/src/main/java/com/moez/QKSMS/receiver/MessageDeliveredReceiver.kt
+++ b/qksms/src/main/java/receiver/MessageDeliveredReceiver.kt
@@ -16,15 +16,15 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.receiver
+package receiver
import android.app.Activity
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
-import com.moez.QKSMS.common.di.appComponent
-import com.moez.QKSMS.domain.interactor.MarkDelivered
-import com.moez.QKSMS.domain.interactor.MarkDeliveryFailed
+import common.di.appComponent
+import interactor.MarkDelivered
+import interactor.MarkDeliveryFailed
import javax.inject.Inject
class MessageDeliveredReceiver : BroadcastReceiver() {
diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt b/qksms/src/main/java/receiver/MessageSentReceiver.kt
similarity index 90%
rename from qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt
rename to qksms/src/main/java/receiver/MessageSentReceiver.kt
index 1ef174c2..a173d60a 100644
--- a/qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt
+++ b/qksms/src/main/java/receiver/MessageSentReceiver.kt
@@ -16,16 +16,16 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.receiver
+package 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.common.di.appComponent
-import com.moez.QKSMS.domain.interactor.MarkFailed
-import com.moez.QKSMS.domain.interactor.MarkSent
+import common.di.appComponent
+import interactor.MarkFailed
+import interactor.MarkSent
import javax.inject.Inject
class MessageSentReceiver : BroadcastReceiver() {
diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.kt b/qksms/src/main/java/receiver/MmsReceiver.kt
similarity index 98%
rename from qksms/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.kt
rename to qksms/src/main/java/receiver/MmsReceiver.kt
index 50e5efba..af393b52 100644
--- a/qksms/src/main/java/com/moez/QKSMS/receiver/MmsReceiver.kt
+++ b/qksms/src/main/java/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 com.moez.QKSMS.receiver
+package receiver
import android.content.BroadcastReceiver
import android.content.Context
diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt b/qksms/src/main/java/receiver/RemoteMessagingReceiver.kt
similarity index 90%
rename from qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt
rename to qksms/src/main/java/receiver/RemoteMessagingReceiver.kt
index f2723ea7..79d6cc3a 100644
--- a/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt
+++ b/qksms/src/main/java/receiver/RemoteMessagingReceiver.kt
@@ -16,15 +16,15 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.receiver
+package receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.support.v4.app.RemoteInput
-import com.moez.QKSMS.common.di.appComponent
-import com.moez.QKSMS.domain.interactor.MarkRead
-import com.moez.QKSMS.domain.interactor.SendMessage
+import common.di.appComponent
+import interactor.MarkRead
+import interactor.SendMessage
import javax.inject.Inject
class RemoteMessagingReceiver : BroadcastReceiver() {
diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt b/qksms/src/main/java/receiver/SmsReceiver.kt
similarity index 92%
rename from qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt
rename to qksms/src/main/java/receiver/SmsReceiver.kt
index c4a4c0de..966f83ec 100644
--- a/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt
+++ b/qksms/src/main/java/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 com.moez.QKSMS.receiver
+package receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.provider.Telephony.Sms
-import com.moez.QKSMS.common.di.appComponent
-import com.moez.QKSMS.domain.interactor.ReceiveMessage
+import common.di.appComponent
+import interactor.ReceiveMessage
import timber.log.Timber
import javax.inject.Inject
diff --git a/qksms/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt b/qksms/src/main/java/service/HeadlessSmsSendService.kt
similarity index 96%
rename from qksms/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt
rename to qksms/src/main/java/service/HeadlessSmsSendService.kt
index 687f029b..cc13e9ce 100644
--- a/qksms/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt
+++ b/qksms/src/main/java/service/HeadlessSmsSendService.kt
@@ -16,7 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.service
+package service
import android.app.IntentService
import android.content.Intent
diff --git a/qksms/src/main/res/layout/avatar_view.xml b/qksms/src/main/res/layout/avatar_view.xml
index a835d1e2..a9f75d69 100644
--- a/qksms/src/main/res/layout/avatar_view.xml
+++ b/qksms/src/main/res/layout/avatar_view.xml
@@ -24,9 +24,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:background="@color/tools_theme"
- tools:parentTag="com.moez.QKSMS.presentation.common.widget.AvatarView">
+ tools:parentTag="presentation.common.widget.AvatarView">
- .
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -48,7 +48,7 @@
style="@style/DrawerIcon"
android:src="@drawable/ic_folder_black_24dp" />
-
@@ -64,7 +64,7 @@
style="@style/DrawerIcon"
android:src="@drawable/ic_event_black_24dp" />
-
@@ -80,13 +80,13 @@
style="@style/DrawerIcon"
android:src="@drawable/ic_block_black_24dp" />
-
-
-
diff --git a/qksms/src/main/res/layout/group_avatar_view.xml b/qksms/src/main/res/layout/group_avatar_view.xml
index a3626cbd..7654547d 100644
--- a/qksms/src/main/res/layout/group_avatar_view.xml
+++ b/qksms/src/main/res/layout/group_avatar_view.xml
@@ -23,9 +23,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
- tools:parentTag="com.moez.QKSMS.presentation.common.widget.GroupAvatarView">
+ tools:parentTag="presentation.common.widget.GroupAvatarView">
-
-
-
-
-
-
-
-
-
-
-
+ tools:parentTag="presentation.common.widget.PreferenceView">
-
-
-
diff --git a/qksms/src/main/res/layout/settings_activity.xml b/qksms/src/main/res/layout/settings_activity.xml
index 6ee4a0e2..4207df41 100644
--- a/qksms/src/main/res/layout/settings_activity.xml
+++ b/qksms/src/main/res/layout/settings_activity.xml
@@ -40,26 +40,26 @@
android:layout_height="wrap_content"
android:orientation="vertical">
-
-
-
-
-
-
-
-
-
-
-
-
-
- .
-->
-
-
-
-
-
-
-
- .
*/
-package com.moez.QKSMS
import org.junit.Test
import org.junit.runner.RunWith