diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml index 77ef3d8c..49890599 100644 --- a/presentation/src/main/AndroidManifest.xml +++ b/presentation/src/main/AndroidManifest.xml @@ -21,7 +21,7 @@ android:theme="@style/AppThemeLight"> @@ -29,8 +29,8 @@ + android:name="feature.compose.ComposeActivity" + android:parentActivityName="feature.main.MainActivity"> @@ -57,31 +57,31 @@ - - - - + + + + - - - + + + - + @@ -89,25 +89,25 @@ - - - - - + + + + + @@ -115,7 +115,7 @@ diff --git a/presentation/src/main/java/common/GlideCompletionListener.kt b/presentation/src/main/java/common/GlideCompletionListener.kt index b909114d..f8460a9c 100644 --- a/presentation/src/main/java/common/GlideCompletionListener.kt +++ b/presentation/src/main/java/common/GlideCompletionListener.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.common +package common import com.bumptech.glide.load.DataSource import com.bumptech.glide.load.engine.GlideException diff --git a/presentation/src/main/java/common/MenuItemAdapter.kt b/presentation/src/main/java/common/MenuItemAdapter.kt index 310b3c56..690d373b 100644 --- a/presentation/src/main/java/common/MenuItemAdapter.kt +++ b/presentation/src/main/java/common/MenuItemAdapter.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package 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) diff --git a/presentation/src/main/java/common/Navigator.kt b/presentation/src/main/java/common/Navigator.kt index 607d17cc..18cd46f7 100644 --- a/presentation/src/main/java/common/Navigator.kt +++ b/presentation/src/main/java/common/Navigator.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package 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 diff --git a/presentation/src/main/java/common/base/FlowableAdapter.kt b/presentation/src/main/java/common/base/FlowableAdapter.kt index 380d3736..3bfb912d 100644 --- a/presentation/src/main/java/common/base/FlowableAdapter.kt +++ b/presentation/src/main/java/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 presentation.common.base +package common.base import android.support.annotation.CallSuper import android.support.v7.widget.RecyclerView diff --git a/presentation/src/main/java/common/base/QkActivity.kt b/presentation/src/main/java/common/base/QkActivity.kt index ae68bda9..c340372d 100644 --- a/presentation/src/main/java/common/base/QkActivity.kt +++ b/presentation/src/main/java/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 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> : AppCompatActivity() { diff --git a/presentation/src/main/java/common/base/QkAdapter.kt b/presentation/src/main/java/common/base/QkAdapter.kt index ec917a35..8d7ff727 100644 --- a/presentation/src/main/java/common/base/QkAdapter.kt +++ b/presentation/src/main/java/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 presentation.common.base +package common.base import android.support.v7.util.DiffUtil import android.support.v7.widget.RecyclerView diff --git a/presentation/src/main/java/common/base/QkThemedActivity.kt b/presentation/src/main/java/common/base/QkThemedActivity.kt index d67dbe36..557d4178 100644 --- a/presentation/src/main/java/common/base/QkThemedActivity.kt +++ b/presentation/src/main/java/common/base/QkThemedActivity.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.common.base +package common.base import android.annotation.SuppressLint import android.arch.lifecycle.Lifecycle diff --git a/presentation/src/main/java/common/base/QkView.kt b/presentation/src/main/java/common/base/QkView.kt index 5bfdc111..68fcf2c1 100644 --- a/presentation/src/main/java/common/base/QkView.kt +++ b/presentation/src/main/java/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 presentation.common.base +package common.base import android.arch.lifecycle.LifecycleOwner diff --git a/presentation/src/main/java/common/base/QkViewHolder.kt b/presentation/src/main/java/common/base/QkViewHolder.kt index 612d08a0..9627f530 100644 --- a/presentation/src/main/java/common/base/QkViewHolder.kt +++ b/presentation/src/main/java/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 presentation.common.base +package common.base import android.support.v7.widget.RecyclerView import android.view.View diff --git a/presentation/src/main/java/common/base/QkViewModel.kt b/presentation/src/main/java/common/base/QkViewModel.kt index 76febe8b..7854e484 100644 --- a/presentation/src/main/java/common/base/QkViewModel.kt +++ b/presentation/src/main/java/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 presentation.common.base +package common.base import android.arch.lifecycle.ViewModel import android.support.annotation.CallSuper diff --git a/presentation/src/main/java/common/util/NightModeManager.kt b/presentation/src/main/java/common/util/NightModeManager.kt index 10518a7e..9b41a5da 100644 --- a/presentation/src/main/java/common/util/NightModeManager.kt +++ b/presentation/src/main/java/common/util/NightModeManager.kt @@ -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 diff --git a/presentation/src/main/java/common/util/NotificationManagerImpl.kt b/presentation/src/main/java/common/util/NotificationManagerImpl.kt index 63f7ae9e..3e0140e9 100644 --- a/presentation/src/main/java/common/util/NotificationManagerImpl.kt +++ b/presentation/src/main/java/common/util/NotificationManagerImpl.kt @@ -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 diff --git a/presentation/src/main/java/common/widget/AvatarView.kt b/presentation/src/main/java/common/widget/AvatarView.kt index 3ec4143a..da0fbfaa 100644 --- a/presentation/src/main/java/common/widget/AvatarView.kt +++ b/presentation/src/main/java/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 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) { diff --git a/presentation/src/main/java/common/widget/GroupAvatarView.kt b/presentation/src/main/java/common/widget/GroupAvatarView.kt index 8e133f7b..4cbe8a75 100644 --- a/presentation/src/main/java/common/widget/GroupAvatarView.kt +++ b/presentation/src/main/java/common/widget/GroupAvatarView.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.common.widget +package common.widget import android.content.Context import android.support.constraint.ConstraintLayout diff --git a/presentation/src/main/java/common/widget/MmsPreviewView.kt b/presentation/src/main/java/common/widget/MmsPreviewView.kt index 65817369..98a9c927 100644 --- a/presentation/src/main/java/common/widget/MmsPreviewView.kt +++ b/presentation/src/main/java/common/widget/MmsPreviewView.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -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) { diff --git a/presentation/src/main/java/common/widget/PagerTitleView.kt b/presentation/src/main/java/common/widget/PagerTitleView.kt index 5aa685ed..6b96742f 100644 --- a/presentation/src/main/java/common/widget/PagerTitleView.kt +++ b/presentation/src/main/java/common/widget/PagerTitleView.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.common.widget +package common.widget import android.content.Context import android.content.res.ColorStateList diff --git a/presentation/src/main/java/common/widget/PreferenceView.kt b/presentation/src/main/java/common/widget/PreferenceView.kt index 99878d71..319e0558 100644 --- a/presentation/src/main/java/common/widget/PreferenceView.kt +++ b/presentation/src/main/java/common/widget/PreferenceView.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.common.widget +package common.widget import android.content.Context import android.support.v7.widget.LinearLayoutCompat diff --git a/presentation/src/main/java/common/widget/QkEditText.kt b/presentation/src/main/java/common/widget/QkEditText.kt index dbcf5273..597a227b 100644 --- a/presentation/src/main/java/common/widget/QkEditText.kt +++ b/presentation/src/main/java/common/widget/QkEditText.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.common.widget +package common.widget import android.content.Context import android.graphics.Typeface diff --git a/presentation/src/main/java/common/widget/QkSwitch.kt b/presentation/src/main/java/common/widget/QkSwitch.kt index 03099f17..ea7d1c3b 100644 --- a/presentation/src/main/java/common/widget/QkSwitch.kt +++ b/presentation/src/main/java/common/widget/QkSwitch.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.common.widget +package common.widget import android.content.Context import android.content.res.ColorStateList diff --git a/presentation/src/main/java/common/widget/QkTextView.kt b/presentation/src/main/java/common/widget/QkTextView.kt index ed6bb183..67e4ae75 100644 --- a/presentation/src/main/java/common/widget/QkTextView.kt +++ b/presentation/src/main/java/common/widget/QkTextView.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.common.widget +package common.widget import android.content.Context import android.graphics.Typeface diff --git a/presentation/src/main/java/common/widget/Separator.kt b/presentation/src/main/java/common/widget/Separator.kt index 1c84c784..2d602424 100644 --- a/presentation/src/main/java/common/widget/Separator.kt +++ b/presentation/src/main/java/common/widget/Separator.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.common.widget +package common.widget import android.content.Context import android.util.AttributeSet diff --git a/presentation/src/main/java/common/widget/SquareImageView.kt b/presentation/src/main/java/common/widget/SquareImageView.kt index c050bab9..a935dac4 100644 --- a/presentation/src/main/java/common/widget/SquareImageView.kt +++ b/presentation/src/main/java/common/widget/SquareImageView.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.common.widget +package common.widget import android.content.Context import android.util.AttributeSet diff --git a/presentation/src/main/java/common/widget/TightTextView.kt b/presentation/src/main/java/common/widget/TightTextView.kt index 01489bd6..acfb6dc3 100644 --- a/presentation/src/main/java/common/widget/TightTextView.kt +++ b/presentation/src/main/java/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 presentation.common.widget +package common.widget import android.content.Context import android.util.AttributeSet diff --git a/presentation/src/main/java/feature/blocked/BlockedActivity.kt b/presentation/src/main/java/feature/blocked/BlockedActivity.kt index 54759059..8f806e37 100644 --- a/presentation/src/main/java/feature/blocked/BlockedActivity.kt +++ b/presentation/src/main/java/feature/blocked/BlockedActivity.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package 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(), BlockedView { diff --git a/presentation/src/main/java/feature/blocked/BlockedAdapter.kt b/presentation/src/main/java/feature/blocked/BlockedAdapter.kt index 49caf7f8..2fc6a76a 100644 --- a/presentation/src/main/java/feature/blocked/BlockedAdapter.kt +++ b/presentation/src/main/java/feature/blocked/BlockedAdapter.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -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() { diff --git a/presentation/src/main/java/feature/blocked/BlockedState.kt b/presentation/src/main/java/feature/blocked/BlockedState.kt index b673af32..f7ca41cd 100644 --- a/presentation/src/main/java/feature/blocked/BlockedState.kt +++ b/presentation/src/main/java/feature/blocked/BlockedState.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.feature.blocked +package feature.blocked import io.reactivex.Flowable import model.Conversation diff --git a/presentation/src/main/java/feature/blocked/BlockedView.kt b/presentation/src/main/java/feature/blocked/BlockedView.kt index 028d8230..17f422fe 100644 --- a/presentation/src/main/java/feature/blocked/BlockedView.kt +++ b/presentation/src/main/java/feature/blocked/BlockedView.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.feature.blocked +package feature.blocked import io.reactivex.Observable -import presentation.common.base.QkView +import common.base.QkView interface BlockedView : QkView { diff --git a/presentation/src/main/java/feature/blocked/BlockedViewModel.kt b/presentation/src/main/java/feature/blocked/BlockedViewModel.kt index 91a2eafb..925b7f2d 100644 --- a/presentation/src/main/java/feature/blocked/BlockedViewModel.kt +++ b/presentation/src/main/java/feature/blocked/BlockedViewModel.kt @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -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 diff --git a/presentation/src/main/java/feature/compose/AttachmentAdapter.kt b/presentation/src/main/java/feature/compose/AttachmentAdapter.kt index 3c11b403..1eb83aa3 100644 --- a/presentation/src/main/java/feature/compose/AttachmentAdapter.kt +++ b/presentation/src/main/java/feature/compose/AttachmentAdapter.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package 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( diff --git a/presentation/src/main/java/feature/compose/ChipsAdapter.kt b/presentation/src/main/java/feature/compose/ChipsAdapter.kt index e84e6fdd..48749dec 100755 --- a/presentation/src/main/java/feature/compose/ChipsAdapter.kt +++ b/presentation/src/main/java/feature/compose/ChipsAdapter.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package 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() { diff --git a/presentation/src/main/java/feature/compose/ComposeActivity.kt b/presentation/src/main/java/feature/compose/ComposeActivity.kt index 65f70202..5edbee87 100644 --- a/presentation/src/main/java/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/feature/compose/ComposeActivity.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package 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(), ComposeView { diff --git a/presentation/src/main/java/feature/compose/ComposeState.kt b/presentation/src/main/java/feature/compose/ComposeState.kt index 0dd07280..ee4f3213 100644 --- a/presentation/src/main/java/feature/compose/ComposeState.kt +++ b/presentation/src/main/java/feature/compose/ComposeState.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.feature.compose +package feature.compose import android.net.Uri import io.realm.RealmResults diff --git a/presentation/src/main/java/feature/compose/ComposeView.kt b/presentation/src/main/java/feature/compose/ComposeView.kt index 5c2253e7..069ede65 100644 --- a/presentation/src/main/java/feature/compose/ComposeView.kt +++ b/presentation/src/main/java/feature/compose/ComposeView.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -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 { diff --git a/presentation/src/main/java/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/feature/compose/ComposeViewModel.kt index b76f634f..680d11d5 100644 --- a/presentation/src/main/java/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/feature/compose/ComposeViewModel.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -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 diff --git a/presentation/src/main/java/feature/compose/ComposeWindowCallback.kt b/presentation/src/main/java/feature/compose/ComposeWindowCallback.kt index 9a56e632..610fb91a 100755 --- a/presentation/src/main/java/feature/compose/ComposeWindowCallback.kt +++ b/presentation/src/main/java/feature/compose/ComposeWindowCallback.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.feature.compose +package feature.compose import android.app.Activity import android.graphics.Rect diff --git a/presentation/src/main/java/feature/compose/ContactAdapter.kt b/presentation/src/main/java/feature/compose/ContactAdapter.kt index 2c86c6b5..e312a48a 100644 --- a/presentation/src/main/java/feature/compose/ContactAdapter.kt +++ b/presentation/src/main/java/feature/compose/ContactAdapter.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -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() { diff --git a/presentation/src/main/java/feature/compose/DetailedChipView.kt b/presentation/src/main/java/feature/compose/DetailedChipView.kt index a2038c59..56c5da45 100755 --- a/presentation/src/main/java/feature/compose/DetailedChipView.kt +++ b/presentation/src/main/java/feature/compose/DetailedChipView.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.feature.compose +package feature.compose import android.content.Context import android.view.View diff --git a/presentation/src/main/java/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/feature/compose/MessagesAdapter.kt index 1153583b..fca17dad 100644 --- a/presentation/src/main/java/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/feature/compose/MessagesAdapter.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package 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 diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt b/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt index 71ab5d97..062869c3 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt +++ b/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package 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(), ConversationInfoView { diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoState.kt b/presentation/src/main/java/feature/conversationinfo/ConversationInfoState.kt index ec8ba91e..65cf9699 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoState.kt +++ b/presentation/src/main/java/feature/conversationinfo/ConversationInfoState.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.feature.conversationinfo +package feature.conversationinfo import model.MmsPart import model.Recipient diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoView.kt b/presentation/src/main/java/feature/conversationinfo/ConversationInfoView.kt index 00a59cbd..e556b000 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoView.kt +++ b/presentation/src/main/java/feature/conversationinfo/ConversationInfoView.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.feature.conversationinfo +package feature.conversationinfo import io.reactivex.Observable -import presentation.common.base.QkView +import common.base.QkView interface ConversationInfoView : QkView { diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt b/presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt index 822a6c1b..a2b989f5 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt +++ b/presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -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 diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationMediaAdapter.kt b/presentation/src/main/java/feature/conversationinfo/ConversationMediaAdapter.kt index f9c4219b..c092c642 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationMediaAdapter.kt +++ b/presentation/src/main/java/feature/conversationinfo/ConversationMediaAdapter.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package 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( diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationRecipientAdapter.kt b/presentation/src/main/java/feature/conversationinfo/ConversationRecipientAdapter.kt index ef4b02e0..fa468848 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationRecipientAdapter.kt +++ b/presentation/src/main/java/feature/conversationinfo/ConversationRecipientAdapter.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -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( diff --git a/presentation/src/main/java/feature/conversationinfo/GridSpacingItemDecoration.kt b/presentation/src/main/java/feature/conversationinfo/GridSpacingItemDecoration.kt index 325260b2..0f17a9ec 100644 --- a/presentation/src/main/java/feature/conversationinfo/GridSpacingItemDecoration.kt +++ b/presentation/src/main/java/feature/conversationinfo/GridSpacingItemDecoration.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.feature.conversationinfo +package feature.conversationinfo import android.content.Context import android.graphics.Rect diff --git a/presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt b/presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt index 13b40a94..364375c0 100644 --- a/presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt +++ b/presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.feature.conversations +package feature.conversations import android.support.v7.widget.RecyclerView import android.support.v7.widget.helper.ItemTouchHelper diff --git a/presentation/src/main/java/feature/conversations/ConversationsAdapter.kt b/presentation/src/main/java/feature/conversations/ConversationsAdapter.kt index 026fda3a..a1521620 100644 --- a/presentation/src/main/java/feature/conversations/ConversationsAdapter.kt +++ b/presentation/src/main/java/feature/conversations/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 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 diff --git a/presentation/src/main/java/feature/gallery/GalleryActivity.kt b/presentation/src/main/java/feature/gallery/GalleryActivity.kt index cea213b6..4b7071d4 100644 --- a/presentation/src/main/java/feature/gallery/GalleryActivity.kt +++ b/presentation/src/main/java/feature/gallery/GalleryActivity.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package 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(), GalleryView { diff --git a/presentation/src/main/java/feature/gallery/GalleryState.kt b/presentation/src/main/java/feature/gallery/GalleryState.kt index d5a33918..08c0ffa7 100644 --- a/presentation/src/main/java/feature/gallery/GalleryState.kt +++ b/presentation/src/main/java/feature/gallery/GalleryState.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.feature.gallery +package feature.gallery data class GalleryState( val navigationVisible: Boolean = true, diff --git a/presentation/src/main/java/feature/gallery/GalleryView.kt b/presentation/src/main/java/feature/gallery/GalleryView.kt index c88535f8..df2cd204 100644 --- a/presentation/src/main/java/feature/gallery/GalleryView.kt +++ b/presentation/src/main/java/feature/gallery/GalleryView.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.feature.gallery +package feature.gallery import io.reactivex.Observable -import presentation.common.base.QkView +import common.base.QkView interface GalleryView : QkView { diff --git a/presentation/src/main/java/feature/gallery/GalleryViewModel.kt b/presentation/src/main/java/feature/gallery/GalleryViewModel.kt index 07b4cc77..37a63ff7 100644 --- a/presentation/src/main/java/feature/gallery/GalleryViewModel.kt +++ b/presentation/src/main/java/feature/gallery/GalleryViewModel.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -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 diff --git a/presentation/src/main/java/feature/main/MainActivity.kt b/presentation/src/main/java/feature/main/MainActivity.kt index 24dd8996..c251dd9b 100644 --- a/presentation/src/main/java/feature/main/MainActivity.kt +++ b/presentation/src/main/java/feature/main/MainActivity.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package 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(), MainView { diff --git a/presentation/src/main/java/feature/main/MainState.kt b/presentation/src/main/java/feature/main/MainState.kt index 7b3c330a..1ec3a68b 100644 --- a/presentation/src/main/java/feature/main/MainState.kt +++ b/presentation/src/main/java/feature/main/MainState.kt @@ -16,12 +16,12 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package 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(), diff --git a/presentation/src/main/java/feature/main/MainView.kt b/presentation/src/main/java/feature/main/MainView.kt index 59fe5f01..565140ed 100644 --- a/presentation/src/main/java/feature/main/MainView.kt +++ b/presentation/src/main/java/feature/main/MainView.kt @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.feature.main +package feature.main import io.reactivex.Observable -import presentation.common.base.QkView +import common.base.QkView interface MainView : QkView { diff --git a/presentation/src/main/java/feature/main/MainViewModel.kt b/presentation/src/main/java/feature/main/MainViewModel.kt index 95975284..70907a4e 100644 --- a/presentation/src/main/java/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/feature/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 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 diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt index fb395d7b..2b545ff8 100644 --- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt +++ b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package 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(), NotificationPrefsView { diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsState.kt b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsState.kt index 679aa6bd..6ffd0200 100644 --- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsState.kt +++ b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsState.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.feature.notificationprefs +package feature.notificationprefs data class NotificationPrefsState( val conversationTitle: String = "", diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsView.kt b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsView.kt index 215efb03..0170c8a1 100644 --- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsView.kt +++ b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsView.kt @@ -16,13 +16,13 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -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 { diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt index 6a6a2788..a466e2ce 100644 --- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt +++ b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package 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 diff --git a/presentation/src/main/java/feature/plus/PlusActivity.kt b/presentation/src/main/java/feature/plus/PlusActivity.kt index bd93c67f..a711d951 100644 --- a/presentation/src/main/java/feature/plus/PlusActivity.kt +++ b/presentation/src/main/java/feature/plus/PlusActivity.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package 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(), PlusView { diff --git a/presentation/src/main/java/feature/plus/PlusState.kt b/presentation/src/main/java/feature/plus/PlusState.kt index 497a2e6f..b1d0d15a 100644 --- a/presentation/src/main/java/feature/plus/PlusState.kt +++ b/presentation/src/main/java/feature/plus/PlusState.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.feature.plus +package feature.plus import common.util.BillingManager diff --git a/presentation/src/main/java/feature/plus/PlusView.kt b/presentation/src/main/java/feature/plus/PlusView.kt index 1f9013c6..f2c23a1c 100644 --- a/presentation/src/main/java/feature/plus/PlusView.kt +++ b/presentation/src/main/java/feature/plus/PlusView.kt @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -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 { diff --git a/presentation/src/main/java/feature/plus/PlusViewModel.kt b/presentation/src/main/java/feature/plus/PlusViewModel.kt index 130909a2..c6a11e8b 100644 --- a/presentation/src/main/java/feature/plus/PlusViewModel.kt +++ b/presentation/src/main/java/feature/plus/PlusViewModel.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -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(PlusState()) { diff --git a/presentation/src/main/java/feature/settings/SettingsActivity.kt b/presentation/src/main/java/feature/settings/SettingsActivity.kt index 6bf5a446..dab6d0ff 100644 --- a/presentation/src/main/java/feature/settings/SettingsActivity.kt +++ b/presentation/src/main/java/feature/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 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(), SettingsView { diff --git a/presentation/src/main/java/feature/settings/SettingsState.kt b/presentation/src/main/java/feature/settings/SettingsState.kt index bfd03894..0a8dc5f4 100644 --- a/presentation/src/main/java/feature/settings/SettingsState.kt +++ b/presentation/src/main/java/feature/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 presentation.feature.settings +package feature.settings import util.Preferences diff --git a/presentation/src/main/java/feature/settings/SettingsView.kt b/presentation/src/main/java/feature/settings/SettingsView.kt index 673d0895..7d429000 100644 --- a/presentation/src/main/java/feature/settings/SettingsView.kt +++ b/presentation/src/main/java/feature/settings/SettingsView.kt @@ -16,12 +16,13 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -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 { diff --git a/presentation/src/main/java/feature/settings/SettingsViewModel.kt b/presentation/src/main/java/feature/settings/SettingsViewModel.kt index 49bdfa2b..db064f6c 100644 --- a/presentation/src/main/java/feature/settings/SettingsViewModel.kt +++ b/presentation/src/main/java/feature/settings/SettingsViewModel.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -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 diff --git a/presentation/src/main/java/feature/setup/SetupActivity.kt b/presentation/src/main/java/feature/setup/SetupActivity.kt index b1989ebd..8f68c4ed 100644 --- a/presentation/src/main/java/feature/setup/SetupActivity.kt +++ b/presentation/src/main/java/feature/setup/SetupActivity.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -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(), SetupView { diff --git a/presentation/src/main/java/feature/setup/SetupState.kt b/presentation/src/main/java/feature/setup/SetupState.kt index 0ffce73a..248c5dae 100644 --- a/presentation/src/main/java/feature/setup/SetupState.kt +++ b/presentation/src/main/java/feature/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 presentation.feature.setup +package feature.setup class SetupState \ No newline at end of file diff --git a/presentation/src/main/java/feature/setup/SetupView.kt b/presentation/src/main/java/feature/setup/SetupView.kt index 87ab4267..380b40cb 100644 --- a/presentation/src/main/java/feature/setup/SetupView.kt +++ b/presentation/src/main/java/feature/setup/SetupView.kt @@ -16,10 +16,11 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -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 { diff --git a/presentation/src/main/java/feature/setup/SetupViewModel.kt b/presentation/src/main/java/feature/setup/SetupViewModel.kt index 18a1aa57..1f4e69bd 100644 --- a/presentation/src/main/java/feature/setup/SetupViewModel.kt +++ b/presentation/src/main/java/feature/setup/SetupViewModel.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -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(SetupState()) { diff --git a/presentation/src/main/java/feature/themepicker/ThemeAdapter.kt b/presentation/src/main/java/feature/themepicker/ThemeAdapter.kt index a23f1efb..984b1d9f 100644 --- a/presentation/src/main/java/feature/themepicker/ThemeAdapter.kt +++ b/presentation/src/main/java/feature/themepicker/ThemeAdapter.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package 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( diff --git a/presentation/src/main/java/feature/themepicker/ThemePagerAdapter.kt b/presentation/src/main/java/feature/themepicker/ThemePagerAdapter.kt index 08097c43..ec13dd8e 100644 --- a/presentation/src/main/java/feature/themepicker/ThemePagerAdapter.kt +++ b/presentation/src/main/java/feature/themepicker/ThemePagerAdapter.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.feature.themepicker +package feature.themepicker import android.content.Context import android.support.v4.view.PagerAdapter diff --git a/presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt b/presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt index a6ab4ad1..ad9982be 100644 --- a/presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt +++ b/presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package 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(), ThemePickerView { diff --git a/presentation/src/main/java/feature/themepicker/ThemePickerState.kt b/presentation/src/main/java/feature/themepicker/ThemePickerState.kt index e1a39591..86023188 100644 --- a/presentation/src/main/java/feature/themepicker/ThemePickerState.kt +++ b/presentation/src/main/java/feature/themepicker/ThemePickerState.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.feature.themepicker +package feature.themepicker data class ThemePickerState( val threadId: Long = 0, diff --git a/presentation/src/main/java/feature/themepicker/ThemePickerView.kt b/presentation/src/main/java/feature/themepicker/ThemePickerView.kt index f60ca098..89203d00 100644 --- a/presentation/src/main/java/feature/themepicker/ThemePickerView.kt +++ b/presentation/src/main/java/feature/themepicker/ThemePickerView.kt @@ -16,11 +16,12 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -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 { diff --git a/presentation/src/main/java/feature/themepicker/ThemePickerViewModel.kt b/presentation/src/main/java/feature/themepicker/ThemePickerViewModel.kt index 0661075e..d4448e02 100644 --- a/presentation/src/main/java/feature/themepicker/ThemePickerViewModel.kt +++ b/presentation/src/main/java/feature/themepicker/ThemePickerViewModel.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -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 diff --git a/presentation/src/main/java/injection/AppComponent.kt b/presentation/src/main/java/injection/AppComponent.kt index 711599a7..689fb274 100644 --- a/presentation/src/main/java/injection/AppComponent.kt +++ b/presentation/src/main/java/injection/AppComponent.kt @@ -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 diff --git a/presentation/src/main/java/receiver/DefaultSmsChangedReceiver.kt b/presentation/src/main/java/receiver/DefaultSmsChangedReceiver.kt index 4fa04224..d9f37bcd 100644 --- a/presentation/src/main/java/receiver/DefaultSmsChangedReceiver.kt +++ b/presentation/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 presentation.receiver +package receiver import android.content.BroadcastReceiver import android.content.Context diff --git a/presentation/src/main/java/receiver/MarkReadReceiver.kt b/presentation/src/main/java/receiver/MarkReadReceiver.kt index 7b9aee41..60e165ed 100644 --- a/presentation/src/main/java/receiver/MarkReadReceiver.kt +++ b/presentation/src/main/java/receiver/MarkReadReceiver.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.receiver +package receiver import android.content.BroadcastReceiver import android.content.Context diff --git a/presentation/src/main/java/receiver/MarkSeenReceiver.kt b/presentation/src/main/java/receiver/MarkSeenReceiver.kt index 59f73bc2..25c5623f 100644 --- a/presentation/src/main/java/receiver/MarkSeenReceiver.kt +++ b/presentation/src/main/java/receiver/MarkSeenReceiver.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.receiver +package receiver import android.content.BroadcastReceiver import android.content.Context diff --git a/presentation/src/main/java/receiver/MmsReceivedReceiver.kt b/presentation/src/main/java/receiver/MmsReceivedReceiver.kt index b710b6fa..b682ade2 100644 --- a/presentation/src/main/java/receiver/MmsReceivedReceiver.kt +++ b/presentation/src/main/java/receiver/MmsReceivedReceiver.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.receiver +package receiver import android.net.Uri import com.klinker.android.send_message.MmsReceivedReceiver diff --git a/presentation/src/main/java/receiver/MmsReceiver.kt b/presentation/src/main/java/receiver/MmsReceiver.kt index a41e197d..e432493b 100644 --- a/presentation/src/main/java/receiver/MmsReceiver.kt +++ b/presentation/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 presentation.receiver +package receiver import com.android.mms.transaction.PushReceiver diff --git a/presentation/src/main/java/receiver/MmsSentReceiver.kt b/presentation/src/main/java/receiver/MmsSentReceiver.kt index 01319e33..b2e30269 100644 --- a/presentation/src/main/java/receiver/MmsSentReceiver.kt +++ b/presentation/src/main/java/receiver/MmsSentReceiver.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.receiver +package receiver import android.content.Context import android.content.Intent diff --git a/presentation/src/main/java/receiver/MmsUpdatedReceiver.kt b/presentation/src/main/java/receiver/MmsUpdatedReceiver.kt index f55cc9f9..0bb21384 100644 --- a/presentation/src/main/java/receiver/MmsUpdatedReceiver.kt +++ b/presentation/src/main/java/receiver/MmsUpdatedReceiver.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.receiver +package receiver import android.content.BroadcastReceiver import android.content.Context diff --git a/presentation/src/main/java/receiver/NightModeReceiver.kt b/presentation/src/main/java/receiver/NightModeReceiver.kt index 2fdf153f..ef5e4f65 100644 --- a/presentation/src/main/java/receiver/NightModeReceiver.kt +++ b/presentation/src/main/java/receiver/NightModeReceiver.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.receiver +package receiver import android.content.BroadcastReceiver import android.content.Context diff --git a/presentation/src/main/java/receiver/RemoteMessagingReceiver.kt b/presentation/src/main/java/receiver/RemoteMessagingReceiver.kt index 05e7912e..6ef06b8e 100644 --- a/presentation/src/main/java/receiver/RemoteMessagingReceiver.kt +++ b/presentation/src/main/java/receiver/RemoteMessagingReceiver.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.receiver +package receiver import android.content.BroadcastReceiver import android.content.Context diff --git a/presentation/src/main/java/receiver/SmsDeliveredReceiver.kt b/presentation/src/main/java/receiver/SmsDeliveredReceiver.kt index ab153242..cd5eaaaf 100644 --- a/presentation/src/main/java/receiver/SmsDeliveredReceiver.kt +++ b/presentation/src/main/java/receiver/SmsDeliveredReceiver.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.receiver +package receiver import android.app.Activity import android.content.BroadcastReceiver diff --git a/presentation/src/main/java/receiver/SmsProviderChangedReceiver.kt b/presentation/src/main/java/receiver/SmsProviderChangedReceiver.kt index 3c2e1425..82591d31 100644 --- a/presentation/src/main/java/receiver/SmsProviderChangedReceiver.kt +++ b/presentation/src/main/java/receiver/SmsProviderChangedReceiver.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.receiver +package receiver import android.content.BroadcastReceiver import android.content.Context diff --git a/presentation/src/main/java/receiver/SmsReceiver.kt b/presentation/src/main/java/receiver/SmsReceiver.kt index 4890bbe6..14198360 100644 --- a/presentation/src/main/java/receiver/SmsReceiver.kt +++ b/presentation/src/main/java/receiver/SmsReceiver.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.receiver +package receiver import android.content.BroadcastReceiver import android.content.Context diff --git a/presentation/src/main/java/receiver/SmsSentReceiver.kt b/presentation/src/main/java/receiver/SmsSentReceiver.kt index 42e30951..e610e5df 100644 --- a/presentation/src/main/java/receiver/SmsSentReceiver.kt +++ b/presentation/src/main/java/receiver/SmsSentReceiver.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package presentation.receiver +package receiver import android.app.Activity import android.content.BroadcastReceiver diff --git a/presentation/src/main/java/service/HeadlessSmsSendService.kt b/presentation/src/main/java/service/HeadlessSmsSendService.kt index b9a630c0..cc13e9ce 100644 --- a/presentation/src/main/java/service/HeadlessSmsSendService.kt +++ b/presentation/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 presentation.service +package service import android.app.IntentService import android.content.Intent diff --git a/presentation/src/main/res/layout/avatar_view.xml b/presentation/src/main/res/layout/avatar_view.xml index a9f75d69..9adeecd0 100644 --- a/presentation/src/main/res/layout/avatar_view.xml +++ b/presentation/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="presentation.common.widget.AvatarView"> + tools:parentTag="common.widget.AvatarView"> - - - - . --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - . --> - - - - - @@ -48,7 +48,7 @@ style="@style/DrawerIcon" android:src="@drawable/ic_folder_black_24dp" /> - @@ -64,18 +64,18 @@ style="@style/DrawerIcon" android:src="@drawable/ic_event_black_24dp" /> - - - - @@ -106,7 +106,7 @@ style="@style/DrawerIcon" android:src="@drawable/ic_star_black_24dp" /> - @@ -121,7 +121,7 @@ style="@style/DrawerIcon" android:src="@drawable/ic_help_black_24dp" /> - diff --git a/presentation/src/main/res/layout/gallery_activity.xml b/presentation/src/main/res/layout/gallery_activity.xml index 63f14069..8433a0e0 100644 --- a/presentation/src/main/res/layout/gallery_activity.xml +++ b/presentation/src/main/res/layout/gallery_activity.xml @@ -22,7 +22,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="presentation.feature.gallery.GalleryActivity"> + tools:context="feature.gallery.GalleryActivity"> - + tools:parentTag="common.widget.GroupAvatarView"> - - - - - - - - - - - - - - - - - - - - - + tools:parentTag="common.widget.PreferenceView"> - - - - - - - - - - - - - - - - - - - - - @@ -57,42 +57,42 @@ android:paddingBottom="8dp" android:paddingTop="8dp"> - - - - - - - - - - - - - - - - - - . --> - - - - - . --> - - diff --git a/presentation/src/main/res/layout/theme_picker_activity.xml b/presentation/src/main/res/layout/theme_picker_activity.xml index 86e5da86..a7624bd7 100644 --- a/presentation/src/main/res/layout/theme_picker_activity.xml +++ b/presentation/src/main/res/layout/theme_picker_activity.xml @@ -24,7 +24,7 @@ - -