diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml index a7fb5ec4..b9a96c27 100644 --- a/qksms/src/main/AndroidManifest.xml +++ b/qksms/src/main/AndroidManifest.xml @@ -21,7 +21,7 @@ android:theme="@style/AppThemeLight"> @@ -45,39 +45,39 @@ - - + android:name="presentation.feature.compose.ComposeActivity" + android:parentActivityName="presentation.feature.main.MainActivity" /> + + - + - - - - - + + + + + diff --git a/qksms/src/main/java/common/di/AppComponent.kt b/qksms/src/main/java/common/di/AppComponent.kt index 17cc17c3..0987c374 100644 --- a/qksms/src/main/java/common/di/AppComponent.kt +++ b/qksms/src/main/java/common/di/AppComponent.kt @@ -21,16 +21,16 @@ package common.di import common.QKApplication import common.util.ContactImageLoader import presentation.common.widget.* -import presentation.compose.ComposeActivity -import presentation.compose.ComposeViewModel -import presentation.compose.DetailedChipView -import presentation.main.MainActivity -import presentation.main.MainViewModel -import presentation.settings.SettingsActivity -import presentation.settings.SettingsViewModel -import presentation.setup.SetupActivity -import presentation.setup.SetupViewModel -import receiver.* +import presentation.feature.compose.ComposeActivity +import presentation.feature.compose.ComposeViewModel +import presentation.feature.compose.DetailedChipView +import presentation.feature.main.MainActivity +import presentation.feature.main.MainViewModel +import presentation.feature.settings.SettingsActivity +import presentation.feature.settings.SettingsViewModel +import presentation.feature.setup.SetupActivity +import presentation.feature.setup.SetupViewModel +import presentation.receiver.* import dagger.Component import javax.inject.Singleton diff --git a/qksms/src/main/java/common/util/NotificationManager.kt b/qksms/src/main/java/common/util/NotificationManager.kt index eb3fc384..badd33a8 100644 --- a/qksms/src/main/java/common/util/NotificationManager.kt +++ b/qksms/src/main/java/common/util/NotificationManager.kt @@ -33,10 +33,10 @@ import android.support.v4.app.TaskStackBuilder import com.moez.QKSMS.R import data.repository.MessageRepository import interactor.MarkUnarchived -import presentation.compose.ComposeActivity -import receiver.MarkReadReceiver -import receiver.MarkSeenReceiver -import receiver.RemoteMessagingReceiver +import presentation.feature.compose.ComposeActivity +import presentation.receiver.MarkReadReceiver +import presentation.receiver.MarkSeenReceiver +import presentation.receiver.RemoteMessagingReceiver import javax.inject.Inject import javax.inject.Singleton diff --git a/qksms/src/main/java/interactor/SendMessage.kt b/qksms/src/main/java/interactor/SendMessage.kt index 6b6526f1..8fe6d56b 100644 --- a/qksms/src/main/java/interactor/SendMessage.kt +++ b/qksms/src/main/java/interactor/SendMessage.kt @@ -24,8 +24,8 @@ import android.content.Intent import android.telephony.SmsManager import common.util.Preferences import data.repository.MessageRepository -import receiver.MessageDeliveredReceiver -import receiver.MessageSentReceiver +import presentation.receiver.MessageDeliveredReceiver +import presentation.receiver.MessageSentReceiver import io.reactivex.Flowable import io.reactivex.rxkotlin.toFlowable import javax.inject.Inject diff --git a/qksms/src/main/java/presentation/Navigator.kt b/qksms/src/main/java/presentation/common/Navigator.kt similarity index 90% rename from qksms/src/main/java/presentation/Navigator.kt rename to qksms/src/main/java/presentation/common/Navigator.kt index 7c7d889e..07b38f40 100644 --- a/qksms/src/main/java/presentation/Navigator.kt +++ b/qksms/src/main/java/presentation/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 +package presentation.common import android.annotation.TargetApi import android.arch.lifecycle.ViewModel @@ -28,13 +28,13 @@ import android.os.Build import android.provider.Settings import android.provider.Telephony import common.util.NotificationManager -import presentation.compose.ComposeActivity -import presentation.compose.ComposeViewModel -import presentation.main.MainViewModel -import presentation.settings.SettingsActivity -import presentation.settings.SettingsViewModel -import presentation.setup.SetupActivity -import presentation.setup.SetupViewModel +import presentation.feature.compose.ComposeActivity +import presentation.feature.compose.ComposeViewModel +import presentation.feature.main.MainViewModel +import presentation.feature.settings.SettingsActivity +import presentation.feature.settings.SettingsViewModel +import presentation.feature.setup.SetupActivity +import presentation.feature.setup.SetupViewModel import javax.inject.Inject import javax.inject.Singleton diff --git a/qksms/src/main/java/presentation/common/base/QkActivity.kt b/qksms/src/main/java/presentation/common/base/QkActivity.kt index 248515d1..09766f86 100644 --- a/qksms/src/main/java/presentation/common/base/QkActivity.kt +++ b/qksms/src/main/java/presentation/common/base/QkActivity.kt @@ -25,7 +25,7 @@ import android.support.v7.app.AppCompatActivity import android.view.Menu import android.view.MenuItem import common.util.Colors -import presentation.Navigator +import presentation.common.Navigator import io.reactivex.disposables.CompositeDisposable import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign diff --git a/qksms/src/main/java/presentation/common/widget/AvatarView.kt b/qksms/src/main/java/presentation/common/widget/AvatarView.kt index e12a6826..ae6379e5 100644 --- a/qksms/src/main/java/presentation/common/widget/AvatarView.kt +++ b/qksms/src/main/java/presentation/common/widget/AvatarView.kt @@ -32,7 +32,7 @@ import common.util.Colors import common.util.GlideApp import common.util.extensions.setTint import data.model.Contact -import presentation.Navigator +import presentation.common.Navigator import io.reactivex.disposables.CompositeDisposable import io.reactivex.rxkotlin.plusAssign import kotlinx.android.synthetic.main.avatar_view.view.* diff --git a/qksms/src/main/java/presentation/compose/ChipsAdapter.kt b/qksms/src/main/java/presentation/feature/compose/ChipsAdapter.kt similarity index 99% rename from qksms/src/main/java/presentation/compose/ChipsAdapter.kt rename to qksms/src/main/java/presentation/feature/compose/ChipsAdapter.kt index cbc64be4..8e5402f2 100755 --- a/qksms/src/main/java/presentation/compose/ChipsAdapter.kt +++ b/qksms/src/main/java/presentation/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.compose +package presentation.feature.compose import android.content.Context import android.support.v7.widget.RecyclerView diff --git a/qksms/src/main/java/presentation/compose/ComposeActivity.kt b/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt similarity index 99% rename from qksms/src/main/java/presentation/compose/ComposeActivity.kt rename to qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt index d1c5f9f2..5453de77 100644 --- a/qksms/src/main/java/presentation/compose/ComposeActivity.kt +++ b/qksms/src/main/java/presentation/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.compose +package presentation.feature.compose import android.app.AlertDialog import android.content.res.ColorStateList diff --git a/qksms/src/main/java/presentation/compose/ComposeState.kt b/qksms/src/main/java/presentation/feature/compose/ComposeState.kt similarity index 97% rename from qksms/src/main/java/presentation/compose/ComposeState.kt rename to qksms/src/main/java/presentation/feature/compose/ComposeState.kt index 5ea57403..b8c55948 100644 --- a/qksms/src/main/java/presentation/compose/ComposeState.kt +++ b/qksms/src/main/java/presentation/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.compose +package presentation.feature.compose import data.model.Contact import data.model.Message diff --git a/qksms/src/main/java/presentation/compose/ComposeView.kt b/qksms/src/main/java/presentation/feature/compose/ComposeView.kt similarity index 97% rename from qksms/src/main/java/presentation/compose/ComposeView.kt rename to qksms/src/main/java/presentation/feature/compose/ComposeView.kt index 2d148b0c..7a17040c 100644 --- a/qksms/src/main/java/presentation/compose/ComposeView.kt +++ b/qksms/src/main/java/presentation/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.compose +package presentation.feature.compose import data.model.Contact import data.model.Message diff --git a/qksms/src/main/java/presentation/compose/ComposeViewModel.kt b/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt similarity index 99% rename from qksms/src/main/java/presentation/compose/ComposeViewModel.kt rename to qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt index 0da73dc9..d47e06c4 100644 --- a/qksms/src/main/java/presentation/compose/ComposeViewModel.kt +++ b/qksms/src/main/java/presentation/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.compose +package presentation.feature.compose import android.content.Context import com.moez.QKSMS.R @@ -30,7 +30,7 @@ import data.model.Conversation import data.repository.ContactRepository import data.repository.MessageRepository import interactor.* -import presentation.Navigator +import presentation.common.Navigator import presentation.common.base.QkViewModel import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/qksms/src/main/java/presentation/compose/ComposeWindowCallback.kt b/qksms/src/main/java/presentation/feature/compose/ComposeWindowCallback.kt similarity index 99% rename from qksms/src/main/java/presentation/compose/ComposeWindowCallback.kt rename to qksms/src/main/java/presentation/feature/compose/ComposeWindowCallback.kt index 44a9c372..266f205a 100755 --- a/qksms/src/main/java/presentation/compose/ComposeWindowCallback.kt +++ b/qksms/src/main/java/presentation/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.compose +package presentation.feature.compose import android.app.Activity import android.graphics.Rect diff --git a/qksms/src/main/java/presentation/compose/ContactAdapter.kt b/qksms/src/main/java/presentation/feature/compose/ContactAdapter.kt similarity index 98% rename from qksms/src/main/java/presentation/compose/ContactAdapter.kt rename to qksms/src/main/java/presentation/feature/compose/ContactAdapter.kt index 8a9cb3dc..dd0e083d 100644 --- a/qksms/src/main/java/presentation/compose/ContactAdapter.kt +++ b/qksms/src/main/java/presentation/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.compose +package presentation.feature.compose import android.content.Context import android.view.LayoutInflater diff --git a/qksms/src/main/java/presentation/compose/DetailedChipView.kt b/qksms/src/main/java/presentation/feature/compose/DetailedChipView.kt similarity index 98% rename from qksms/src/main/java/presentation/compose/DetailedChipView.kt rename to qksms/src/main/java/presentation/feature/compose/DetailedChipView.kt index e15fc125..d217cbe9 100755 --- a/qksms/src/main/java/presentation/compose/DetailedChipView.kt +++ b/qksms/src/main/java/presentation/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.compose +package presentation.feature.compose import android.content.Context import android.view.View diff --git a/qksms/src/main/java/presentation/compose/MessagesAdapter.kt b/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt similarity index 99% rename from qksms/src/main/java/presentation/compose/MessagesAdapter.kt rename to qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt index f8e46530..1623c603 100644 --- a/qksms/src/main/java/presentation/compose/MessagesAdapter.kt +++ b/qksms/src/main/java/presentation/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.compose +package presentation.feature.compose import android.content.Context import android.support.v7.widget.RecyclerView diff --git a/qksms/src/main/java/presentation/main/ConversationItemTouchCallback.kt b/qksms/src/main/java/presentation/feature/conversations/ConversationItemTouchCallback.kt similarity index 97% rename from qksms/src/main/java/presentation/main/ConversationItemTouchCallback.kt rename to qksms/src/main/java/presentation/feature/conversations/ConversationItemTouchCallback.kt index 8d59752a..05cb53f9 100644 --- a/qksms/src/main/java/presentation/main/ConversationItemTouchCallback.kt +++ b/qksms/src/main/java/presentation/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.main +package presentation.feature.conversations import android.support.v7.widget.RecyclerView import android.support.v7.widget.helper.ItemTouchHelper diff --git a/qksms/src/main/java/presentation/main/ConversationsAdapter.kt b/qksms/src/main/java/presentation/feature/conversations/ConversationsAdapter.kt similarity index 97% rename from qksms/src/main/java/presentation/main/ConversationsAdapter.kt rename to qksms/src/main/java/presentation/feature/conversations/ConversationsAdapter.kt index 307cb247..361764c7 100644 --- a/qksms/src/main/java/presentation/main/ConversationsAdapter.kt +++ b/qksms/src/main/java/presentation/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.main +package presentation.feature.conversations import android.content.Context import android.support.v7.widget.RecyclerView @@ -31,7 +31,7 @@ import data.model.Contact import data.model.InboxItem import data.model.PhoneNumber import data.repository.MessageRepository -import presentation.Navigator +import presentation.common.Navigator import presentation.common.base.FlowableAdapter import presentation.common.base.QkViewHolder import io.reactivex.disposables.CompositeDisposable diff --git a/qksms/src/main/java/presentation/main/MainActivity.kt b/qksms/src/main/java/presentation/feature/main/MainActivity.kt similarity index 98% rename from qksms/src/main/java/presentation/main/MainActivity.kt rename to qksms/src/main/java/presentation/feature/main/MainActivity.kt index 84cd19c2..94b117d7 100644 --- a/qksms/src/main/java/presentation/main/MainActivity.kt +++ b/qksms/src/main/java/presentation/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.main +package presentation.feature.main import android.app.AlertDialog import android.content.Intent @@ -48,9 +48,11 @@ import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.drawer_view.* import kotlinx.android.synthetic.main.main_activity.* import kotlinx.android.synthetic.main.toolbar_search.* -import presentation.Navigator +import presentation.common.Navigator import presentation.common.MenuItemAdapter import presentation.common.base.QkActivity +import presentation.feature.conversations.ConversationItemTouchCallback +import presentation.feature.conversations.ConversationsAdapter import javax.inject.Inject class MainActivity : QkActivity(), MainView { diff --git a/qksms/src/main/java/presentation/main/MainState.kt b/qksms/src/main/java/presentation/feature/main/MainState.kt similarity index 97% rename from qksms/src/main/java/presentation/main/MainState.kt rename to qksms/src/main/java/presentation/feature/main/MainState.kt index ff2e332b..b6a20a11 100644 --- a/qksms/src/main/java/presentation/main/MainState.kt +++ b/qksms/src/main/java/presentation/feature/main/MainState.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.main +package presentation.feature.main import data.model.InboxItem import data.model.MenuItem diff --git a/qksms/src/main/java/presentation/main/MainView.kt b/qksms/src/main/java/presentation/feature/main/MainView.kt similarity index 97% rename from qksms/src/main/java/presentation/main/MainView.kt rename to qksms/src/main/java/presentation/feature/main/MainView.kt index 22a5ab3f..6a10ca01 100644 --- a/qksms/src/main/java/presentation/main/MainView.kt +++ b/qksms/src/main/java/presentation/feature/main/MainView.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.main +package presentation.feature.main import presentation.common.base.QkView import io.reactivex.Observable diff --git a/qksms/src/main/java/presentation/main/MainViewModel.kt b/qksms/src/main/java/presentation/feature/main/MainViewModel.kt similarity index 99% rename from qksms/src/main/java/presentation/main/MainViewModel.kt rename to qksms/src/main/java/presentation/feature/main/MainViewModel.kt index 802e343c..2e6b2c8f 100644 --- a/qksms/src/main/java/presentation/main/MainViewModel.kt +++ b/qksms/src/main/java/presentation/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.main +package presentation.feature.main import android.Manifest import android.content.Context @@ -34,7 +34,7 @@ import io.reactivex.Observable import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom import io.realm.Realm -import presentation.Navigator +import presentation.common.Navigator import presentation.common.base.QkViewModel import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/qksms/src/main/java/presentation/settings/SettingsActivity.kt b/qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt similarity index 99% rename from qksms/src/main/java/presentation/settings/SettingsActivity.kt rename to qksms/src/main/java/presentation/feature/settings/SettingsActivity.kt index 973c7b0e..b5360b19 100644 --- a/qksms/src/main/java/presentation/settings/SettingsActivity.kt +++ b/qksms/src/main/java/presentation/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.settings +package presentation.feature.settings import android.app.AlertDialog import android.app.ProgressDialog diff --git a/qksms/src/main/java/presentation/settings/SettingsState.kt b/qksms/src/main/java/presentation/feature/settings/SettingsState.kt similarity index 97% rename from qksms/src/main/java/presentation/settings/SettingsState.kt rename to qksms/src/main/java/presentation/feature/settings/SettingsState.kt index 6469ebfe..5d27cc00 100644 --- a/qksms/src/main/java/presentation/settings/SettingsState.kt +++ b/qksms/src/main/java/presentation/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.settings +package presentation.feature.settings data class SettingsState( val selectingTheme: Boolean = false, diff --git a/qksms/src/main/java/presentation/settings/SettingsView.kt b/qksms/src/main/java/presentation/feature/settings/SettingsView.kt similarity index 96% rename from qksms/src/main/java/presentation/settings/SettingsView.kt rename to qksms/src/main/java/presentation/feature/settings/SettingsView.kt index 5f084273..c841fcfd 100644 --- a/qksms/src/main/java/presentation/settings/SettingsView.kt +++ b/qksms/src/main/java/presentation/feature/settings/SettingsView.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.settings +package presentation.feature.settings import presentation.common.base.QkView import presentation.common.widget.PreferenceView diff --git a/qksms/src/main/java/presentation/settings/SettingsViewModel.kt b/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt similarity index 98% rename from qksms/src/main/java/presentation/settings/SettingsViewModel.kt rename to qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt index a6cab283..913e0534 100644 --- a/qksms/src/main/java/presentation/settings/SettingsViewModel.kt +++ b/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.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.settings +package presentation.feature.settings import android.content.Context import com.moez.QKSMS.R import common.di.appComponent import common.util.Preferences import interactor.FullSync -import presentation.Navigator +import presentation.common.Navigator import presentation.common.base.QkViewModel import io.reactivex.rxkotlin.plusAssign import timber.log.Timber diff --git a/qksms/src/main/java/presentation/settings/ThemeAdapter.kt b/qksms/src/main/java/presentation/feature/settings/ThemeAdapter.kt similarity index 97% rename from qksms/src/main/java/presentation/settings/ThemeAdapter.kt rename to qksms/src/main/java/presentation/feature/settings/ThemeAdapter.kt index 0204e707..62a68705 100644 --- a/qksms/src/main/java/presentation/settings/ThemeAdapter.kt +++ b/qksms/src/main/java/presentation/feature/settings/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.settings +package presentation.feature.settings import android.content.Context import android.view.LayoutInflater diff --git a/qksms/src/main/java/presentation/setup/SetupActivity.kt b/qksms/src/main/java/presentation/feature/setup/SetupActivity.kt similarity index 96% rename from qksms/src/main/java/presentation/setup/SetupActivity.kt rename to qksms/src/main/java/presentation/feature/setup/SetupActivity.kt index 5a9aabfc..64013719 100644 --- a/qksms/src/main/java/presentation/setup/SetupActivity.kt +++ b/qksms/src/main/java/presentation/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.setup +package presentation.feature.setup import android.Manifest import android.os.Bundle @@ -24,7 +24,7 @@ import android.support.v4.app.ActivityCompat import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import common.di.appComponent -import presentation.Navigator +import presentation.common.Navigator import presentation.common.base.QkActivity import io.reactivex.rxkotlin.plusAssign import io.reactivex.subjects.PublishSubject diff --git a/qksms/src/main/java/presentation/setup/SetupState.kt b/qksms/src/main/java/presentation/feature/setup/SetupState.kt similarity index 95% rename from qksms/src/main/java/presentation/setup/SetupState.kt rename to qksms/src/main/java/presentation/feature/setup/SetupState.kt index 92c622cc..0ffce73a 100644 --- a/qksms/src/main/java/presentation/setup/SetupState.kt +++ b/qksms/src/main/java/presentation/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.setup +package presentation.feature.setup class SetupState \ No newline at end of file diff --git a/qksms/src/main/java/presentation/setup/SetupView.kt b/qksms/src/main/java/presentation/feature/setup/SetupView.kt similarity index 96% rename from qksms/src/main/java/presentation/setup/SetupView.kt rename to qksms/src/main/java/presentation/feature/setup/SetupView.kt index 1ff6acec..b84df1a4 100644 --- a/qksms/src/main/java/presentation/setup/SetupView.kt +++ b/qksms/src/main/java/presentation/feature/setup/SetupView.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.setup +package presentation.feature.setup import presentation.common.base.QkView import io.reactivex.Observable diff --git a/qksms/src/main/java/presentation/setup/SetupViewModel.kt b/qksms/src/main/java/presentation/feature/setup/SetupViewModel.kt similarity index 98% rename from qksms/src/main/java/presentation/setup/SetupViewModel.kt rename to qksms/src/main/java/presentation/feature/setup/SetupViewModel.kt index b6fa4ae8..5d5e2246 100644 --- a/qksms/src/main/java/presentation/setup/SetupViewModel.kt +++ b/qksms/src/main/java/presentation/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.setup +package presentation.feature.setup import android.content.Context import android.provider.Telephony diff --git a/qksms/src/main/java/receiver/DefaultSmsChangedReceiver.kt b/qksms/src/main/java/presentation/receiver/DefaultSmsChangedReceiver.kt similarity index 98% rename from qksms/src/main/java/receiver/DefaultSmsChangedReceiver.kt rename to qksms/src/main/java/presentation/receiver/DefaultSmsChangedReceiver.kt index b454babb..7fed6c59 100644 --- a/qksms/src/main/java/receiver/DefaultSmsChangedReceiver.kt +++ b/qksms/src/main/java/presentation/receiver/DefaultSmsChangedReceiver.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package receiver +package presentation.receiver import android.content.BroadcastReceiver import android.content.Context diff --git a/qksms/src/main/java/receiver/MarkReadReceiver.kt b/qksms/src/main/java/presentation/receiver/MarkReadReceiver.kt similarity index 97% rename from qksms/src/main/java/receiver/MarkReadReceiver.kt rename to qksms/src/main/java/presentation/receiver/MarkReadReceiver.kt index 94bd522a..2df3e7d5 100644 --- a/qksms/src/main/java/receiver/MarkReadReceiver.kt +++ b/qksms/src/main/java/presentation/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 receiver +package presentation.receiver import android.content.BroadcastReceiver import android.content.Context diff --git a/qksms/src/main/java/receiver/MarkSeenReceiver.kt b/qksms/src/main/java/presentation/receiver/MarkSeenReceiver.kt similarity index 97% rename from qksms/src/main/java/receiver/MarkSeenReceiver.kt rename to qksms/src/main/java/presentation/receiver/MarkSeenReceiver.kt index fdc1e01e..e86d0710 100644 --- a/qksms/src/main/java/receiver/MarkSeenReceiver.kt +++ b/qksms/src/main/java/presentation/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 receiver +package presentation.receiver import android.content.BroadcastReceiver import android.content.Context diff --git a/qksms/src/main/java/receiver/MessageDeliveredReceiver.kt b/qksms/src/main/java/presentation/receiver/MessageDeliveredReceiver.kt similarity index 98% rename from qksms/src/main/java/receiver/MessageDeliveredReceiver.kt rename to qksms/src/main/java/presentation/receiver/MessageDeliveredReceiver.kt index a0d1014f..ddec789b 100644 --- a/qksms/src/main/java/receiver/MessageDeliveredReceiver.kt +++ b/qksms/src/main/java/presentation/receiver/MessageDeliveredReceiver.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package receiver +package presentation.receiver import android.app.Activity import android.content.BroadcastReceiver diff --git a/qksms/src/main/java/receiver/MessageSentReceiver.kt b/qksms/src/main/java/presentation/receiver/MessageSentReceiver.kt similarity index 98% rename from qksms/src/main/java/receiver/MessageSentReceiver.kt rename to qksms/src/main/java/presentation/receiver/MessageSentReceiver.kt index a173d60a..63d8c1dc 100644 --- a/qksms/src/main/java/receiver/MessageSentReceiver.kt +++ b/qksms/src/main/java/presentation/receiver/MessageSentReceiver.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package receiver +package presentation.receiver import android.app.Activity import android.content.BroadcastReceiver diff --git a/qksms/src/main/java/receiver/MmsReceiver.kt b/qksms/src/main/java/presentation/receiver/MmsReceiver.kt similarity index 98% rename from qksms/src/main/java/receiver/MmsReceiver.kt rename to qksms/src/main/java/presentation/receiver/MmsReceiver.kt index af393b52..8d583f22 100644 --- a/qksms/src/main/java/receiver/MmsReceiver.kt +++ b/qksms/src/main/java/presentation/receiver/MmsReceiver.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package receiver +package presentation.receiver import android.content.BroadcastReceiver import android.content.Context diff --git a/qksms/src/main/java/receiver/RemoteMessagingReceiver.kt b/qksms/src/main/java/presentation/receiver/RemoteMessagingReceiver.kt similarity index 98% rename from qksms/src/main/java/receiver/RemoteMessagingReceiver.kt rename to qksms/src/main/java/presentation/receiver/RemoteMessagingReceiver.kt index 79d6cc3a..89903c13 100644 --- a/qksms/src/main/java/receiver/RemoteMessagingReceiver.kt +++ b/qksms/src/main/java/presentation/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 receiver +package presentation.receiver import android.content.BroadcastReceiver import android.content.Context diff --git a/qksms/src/main/java/receiver/SmsReceiver.kt b/qksms/src/main/java/presentation/receiver/SmsReceiver.kt similarity index 98% rename from qksms/src/main/java/receiver/SmsReceiver.kt rename to qksms/src/main/java/presentation/receiver/SmsReceiver.kt index 966f83ec..0aee1661 100644 --- a/qksms/src/main/java/receiver/SmsReceiver.kt +++ b/qksms/src/main/java/presentation/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 receiver +package presentation.receiver import android.content.BroadcastReceiver import android.content.Context diff --git a/qksms/src/main/java/service/HeadlessSmsSendService.kt b/qksms/src/main/java/presentation/service/HeadlessSmsSendService.kt similarity index 96% rename from qksms/src/main/java/service/HeadlessSmsSendService.kt rename to qksms/src/main/java/presentation/service/HeadlessSmsSendService.kt index cc13e9ce..b9a630c0 100644 --- a/qksms/src/main/java/service/HeadlessSmsSendService.kt +++ b/qksms/src/main/java/presentation/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 service +package presentation.service import android.app.IntentService import android.content.Intent