Fixed package names for classes in presentation module

2018-03-22 22:37:03 -04:00
parent 7212983ffe
commit 436e514c33
124 changed files with 382 additions and 364 deletions
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.common
+package common

 import com.bumptech.glide.load.DataSource
 import com.bumptech.glide.load.engine.GlideException
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.common
+package common

 import android.content.Context
 import android.support.annotation.ArrayRes
@@ -33,8 +33,8 @@ import io.reactivex.rxkotlin.plusAssign
 import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject
 import kotlinx.android.synthetic.main.menu_list_item.view.*
-import presentation.common.base.QkAdapter
-import presentation.common.base.QkViewHolder
+import common.base.QkAdapter
+import common.base.QkViewHolder
 import javax.inject.Inject

 data class MenuItem(val title: String, val actionId: Int)
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.common
+package common

 import android.app.Activity
 import android.app.ActivityOptions
@@ -31,25 +31,25 @@ import android.provider.Settings
 import android.provider.Telephony
 import android.view.View
 import manager.NotificationManager
-import presentation.feature.blocked.BlockedActivity
-import presentation.feature.blocked.BlockedViewModel
-import presentation.feature.compose.ComposeActivity
-import presentation.feature.compose.ComposeViewModel
-import presentation.feature.conversationinfo.ConversationInfoActivity
-import presentation.feature.conversationinfo.ConversationInfoViewModel
-import presentation.feature.gallery.GalleryActivity
-import presentation.feature.gallery.GalleryViewModel
-import presentation.feature.main.MainViewModel
-import presentation.feature.notificationprefs.NotificationPrefsActivity
-import presentation.feature.notificationprefs.NotificationPrefsViewModel
-import presentation.feature.plus.PlusActivity
-import presentation.feature.plus.PlusViewModel
-import presentation.feature.settings.SettingsActivity
-import presentation.feature.settings.SettingsViewModel
-import presentation.feature.setup.SetupActivity
-import presentation.feature.setup.SetupViewModel
-import presentation.feature.themepicker.ThemePickerActivity
-import presentation.feature.themepicker.ThemePickerViewModel
+import feature.blocked.BlockedActivity
+import feature.blocked.BlockedViewModel
+import feature.compose.ComposeActivity
+import feature.compose.ComposeViewModel
+import feature.conversationinfo.ConversationInfoActivity
+import feature.conversationinfo.ConversationInfoViewModel
+import feature.gallery.GalleryActivity
+import feature.gallery.GalleryViewModel
+import feature.main.MainViewModel
+import feature.notificationprefs.NotificationPrefsActivity
+import feature.notificationprefs.NotificationPrefsViewModel
+import feature.plus.PlusActivity
+import feature.plus.PlusViewModel
+import feature.settings.SettingsActivity
+import feature.settings.SettingsViewModel
+import feature.setup.SetupActivity
+import feature.setup.SetupViewModel
+import feature.themepicker.ThemePickerActivity
+import feature.themepicker.ThemePickerViewModel
 import javax.inject.Inject
 import javax.inject.Singleton

@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.common.base
+package common.base

 import android.support.annotation.CallSuper
 import android.support.v7.widget.RecyclerView
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.common.base
+package common.base

 import android.annotation.SuppressLint
 import android.arch.lifecycle.ViewModelProviders
@@ -27,7 +27,7 @@ import android.view.MenuItem
 import io.reactivex.subjects.BehaviorSubject
 import io.reactivex.subjects.Subject
 import kotlinx.android.synthetic.main.toolbar.*
