diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml
index 3a7862b3..b1315494 100644
--- a/qksms/src/main/AndroidManifest.xml
+++ b/qksms/src/main/AndroidManifest.xml
@@ -44,7 +44,7 @@
-
+
diff --git a/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt b/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt
index a952b1bd..b729b4c2 100644
--- a/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt
@@ -5,9 +5,9 @@ import com.moez.QKSMS.presentation.compose.DetailedChipView
import com.moez.QKSMS.presentation.main.ConversationsAdapter
import com.moez.QKSMS.presentation.main.MainActivity
import com.moez.QKSMS.presentation.main.MainViewModel
-import com.moez.QKSMS.presentation.messages.MessagesActivity
-import com.moez.QKSMS.presentation.messages.MessagesAdapter
-import com.moez.QKSMS.presentation.messages.MessagesViewModel
+import com.moez.QKSMS.presentation.compose.ComposeActivity
+import com.moez.QKSMS.presentation.compose.MessagesAdapter
+import com.moez.QKSMS.presentation.compose.ComposeViewModel
import com.moez.QKSMS.presentation.settings.SettingsViewModel
import com.moez.QKSMS.presentation.view.AvatarView
import com.moez.QKSMS.receiver.*
@@ -19,7 +19,7 @@ import javax.inject.Singleton
interface AppComponent {
fun inject(activity: MainActivity)
- fun inject(activity: MessagesActivity)
+ fun inject(activity: ComposeActivity)
fun inject(adapter: ConversationsAdapter)
fun inject(adapter: MessagesAdapter)
@@ -35,7 +35,7 @@ interface AppComponent {
fun inject(view: AvatarView)
fun inject(viewModel: MainViewModel)
- fun inject(viewModel: MessagesViewModel)
+ fun inject(viewModel: ComposeViewModel)
fun inject(viewModel: SettingsViewModel)
fun inject(fetcher: ContactImageLoader.ContactImageFetcher)
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt
index 5ae54d54..e6c3046f 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt
@@ -4,9 +4,9 @@ import android.arch.lifecycle.ViewModel
import android.arch.lifecycle.ViewModelProvider
import android.content.Context
import android.content.Intent
+import com.moez.QKSMS.presentation.compose.ComposeActivity
+import com.moez.QKSMS.presentation.compose.ComposeViewModel
import com.moez.QKSMS.presentation.main.MainViewModel
-import com.moez.QKSMS.presentation.messages.MessagesActivity
-import com.moez.QKSMS.presentation.messages.MessagesViewModel
import com.moez.QKSMS.presentation.settings.SettingsActivity
import com.moez.QKSMS.presentation.settings.SettingsViewModel
import javax.inject.Inject
@@ -21,12 +21,12 @@ class Navigator @Inject constructor(val context: Context) {
}
fun showCompose() {
- val intent = Intent(context, MessagesActivity::class.java)
+ val intent = Intent(context, ComposeActivity::class.java)
startActivity(intent)
}
fun showConversation(threadId: Long) {
- val intent = Intent(context, MessagesActivity::class.java)
+ val intent = Intent(context, ComposeActivity::class.java)
intent.putExtra("threadId", threadId)
startActivity(intent)
}
@@ -46,9 +46,9 @@ class Navigator @Inject constructor(val context: Context) {
MainViewModel()
}
- MessagesViewModel::class.java -> {
+ ComposeViewModel::class.java -> {
val threadId = intent.getLongExtra("threadId", 0)
- MessagesViewModel(threadId)
+ ComposeViewModel(threadId)
}
SettingsViewModel::class.java -> {
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt
similarity index 90%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesActivity.kt
rename to qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt
index fa427898..92a38a5e 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesActivity.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt
@@ -1,4 +1,4 @@
-package com.moez.QKSMS.presentation.messages
+package com.moez.QKSMS.presentation.compose
import android.app.AlertDialog
import android.os.Bundle
@@ -15,24 +15,21 @@ import com.moez.QKSMS.common.util.extensions.setTint
import com.moez.QKSMS.data.model.Contact
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.presentation.base.QkActivity
-import com.moez.QKSMS.presentation.compose.ChipsAdapter
-import com.moez.QKSMS.presentation.compose.ComposeWindowCallback
-import com.moez.QKSMS.presentation.compose.ContactAdapter
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import io.realm.RealmResults
-import kotlinx.android.synthetic.main.message_list_activity.*
+import kotlinx.android.synthetic.main.compose_activity.*
import kotlinx.android.synthetic.main.toolbar_chips.*
import javax.inject.Inject
-class MessagesActivity : QkActivity(), MessagesView {
+class ComposeActivity : QkActivity(), ComposeView {
@Inject lateinit var themeManager: ThemeManager
private lateinit var layoutManager: LinearLayoutManager
- override val viewModelClass = MessagesViewModel::class
+ override val viewModelClass = ComposeViewModel::class
override val queryChangedIntent: Subject = PublishSubject.create()
override val chipSelectedIntent: Subject = PublishSubject.create()
override val chipDeletedIntent: Subject = PublishSubject.create()
@@ -46,7 +43,7 @@ class MessagesActivity : QkActivity(), MessagesView {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
AppComponentManager.appComponent.inject(this)
- setContentView(R.layout.message_list_activity)
+ setContentView(R.layout.compose_activity)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
viewModel.bindView(this)
@@ -60,7 +57,7 @@ class MessagesActivity : QkActivity(), MessagesView {
messageList.layoutManager = layoutManager
}
- override fun render(state: MessagesState) {
+ override fun render(state: ComposeState) {
toolbarTitle.visibility = if (state.editingMode) View.GONE else View.VISIBLE
chips.visibility = if (state.editingMode) View.VISIBLE else View.GONE
contacts.visibility = if (state.editingMode) View.VISIBLE else View.GONE
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt
similarity index 86%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesState.kt
rename to qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt
index 5341dc12..9b739097 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesState.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt
@@ -1,11 +1,11 @@
-package com.moez.QKSMS.presentation.messages
+package com.moez.QKSMS.presentation.compose
import com.moez.QKSMS.data.model.Contact
import com.moez.QKSMS.data.model.Message
import io.reactivex.Flowable
import io.realm.RealmResults
-data class MessagesState(
+data class ComposeState(
val editingMode: Boolean = false,
val contacts: Flowable>? = null,
val selectedContacts: Flowable>? = null,
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt
similarity index 86%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesView.kt
rename to qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt
index 728b3ec2..af33fc8e 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesView.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt
@@ -1,4 +1,4 @@
-package com.moez.QKSMS.presentation.messages
+package com.moez.QKSMS.presentation.compose
import com.moez.QKSMS.data.model.Contact
import com.moez.QKSMS.data.model.Message
@@ -6,7 +6,7 @@ import com.moez.QKSMS.presentation.base.QkView
import io.reactivex.Observable
import io.reactivex.subjects.Subject
-interface MessagesView : QkView {
+interface ComposeView : QkView {
val queryChangedIntent: Subject
val chipSelectedIntent: Subject
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt
similarity index 95%
rename from qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesViewModel.kt
rename to qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt
index 7628f0aa..b74bdfec 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesViewModel.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt
@@ -1,4 +1,4 @@
-package com.moez.QKSMS.presentation.messages
+package com.moez.QKSMS.presentation.compose
import android.content.Context
import android.telephony.PhoneNumberUtils
@@ -23,7 +23,7 @@ import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.Subject
import javax.inject.Inject
-class MessagesViewModel(val threadId: Long) : QkViewModel(MessagesState(editingMode = threadId == 0L)) {
+class ComposeViewModel(val threadId: Long) : QkViewModel(ComposeState(editingMode = threadId == 0L)) {
@Inject lateinit var context: Context
@Inject lateinit var contactsRepo: ContactRepository
@@ -71,7 +71,7 @@ class MessagesViewModel(val threadId: Long) : QkViewModel