diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml
index c3d5e172..3a7862b3 100644
--- a/qksms/src/main/AndroidManifest.xml
+++ b/qksms/src/main/AndroidManifest.xml
@@ -46,7 +46,6 @@
-
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 f765181e..a952b1bd 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
@@ -1,7 +1,6 @@
package com.moez.QKSMS.common.di
import com.moez.QKSMS.common.util.ContactImageLoader
-import com.moez.QKSMS.presentation.compose.ComposeViewModel
import com.moez.QKSMS.presentation.compose.DetailedChipView
import com.moez.QKSMS.presentation.main.ConversationsAdapter
import com.moez.QKSMS.presentation.main.MainActivity
@@ -36,7 +35,6 @@ interface AppComponent {
fun inject(view: AvatarView)
fun inject(viewModel: MainViewModel)
- fun inject(viewModel: ComposeViewModel)
fun inject(viewModel: MessagesViewModel)
fun inject(viewModel: SettingsViewModel)
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 fd26146f..5ae54d54 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt
@@ -4,8 +4,6 @@ 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
@@ -23,7 +21,7 @@ class Navigator @Inject constructor(val context: Context) {
}
fun showCompose() {
- val intent = Intent(context, ComposeActivity::class.java)
+ val intent = Intent(context, MessagesActivity::class.java)
startActivity(intent)
}
@@ -48,10 +46,6 @@ class Navigator @Inject constructor(val context: Context) {
MainViewModel()
}
- ComposeViewModel::class.java -> {
- ComposeViewModel()
- }
-
MessagesViewModel::class.java -> {
val threadId = intent.getLongExtra("threadId", 0)
MessagesViewModel(threadId)
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt
deleted file mode 100644
index a9748373..00000000
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.moez.QKSMS.presentation.compose
-
-import android.os.Bundle
-import android.support.v7.widget.LinearLayoutManager
-import com.google.android.flexbox.FlexboxLayoutManager
-import com.moez.QKSMS.R
-import com.moez.QKSMS.data.model.Contact
-import com.moez.QKSMS.presentation.base.QkActivity
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.compose_activity.*
-import kotlinx.android.synthetic.main.toolbar_chips.*
-
-class ComposeActivity : QkActivity(), ComposeView {
-
- override val viewModelClass = ComposeViewModel::class
-
- override val queryChangedIntent: Subject = PublishSubject.create()
- override val chipSelectedIntent: Subject = PublishSubject.create()
- override val chipDeletedIntent: Subject = PublishSubject.create()
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- setContentView(R.layout.compose_activity)
- supportActionBar?.setDisplayHomeAsUpEnabled(true)
- viewModel.bindView(this)
-
- chips.layoutManager = FlexboxLayoutManager(this)
- contacts.layoutManager = LinearLayoutManager(this)
-
- window.callback = ComposeWindowCallback(window.callback, this)
- }
-
- override fun render(state: ComposeState) {
- if (chips.adapter == null && state.selectedContacts != null) {
- val adapter = ChipsAdapter(this, chips, state.selectedContacts)
- adapter.chipDeleted.subscribe { chipDeletedIntent.onNext(it) }
- adapter.textChanges.subscribe { queryChangedIntent.onNext(it) }
-
- chips.adapter = adapter
- }
-
- if (contacts.adapter == null && state.contacts != null) {
- val adapter = ContactAdapter(this, state.contacts)
- adapter.contactSelected.subscribe { chipSelectedIntent.onNext(it) }
-
- contacts.adapter = adapter
- }
- }
-
-}
\ No newline at end of file
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt
deleted file mode 100644
index 749aab3d..00000000
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.moez.QKSMS.presentation.compose
-
-import com.moez.QKSMS.data.model.Contact
-import io.reactivex.Flowable
-
-data class ComposeState(
- val contacts: Flowable>? = null,
- val selectedContacts: Flowable>? = null
-)
\ No newline at end of file
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt
deleted file mode 100644
index 26bdf342..00000000
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.moez.QKSMS.presentation.compose
-
-import com.moez.QKSMS.data.model.Contact
-import com.moez.QKSMS.presentation.base.QkView
-import io.reactivex.subjects.Subject
-
-interface ComposeView : QkView {
-
- val queryChangedIntent: Subject
- val chipSelectedIntent: Subject
- val chipDeletedIntent: Subject
-
-}
\ No newline at end of file
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt
deleted file mode 100644
index 47d8cb89..00000000
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.moez.QKSMS.presentation.compose
-
-import android.content.Context
-import android.telephony.PhoneNumberUtils
-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.presentation.base.QkViewModel
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.rxkotlin.plusAssign
-import io.reactivex.schedulers.Schedulers
-import io.reactivex.subjects.BehaviorSubject
-import io.reactivex.subjects.Subject
-import javax.inject.Inject
-
-
-class ComposeViewModel : QkViewModel(ComposeState()) {
-
- @Inject lateinit var context: Context
- @Inject lateinit var contactsRepo: ContactRepository
-
- private val contactsSubject: Subject> = BehaviorSubject.create()
- private val selectedContactsReducer: Subject<(List) -> List> = BehaviorSubject.create()
-
- private val contacts: List
-
- init {
- AppComponentManager.appComponent.inject(this)
-
- contacts = contactsRepo.getContacts()
-
- val contactsFlowable = contactsSubject.toFlowable(BackpressureStrategy.BUFFER)
-
- val selectedContacts: Flowable> = selectedContactsReducer
- .scan(listOf(), { previousState, reducer -> reducer(previousState) })
- .toFlowable(BackpressureStrategy.BUFFER)
-
- newState { it.copy(contacts = contactsFlowable, selectedContacts = selectedContacts) }
- }
-
- override fun bindView(view: ComposeView) {
- super.bindView(view)
-
- intents += view.queryChangedIntent
- .toFlowable(BackpressureStrategy.LATEST)
- .map { query -> query.toString() }
- .map { query ->
- contacts.filter { contact ->
- contact.name.contains(query, true) || PhoneNumberUtils.compare(contact.address, query)
- }
- }
- .subscribeOn(Schedulers.computation())
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe { contacts -> contactsSubject.onNext(contacts) }
-
- intents += view.chipSelectedIntent.subscribe { contact ->
- selectedContactsReducer.onNext { it.toMutableList().apply { add(contact) } }
- }
-
- intents += view.chipDeletedIntent.subscribe { contact ->
- selectedContactsReducer.onNext { it.filterNot { it == contact } }
- }
- }
-
-}
\ No newline at end of file
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesActivity.kt
index 215145e5..fa427898 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesActivity.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesActivity.kt
@@ -4,18 +4,25 @@ import android.app.AlertDialog
import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
+import android.view.View
+import com.google.android.flexbox.FlexboxLayoutManager
import com.jakewharton.rxbinding2.view.clicks
import com.jakewharton.rxbinding2.widget.textChanges
import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.util.ThemeManager
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.toolbar_chips.*
import javax.inject.Inject
@@ -26,6 +33,9 @@ class MessagesActivity : QkActivity(), MessagesView {
private lateinit var layoutManager: LinearLayoutManager
override val viewModelClass = MessagesViewModel::class
+ override val queryChangedIntent: Subject = PublishSubject.create()
+ override val chipSelectedIntent: Subject = PublishSubject.create()
+ override val chipDeletedIntent: Subject = PublishSubject.create()
override val copyTextIntent: Subject = PublishSubject.create()
override val forwardMessageIntent: Subject = PublishSubject.create()
override val deleteMessageIntent: Subject = PublishSubject.create()
@@ -40,16 +50,39 @@ class MessagesActivity : QkActivity(), MessagesView {
supportActionBar?.setDisplayHomeAsUpEnabled(true)
viewModel.bindView(this)
+ chips.layoutManager = FlexboxLayoutManager(this)
+ contacts.layoutManager = LinearLayoutManager(this)
+
+ window.callback = ComposeWindowCallback(window.callback, this)
+
layoutManager = LinearLayoutManager(this)
layoutManager.stackFromEnd = true
messageList.layoutManager = layoutManager
}
override fun render(state: MessagesState) {
+ 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
+
+ if (chips.adapter == null && state.selectedContacts != null) {
+ val adapter = ChipsAdapter(this, chips, state.selectedContacts)
+ adapter.chipDeleted.subscribe { chipDeletedIntent.onNext(it) }
+ adapter.textChanges.subscribe { queryChangedIntent.onNext(it) }
+
+ chips.adapter = adapter
+ }
+
+ if (contacts.adapter == null && state.contacts != null) {
+ val adapter = ContactAdapter(this, state.contacts)
+ adapter.contactSelected.subscribe { chipSelectedIntent.onNext(it) }
+
+ contacts.adapter = adapter
+ }
+
if (title != state.title) title = state.title
if (messageList.adapter == null && state.messages?.isValid == true) messageList.adapter = createAdapter(state.messages)
if (message.text.toString() != state.draft) message.setText(state.draft)
- if (state.hasError) finish()
send.setTint(if (state.canSend) themeManager.color else resources.getColor(R.color.textTertiary))
send.isEnabled = state.canSend
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesState.kt
index 4bd42a0a..5341dc12 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesState.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesState.kt
@@ -1,12 +1,16 @@
package com.moez.QKSMS.presentation.messages
+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(
+ val editingMode: Boolean = false,
+ val contacts: Flowable>? = null,
+ val selectedContacts: Flowable>? = null,
val title: String = "",
val messages: RealmResults? = null,
val draft: String = "",
- val canSend: Boolean = false,
- val hasError: Boolean = false
+ val canSend: Boolean = false
)
\ No newline at end of file
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesView.kt
index 83e34d44..728b3ec2 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesView.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesView.kt
@@ -1,5 +1,6 @@
package com.moez.QKSMS.presentation.messages
+import com.moez.QKSMS.data.model.Contact
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.presentation.base.QkView
import io.reactivex.Observable
@@ -7,6 +8,9 @@ import io.reactivex.subjects.Subject
interface MessagesView : QkView {
+ val queryChangedIntent: Subject
+ val chipSelectedIntent: Subject
+ val chipDeletedIntent: Subject
val copyTextIntent: Subject
val forwardMessageIntent: Subject
val deleteMessageIntent: Subject
diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesViewModel.kt
index 4fceef34..7628f0aa 100644
--- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesViewModel.kt
+++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessagesViewModel.kt
@@ -1,27 +1,42 @@
package com.moez.QKSMS.presentation.messages
import android.content.Context
+import android.telephony.PhoneNumberUtils
import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.util.ClipboardUtils
import com.moez.QKSMS.common.util.extensions.makeToast
+import com.moez.QKSMS.data.model.Contact
import com.moez.QKSMS.data.model.Conversation
+import com.moez.QKSMS.data.repository.ContactRepository
import com.moez.QKSMS.data.repository.MessageRepository
import com.moez.QKSMS.domain.interactor.DeleteMessage
import com.moez.QKSMS.domain.interactor.MarkRead
import com.moez.QKSMS.domain.interactor.SendMessage
import com.moez.QKSMS.presentation.base.QkViewModel
+import io.reactivex.BackpressureStrategy
+import io.reactivex.Flowable
+import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.rxkotlin.plusAssign
+import io.reactivex.schedulers.Schedulers
+import io.reactivex.subjects.BehaviorSubject
+import io.reactivex.subjects.Subject
import javax.inject.Inject
-class MessagesViewModel(val threadId: Long) : QkViewModel(MessagesState()) {
+class MessagesViewModel(val threadId: Long) : QkViewModel(MessagesState(editingMode = threadId == 0L)) {
@Inject lateinit var context: Context
+ @Inject lateinit var contactsRepo: ContactRepository
@Inject lateinit var messageRepo: MessageRepository
@Inject lateinit var sendMessage: SendMessage
@Inject lateinit var markRead: MarkRead
@Inject lateinit var deleteMessage: DeleteMessage
+ private val contactsSubject: Subject> = BehaviorSubject.create()
+ private val selectedContactsReducer: Subject<(List) -> List> = BehaviorSubject.create()
+
+ private val contacts: List
+
private var conversation: Conversation? = null
init {
@@ -40,16 +55,45 @@ class MessagesViewModel(val threadId: Long) : QkViewModel newState { it.copy(hasError = true) }
}
}
+ contacts = contactsRepo.getContacts()
+
+ val contactsFlowable = contactsSubject.toFlowable(BackpressureStrategy.BUFFER)
+
+ val selectedContacts: Flowable> = selectedContactsReducer
+ .scan(listOf(), { previousState, reducer -> reducer(previousState) })
+ .toFlowable(BackpressureStrategy.BUFFER)
+
+ newState { it.copy(contacts = contactsFlowable, selectedContacts = selectedContacts) }
+
dataChanged()
}
override fun bindView(view: MessagesView) {
super.bindView(view)
+ intents += view.queryChangedIntent
+ .toFlowable(BackpressureStrategy.LATEST)
+ .map { query -> query.toString() }
+ .map { query ->
+ contacts.filter { contact ->
+ contact.name.contains(query, true) || PhoneNumberUtils.compare(contact.address, query)
+ }
+ }
+ .subscribeOn(Schedulers.computation())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe { contacts -> contactsSubject.onNext(contacts) }
+
+ intents += view.chipSelectedIntent.subscribe { contact ->
+ selectedContactsReducer.onNext { it.toMutableList().apply { add(contact) } }
+ }
+
+ intents += view.chipDeletedIntent.subscribe { contact ->
+ selectedContactsReducer.onNext { it.filterNot { it == contact } }
+ }
+
intents += view.textChangedIntent.subscribe { text ->
newState { it.copy(draft = text.toString(), canSend = text.isNotEmpty()) }
}
diff --git a/qksms/src/main/res/layout/compose_activity.xml b/qksms/src/main/res/layout/compose_activity.xml
deleted file mode 100644
index 3977ac91..00000000
--- a/qksms/src/main/res/layout/compose_activity.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/qksms/src/main/res/layout/message_list_activity.xml b/qksms/src/main/res/layout/message_list_activity.xml
index d5bcb61d..2760f0a4 100644
--- a/qksms/src/main/res/layout/message_list_activity.xml
+++ b/qksms/src/main/res/layout/message_list_activity.xml
@@ -6,7 +6,7 @@
android:background="@color/backgroundLight"
android:orientation="vertical">
-
+
+
+
+ android:minHeight="56dp"
+ xmlns:tools="http://schemas.android.com/tools">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@null"
+ android:gravity="left|center_vertical"
+ android:maxLines="1"
+ android:singleLine="true"
+ android:textColor="@color/textPrimary"
+ android:textColorHint="@color/textTertiary"
+ android:textSize="20sp"
+ tools:text="Conversations" />