-import presentation.common.Navigator
+import common.Navigator
 import kotlin.reflect.KClass

 abstract class QkActivity<VM : QkViewModel<*, *>> : AppCompatActivity() {
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.common.base
+package common.base

 import android.support.v7.util.DiffUtil
 import android.support.v7.widget.RecyclerView
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.common.base
+package common.base

 import android.annotation.SuppressLint
 import android.arch.lifecycle.Lifecycle
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.common.base
+package common.base

 import android.arch.lifecycle.LifecycleOwner

@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.common.base
+package common.base

 import android.support.v7.widget.RecyclerView
 import android.view.View
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.common.base
+package common.base

 import android.arch.lifecycle.ViewModel
 import android.support.annotation.CallSuper
@@ -22,7 +22,7 @@ import android.app.AlarmManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import presentation.receiver.NightModeReceiver
+import receiver.NightModeReceiver
 import util.Preferences
 import java.util.*
 import java.util.concurrent.TimeUnit
@@ -32,10 +32,10 @@ import android.support.v4.app.NotificationManagerCompat
 import android.support.v4.app.RemoteInput
 import android.support.v4.app.TaskStackBuilder
 import com.moez.QKSMS.R
-import presentation.feature.compose.ComposeActivity
-import presentation.receiver.MarkReadReceiver
-import presentation.receiver.MarkSeenReceiver
-import presentation.receiver.RemoteMessagingReceiver
+import feature.compose.ComposeActivity
+import receiver.MarkReadReceiver
+import receiver.MarkSeenReceiver
+import receiver.RemoteMessagingReceiver
 import repository.MessageRepository
 import util.Preferences
 import javax.inject.Inject
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.common.widget
+package common.widget

 import android.content.Context
 import android.net.Uri
@@ -35,7 +35,7 @@ import common.util.GlideApp
 import common.util.extensions.setTint
 import kotlinx.android.synthetic.main.avatar_view.view.*
 import model.Contact
-import presentation.common.Navigator
+import common.Navigator
 import javax.inject.Inject

 class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : FrameLayout(context, attrs) {
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.common.widget
+package common.widget

 import android.content.Context
 import android.support.constraint.ConstraintLayout
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.common.widget
+package common.widget

 import android.content.Context
 import android.util.AttributeSet
@@ -26,7 +26,7 @@ import injection.appComponent
 import common.util.GlideApp
 import common.util.extensions.setVisible
 import model.MmsPart
-import presentation.common.Navigator
+import common.Navigator
 import javax.inject.Inject

 class MmsPreviewView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : LinearLayout(context, attrs) {
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.common.widget
+package common.widget

 import android.content.Context
 import android.content.res.ColorStateList
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.common.widget
+package common.widget

 import android.content.Context
 import android.support.v7.widget.LinearLayoutCompat
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.common.widget
+package common.widget

 import android.content.Context
 import android.graphics.Typeface
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.common.widget
+package common.widget

 import android.content.Context
 import android.content.res.ColorStateList
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.common.widget
+package common.widget

 import android.content.Context
 import android.graphics.Typeface
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.common.widget
+package common.widget

 import android.content.Context
 import android.util.AttributeSet
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.common.widget
+package common.widget

 import android.content.Context
 import android.util.AttributeSet
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.common.widget
+package common.widget

 import android.content.Context
 import android.util.AttributeSet
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.blocked
+package feature.blocked

 import android.app.AlertDialog
 import android.os.Bundle
@@ -28,7 +28,7 @@ import common.util.extensions.setVisible
 import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject
 import kotlinx.android.synthetic.main.blocked_activity.*
-import presentation.common.base.QkThemedActivity
+import common.base.QkThemedActivity
 import javax.inject.Inject

 class BlockedActivity : QkThemedActivity<BlockedViewModel>(), BlockedView {
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.blocked
+package feature.blocked

 import android.content.Context
 import android.view.LayoutInflater
@@ -27,8 +27,8 @@ import kotlinx.android.synthetic.main.blocked_list_item.view.*
 import model.Contact
 import model.Conversation
 import model.PhoneNumber
-import presentation.common.base.FlowableAdapter
-import presentation.common.base.QkViewHolder
+import common.base.FlowableAdapter
+import common.base.QkViewHolder
 import javax.inject.Inject

 class BlockedAdapter @Inject constructor(private val context: Context) : FlowableAdapter<Conversation>() {
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.blocked
+package feature.blocked

 import io.reactivex.Flowable
 import model.Conversation
@@ -16,10 +16,10 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.blocked
+package feature.blocked

 import io.reactivex.Observable
-import presentation.common.base.QkView
+import common.base.QkView

 interface BlockedView : QkView<BlockedState> {

@@ -16,14 +16,14 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.blocked
+package feature.blocked

 import com.uber.autodispose.android.lifecycle.scope
 import com.uber.autodispose.kotlin.autoDisposable
 import injection.appComponent
 import interactor.MarkUnblocked
 import io.reactivex.rxkotlin.withLatestFrom
-import presentation.common.base.QkViewModel
+import common.base.QkViewModel
 import repository.MessageRepository
 import javax.inject.Inject

@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.compose
+package feature.compose

 import android.content.Context
 import android.net.Uri
@@ -34,8 +34,8 @@ import io.reactivex.rxkotlin.plusAssign
 import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject
 import kotlinx.android.synthetic.main.attachment_list_item.view.*
-import presentation.common.base.QkAdapter
-import presentation.common.base.QkViewHolder
+import common.base.QkAdapter
+import common.base.QkViewHolder
 import javax.inject.Inject

 class AttachmentAdapter @Inject constructor(
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.compose
+package feature.compose

 import android.content.Context
 import android.support.v7.widget.RecyclerView
@@ -37,8 +37,8 @@ import common.util.extensions.showKeyboard
 import io.reactivex.subjects.PublishSubject
 import kotlinx.android.synthetic.main.contact_chip.view.*
 import model.Contact
-import presentation.common.base.QkAdapter
-import presentation.common.base.QkViewHolder
+import common.base.QkAdapter
+import common.base.QkViewHolder
 import javax.inject.Inject

 class ChipsAdapter @Inject constructor(private val context: Context, private val colors: Colors) : QkAdapter<Contact>() {
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.compose
+package feature.compose

 import android.app.AlertDialog
 import android.content.res.ColorStateList
@@ -46,7 +46,7 @@ import io.reactivex.subjects.Subject
 import kotlinx.android.synthetic.main.compose_activity.*
 import model.Contact
 import model.Message
-import presentation.common.base.QkThemedActivity
+import common.base.QkThemedActivity
 import javax.inject.Inject

 class ComposeActivity : QkThemedActivity<ComposeViewModel>(), ComposeView {
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.compose
+package feature.compose

 import android.net.Uri
 import io.realm.RealmResults
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.compose
+package feature.compose

 import android.net.Uri
 import android.view.KeyEvent
@@ -24,7 +24,7 @@ import io.reactivex.Observable
 import io.reactivex.subjects.Subject
 import model.Contact
 import model.Message
-import presentation.common.base.QkView
+import common.base.QkView

 interface ComposeView : QkView<ComposeState> {

@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.compose
+package feature.compose

 import android.content.Context
 import android.content.Intent
@@ -53,8 +53,8 @@ import model.Contact
 import model.Conversation
 import model.Message
 import model.PhoneNumber
-import presentation.common.Navigator
-import presentation.common.base.QkViewModel
+import common.Navigator
+import common.base.QkViewModel
 import repository.ContactRepository
 import repository.MessageRepository
 import util.extensions.asObservable
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.compose
+package feature.compose

 import android.app.Activity
 import android.graphics.Rect
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.compose
+package feature.compose

 import android.content.Context
 import android.view.LayoutInflater
@@ -29,8 +29,8 @@ import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject
 import kotlinx.android.synthetic.main.contact_list_item.view.*
 import model.Contact
-import presentation.common.base.QkAdapter
-import presentation.common.base.QkViewHolder
+import common.base.QkAdapter
+import common.base.QkViewHolder
 import javax.inject.Inject

 class ContactAdapter @Inject constructor(private val context: Context) : QkAdapter<Contact>() {
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.compose
+package feature.compose

 import android.content.Context
 import android.view.View
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.compose
+package feature.compose

 import android.content.Context
 import android.support.v7.widget.RecyclerView
@@ -44,7 +44,7 @@ import model.Contact
 import model.Conversation
 import model.Message
 import model.PhoneNumber
-import presentation.common.base.QkViewHolder
+import common.base.QkViewHolder
 import util.extensions.isImage
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.conversationinfo
+package feature.conversationinfo

 import android.os.Bundle
 import android.support.v7.app.AlertDialog
@@ -28,8 +28,8 @@ import injection.appComponent
 import common.util.extensions.setVisible
 import io.reactivex.subjects.PublishSubject
 import kotlinx.android.synthetic.main.conversation_info_activity.*
-import presentation.common.Navigator
-import presentation.common.base.QkThemedActivity
+import common.Navigator
+import common.base.QkThemedActivity
 import javax.inject.Inject

 class ConversationInfoActivity : QkThemedActivity<ConversationInfoViewModel>(), ConversationInfoView {
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.conversationinfo
+package feature.conversationinfo

 import model.MmsPart
 import model.Recipient
@@ -16,10 +16,10 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.conversationinfo
+package feature.conversationinfo

 import io.reactivex.Observable
-import presentation.common.base.QkView
+import common.base.QkView

 interface ConversationInfoView : QkView<ConversationInfoState> {

@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.conversationinfo
+package feature.conversationinfo

 import android.content.Context
 import android.content.Intent
@@ -32,8 +32,8 @@ import io.reactivex.Observable
 import io.reactivex.rxkotlin.plusAssign
 import io.reactivex.rxkotlin.withLatestFrom
 import model.Conversation
-import presentation.common.Navigator
-import presentation.common.base.QkViewModel
+import common.Navigator
+import common.base.QkViewModel
 import repository.MessageRepository
 import util.extensions.asObservable
 import util.extensions.isImage
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.conversationinfo
+package feature.conversationinfo

 import android.content.Context
 import android.support.v7.widget.RecyclerView
@@ -31,8 +31,8 @@ import io.reactivex.rxkotlin.plusAssign
 import io.reactivex.subjects.PublishSubject
 import kotlinx.android.synthetic.main.conversation_media_list_item.view.*
 import model.MmsPart
-import presentation.common.base.QkAdapter
-import presentation.common.base.QkViewHolder
+import common.base.QkAdapter
+import common.base.QkViewHolder
 import javax.inject.Inject

 class ConversationMediaAdapter @Inject constructor(
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.conversationinfo
+package feature.conversationinfo

 import android.content.Context
 import android.support.v7.widget.RecyclerView
@@ -30,9 +30,9 @@ import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.plusAssign
 import kotlinx.android.synthetic.main.conversation_recipient_list_item.view.*
 import model.Recipient
-import presentation.common.Navigator
-import presentation.common.base.QkAdapter
-import presentation.common.base.QkViewHolder
+import common.Navigator
+import common.base.QkAdapter
+import common.base.QkViewHolder
 import javax.inject.Inject

 class ConversationRecipientAdapter @Inject constructor(
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.conversationinfo
+package feature.conversationinfo

 import android.content.Context
 import android.graphics.Rect
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.conversations
+package feature.conversations

 import android.support.v7.widget.RecyclerView
 import android.support.v7.widget.helper.ItemTouchHelper
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.conversations
+package feature.conversations

 import android.content.Context
 import android.support.v7.widget.RecyclerView
@@ -36,9 +36,9 @@ import model.Contact
 import model.Conversation
 import model.Message
 import model.PhoneNumber
-import presentation.common.Navigator
-import presentation.common.base.FlowableAdapter
-import presentation.common.base.QkViewHolder
+import common.Navigator
+import common.base.FlowableAdapter
+import common.base.QkViewHolder
 import repository.MessageRepository
 import javax.inject.Inject

@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.gallery
+package feature.gallery

 import android.os.Bundle
 import android.transition.ChangeBounds
@@ -31,8 +31,8 @@ import common.util.extensions.setVisible
 import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject
 import kotlinx.android.synthetic.main.gallery_activity.*
-import presentation.common.GlideCompletionListener
-import presentation.common.base.QkActivity
+import common.GlideCompletionListener
+import common.base.QkActivity

 class GalleryActivity : QkActivity<GalleryViewModel>(), GalleryView {

@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.gallery
+package feature.gallery

 data class GalleryState(
        val navigationVisible: Boolean = true,
@@ -16,10 +16,10 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.gallery
+package feature.gallery

 import io.reactivex.Observable
-import presentation.common.base.QkView
+import common.base.QkView

 interface GalleryView : QkView<GalleryState> {

@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.gallery
+package feature.gallery

 import android.content.Context
 import android.content.Intent
@@ -29,7 +29,7 @@ import interactor.SaveImage
 import io.reactivex.Flowable
 import io.reactivex.rxkotlin.plusAssign
 import io.reactivex.rxkotlin.withLatestFrom
-import presentation.common.base.QkViewModel
+import common.base.QkViewModel
 import repository.MessageRepository
 import util.extensions.mapNotNull
 import javax.inject.Inject
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.main
+package feature.main

 import android.app.AlertDialog
 import android.content.res.ColorStateList
@@ -37,21 +37,21 @@ import com.jakewharton.rxbinding2.widget.textChanges
 import com.moez.QKSMS.R
 import com.uber.autodispose.android.lifecycle.scope
 import com.uber.autodispose.kotlin.autoDisposable
-import injection.appComponent
+import common.MenuItemAdapter
+import common.Navigator
+import common.base.QkThemedActivity
 import common.util.extensions.dpToPx
 import common.util.extensions.setBackgroundTint
 import common.util.extensions.setVisible
+import feature.conversations.ConversationItemTouchCallback
+import feature.conversations.ConversationsAdapter
+import injection.appComponent
 import io.reactivex.Observable
 import io.reactivex.rxkotlin.Observables
 import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject
 import kotlinx.android.synthetic.main.drawer_view.*
 import kotlinx.android.synthetic.main.main_activity.*
-import presentation.common.MenuItemAdapter
-import presentation.common.Navigator
-import presentation.common.base.QkThemedActivity
-import presentation.feature.conversations.ConversationItemTouchCallback
-import presentation.feature.conversations.ConversationsAdapter
 import javax.inject.Inject

 class MainActivity : QkThemedActivity<MainViewModel>(), MainView {
@@ -16,12 +16,12 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.main
+package feature.main

 import io.reactivex.Flowable
 import model.Conversation
 import model.Message
-import presentation.common.MenuItem
+import common.MenuItem

 data class MainState(
        val page: MainPage = Inbox(),
@@ -16,10 +16,10 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.main
+package feature.main

 import io.reactivex.Observable
-import presentation.common.base.QkView
+import common.base.QkView

 interface MainView : QkView<MainState> {

@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.main
+package feature.main

 import android.Manifest
 import android.content.Context
@@ -39,9 +39,9 @@ import io.reactivex.rxkotlin.plusAssign
 import io.reactivex.rxkotlin.withLatestFrom
 import io.realm.Realm
 import model.SyncLog
-import presentation.common.MenuItem
-import presentation.common.Navigator
-import presentation.common.base.QkViewModel
+import common.MenuItem
+import common.Navigator
+import common.base.QkViewModel
 import repository.MessageRepository
 import util.Preferences
 import util.extensions.toFlowable
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.notificationprefs
+package feature.notificationprefs

 import android.app.Activity
 import android.content.Intent
@@ -32,9 +32,9 @@ import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject
 import kotlinx.android.synthetic.main.notification_prefs_activity.*
 import kotlinx.android.synthetic.main.settings_switch_widget.view.*
-import presentation.common.MenuItemAdapter
-import presentation.common.base.QkThemedActivity
-import presentation.common.widget.PreferenceView
+import common.MenuItemAdapter
+import common.base.QkThemedActivity
+import common.widget.PreferenceView
 import javax.inject.Inject

 class NotificationPrefsActivity : QkThemedActivity<NotificationPrefsViewModel>(), NotificationPrefsView {
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.notificationprefs
+package feature.notificationprefs

 data class NotificationPrefsState(
        val conversationTitle: String = "",
@@ -16,13 +16,13 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.notificationprefs
+package feature.notificationprefs

 import android.net.Uri
 import io.reactivex.Observable
 import io.reactivex.subjects.Subject
-import presentation.common.base.QkView
-import presentation.common.widget.PreferenceView
+import common.base.QkView
+import common.widget.PreferenceView

 interface NotificationPrefsView : QkView<NotificationPrefsState> {

@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.notificationprefs
+package feature.notificationprefs

 import android.content.Context
 import android.content.Intent
@@ -32,8 +32,8 @@ import util.Preferences
 import io.reactivex.Flowable
 import io.reactivex.rxkotlin.plusAssign
 import io.reactivex.schedulers.Schedulers
-import presentation.common.Navigator
-import presentation.common.base.QkViewModel
+import common.Navigator
+import common.base.QkViewModel
 import repository.MessageRepository
 import timber.log.Timber
 import util.extensions.mapNotNull
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.plus
+package feature.plus

 import android.graphics.Typeface
 import android.os.Bundle
@@ -31,7 +31,7 @@ import common.util.extensions.setBackgroundTint
 import common.util.extensions.setTint
 import common.util.extensions.setVisible
 import kotlinx.android.synthetic.main.qksms_plus_activity.*
-import presentation.common.base.QkThemedActivity
+import common.base.QkThemedActivity
 import javax.inject.Inject

 class PlusActivity : QkThemedActivity<PlusViewModel>(), PlusView {
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.plus
+package feature.plus

 import common.util.BillingManager

@@ -16,11 +16,11 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.plus
+package feature.plus

 import common.util.BillingManager
 import io.reactivex.Observable
-import presentation.common.base.QkView
+import common.base.QkView

 interface PlusView : QkView<PlusState> {

@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.plus
+package feature.plus

 import com.uber.autodispose.android.lifecycle.scope
 import com.uber.autodispose.kotlin.autoDisposable
@@ -24,7 +24,7 @@ import injection.appComponent
 import common.util.BillingManager
 import io.reactivex.Observable
 import io.reactivex.rxkotlin.plusAssign
-import presentation.common.base.QkViewModel
+import common.base.QkViewModel
 import javax.inject.Inject

 class PlusViewModel : QkViewModel<PlusView, PlusState>(PlusState()) {
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.settings
+package feature.settings

 import android.app.AlertDialog
 import android.app.ProgressDialog
@@ -37,9 +37,9 @@ import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject
 import kotlinx.android.synthetic.main.settings_activity.*
 import kotlinx.android.synthetic.main.settings_switch_widget.view.*
-import presentation.common.MenuItemAdapter
-import presentation.common.base.QkThemedActivity
-import presentation.common.widget.PreferenceView
+import common.MenuItemAdapter
+import common.base.QkThemedActivity
+import common.widget.PreferenceView
 import javax.inject.Inject

 class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.settings
+package feature.settings

 import util.Preferences

@@ -16,12 +16,13 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.settings
+package feature.settings

 import io.reactivex.Observable
 import io.reactivex.subjects.Subject
-import presentation.common.base.QkView
-import presentation.common.widget.PreferenceView
+import common.base.QkView
+import common.widget.PreferenceView
+import feature.settings.SettingsState

 interface SettingsView : QkView<SettingsState> {

@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.settings
+package feature.settings

 import android.content.Context
 import com.moez.QKSMS.R
@@ -30,8 +30,8 @@ import util.Preferences
 import interactor.FullSync
 import io.reactivex.rxkotlin.plusAssign
 import io.reactivex.rxkotlin.withLatestFrom
-import presentation.common.Navigator
-import presentation.common.base.QkViewModel
+import common.Navigator
+import common.base.QkViewModel
 import timber.log.Timber
 import java.util.*
 import javax.inject.Inject
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.setup
+package feature.setup

 import android.Manifest
 import android.os.Bundle
@@ -29,8 +29,8 @@ import injection.appComponent
 import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject
 import kotlinx.android.synthetic.main.setup_activity.*
-import presentation.common.Navigator
-import presentation.common.base.QkThemedActivity
+import common.Navigator
+import common.base.QkThemedActivity
 import javax.inject.Inject

 class SetupActivity : QkThemedActivity<SetupViewModel>(), SetupView {
@@ -16,6 +16,6 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.setup
+package feature.setup

 class SetupState
@@ -16,10 +16,11 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.setup
+package feature.setup

 import io.reactivex.Observable
-import presentation.common.base.QkView
+import common.base.QkView
+import feature.setup.SetupState

 interface SetupView : QkView<SetupState> {

@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.setup
+package feature.setup

 import android.content.Context
 import android.provider.Telephony
@@ -24,7 +24,9 @@ import com.uber.autodispose.android.lifecycle.scope
 import com.uber.autodispose.kotlin.autoDisposable
 import injection.appComponent
 import manager.PermissionManager
-import presentation.common.base.QkViewModel
+import common.base.QkViewModel
+import feature.setup.SetupState
+import feature.setup.SetupView
 import javax.inject.Inject

 class SetupViewModel : QkViewModel<SetupView, SetupState>(SetupState()) {
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.themepicker
+package feature.themepicker

 import android.content.Context
 import android.content.res.Resources
@@ -38,8 +38,8 @@ import io.reactivex.subjects.PublishSubject
 import io.reactivex.subjects.Subject
 import kotlinx.android.synthetic.main.theme_list_item.view.*
 import kotlinx.android.synthetic.main.theme_palette_list_item.view.*
-import presentation.common.base.QkAdapter
-import presentation.common.base.QkViewHolder
+import common.base.QkAdapter
+import common.base.QkViewHolder
 import javax.inject.Inject

 class ThemeAdapter @Inject constructor(
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.themepicker
+package feature.themepicker

 import android.content.Context
 import android.support.v4.view.PagerAdapter
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.themepicker
+package feature.themepicker

 import android.os.Bundle
 import android.support.v7.widget.LinearLayoutManager
@@ -26,7 +26,7 @@ import com.uber.autodispose.kotlin.autoDisposable
 import injection.appComponent
 import common.util.extensions.pageScrolled
 import kotlinx.android.synthetic.main.theme_picker_activity.*
-import presentation.common.base.QkThemedActivity
+import common.base.QkThemedActivity
 import javax.inject.Inject

 class ThemePickerActivity : QkThemedActivity<ThemePickerViewModel>(), ThemePickerView {
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.themepicker
+package feature.themepicker

 data class ThemePickerState(
        val threadId: Long = 0,
@@ -16,11 +16,12 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.themepicker
+package feature.themepicker

 import common.util.extensions.PageScroll
 import io.reactivex.Observable
-import presentation.common.base.QkView
+import common.base.QkView
+import feature.themepicker.ThemePickerState

 interface ThemePickerView : QkView<ThemePickerState> {

@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.feature.themepicker
+package feature.themepicker

 import android.content.Intent
 import com.f2prateek.rx.preferences2.Preference
@@ -25,7 +25,9 @@ import com.uber.autodispose.kotlin.autoDisposable
 import injection.appComponent
 import util.Preferences
 import io.reactivex.rxkotlin.plusAssign
-import presentation.common.base.QkViewModel
+import common.base.QkViewModel
+import feature.themepicker.ThemePickerState
+import feature.themepicker.ThemePickerView
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject

@@ -21,36 +21,47 @@ package injection
 import common.QKApplication
 import common.util.ContactImageLoader
 import dagger.Component
-import presentation.common.widget.AvatarView
-import presentation.common.widget.MmsPreviewView
-import presentation.common.widget.PagerTitleView
-import presentation.common.widget.PreferenceView
-import presentation.common.widget.QkEditText
-import presentation.common.widget.QkSwitch
-import presentation.common.widget.QkTextView
-import presentation.common.widget.Separator
-import presentation.feature.blocked.BlockedActivity
-import presentation.feature.blocked.BlockedViewModel
-import presentation.feature.compose.ComposeActivity
-import presentation.feature.compose.ComposeViewModel
-import presentation.feature.compose.DetailedChipView
-import presentation.feature.conversationinfo.ConversationInfoActivity
-import presentation.feature.conversationinfo.ConversationInfoViewModel
-import presentation.feature.gallery.GalleryActivity
-import presentation.feature.gallery.GalleryViewModel
-import presentation.feature.main.MainActivity
-import presentation.feature.main.MainViewModel
-import presentation.feature.notificationprefs.NotificationPrefsActivity
-import presentation.feature.notificationprefs.NotificationPrefsViewModel
-import presentation.feature.plus.PlusActivity
-import presentation.feature.plus.PlusViewModel
-import presentation.feature.settings.SettingsActivity
-import presentation.feature.settings.SettingsViewModel
-import presentation.feature.setup.SetupActivity
-import presentation.feature.setup.SetupViewModel
-import presentation.feature.themepicker.ThemePickerActivity
-import presentation.feature.themepicker.ThemePickerViewModel
-import presentation.receiver.*
+import common.widget.AvatarView
+import common.widget.MmsPreviewView
+import common.widget.PagerTitleView
+import common.widget.PreferenceView
+import common.widget.QkEditText
+import common.widget.QkSwitch
+import common.widget.QkTextView
+import common.widget.Separator
+import feature.blocked.BlockedActivity
+import feature.blocked.BlockedViewModel
+import feature.compose.ComposeActivity
+import feature.compose.ComposeViewModel
+import feature.compose.DetailedChipView
+import feature.conversationinfo.ConversationInfoActivity
+import feature.conversationinfo.ConversationInfoViewModel
+import feature.gallery.GalleryActivity
+import feature.gallery.GalleryViewModel
+import feature.main.MainActivity
+import feature.main.MainViewModel
+import feature.notificationprefs.NotificationPrefsActivity
+import feature.notificationprefs.NotificationPrefsViewModel
+import feature.plus.PlusActivity
+import feature.plus.PlusViewModel
+import feature.settings.SettingsActivity
+import feature.settings.SettingsViewModel
+import feature.setup.SetupActivity
+import feature.setup.SetupViewModel
+import feature.themepicker.ThemePickerActivity
+import feature.themepicker.ThemePickerViewModel
+import receiver.DefaultSmsChangedReceiver
+import receiver.MarkReadReceiver
+import receiver.MarkSeenReceiver
+import receiver.MmsReceivedReceiver
+import receiver.MmsSentReceiver
+import receiver.MmsUpdatedReceiver
+import receiver.NightModeReceiver
+import receiver.RemoteMessagingReceiver
+import receiver.SmsDeliveredReceiver
+import receiver.SmsProviderChangedReceiver
+import receiver.SmsReceiver
+import receiver.SmsSentReceiver
 import javax.inject.Singleton

@Singleton
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.receiver
+package receiver

 import android.content.BroadcastReceiver
 import android.content.Context
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.receiver
+package receiver

 import android.content.BroadcastReceiver
 import android.content.Context
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.receiver
+package receiver

 import android.content.BroadcastReceiver
 import android.content.Context
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.receiver
+package receiver

 import android.net.Uri
 import com.klinker.android.send_message.MmsReceivedReceiver
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.receiver
+package receiver

 import com.android.mms.transaction.PushReceiver

@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.receiver
+package receiver

 import android.content.Context
 import android.content.Intent
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.receiver
+package receiver

 import android.content.BroadcastReceiver
 import android.content.Context
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.receiver
+package receiver

 import android.content.BroadcastReceiver
 import android.content.Context
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.receiver
+package receiver

 import android.content.BroadcastReceiver
 import android.content.Context
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.receiver
+package receiver

 import android.app.Activity
 import android.content.BroadcastReceiver
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.receiver
+package receiver

 import android.content.BroadcastReceiver
 import android.content.Context
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.receiver
+package receiver

 import android.content.BroadcastReceiver
 import android.content.Context
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.receiver
+package receiver

 import android.app.Activity
 import android.content.BroadcastReceiver
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU General Public License
 * along with QKSMS.  If not, see <http://www.gnu.org/licenses/>.
 */
-package presentation.service
+package service

 import android.app.IntentService
 import android.content.Intent