diff --git a/presentation/src/main/java/presentation/common/GlideCompletionListener.kt b/presentation/src/main/java/common/GlideCompletionListener.kt similarity index 100% rename from presentation/src/main/java/presentation/common/GlideCompletionListener.kt rename to presentation/src/main/java/common/GlideCompletionListener.kt diff --git a/presentation/src/main/java/presentation/common/MenuItemAdapter.kt b/presentation/src/main/java/common/MenuItemAdapter.kt similarity index 100% rename from presentation/src/main/java/presentation/common/MenuItemAdapter.kt rename to presentation/src/main/java/common/MenuItemAdapter.kt diff --git a/presentation/src/main/java/presentation/common/Navigator.kt b/presentation/src/main/java/common/Navigator.kt similarity index 100% rename from presentation/src/main/java/presentation/common/Navigator.kt rename to presentation/src/main/java/common/Navigator.kt diff --git a/presentation/src/main/java/common/QKApplication.kt b/presentation/src/main/java/common/QKApplication.kt index dc03e749..b4c4a230 100644 --- a/presentation/src/main/java/common/QKApplication.kt +++ b/presentation/src/main/java/common/QKApplication.kt @@ -1,4 +1,4 @@ -/* +package common/* * Copyright (C) 2017 Moez Bhatti * * This file is part of QKSMS. @@ -16,8 +16,6 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common - import android.app.Application import android.support.text.emoji.EmojiCompat import android.support.text.emoji.FontRequestEmojiCompatConfig @@ -25,15 +23,14 @@ import android.support.v4.provider.FontRequest import com.bugsnag.android.Bugsnag import com.moez.QKSMS.BuildConfig import com.moez.QKSMS.R -import common.di.AppComponentManager -import common.di.appComponent -import manager.AnalyticsManager +import injection.AppComponentManager +import injection.appComponent import io.realm.Realm import io.realm.RealmConfiguration +import manager.AnalyticsManager import timber.log.Timber import javax.inject.Inject - class QKApplication : Application() { /** diff --git a/presentation/src/main/java/presentation/common/base/FlowableAdapter.kt b/presentation/src/main/java/common/base/FlowableAdapter.kt similarity index 100% rename from presentation/src/main/java/presentation/common/base/FlowableAdapter.kt rename to presentation/src/main/java/common/base/FlowableAdapter.kt diff --git a/presentation/src/main/java/presentation/common/base/QkActivity.kt b/presentation/src/main/java/common/base/QkActivity.kt similarity index 100% rename from presentation/src/main/java/presentation/common/base/QkActivity.kt rename to presentation/src/main/java/common/base/QkActivity.kt diff --git a/presentation/src/main/java/presentation/common/base/QkAdapter.kt b/presentation/src/main/java/common/base/QkAdapter.kt similarity index 100% rename from presentation/src/main/java/presentation/common/base/QkAdapter.kt rename to presentation/src/main/java/common/base/QkAdapter.kt diff --git a/presentation/src/main/java/presentation/common/base/QkThemedActivity.kt b/presentation/src/main/java/common/base/QkThemedActivity.kt similarity index 100% rename from presentation/src/main/java/presentation/common/base/QkThemedActivity.kt rename to presentation/src/main/java/common/base/QkThemedActivity.kt diff --git a/presentation/src/main/java/presentation/common/base/QkView.kt b/presentation/src/main/java/common/base/QkView.kt similarity index 100% rename from presentation/src/main/java/presentation/common/base/QkView.kt rename to presentation/src/main/java/common/base/QkView.kt diff --git a/presentation/src/main/java/presentation/common/base/QkViewHolder.kt b/presentation/src/main/java/common/base/QkViewHolder.kt similarity index 100% rename from presentation/src/main/java/presentation/common/base/QkViewHolder.kt rename to presentation/src/main/java/common/base/QkViewHolder.kt diff --git a/presentation/src/main/java/presentation/common/base/QkViewModel.kt b/presentation/src/main/java/common/base/QkViewModel.kt similarity index 100% rename from presentation/src/main/java/presentation/common/base/QkViewModel.kt rename to presentation/src/main/java/common/base/QkViewModel.kt diff --git a/presentation/src/main/java/common/util/ContactImageLoader.kt b/presentation/src/main/java/common/util/ContactImageLoader.kt index 4d07f8fb..4649de89 100644 --- a/presentation/src/main/java/common/util/ContactImageLoader.kt +++ b/presentation/src/main/java/common/util/ContactImageLoader.kt @@ -29,7 +29,7 @@ import com.bumptech.glide.load.data.DataFetcher import com.bumptech.glide.load.model.ModelLoader import com.bumptech.glide.load.model.ModelLoaderFactory import com.bumptech.glide.load.model.MultiModelLoaderFactory -import common.di.appComponent +import injection.appComponent import io.reactivex.disposables.Disposable import io.reactivex.schedulers.Schedulers import repository.ContactRepository diff --git a/presentation/src/main/java/presentation/common/widget/AvatarView.kt b/presentation/src/main/java/common/widget/AvatarView.kt similarity index 99% rename from presentation/src/main/java/presentation/common/widget/AvatarView.kt rename to presentation/src/main/java/common/widget/AvatarView.kt index 7684ccf3..3ec4143a 100644 --- a/presentation/src/main/java/presentation/common/widget/AvatarView.kt +++ b/presentation/src/main/java/common/widget/AvatarView.kt @@ -29,7 +29,7 @@ import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.uber.autodispose.android.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import common.util.Colors import common.util.GlideApp import common.util.extensions.setTint diff --git a/presentation/src/main/java/presentation/common/widget/GroupAvatarView.kt b/presentation/src/main/java/common/widget/GroupAvatarView.kt similarity index 100% rename from presentation/src/main/java/presentation/common/widget/GroupAvatarView.kt rename to presentation/src/main/java/common/widget/GroupAvatarView.kt diff --git a/presentation/src/main/java/presentation/common/widget/MmsPreviewView.kt b/presentation/src/main/java/common/widget/MmsPreviewView.kt similarity index 98% rename from presentation/src/main/java/presentation/common/widget/MmsPreviewView.kt rename to presentation/src/main/java/common/widget/MmsPreviewView.kt index 9432e8bf..65817369 100644 --- a/presentation/src/main/java/presentation/common/widget/MmsPreviewView.kt +++ b/presentation/src/main/java/common/widget/MmsPreviewView.kt @@ -22,7 +22,7 @@ import android.content.Context import android.util.AttributeSet import android.widget.ImageView import android.widget.LinearLayout -import common.di.appComponent +import injection.appComponent import common.util.GlideApp import common.util.extensions.setVisible import model.MmsPart diff --git a/presentation/src/main/java/presentation/common/widget/PagerTitleView.kt b/presentation/src/main/java/common/widget/PagerTitleView.kt similarity index 99% rename from presentation/src/main/java/presentation/common/widget/PagerTitleView.kt rename to presentation/src/main/java/common/widget/PagerTitleView.kt index 362d31b9..5aa685ed 100644 --- a/presentation/src/main/java/presentation/common/widget/PagerTitleView.kt +++ b/presentation/src/main/java/common/widget/PagerTitleView.kt @@ -28,7 +28,7 @@ import android.widget.TextView import com.moez.QKSMS.R import com.uber.autodispose.android.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import common.util.Colors import common.util.extensions.forEach import io.reactivex.rxkotlin.Observables diff --git a/presentation/src/main/java/presentation/common/widget/PreferenceView.kt b/presentation/src/main/java/common/widget/PreferenceView.kt similarity index 99% rename from presentation/src/main/java/presentation/common/widget/PreferenceView.kt rename to presentation/src/main/java/common/widget/PreferenceView.kt index af2d970b..99878d71 100644 --- a/presentation/src/main/java/presentation/common/widget/PreferenceView.kt +++ b/presentation/src/main/java/common/widget/PreferenceView.kt @@ -27,7 +27,7 @@ import android.widget.TextView import com.moez.QKSMS.R import com.uber.autodispose.android.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import common.util.Colors import common.util.extensions.getColorCompat import common.util.extensions.setTint diff --git a/presentation/src/main/java/presentation/common/widget/QkEditText.kt b/presentation/src/main/java/common/widget/QkEditText.kt similarity index 98% rename from presentation/src/main/java/presentation/common/widget/QkEditText.kt rename to presentation/src/main/java/common/widget/QkEditText.kt index e75b632c..dbcf5273 100644 --- a/presentation/src/main/java/presentation/common/widget/QkEditText.kt +++ b/presentation/src/main/java/common/widget/QkEditText.kt @@ -25,7 +25,7 @@ import android.widget.EditText import com.moez.QKSMS.R import com.uber.autodispose.android.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import common.util.Colors import common.util.FontProvider import io.reactivex.Observable diff --git a/presentation/src/main/java/presentation/common/widget/QkSwitch.kt b/presentation/src/main/java/common/widget/QkSwitch.kt similarity index 98% rename from presentation/src/main/java/presentation/common/widget/QkSwitch.kt rename to presentation/src/main/java/common/widget/QkSwitch.kt index 3542b555..03099f17 100644 --- a/presentation/src/main/java/presentation/common/widget/QkSwitch.kt +++ b/presentation/src/main/java/common/widget/QkSwitch.kt @@ -24,7 +24,7 @@ import android.support.v7.widget.SwitchCompat import android.util.AttributeSet import com.uber.autodispose.android.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import common.util.Colors import common.util.extensions.withAlpha import io.reactivex.rxkotlin.Observables diff --git a/presentation/src/main/java/presentation/common/widget/QkTextView.kt b/presentation/src/main/java/common/widget/QkTextView.kt similarity index 99% rename from presentation/src/main/java/presentation/common/widget/QkTextView.kt rename to presentation/src/main/java/common/widget/QkTextView.kt index ef0697ba..ed6bb183 100644 --- a/presentation/src/main/java/presentation/common/widget/QkTextView.kt +++ b/presentation/src/main/java/common/widget/QkTextView.kt @@ -23,7 +23,7 @@ import android.graphics.Typeface import android.support.text.emoji.widget.EmojiAppCompatTextView import android.util.AttributeSet import com.moez.QKSMS.R -import common.di.appComponent +import injection.appComponent import common.util.Colors import common.util.FontProvider import common.util.extensions.getColorCompat diff --git a/presentation/src/main/java/presentation/common/widget/Separator.kt b/presentation/src/main/java/common/widget/Separator.kt similarity index 98% rename from presentation/src/main/java/presentation/common/widget/Separator.kt rename to presentation/src/main/java/common/widget/Separator.kt index a8b81c33..1c84c784 100644 --- a/presentation/src/main/java/presentation/common/widget/Separator.kt +++ b/presentation/src/main/java/common/widget/Separator.kt @@ -24,7 +24,7 @@ import android.view.View import com.moez.QKSMS.R import com.uber.autodispose.android.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import common.util.Colors import common.util.extensions.getColorCompat import javax.inject.Inject diff --git a/presentation/src/main/java/presentation/common/widget/SquareImageView.kt b/presentation/src/main/java/common/widget/SquareImageView.kt similarity index 100% rename from presentation/src/main/java/presentation/common/widget/SquareImageView.kt rename to presentation/src/main/java/common/widget/SquareImageView.kt diff --git a/presentation/src/main/java/presentation/common/widget/TightTextView.kt b/presentation/src/main/java/common/widget/TightTextView.kt similarity index 100% rename from presentation/src/main/java/presentation/common/widget/TightTextView.kt rename to presentation/src/main/java/common/widget/TightTextView.kt diff --git a/presentation/src/main/java/presentation/feature/blocked/BlockedActivity.kt b/presentation/src/main/java/feature/blocked/BlockedActivity.kt similarity index 98% rename from presentation/src/main/java/presentation/feature/blocked/BlockedActivity.kt rename to presentation/src/main/java/feature/blocked/BlockedActivity.kt index cdeaa62d..54759059 100644 --- a/presentation/src/main/java/presentation/feature/blocked/BlockedActivity.kt +++ b/presentation/src/main/java/feature/blocked/BlockedActivity.kt @@ -23,7 +23,7 @@ import android.os.Bundle import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import common.util.extensions.setVisible import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject diff --git a/presentation/src/main/java/presentation/feature/blocked/BlockedAdapter.kt b/presentation/src/main/java/feature/blocked/BlockedAdapter.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/blocked/BlockedAdapter.kt rename to presentation/src/main/java/feature/blocked/BlockedAdapter.kt diff --git a/presentation/src/main/java/presentation/feature/blocked/BlockedState.kt b/presentation/src/main/java/feature/blocked/BlockedState.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/blocked/BlockedState.kt rename to presentation/src/main/java/feature/blocked/BlockedState.kt diff --git a/presentation/src/main/java/presentation/feature/blocked/BlockedView.kt b/presentation/src/main/java/feature/blocked/BlockedView.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/blocked/BlockedView.kt rename to presentation/src/main/java/feature/blocked/BlockedView.kt diff --git a/presentation/src/main/java/presentation/feature/blocked/BlockedViewModel.kt b/presentation/src/main/java/feature/blocked/BlockedViewModel.kt similarity index 98% rename from presentation/src/main/java/presentation/feature/blocked/BlockedViewModel.kt rename to presentation/src/main/java/feature/blocked/BlockedViewModel.kt index b58e7ea7..91a2eafb 100644 --- a/presentation/src/main/java/presentation/feature/blocked/BlockedViewModel.kt +++ b/presentation/src/main/java/feature/blocked/BlockedViewModel.kt @@ -20,7 +20,7 @@ package presentation.feature.blocked import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import interactor.MarkUnblocked import io.reactivex.rxkotlin.withLatestFrom import presentation.common.base.QkViewModel diff --git a/presentation/src/main/java/presentation/feature/compose/AttachmentAdapter.kt b/presentation/src/main/java/feature/compose/AttachmentAdapter.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/compose/AttachmentAdapter.kt rename to presentation/src/main/java/feature/compose/AttachmentAdapter.kt diff --git a/presentation/src/main/java/presentation/feature/compose/ChipsAdapter.kt b/presentation/src/main/java/feature/compose/ChipsAdapter.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/compose/ChipsAdapter.kt rename to presentation/src/main/java/feature/compose/ChipsAdapter.kt diff --git a/presentation/src/main/java/presentation/feature/compose/ComposeActivity.kt b/presentation/src/main/java/feature/compose/ComposeActivity.kt similarity index 99% rename from presentation/src/main/java/presentation/feature/compose/ComposeActivity.kt rename to presentation/src/main/java/feature/compose/ComposeActivity.kt index a4c2b829..65f70202 100644 --- a/presentation/src/main/java/presentation/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/feature/compose/ComposeActivity.kt @@ -34,7 +34,7 @@ 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 common.di.appComponent +import injection.appComponent import common.util.extensions.setBackgroundTint import common.util.extensions.setTint import common.util.extensions.setVisible diff --git a/presentation/src/main/java/presentation/feature/compose/ComposeState.kt b/presentation/src/main/java/feature/compose/ComposeState.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/compose/ComposeState.kt rename to presentation/src/main/java/feature/compose/ComposeState.kt diff --git a/presentation/src/main/java/presentation/feature/compose/ComposeView.kt b/presentation/src/main/java/feature/compose/ComposeView.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/compose/ComposeView.kt rename to presentation/src/main/java/feature/compose/ComposeView.kt diff --git a/presentation/src/main/java/presentation/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/feature/compose/ComposeViewModel.kt similarity index 99% rename from presentation/src/main/java/presentation/feature/compose/ComposeViewModel.kt rename to presentation/src/main/java/feature/compose/ComposeViewModel.kt index afe2b24d..b76f634f 100644 --- a/presentation/src/main/java/presentation/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/feature/compose/ComposeViewModel.kt @@ -30,7 +30,7 @@ import com.mlsdev.rximagepicker.Sources import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import common.util.ClipboardUtils import common.util.extensions.makeToast import common.util.filter.ContactFilter diff --git a/presentation/src/main/java/presentation/feature/compose/ComposeWindowCallback.kt b/presentation/src/main/java/feature/compose/ComposeWindowCallback.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/compose/ComposeWindowCallback.kt rename to presentation/src/main/java/feature/compose/ComposeWindowCallback.kt diff --git a/presentation/src/main/java/presentation/feature/compose/ContactAdapter.kt b/presentation/src/main/java/feature/compose/ContactAdapter.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/compose/ContactAdapter.kt rename to presentation/src/main/java/feature/compose/ContactAdapter.kt diff --git a/presentation/src/main/java/presentation/feature/compose/DetailedChipView.kt b/presentation/src/main/java/feature/compose/DetailedChipView.kt similarity index 98% rename from presentation/src/main/java/presentation/feature/compose/DetailedChipView.kt rename to presentation/src/main/java/feature/compose/DetailedChipView.kt index ee31df1b..a2038c59 100755 --- a/presentation/src/main/java/presentation/feature/compose/DetailedChipView.kt +++ b/presentation/src/main/java/feature/compose/DetailedChipView.kt @@ -25,7 +25,7 @@ import android.widget.RelativeLayout import com.moez.QKSMS.R import com.uber.autodispose.android.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import common.util.Colors import common.util.extensions.setBackgroundTint import kotlinx.android.synthetic.main.contact_chip_detailed.view.* diff --git a/presentation/src/main/java/presentation/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/feature/compose/MessagesAdapter.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/compose/MessagesAdapter.kt rename to presentation/src/main/java/feature/compose/MessagesAdapter.kt diff --git a/presentation/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt b/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt similarity index 99% rename from presentation/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt rename to presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt index 83fb3ffe..71ab5d97 100644 --- a/presentation/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt +++ b/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt @@ -24,7 +24,7 @@ import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import common.util.extensions.setVisible import io.reactivex.subjects.PublishSubject import kotlinx.android.synthetic.main.conversation_info_activity.* diff --git a/presentation/src/main/java/presentation/feature/conversationinfo/ConversationInfoState.kt b/presentation/src/main/java/feature/conversationinfo/ConversationInfoState.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/conversationinfo/ConversationInfoState.kt rename to presentation/src/main/java/feature/conversationinfo/ConversationInfoState.kt diff --git a/presentation/src/main/java/presentation/feature/conversationinfo/ConversationInfoView.kt b/presentation/src/main/java/feature/conversationinfo/ConversationInfoView.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/conversationinfo/ConversationInfoView.kt rename to presentation/src/main/java/feature/conversationinfo/ConversationInfoView.kt diff --git a/presentation/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt b/presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt similarity index 99% rename from presentation/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt rename to presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt index 8d0b0240..822a6c1b 100644 --- a/presentation/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt +++ b/presentation/src/main/java/feature/conversationinfo/ConversationInfoViewModel.kt @@ -22,7 +22,7 @@ import android.content.Context import android.content.Intent import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import interactor.DeleteConversation import interactor.MarkArchived import interactor.MarkBlocked diff --git a/presentation/src/main/java/presentation/feature/conversationinfo/ConversationMediaAdapter.kt b/presentation/src/main/java/feature/conversationinfo/ConversationMediaAdapter.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/conversationinfo/ConversationMediaAdapter.kt rename to presentation/src/main/java/feature/conversationinfo/ConversationMediaAdapter.kt diff --git a/presentation/src/main/java/presentation/feature/conversationinfo/ConversationRecipientAdapter.kt b/presentation/src/main/java/feature/conversationinfo/ConversationRecipientAdapter.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/conversationinfo/ConversationRecipientAdapter.kt rename to presentation/src/main/java/feature/conversationinfo/ConversationRecipientAdapter.kt diff --git a/presentation/src/main/java/presentation/feature/conversationinfo/GridSpacingItemDecoration.kt b/presentation/src/main/java/feature/conversationinfo/GridSpacingItemDecoration.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/conversationinfo/GridSpacingItemDecoration.kt rename to presentation/src/main/java/feature/conversationinfo/GridSpacingItemDecoration.kt diff --git a/presentation/src/main/java/presentation/feature/conversations/ConversationItemTouchCallback.kt b/presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/conversations/ConversationItemTouchCallback.kt rename to presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt diff --git a/presentation/src/main/java/presentation/feature/conversations/ConversationsAdapter.kt b/presentation/src/main/java/feature/conversations/ConversationsAdapter.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/conversations/ConversationsAdapter.kt rename to presentation/src/main/java/feature/conversations/ConversationsAdapter.kt diff --git a/presentation/src/main/java/presentation/feature/gallery/GalleryActivity.kt b/presentation/src/main/java/feature/gallery/GalleryActivity.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/gallery/GalleryActivity.kt rename to presentation/src/main/java/feature/gallery/GalleryActivity.kt diff --git a/presentation/src/main/java/presentation/feature/gallery/GalleryState.kt b/presentation/src/main/java/feature/gallery/GalleryState.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/gallery/GalleryState.kt rename to presentation/src/main/java/feature/gallery/GalleryState.kt diff --git a/presentation/src/main/java/presentation/feature/gallery/GalleryView.kt b/presentation/src/main/java/feature/gallery/GalleryView.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/gallery/GalleryView.kt rename to presentation/src/main/java/feature/gallery/GalleryView.kt diff --git a/presentation/src/main/java/presentation/feature/gallery/GalleryViewModel.kt b/presentation/src/main/java/feature/gallery/GalleryViewModel.kt similarity index 99% rename from presentation/src/main/java/presentation/feature/gallery/GalleryViewModel.kt rename to presentation/src/main/java/feature/gallery/GalleryViewModel.kt index fa88c635..07b4cc77 100644 --- a/presentation/src/main/java/presentation/feature/gallery/GalleryViewModel.kt +++ b/presentation/src/main/java/feature/gallery/GalleryViewModel.kt @@ -23,7 +23,7 @@ import android.content.Intent import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import common.util.extensions.makeToast import interactor.SaveImage import io.reactivex.Flowable diff --git a/presentation/src/main/java/presentation/feature/main/MainActivity.kt b/presentation/src/main/java/feature/main/MainActivity.kt similarity index 99% rename from presentation/src/main/java/presentation/feature/main/MainActivity.kt rename to presentation/src/main/java/feature/main/MainActivity.kt index c1de7cd5..24dd8996 100644 --- a/presentation/src/main/java/presentation/feature/main/MainActivity.kt +++ b/presentation/src/main/java/feature/main/MainActivity.kt @@ -37,7 +37,7 @@ 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 common.di.appComponent +import injection.appComponent import common.util.extensions.dpToPx import common.util.extensions.setBackgroundTint import common.util.extensions.setVisible diff --git a/presentation/src/main/java/presentation/feature/main/MainState.kt b/presentation/src/main/java/feature/main/MainState.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/main/MainState.kt rename to presentation/src/main/java/feature/main/MainState.kt diff --git a/presentation/src/main/java/presentation/feature/main/MainView.kt b/presentation/src/main/java/feature/main/MainView.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/main/MainView.kt rename to presentation/src/main/java/feature/main/MainView.kt diff --git a/presentation/src/main/java/presentation/feature/main/MainViewModel.kt b/presentation/src/main/java/feature/main/MainViewModel.kt similarity index 99% rename from presentation/src/main/java/presentation/feature/main/MainViewModel.kt rename to presentation/src/main/java/feature/main/MainViewModel.kt index e4995e09..95975284 100644 --- a/presentation/src/main/java/presentation/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/feature/main/MainViewModel.kt @@ -26,7 +26,7 @@ import android.support.v4.content.ContextCompat import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import common.util.filter.ConversationFilter import interactor.DeleteConversation import interactor.MarkAllSeen diff --git a/presentation/src/main/java/presentation/feature/notificationprefs/NotificationPrefsActivity.kt b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt similarity index 99% rename from presentation/src/main/java/presentation/feature/notificationprefs/NotificationPrefsActivity.kt rename to presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt index a07f36e8..fb395d7b 100644 --- a/presentation/src/main/java/presentation/feature/notificationprefs/NotificationPrefsActivity.kt +++ b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt @@ -27,7 +27,7 @@ import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.notification_prefs_activity.* diff --git a/presentation/src/main/java/presentation/feature/notificationprefs/NotificationPrefsState.kt b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsState.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/notificationprefs/NotificationPrefsState.kt rename to presentation/src/main/java/feature/notificationprefs/NotificationPrefsState.kt diff --git a/presentation/src/main/java/presentation/feature/notificationprefs/NotificationPrefsView.kt b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsView.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/notificationprefs/NotificationPrefsView.kt rename to presentation/src/main/java/feature/notificationprefs/NotificationPrefsView.kt diff --git a/presentation/src/main/java/presentation/feature/notificationprefs/NotificationPrefsViewModel.kt b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt similarity index 99% rename from presentation/src/main/java/presentation/feature/notificationprefs/NotificationPrefsViewModel.kt rename to presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt index 190e390c..6a6a2788 100644 --- a/presentation/src/main/java/presentation/feature/notificationprefs/NotificationPrefsViewModel.kt +++ b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsViewModel.kt @@ -27,7 +27,7 @@ import com.f2prateek.rx.preferences2.Preference import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import util.Preferences import io.reactivex.Flowable import io.reactivex.rxkotlin.plusAssign diff --git a/presentation/src/main/java/presentation/feature/plus/PlusActivity.kt b/presentation/src/main/java/feature/plus/PlusActivity.kt similarity index 99% rename from presentation/src/main/java/presentation/feature/plus/PlusActivity.kt rename to presentation/src/main/java/feature/plus/PlusActivity.kt index 2340d531..bd93c67f 100644 --- a/presentation/src/main/java/presentation/feature/plus/PlusActivity.kt +++ b/presentation/src/main/java/feature/plus/PlusActivity.kt @@ -24,7 +24,7 @@ import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import common.util.BillingManager import common.util.FontProvider import common.util.extensions.setBackgroundTint diff --git a/presentation/src/main/java/presentation/feature/plus/PlusState.kt b/presentation/src/main/java/feature/plus/PlusState.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/plus/PlusState.kt rename to presentation/src/main/java/feature/plus/PlusState.kt diff --git a/presentation/src/main/java/presentation/feature/plus/PlusView.kt b/presentation/src/main/java/feature/plus/PlusView.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/plus/PlusView.kt rename to presentation/src/main/java/feature/plus/PlusView.kt diff --git a/presentation/src/main/java/presentation/feature/plus/PlusViewModel.kt b/presentation/src/main/java/feature/plus/PlusViewModel.kt similarity index 98% rename from presentation/src/main/java/presentation/feature/plus/PlusViewModel.kt rename to presentation/src/main/java/feature/plus/PlusViewModel.kt index 2294d419..130909a2 100644 --- a/presentation/src/main/java/presentation/feature/plus/PlusViewModel.kt +++ b/presentation/src/main/java/feature/plus/PlusViewModel.kt @@ -20,7 +20,7 @@ package presentation.feature.plus import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import common.util.BillingManager import io.reactivex.Observable import io.reactivex.rxkotlin.plusAssign diff --git a/presentation/src/main/java/presentation/feature/settings/SettingsActivity.kt b/presentation/src/main/java/feature/settings/SettingsActivity.kt similarity index 99% rename from presentation/src/main/java/presentation/feature/settings/SettingsActivity.kt rename to presentation/src/main/java/feature/settings/SettingsActivity.kt index e868febc..6bf5a446 100644 --- a/presentation/src/main/java/presentation/feature/settings/SettingsActivity.kt +++ b/presentation/src/main/java/feature/settings/SettingsActivity.kt @@ -29,7 +29,7 @@ import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import util.Preferences import common.util.extensions.dpToPx import common.util.extensions.setVisible diff --git a/presentation/src/main/java/presentation/feature/settings/SettingsState.kt b/presentation/src/main/java/feature/settings/SettingsState.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/settings/SettingsState.kt rename to presentation/src/main/java/feature/settings/SettingsState.kt diff --git a/presentation/src/main/java/presentation/feature/settings/SettingsView.kt b/presentation/src/main/java/feature/settings/SettingsView.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/settings/SettingsView.kt rename to presentation/src/main/java/feature/settings/SettingsView.kt diff --git a/presentation/src/main/java/presentation/feature/settings/SettingsViewModel.kt b/presentation/src/main/java/feature/settings/SettingsViewModel.kt similarity index 99% rename from presentation/src/main/java/presentation/feature/settings/SettingsViewModel.kt rename to presentation/src/main/java/feature/settings/SettingsViewModel.kt index 694c74f8..49bdfa2b 100644 --- a/presentation/src/main/java/presentation/feature/settings/SettingsViewModel.kt +++ b/presentation/src/main/java/feature/settings/SettingsViewModel.kt @@ -22,7 +22,7 @@ import android.content.Context import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import common.util.BillingManager import common.util.DateFormatter import common.util.NightModeManager diff --git a/presentation/src/main/java/presentation/feature/setup/SetupActivity.kt b/presentation/src/main/java/feature/setup/SetupActivity.kt similarity index 98% rename from presentation/src/main/java/presentation/feature/setup/SetupActivity.kt rename to presentation/src/main/java/feature/setup/SetupActivity.kt index 65a18a05..b1989ebd 100644 --- a/presentation/src/main/java/presentation/feature/setup/SetupActivity.kt +++ b/presentation/src/main/java/feature/setup/SetupActivity.kt @@ -25,7 +25,7 @@ import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.setup_activity.* diff --git a/presentation/src/main/java/presentation/feature/setup/SetupState.kt b/presentation/src/main/java/feature/setup/SetupState.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/setup/SetupState.kt rename to presentation/src/main/java/feature/setup/SetupState.kt diff --git a/presentation/src/main/java/presentation/feature/setup/SetupView.kt b/presentation/src/main/java/feature/setup/SetupView.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/setup/SetupView.kt rename to presentation/src/main/java/feature/setup/SetupView.kt diff --git a/presentation/src/main/java/presentation/feature/setup/SetupViewModel.kt b/presentation/src/main/java/feature/setup/SetupViewModel.kt similarity index 98% rename from presentation/src/main/java/presentation/feature/setup/SetupViewModel.kt rename to presentation/src/main/java/feature/setup/SetupViewModel.kt index 49c77af3..18a1aa57 100644 --- a/presentation/src/main/java/presentation/feature/setup/SetupViewModel.kt +++ b/presentation/src/main/java/feature/setup/SetupViewModel.kt @@ -22,7 +22,7 @@ import android.content.Context import android.provider.Telephony import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import manager.PermissionManager import presentation.common.base.QkViewModel import javax.inject.Inject diff --git a/presentation/src/main/java/presentation/feature/themepicker/ThemeAdapter.kt b/presentation/src/main/java/feature/themepicker/ThemeAdapter.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/themepicker/ThemeAdapter.kt rename to presentation/src/main/java/feature/themepicker/ThemeAdapter.kt diff --git a/presentation/src/main/java/presentation/feature/themepicker/ThemePagerAdapter.kt b/presentation/src/main/java/feature/themepicker/ThemePagerAdapter.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/themepicker/ThemePagerAdapter.kt rename to presentation/src/main/java/feature/themepicker/ThemePagerAdapter.kt diff --git a/presentation/src/main/java/presentation/feature/themepicker/ThemePickerActivity.kt b/presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt similarity index 98% rename from presentation/src/main/java/presentation/feature/themepicker/ThemePickerActivity.kt rename to presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt index de797b92..a6ab4ad1 100644 --- a/presentation/src/main/java/presentation/feature/themepicker/ThemePickerActivity.kt +++ b/presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt @@ -23,7 +23,7 @@ import android.support.v7.widget.LinearLayoutManager import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import common.util.extensions.pageScrolled import kotlinx.android.synthetic.main.theme_picker_activity.* import presentation.common.base.QkThemedActivity diff --git a/presentation/src/main/java/presentation/feature/themepicker/ThemePickerState.kt b/presentation/src/main/java/feature/themepicker/ThemePickerState.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/themepicker/ThemePickerState.kt rename to presentation/src/main/java/feature/themepicker/ThemePickerState.kt diff --git a/presentation/src/main/java/presentation/feature/themepicker/ThemePickerView.kt b/presentation/src/main/java/feature/themepicker/ThemePickerView.kt similarity index 100% rename from presentation/src/main/java/presentation/feature/themepicker/ThemePickerView.kt rename to presentation/src/main/java/feature/themepicker/ThemePickerView.kt diff --git a/presentation/src/main/java/presentation/feature/themepicker/ThemePickerViewModel.kt b/presentation/src/main/java/feature/themepicker/ThemePickerViewModel.kt similarity index 98% rename from presentation/src/main/java/presentation/feature/themepicker/ThemePickerViewModel.kt rename to presentation/src/main/java/feature/themepicker/ThemePickerViewModel.kt index 4c0b3298..0661075e 100644 --- a/presentation/src/main/java/presentation/feature/themepicker/ThemePickerViewModel.kt +++ b/presentation/src/main/java/feature/themepicker/ThemePickerViewModel.kt @@ -22,7 +22,7 @@ import android.content.Intent import com.f2prateek.rx.preferences2.Preference import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable -import common.di.appComponent +import injection.appComponent import util.Preferences import io.reactivex.rxkotlin.plusAssign import presentation.common.base.QkViewModel diff --git a/presentation/src/main/java/common/di/AppComponent.kt b/presentation/src/main/java/injection/AppComponent.kt similarity index 87% rename from presentation/src/main/java/common/di/AppComponent.kt rename to presentation/src/main/java/injection/AppComponent.kt index 0032791c..711599a7 100644 --- a/presentation/src/main/java/common/di/AppComponent.kt +++ b/presentation/src/main/java/injection/AppComponent.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.di +package injection import common.QKApplication import common.util.ContactImageLoader @@ -50,18 +50,7 @@ import presentation.feature.setup.SetupActivity import presentation.feature.setup.SetupViewModel import presentation.feature.themepicker.ThemePickerActivity import presentation.feature.themepicker.ThemePickerViewModel -import presentation.receiver.DefaultSmsChangedReceiver -import presentation.receiver.MarkReadReceiver -import presentation.receiver.MarkSeenReceiver -import presentation.receiver.MmsReceivedReceiver -import presentation.receiver.MmsSentReceiver -import presentation.receiver.MmsUpdatedReceiver -import presentation.receiver.NightModeReceiver -import presentation.receiver.RemoteMessagingReceiver -import presentation.receiver.SmsDeliveredReceiver -import presentation.receiver.SmsProviderChangedReceiver -import presentation.receiver.SmsReceiver -import presentation.receiver.SmsSentReceiver +import presentation.receiver.* import javax.inject.Singleton @Singleton diff --git a/presentation/src/main/java/common/di/AppComponentManager.kt b/presentation/src/main/java/injection/AppComponentManager.kt similarity index 98% rename from presentation/src/main/java/common/di/AppComponentManager.kt rename to presentation/src/main/java/injection/AppComponentManager.kt index 66463fa2..67a0e841 100644 --- a/presentation/src/main/java/common/di/AppComponentManager.kt +++ b/presentation/src/main/java/injection/AppComponentManager.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.di +package injection import common.QKApplication diff --git a/presentation/src/main/java/common/di/AppModule.kt b/presentation/src/main/java/injection/AppModule.kt similarity index 99% rename from presentation/src/main/java/common/di/AppModule.kt rename to presentation/src/main/java/injection/AppModule.kt index 57d17b4d..f7865d55 100644 --- a/presentation/src/main/java/common/di/AppModule.kt +++ b/presentation/src/main/java/injection/AppModule.kt @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with QKSMS. If not, see . */ -package common.di +package injection import android.app.Application import android.content.Context diff --git a/presentation/src/main/java/presentation/receiver/DefaultSmsChangedReceiver.kt b/presentation/src/main/java/receiver/DefaultSmsChangedReceiver.kt similarity index 98% rename from presentation/src/main/java/presentation/receiver/DefaultSmsChangedReceiver.kt rename to presentation/src/main/java/receiver/DefaultSmsChangedReceiver.kt index 8b644a45..4fa04224 100644 --- a/presentation/src/main/java/presentation/receiver/DefaultSmsChangedReceiver.kt +++ b/presentation/src/main/java/receiver/DefaultSmsChangedReceiver.kt @@ -24,7 +24,7 @@ import android.content.Intent import android.os.Build import android.provider.Telephony import android.support.annotation.RequiresApi -import common.di.appComponent +import injection.appComponent import util.Preferences import interactor.PartialSync import javax.inject.Inject diff --git a/presentation/src/main/java/presentation/receiver/MarkReadReceiver.kt b/presentation/src/main/java/receiver/MarkReadReceiver.kt similarity index 97% rename from presentation/src/main/java/presentation/receiver/MarkReadReceiver.kt rename to presentation/src/main/java/receiver/MarkReadReceiver.kt index 2df3e7d5..7b9aee41 100644 --- a/presentation/src/main/java/presentation/receiver/MarkReadReceiver.kt +++ b/presentation/src/main/java/receiver/MarkReadReceiver.kt @@ -21,7 +21,7 @@ package presentation.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import common.di.appComponent +import injection.appComponent import interactor.MarkRead import javax.inject.Inject diff --git a/presentation/src/main/java/presentation/receiver/MarkSeenReceiver.kt b/presentation/src/main/java/receiver/MarkSeenReceiver.kt similarity index 97% rename from presentation/src/main/java/presentation/receiver/MarkSeenReceiver.kt rename to presentation/src/main/java/receiver/MarkSeenReceiver.kt index e86d0710..59f73bc2 100644 --- a/presentation/src/main/java/presentation/receiver/MarkSeenReceiver.kt +++ b/presentation/src/main/java/receiver/MarkSeenReceiver.kt @@ -21,7 +21,7 @@ package presentation.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import common.di.appComponent +import injection.appComponent import interactor.MarkSeen import javax.inject.Inject diff --git a/presentation/src/main/java/presentation/receiver/MmsReceivedReceiver.kt b/presentation/src/main/java/receiver/MmsReceivedReceiver.kt similarity index 97% rename from presentation/src/main/java/presentation/receiver/MmsReceivedReceiver.kt rename to presentation/src/main/java/receiver/MmsReceivedReceiver.kt index f43fba26..b710b6fa 100644 --- a/presentation/src/main/java/presentation/receiver/MmsReceivedReceiver.kt +++ b/presentation/src/main/java/receiver/MmsReceivedReceiver.kt @@ -20,7 +20,7 @@ package presentation.receiver import android.net.Uri import com.klinker.android.send_message.MmsReceivedReceiver -import common.di.appComponent +import injection.appComponent import interactor.ReceiveMms import javax.inject.Inject diff --git a/presentation/src/main/java/presentation/receiver/MmsReceiver.kt b/presentation/src/main/java/receiver/MmsReceiver.kt similarity index 100% rename from presentation/src/main/java/presentation/receiver/MmsReceiver.kt rename to presentation/src/main/java/receiver/MmsReceiver.kt diff --git a/presentation/src/main/java/presentation/receiver/MmsSentReceiver.kt b/presentation/src/main/java/receiver/MmsSentReceiver.kt similarity index 97% rename from presentation/src/main/java/presentation/receiver/MmsSentReceiver.kt rename to presentation/src/main/java/receiver/MmsSentReceiver.kt index 71a90fdf..01319e33 100644 --- a/presentation/src/main/java/presentation/receiver/MmsSentReceiver.kt +++ b/presentation/src/main/java/receiver/MmsSentReceiver.kt @@ -22,7 +22,7 @@ import android.content.Context import android.content.Intent import android.net.Uri import com.klinker.android.send_message.MmsSentReceiver -import common.di.appComponent +import injection.appComponent import interactor.SyncMessage import javax.inject.Inject diff --git a/presentation/src/main/java/presentation/receiver/MmsUpdatedReceiver.kt b/presentation/src/main/java/receiver/MmsUpdatedReceiver.kt similarity index 97% rename from presentation/src/main/java/presentation/receiver/MmsUpdatedReceiver.kt rename to presentation/src/main/java/receiver/MmsUpdatedReceiver.kt index b27143df..f55cc9f9 100644 --- a/presentation/src/main/java/presentation/receiver/MmsUpdatedReceiver.kt +++ b/presentation/src/main/java/receiver/MmsUpdatedReceiver.kt @@ -22,7 +22,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.net.Uri -import common.di.appComponent +import injection.appComponent import interactor.SyncMessage import javax.inject.Inject diff --git a/presentation/src/main/java/presentation/receiver/NightModeReceiver.kt b/presentation/src/main/java/receiver/NightModeReceiver.kt similarity index 97% rename from presentation/src/main/java/presentation/receiver/NightModeReceiver.kt rename to presentation/src/main/java/receiver/NightModeReceiver.kt index 7101aee4..2fdf153f 100644 --- a/presentation/src/main/java/presentation/receiver/NightModeReceiver.kt +++ b/presentation/src/main/java/receiver/NightModeReceiver.kt @@ -21,7 +21,7 @@ package presentation.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import common.di.appComponent +import injection.appComponent import common.util.NightModeManager import javax.inject.Inject diff --git a/presentation/src/main/java/presentation/receiver/RemoteMessagingReceiver.kt b/presentation/src/main/java/receiver/RemoteMessagingReceiver.kt similarity index 98% rename from presentation/src/main/java/presentation/receiver/RemoteMessagingReceiver.kt rename to presentation/src/main/java/receiver/RemoteMessagingReceiver.kt index e6b9b9ca..05e7912e 100644 --- a/presentation/src/main/java/presentation/receiver/RemoteMessagingReceiver.kt +++ b/presentation/src/main/java/receiver/RemoteMessagingReceiver.kt @@ -22,7 +22,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.support.v4.app.RemoteInput -import common.di.appComponent +import injection.appComponent import interactor.MarkRead import interactor.SendMessage import javax.inject.Inject diff --git a/presentation/src/main/java/presentation/receiver/SmsDeliveredReceiver.kt b/presentation/src/main/java/receiver/SmsDeliveredReceiver.kt similarity index 98% rename from presentation/src/main/java/presentation/receiver/SmsDeliveredReceiver.kt rename to presentation/src/main/java/receiver/SmsDeliveredReceiver.kt index 16a8d209..ab153242 100644 --- a/presentation/src/main/java/presentation/receiver/SmsDeliveredReceiver.kt +++ b/presentation/src/main/java/receiver/SmsDeliveredReceiver.kt @@ -22,7 +22,7 @@ import android.app.Activity import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import common.di.appComponent +import injection.appComponent import interactor.MarkDelivered import interactor.MarkDeliveryFailed import javax.inject.Inject diff --git a/presentation/src/main/java/presentation/receiver/SmsProviderChangedReceiver.kt b/presentation/src/main/java/receiver/SmsProviderChangedReceiver.kt similarity index 98% rename from presentation/src/main/java/presentation/receiver/SmsProviderChangedReceiver.kt rename to presentation/src/main/java/receiver/SmsProviderChangedReceiver.kt index cba9e02b..3c2e1425 100644 --- a/presentation/src/main/java/presentation/receiver/SmsProviderChangedReceiver.kt +++ b/presentation/src/main/java/receiver/SmsProviderChangedReceiver.kt @@ -21,7 +21,7 @@ package presentation.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import common.di.appComponent +import injection.appComponent import interactor.SyncMessage import javax.inject.Inject diff --git a/presentation/src/main/java/presentation/receiver/SmsReceiver.kt b/presentation/src/main/java/receiver/SmsReceiver.kt similarity index 97% rename from presentation/src/main/java/presentation/receiver/SmsReceiver.kt rename to presentation/src/main/java/receiver/SmsReceiver.kt index ff9df7a5..4890bbe6 100644 --- a/presentation/src/main/java/presentation/receiver/SmsReceiver.kt +++ b/presentation/src/main/java/receiver/SmsReceiver.kt @@ -22,7 +22,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.provider.Telephony.Sms -import common.di.appComponent +import injection.appComponent import interactor.ReceiveSms import javax.inject.Inject diff --git a/presentation/src/main/java/presentation/receiver/SmsSentReceiver.kt b/presentation/src/main/java/receiver/SmsSentReceiver.kt similarity index 98% rename from presentation/src/main/java/presentation/receiver/SmsSentReceiver.kt rename to presentation/src/main/java/receiver/SmsSentReceiver.kt index dacc387b..42e30951 100644 --- a/presentation/src/main/java/presentation/receiver/SmsSentReceiver.kt +++ b/presentation/src/main/java/receiver/SmsSentReceiver.kt @@ -23,7 +23,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.telephony.SmsManager -import common.di.appComponent +import injection.appComponent import interactor.MarkFailed import interactor.MarkSent import javax.inject.Inject diff --git a/presentation/src/main/java/presentation/service/HeadlessSmsSendService.kt b/presentation/src/main/java/service/HeadlessSmsSendService.kt similarity index 100% rename from presentation/src/main/java/presentation/service/HeadlessSmsSendService.kt rename to presentation/src/main/java/service/HeadlessSmsSendService.kt diff --git a/presentation/src/withAnalytics/java/common/util/AnalyticsImpl.kt b/presentation/src/withAnalytics/java/common/util/AnalyticsManagerImpl.kt similarity index 92% rename from presentation/src/withAnalytics/java/common/util/AnalyticsImpl.kt rename to presentation/src/withAnalytics/java/common/util/AnalyticsManagerImpl.kt index 332daa25..d0b98f34 100644 --- a/presentation/src/withAnalytics/java/common/util/AnalyticsImpl.kt +++ b/presentation/src/withAnalytics/java/common/util/AnalyticsManagerImpl.kt @@ -22,13 +22,13 @@ import android.content.Context import com.amplitude.api.Amplitude import com.amplitude.api.AmplitudeClient import com.mixpanel.android.mpmetrics.MixpanelAPI -import com.moez.QKSMS.domain.BuildConfig +import com.moez.QKSMS.BuildConfig import manager.AnalyticsManager import javax.inject.Inject import javax.inject.Singleton @Singleton -class AnalyticsImpl @Inject constructor(context: Context): AnalyticsManager { +class AnalyticsManagerImpl @Inject constructor(context: Context): AnalyticsManager { private val amplitude: AmplitudeClient = Amplitude.getInstance().initialize(context, BuildConfig.AMPLITUDE_API_KEY) private val mixpanel: MixpanelAPI = MixpanelAPI.getInstance(context, BuildConfig.MIXPANEL_API_KEY)