Reorganize packages

This commit is contained in:
Moez Bhatti
2017-09-29 14:20:13 -04:00
parent 321eadce6c
commit 5a8b8f36ee
40 changed files with 89 additions and 88 deletions
+3 -3
View File
@@ -12,7 +12,7 @@
<uses-permission android:name="android.permission.WRITE_SMS" />
<application
android:name=".QKApplication"
android:name=".common.QKApplication"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
@@ -21,7 +21,7 @@
android:theme="@style/AppTheme">
<activity
android:name=".ui.conversations.ConversationListActivity"
android:name="com.moez.QKSMS.presentation.conversations.ConversationListActivity"
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -44,7 +44,7 @@
<data android:scheme="sms_body" />
</intent-filter>
</activity>
<activity android:name=".ui.messages.MessageListActivity" />
<activity android:name="com.moez.QKSMS.presentation.messages.MessageListActivity" />
<receiver
android:name=".receiver.SmsReceiver"
@@ -1,8 +1,8 @@
package com.moez.QKSMS
package com.moez.QKSMS.common
import android.app.Application
import com.bugsnag.android.Bugsnag
import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.common.di.AppComponentManager
import io.realm.Realm
import io.realm.RealmConfiguration
import timber.log.Timber
@@ -1,13 +1,13 @@
package com.moez.QKSMS.dagger
package com.moez.QKSMS.common.di
import com.moez.QKSMS.common.util.NotificationManager
import com.moez.QKSMS.presentation.conversations.ConversationAdapter
import com.moez.QKSMS.presentation.conversations.ConversationListViewModel
import com.moez.QKSMS.presentation.messages.MessageAdapter
import com.moez.QKSMS.presentation.messages.MessageListActivity
import com.moez.QKSMS.presentation.messages.MessageListViewModel
import com.moez.QKSMS.presentation.view.AvatarView
import com.moez.QKSMS.receiver.*
import com.moez.QKSMS.ui.conversations.ConversationAdapter
import com.moez.QKSMS.ui.conversations.ConversationListViewModel
import com.moez.QKSMS.ui.messages.MessageAdapter
import com.moez.QKSMS.ui.messages.MessageListActivity
import com.moez.QKSMS.ui.messages.MessageListViewModel
import com.moez.QKSMS.ui.view.AvatarView
import com.moez.QKSMS.util.NotificationManager
import dagger.Component
import javax.inject.Singleton
@@ -1,6 +1,6 @@
package com.moez.QKSMS.dagger
package com.moez.QKSMS.common.di
import com.moez.QKSMS.QKApplication
import com.moez.QKSMS.common.QKApplication
internal object AppComponentManager {
@@ -1,13 +1,13 @@
package com.moez.QKSMS.dagger
package com.moez.QKSMS.common.di
import android.app.Application
import android.content.Context
import com.moez.QKSMS.common.util.DateFormatter
import com.moez.QKSMS.common.util.NotificationManager
import com.moez.QKSMS.common.util.ThemeManager
import com.moez.QKSMS.data.repository.ContactRepository
import com.moez.QKSMS.data.repository.MessageRepository
import com.moez.QKSMS.data.sync.SyncManager
import com.moez.QKSMS.util.DateFormatter
import com.moez.QKSMS.util.NotificationManager
import com.moez.QKSMS.util.ThemeManager
import dagger.Module
import dagger.Provides
import javax.inject.Singleton
@@ -1,10 +1,10 @@
package com.moez.QKSMS.util
package com.moez.QKSMS.common.util
import android.content.Context
import android.text.format.DateFormat
import com.moez.QKSMS.util.extensions.isSameDay
import com.moez.QKSMS.util.extensions.isSameWeek
import com.moez.QKSMS.util.extensions.isSameYear
import com.moez.QKSMS.common.util.extensions.isSameDay
import com.moez.QKSMS.common.util.extensions.isSameWeek
import com.moez.QKSMS.common.util.extensions.isSameYear
import java.text.SimpleDateFormat
import java.util.*
@@ -1,4 +1,4 @@
package com.moez.QKSMS.util
package com.moez.QKSMS.common.util
import android.arch.lifecycle.LiveData
import io.realm.RealmChangeListener
@@ -1,4 +1,4 @@
package com.moez.QKSMS.util
package com.moez.QKSMS.common.util
import android.app.NotificationChannel
import android.app.NotificationManager
@@ -15,7 +15,7 @@ import com.moez.QKSMS.data.repository.MessageRepository
import com.moez.QKSMS.receiver.MarkReadReceiver
import com.moez.QKSMS.receiver.MarkSeenReceiver
import com.moez.QKSMS.receiver.RemoteMessagingReceiver
import com.moez.QKSMS.ui.conversations.ConversationListActivity
import com.moez.QKSMS.presentation.conversations.ConversationListActivity
class NotificationManager(private val context: Context, private val themeManager: ThemeManager) {
@@ -1,4 +1,4 @@
package com.moez.QKSMS.util
package com.moez.QKSMS.common.util
class ThemeManager {
@@ -1,4 +1,4 @@
package com.moez.QKSMS.util.extensions
package com.moez.QKSMS.common.util.extensions
import java.util.*
@@ -1,4 +1,4 @@
package com.moez.QKSMS.util.extensions
package com.moez.QKSMS.common.util.extensions
import android.content.Context
import android.support.v4.content.ContextCompat
@@ -1,4 +1,4 @@
package com.moez.QKSMS.util.extensions
package com.moez.QKSMS.common.util.extensions
import android.database.Cursor
import io.reactivex.Flowable
@@ -1,4 +1,4 @@
package com.moez.QKSMS.util.extensions
package com.moez.QKSMS.common.util.extensions
import android.content.Context
import android.util.TypedValue
@@ -1,4 +1,4 @@
package com.moez.QKSMS.util.extensions
package com.moez.QKSMS.common.util.extensions
import io.realm.Realm
import io.realm.RealmObject
@@ -1,4 +1,4 @@
package com.moez.QKSMS.util.extensions
package com.moez.QKSMS.common.util.extensions
import android.content.res.ColorStateList
import android.view.View
@@ -8,15 +8,15 @@ import android.net.Uri
import android.provider.BaseColumns
import android.provider.Telephony.Sms
import android.telephony.SmsManager
import com.moez.QKSMS.common.util.NotificationManager
import com.moez.QKSMS.common.util.extensions.asFlowable
import com.moez.QKSMS.common.util.extensions.insertOrUpdate
import com.moez.QKSMS.data.model.Conversation
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.data.sync.MessageColumns
import com.moez.QKSMS.data.sync.SyncManager
import com.moez.QKSMS.receiver.MessageDeliveredReceiver
import com.moez.QKSMS.receiver.MessageSentReceiver
import com.moez.QKSMS.util.NotificationManager
import com.moez.QKSMS.util.extensions.asFlowable
import com.moez.QKSMS.util.extensions.insertOrUpdate
import io.reactivex.Flowable
import io.reactivex.schedulers.Schedulers
import io.realm.Realm
@@ -7,7 +7,7 @@ import android.provider.Telephony
import com.moez.QKSMS.data.model.Conversation
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.data.repository.ContactRepository
import com.moez.QKSMS.util.extensions.asFlowable
import com.moez.QKSMS.common.util.extensions.asFlowable
import io.reactivex.Flowable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
@@ -1,4 +1,4 @@
package com.moez.QKSMS.ui.base
package com.moez.QKSMS.presentation.base
import android.support.v7.app.AppCompatActivity
import android.view.MenuItem
@@ -1,17 +1,17 @@
package com.moez.QKSMS.ui.conversations
package com.moez.QKSMS.presentation.conversations
import android.content.Context
import android.content.Intent
import android.view.LayoutInflater
import android.view.ViewGroup
import com.moez.QKSMS.R
import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.data.repository.MessageRepository
import com.moez.QKSMS.ui.messages.MessageListActivity
import com.moez.QKSMS.util.DateFormatter
import com.moez.QKSMS.util.ThemeManager
import com.moez.QKSMS.util.extensions.getColorCompat
import com.moez.QKSMS.presentation.messages.MessageListActivity
import com.moez.QKSMS.common.util.DateFormatter
import com.moez.QKSMS.common.util.ThemeManager
import com.moez.QKSMS.common.util.extensions.getColorCompat
import io.realm.OrderedRealmCollection
import io.realm.RealmList
import io.realm.RealmRecyclerViewAdapter
@@ -1,4 +1,4 @@
package com.moez.QKSMS.ui.conversations
package com.moez.QKSMS.presentation.conversations
import android.Manifest
import android.arch.lifecycle.Observer
@@ -13,8 +13,8 @@ import com.karumi.dexter.PermissionToken
import com.karumi.dexter.listener.PermissionRequest
import com.karumi.dexter.listener.multi.MultiplePermissionsListener
import com.moez.QKSMS.R
import com.moez.QKSMS.ui.base.QkActivity
import com.moez.QKSMS.ui.messages.MessageListActivity
import com.moez.QKSMS.presentation.base.QkActivity
import com.moez.QKSMS.presentation.messages.MessageListActivity
import kotlinx.android.synthetic.main.conversation_list_activity.*
import timber.log.Timber
@@ -1,12 +1,12 @@
package com.moez.QKSMS.ui.conversations
package com.moez.QKSMS.presentation.conversations
import android.arch.lifecycle.MutableLiveData
import android.arch.lifecycle.ViewModel
import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.data.repository.MessageRepository
import com.moez.QKSMS.data.sync.SyncManager
import com.moez.QKSMS.util.NotificationManager
import com.moez.QKSMS.common.util.NotificationManager
import io.reactivex.subjects.PublishSubject
import io.realm.RealmResults
import javax.inject.Inject
@@ -1,4 +1,4 @@
package com.moez.QKSMS.ui.conversations
package com.moez.QKSMS.presentation.conversations
import com.moez.QKSMS.data.model.Message
import io.realm.OrderedRealmCollection
@@ -1,10 +1,10 @@
package com.moez.QKSMS.ui.conversations
package com.moez.QKSMS.presentation.conversations
import android.support.v7.widget.RecyclerView
import android.view.View
import android.widget.TextView
import com.moez.QKSMS.R
import com.moez.QKSMS.ui.view.GroupAvatarView
import com.moez.QKSMS.presentation.view.GroupAvatarView
class ConversationViewHolder(view: View) : RecyclerView.ViewHolder(view) {
@@ -1,18 +1,18 @@
package com.moez.QKSMS.ui.messages
package com.moez.QKSMS.presentation.messages
import android.content.Context
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.moez.QKSMS.R
import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.util.DateFormatter
import com.moez.QKSMS.common.util.ThemeManager
import com.moez.QKSMS.common.util.extensions.dpToPx
import com.moez.QKSMS.common.util.extensions.setBackgroundTint
import com.moez.QKSMS.common.util.extensions.setPadding
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.data.repository.ContactRepository
import com.moez.QKSMS.util.DateFormatter
import com.moez.QKSMS.util.ThemeManager
import com.moez.QKSMS.util.extensions.dpToPx
import com.moez.QKSMS.util.extensions.setBackgroundTint
import com.moez.QKSMS.util.extensions.setPadding
import io.realm.OrderedRealmCollection
import io.realm.RealmRecyclerViewAdapter
import timber.log.Timber
@@ -1,4 +1,4 @@
package com.moez.QKSMS.ui.messages
package com.moez.QKSMS.presentation.messages
import android.arch.lifecycle.Observer
import android.arch.lifecycle.ViewModelProviders
@@ -8,11 +8,11 @@ import android.support.v7.widget.RecyclerView
import com.jakewharton.rxbinding2.view.RxView
import com.jakewharton.rxbinding2.widget.RxTextView
import com.moez.QKSMS.R
import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.ui.base.QkActivity
import com.moez.QKSMS.util.ThemeManager
import com.moez.QKSMS.util.extensions.setTint
import com.moez.QKSMS.presentation.base.QkActivity
import com.moez.QKSMS.common.util.ThemeManager
import com.moez.QKSMS.common.util.extensions.setTint
import io.realm.RealmResults
import kotlinx.android.synthetic.main.message_list_activity.*
import javax.inject.Inject
@@ -1,8 +1,8 @@
package com.moez.QKSMS.ui.messages
package com.moez.QKSMS.presentation.messages
import android.arch.lifecycle.MutableLiveData
import android.arch.lifecycle.ViewModel
import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.data.model.Conversation
import com.moez.QKSMS.data.repository.MessageRepository
import io.reactivex.subjects.PublishSubject
@@ -31,6 +31,7 @@ class MessageListViewModel : ViewModel() {
}
private fun newThreadId() {
dataChanged()
conversation?.removeAllChangeListeners()
conversation = messageRepo.getConversationAsync(threadId)
conversation?.addChangeListener { conversation: Conversation ->
@@ -1,4 +1,4 @@
package com.moez.QKSMS.ui.messages
package com.moez.QKSMS.presentation.messages
import com.moez.QKSMS.data.model.Message
import io.realm.RealmResults
@@ -1,10 +1,10 @@
package com.moez.QKSMS.ui.messages
package com.moez.QKSMS.presentation.messages
import android.support.v7.widget.RecyclerView
import android.view.View
import android.widget.TextView
import com.moez.QKSMS.R
import com.moez.QKSMS.ui.view.AvatarView
import com.moez.QKSMS.presentation.view.AvatarView
class MessageViewHolder(view: View) : RecyclerView.ViewHolder(view) {
@@ -1,4 +1,4 @@
package com.moez.QKSMS.ui.view
package com.moez.QKSMS.presentation.view
import android.content.Context
import android.content.res.ColorStateList
@@ -6,10 +6,10 @@ import android.util.AttributeSet
import android.view.View
import android.widget.FrameLayout
import com.moez.QKSMS.R
import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.data.model.Contact
import com.moez.QKSMS.data.repository.ContactRepository
import com.moez.QKSMS.util.extensions.getColorCompat
import com.moez.QKSMS.common.util.extensions.getColorCompat
import io.reactivex.disposables.Disposable
import kotlinx.android.synthetic.main.avatar_view.view.*
import javax.inject.Inject
@@ -1,4 +1,4 @@
package com.moez.QKSMS.ui.view
package com.moez.QKSMS.presentation.view
import android.content.Context
import android.support.constraint.ConstraintLayout
@@ -3,7 +3,7 @@ package com.moez.QKSMS.receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.data.repository.MessageRepository
import javax.inject.Inject
@@ -3,7 +3,7 @@ package com.moez.QKSMS.receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.data.repository.MessageRepository
import javax.inject.Inject
@@ -6,7 +6,7 @@ import android.content.Context
import android.content.Intent
import android.net.Uri
import android.telephony.SmsManager
import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.data.repository.MessageRepository
import javax.inject.Inject
@@ -4,9 +4,9 @@ import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.support.v4.app.RemoteInput
import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.data.repository.MessageRepository
import com.moez.QKSMS.util.NotificationManager
import com.moez.QKSMS.common.util.NotificationManager
import javax.inject.Inject
class RemoteMessagingReceiver : BroadcastReceiver() {
@@ -4,7 +4,7 @@ import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.provider.Telephony.Sms
import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.data.repository.MessageRepository
import timber.log.Timber
import javax.inject.Inject
+1 -1
View File
@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:background="@color/list_separator"
tools:parentTag="com.moez.QKSMS.ui.view.AvatarView">
tools:parentTag="com.moez.QKSMS.presentation.view.AvatarView">
<TextView
android:id="@+id/initial"
@@ -11,7 +11,7 @@
android:paddingStart="16dp"
android:paddingTop="8dp">
<com.moez.QKSMS.ui.view.GroupAvatarView
<com.moez.QKSMS.presentation.view.GroupAvatarView
android:id="@+id/avatars"
android:layout_width="48dp"
android:layout_height="48dp"
@@ -11,7 +11,7 @@
android:paddingStart="16dp"
android:paddingTop="8dp">
<com.moez.QKSMS.ui.view.GroupAvatarView
<com.moez.QKSMS.presentation.view.GroupAvatarView
android:id="@+id/avatars"
android:layout_width="48dp"
android:layout_height="48dp"
@@ -5,9 +5,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
tools:parentTag="com.moez.QKSMS.ui.view.GroupAvatarView">
tools:parentTag="com.moez.QKSMS.presentation.view.GroupAvatarView">
<com.moez.QKSMS.ui.view.AvatarView
<com.moez.QKSMS.presentation.view.AvatarView
android:id="@+id/avatar1"
android:layout_width="0dp"
android:layout_height="0dp"
@@ -16,7 +16,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.moez.QKSMS.ui.view.AvatarView
<com.moez.QKSMS.presentation.view.AvatarView
android:id="@+id/avatar2"
android:layout_width="0dp"
android:layout_height="0dp"
@@ -25,7 +25,7 @@
app:layout_constraintStart_toEndOf="@+id/avatar1"
app:layout_constraintTop_toTopOf="parent" />
<com.moez.QKSMS.ui.view.AvatarView
<com.moez.QKSMS.presentation.view.AvatarView
android:id="@+id/avatar3"
android:layout_width="0dp"
android:layout_height="0dp"
@@ -26,7 +26,7 @@
android:paddingEnd="60dp"
android:paddingStart="12dp">
<com.moez.QKSMS.ui.view.AvatarView
<com.moez.QKSMS.presentation.view.AvatarView
android:id="@+id/avatar"
android:layout_width="36dp"
android:layout_height="36dp"