forked from upstream-mirrors/quik
Refactor MessagesActivity to ComposeActivity
This commit is contained in:
@@ -44,7 +44,7 @@
|
|||||||
<data android:scheme="sms_body" />
|
<data android:scheme="sms_body" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
<activity android:name="com.moez.QKSMS.presentation.messages.MessagesActivity" />
|
<activity android:name="com.moez.QKSMS.presentation.compose.ComposeActivity" />
|
||||||
<activity android:name=".presentation.settings.SettingsActivity" />
|
<activity android:name=".presentation.settings.SettingsActivity" />
|
||||||
|
|
||||||
<receiver android:name=".receiver.DefaultSmsChangedReceiver">
|
<receiver android:name=".receiver.DefaultSmsChangedReceiver">
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ import com.moez.QKSMS.presentation.compose.DetailedChipView
|
|||||||
import com.moez.QKSMS.presentation.main.ConversationsAdapter
|
import com.moez.QKSMS.presentation.main.ConversationsAdapter
|
||||||
import com.moez.QKSMS.presentation.main.MainActivity
|
import com.moez.QKSMS.presentation.main.MainActivity
|
||||||
import com.moez.QKSMS.presentation.main.MainViewModel
|
import com.moez.QKSMS.presentation.main.MainViewModel
|
||||||
import com.moez.QKSMS.presentation.messages.MessagesActivity
|
import com.moez.QKSMS.presentation.compose.ComposeActivity
|
||||||
import com.moez.QKSMS.presentation.messages.MessagesAdapter
|
import com.moez.QKSMS.presentation.compose.MessagesAdapter
|
||||||
import com.moez.QKSMS.presentation.messages.MessagesViewModel
|
import com.moez.QKSMS.presentation.compose.ComposeViewModel
|
||||||
import com.moez.QKSMS.presentation.settings.SettingsViewModel
|
import com.moez.QKSMS.presentation.settings.SettingsViewModel
|
||||||
import com.moez.QKSMS.presentation.view.AvatarView
|
import com.moez.QKSMS.presentation.view.AvatarView
|
||||||
import com.moez.QKSMS.receiver.*
|
import com.moez.QKSMS.receiver.*
|
||||||
@@ -19,7 +19,7 @@ import javax.inject.Singleton
|
|||||||
interface AppComponent {
|
interface AppComponent {
|
||||||
|
|
||||||
fun inject(activity: MainActivity)
|
fun inject(activity: MainActivity)
|
||||||
fun inject(activity: MessagesActivity)
|
fun inject(activity: ComposeActivity)
|
||||||
|
|
||||||
fun inject(adapter: ConversationsAdapter)
|
fun inject(adapter: ConversationsAdapter)
|
||||||
fun inject(adapter: MessagesAdapter)
|
fun inject(adapter: MessagesAdapter)
|
||||||
@@ -35,7 +35,7 @@ interface AppComponent {
|
|||||||
fun inject(view: AvatarView)
|
fun inject(view: AvatarView)
|
||||||
|
|
||||||
fun inject(viewModel: MainViewModel)
|
fun inject(viewModel: MainViewModel)
|
||||||
fun inject(viewModel: MessagesViewModel)
|
fun inject(viewModel: ComposeViewModel)
|
||||||
fun inject(viewModel: SettingsViewModel)
|
fun inject(viewModel: SettingsViewModel)
|
||||||
|
|
||||||
fun inject(fetcher: ContactImageLoader.ContactImageFetcher)
|
fun inject(fetcher: ContactImageLoader.ContactImageFetcher)
|
||||||
|
|||||||
@@ -4,9 +4,9 @@ import android.arch.lifecycle.ViewModel
|
|||||||
import android.arch.lifecycle.ViewModelProvider
|
import android.arch.lifecycle.ViewModelProvider
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
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.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.SettingsActivity
|
||||||
import com.moez.QKSMS.presentation.settings.SettingsViewModel
|
import com.moez.QKSMS.presentation.settings.SettingsViewModel
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
@@ -21,12 +21,12 @@ class Navigator @Inject constructor(val context: Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun showCompose() {
|
fun showCompose() {
|
||||||
val intent = Intent(context, MessagesActivity::class.java)
|
val intent = Intent(context, ComposeActivity::class.java)
|
||||||
startActivity(intent)
|
startActivity(intent)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun showConversation(threadId: Long) {
|
fun showConversation(threadId: Long) {
|
||||||
val intent = Intent(context, MessagesActivity::class.java)
|
val intent = Intent(context, ComposeActivity::class.java)
|
||||||
intent.putExtra("threadId", threadId)
|
intent.putExtra("threadId", threadId)
|
||||||
startActivity(intent)
|
startActivity(intent)
|
||||||
}
|
}
|
||||||
@@ -46,9 +46,9 @@ class Navigator @Inject constructor(val context: Context) {
|
|||||||
MainViewModel()
|
MainViewModel()
|
||||||
}
|
}
|
||||||
|
|
||||||
MessagesViewModel::class.java -> {
|
ComposeViewModel::class.java -> {
|
||||||
val threadId = intent.getLongExtra("threadId", 0)
|
val threadId = intent.getLongExtra("threadId", 0)
|
||||||
MessagesViewModel(threadId)
|
ComposeViewModel(threadId)
|
||||||
}
|
}
|
||||||
|
|
||||||
SettingsViewModel::class.java -> {
|
SettingsViewModel::class.java -> {
|
||||||
|
|||||||
+6
-9
@@ -1,4 +1,4 @@
|
|||||||
package com.moez.QKSMS.presentation.messages
|
package com.moez.QKSMS.presentation.compose
|
||||||
|
|
||||||
import android.app.AlertDialog
|
import android.app.AlertDialog
|
||||||
import android.os.Bundle
|
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.Contact
|
||||||
import com.moez.QKSMS.data.model.Message
|
import com.moez.QKSMS.data.model.Message
|
||||||
import com.moez.QKSMS.presentation.base.QkActivity
|
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.PublishSubject
|
||||||
import io.reactivex.subjects.Subject
|
import io.reactivex.subjects.Subject
|
||||||
import io.realm.RealmResults
|
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 kotlinx.android.synthetic.main.toolbar_chips.*
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
|
|
||||||
class MessagesActivity : QkActivity<MessagesViewModel>(), MessagesView {
|
class ComposeActivity : QkActivity<ComposeViewModel>(), ComposeView {
|
||||||
|
|
||||||
@Inject lateinit var themeManager: ThemeManager
|
@Inject lateinit var themeManager: ThemeManager
|
||||||
|
|
||||||
private lateinit var layoutManager: LinearLayoutManager
|
private lateinit var layoutManager: LinearLayoutManager
|
||||||
|
|
||||||
override val viewModelClass = MessagesViewModel::class
|
override val viewModelClass = ComposeViewModel::class
|
||||||
override val queryChangedIntent: Subject<CharSequence> = PublishSubject.create()
|
override val queryChangedIntent: Subject<CharSequence> = PublishSubject.create()
|
||||||
override val chipSelectedIntent: Subject<Contact> = PublishSubject.create()
|
override val chipSelectedIntent: Subject<Contact> = PublishSubject.create()
|
||||||
override val chipDeletedIntent: Subject<Contact> = PublishSubject.create()
|
override val chipDeletedIntent: Subject<Contact> = PublishSubject.create()
|
||||||
@@ -46,7 +43,7 @@ class MessagesActivity : QkActivity<MessagesViewModel>(), MessagesView {
|
|||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
AppComponentManager.appComponent.inject(this)
|
AppComponentManager.appComponent.inject(this)
|
||||||
setContentView(R.layout.message_list_activity)
|
setContentView(R.layout.compose_activity)
|
||||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
||||||
viewModel.bindView(this)
|
viewModel.bindView(this)
|
||||||
|
|
||||||
@@ -60,7 +57,7 @@ class MessagesActivity : QkActivity<MessagesViewModel>(), MessagesView {
|
|||||||
messageList.layoutManager = layoutManager
|
messageList.layoutManager = layoutManager
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun render(state: MessagesState) {
|
override fun render(state: ComposeState) {
|
||||||
toolbarTitle.visibility = if (state.editingMode) View.GONE else View.VISIBLE
|
toolbarTitle.visibility = if (state.editingMode) View.GONE else View.VISIBLE
|
||||||
chips.visibility = if (state.editingMode) View.VISIBLE else View.GONE
|
chips.visibility = if (state.editingMode) View.VISIBLE else View.GONE
|
||||||
contacts.visibility = if (state.editingMode) View.VISIBLE else View.GONE
|
contacts.visibility = if (state.editingMode) View.VISIBLE else View.GONE
|
||||||
+2
-2
@@ -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.Contact
|
||||||
import com.moez.QKSMS.data.model.Message
|
import com.moez.QKSMS.data.model.Message
|
||||||
import io.reactivex.Flowable
|
import io.reactivex.Flowable
|
||||||
import io.realm.RealmResults
|
import io.realm.RealmResults
|
||||||
|
|
||||||
data class MessagesState(
|
data class ComposeState(
|
||||||
val editingMode: Boolean = false,
|
val editingMode: Boolean = false,
|
||||||
val contacts: Flowable<List<Contact>>? = null,
|
val contacts: Flowable<List<Contact>>? = null,
|
||||||
val selectedContacts: Flowable<List<Contact>>? = null,
|
val selectedContacts: Flowable<List<Contact>>? = null,
|
||||||
+2
-2
@@ -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.Contact
|
||||||
import com.moez.QKSMS.data.model.Message
|
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.Observable
|
||||||
import io.reactivex.subjects.Subject
|
import io.reactivex.subjects.Subject
|
||||||
|
|
||||||
interface MessagesView : QkView<MessagesState> {
|
interface ComposeView : QkView<ComposeState> {
|
||||||
|
|
||||||
val queryChangedIntent: Subject<CharSequence>
|
val queryChangedIntent: Subject<CharSequence>
|
||||||
val chipSelectedIntent: Subject<Contact>
|
val chipSelectedIntent: Subject<Contact>
|
||||||
+3
-3
@@ -1,4 +1,4 @@
|
|||||||
package com.moez.QKSMS.presentation.messages
|
package com.moez.QKSMS.presentation.compose
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.telephony.PhoneNumberUtils
|
import android.telephony.PhoneNumberUtils
|
||||||
@@ -23,7 +23,7 @@ import io.reactivex.subjects.BehaviorSubject
|
|||||||
import io.reactivex.subjects.Subject
|
import io.reactivex.subjects.Subject
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
class MessagesViewModel(val threadId: Long) : QkViewModel<MessagesView, MessagesState>(MessagesState(editingMode = threadId == 0L)) {
|
class ComposeViewModel(val threadId: Long) : QkViewModel<ComposeView, ComposeState>(ComposeState(editingMode = threadId == 0L)) {
|
||||||
|
|
||||||
@Inject lateinit var context: Context
|
@Inject lateinit var context: Context
|
||||||
@Inject lateinit var contactsRepo: ContactRepository
|
@Inject lateinit var contactsRepo: ContactRepository
|
||||||
@@ -71,7 +71,7 @@ class MessagesViewModel(val threadId: Long) : QkViewModel<MessagesView, Messages
|
|||||||
dataChanged()
|
dataChanged()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun bindView(view: MessagesView) {
|
override fun bindView(view: ComposeView) {
|
||||||
super.bindView(view)
|
super.bindView(view)
|
||||||
|
|
||||||
intents += view.queryChangedIntent
|
intents += view.queryChangedIntent
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.moez.QKSMS.presentation.messages
|
package com.moez.QKSMS.presentation.compose
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
Reference in New Issue
Block a user