diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml index d4877afc..65feacb7 100644 --- a/qksms/src/main/AndroidManifest.xml +++ b/qksms/src/main/AndroidManifest.xml @@ -12,7 +12,7 @@ @@ -44,7 +44,7 @@ - + diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewState.kt similarity index 96% rename from qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewState.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewState.kt index 974e46f6..781ae5c3 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewState.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewState.kt @@ -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 diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageViewHolder.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageViewHolder.kt similarity index 83% rename from qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageViewHolder.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageViewHolder.kt index 9aaf45b6..a8445aee 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageViewHolder.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageViewHolder.kt @@ -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) { diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/view/AvatarView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt similarity index 91% rename from qksms/src/main/java/com/moez/QKSMS/ui/view/AvatarView.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt index cbc3560f..d6cafc81 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/view/AvatarView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt @@ -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 diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/view/GroupAvatarView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/view/GroupAvatarView.kt similarity index 97% rename from qksms/src/main/java/com/moez/QKSMS/ui/view/GroupAvatarView.kt rename to qksms/src/main/java/com/moez/QKSMS/presentation/view/GroupAvatarView.kt index f9fe522a..0d0eaf7f 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/view/GroupAvatarView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/view/GroupAvatarView.kt @@ -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 diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt index d223af28..0669819d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt @@ -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 diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt index a1043eea..0715cbaa 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt @@ -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 diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt index 80e49330..63b76728 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt @@ -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 diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt index b69d16ce..5912e851 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt @@ -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() { diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt index 1c4b1096..43fd772e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt @@ -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 diff --git a/qksms/src/main/res/layout/avatar_view.xml b/qksms/src/main/res/layout/avatar_view.xml index d2d6715f..85947859 100644 --- a/qksms/src/main/res/layout/avatar_view.xml +++ b/qksms/src/main/res/layout/avatar_view.xml @@ -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"> - - + tools:parentTag="com.moez.QKSMS.presentation.view.GroupAvatarView"> - - - -