Flatten hierarchy in presentation module

presentation/src/main/java/common/QKApplication.kt

@@ -1,4 +1,4 @@
-/*
+package common/*
  * Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
  *
  * 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 <http://www.gnu.org/licenses/>.
  */
-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() {
 
     /**

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

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

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

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

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

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

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

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

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

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

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

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

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

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.*

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.*

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

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

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

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

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.*

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

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

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

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

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

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.*

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

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

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

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 <http://www.gnu.org/licenses/>.
  */
-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

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 <http://www.gnu.org/licenses/>.
  */
-package common.di
+package injection
 
 import common.QKApplication
 

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 <http://www.gnu.org/licenses/>.
  */
-package common.di
+package injection
 
 import android.app.Application
 import android.content.Context

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

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
 

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
 

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
 

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
 

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
 

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
 

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

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

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
 

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
 

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