mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 11:38:51 +01:00
Refactor Conversations to Main
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
package com.moez.QKSMS.common.di
|
||||
|
||||
import com.moez.QKSMS.common.util.NotificationManager
|
||||
import com.moez.QKSMS.presentation.conversations.ConversationsActivity
|
||||
import com.moez.QKSMS.presentation.conversations.ConversationsAdapter
|
||||
import com.moez.QKSMS.presentation.conversations.ConversationsViewModel
|
||||
import com.moez.QKSMS.presentation.main.MainActivity
|
||||
import com.moez.QKSMS.presentation.main.ConversationsAdapter
|
||||
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
|
||||
@@ -17,7 +17,7 @@ import javax.inject.Singleton
|
||||
@Component(modules = arrayOf(AppModule::class))
|
||||
interface AppComponent {
|
||||
|
||||
fun inject(activity: ConversationsActivity)
|
||||
fun inject(activity: MainActivity)
|
||||
fun inject(activity: MessagesActivity)
|
||||
|
||||
fun inject(adapter: ConversationsAdapter)
|
||||
@@ -34,7 +34,7 @@ interface AppComponent {
|
||||
|
||||
fun inject(view: AvatarView)
|
||||
|
||||
fun inject(viewModel: ConversationsViewModel)
|
||||
fun inject(viewModel: MainViewModel)
|
||||
fun inject(viewModel: MessagesViewModel)
|
||||
fun inject(viewModel: SettingsViewModel)
|
||||
|
||||
|
||||
@@ -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.presentation.conversations.ConversationsActivity
|
||||
import com.moez.QKSMS.presentation.main.MainActivity
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Singleton
|
||||
|
||||
@@ -60,7 +60,7 @@ class NotificationManager @Inject constructor(
|
||||
style.addMessage(message.body, message.date, name)
|
||||
}
|
||||
|
||||
val contentIntent = Intent(context, ConversationsActivity::class.java).putExtra("threadId", threadId)
|
||||
val contentIntent = Intent(context, MainActivity::class.java).putExtra("threadId", threadId)
|
||||
val contentPI = PendingIntent.getActivity(context, threadId.toInt() + 10000, contentIntent, PendingIntent.FLAG_UPDATE_CURRENT)
|
||||
|
||||
val seenIntent = Intent(context, MarkSeenReceiver::class.java).putExtra("threadId", threadId)
|
||||
|
||||
@@ -4,7 +4,7 @@ import android.arch.lifecycle.ViewModel
|
||||
import android.arch.lifecycle.ViewModelProvider
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import com.moez.QKSMS.presentation.conversations.ConversationsViewModel
|
||||
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
|
||||
@@ -37,8 +37,8 @@ class Navigator @Inject constructor(val context: Context) {
|
||||
override fun <T : ViewModel?> create(modelClass: Class<T>): T {
|
||||
return when (modelClass) {
|
||||
|
||||
ConversationsViewModel::class.java -> {
|
||||
ConversationsViewModel()
|
||||
MainViewModel::class.java -> {
|
||||
MainViewModel()
|
||||
}
|
||||
|
||||
MessagesViewModel::class.java -> {
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.moez.QKSMS.presentation.conversations
|
||||
package com.moez.QKSMS.presentation.main
|
||||
|
||||
import android.content.Context
|
||||
import android.view.LayoutInflater
|
||||
+4
-4
@@ -1,4 +1,4 @@
|
||||
package com.moez.QKSMS.presentation.conversations
|
||||
package com.moez.QKSMS.presentation.main
|
||||
|
||||
import android.Manifest
|
||||
import android.content.Intent
|
||||
@@ -23,11 +23,11 @@ import kotlinx.android.synthetic.main.toolbar.*
|
||||
import timber.log.Timber
|
||||
import javax.inject.Inject
|
||||
|
||||
class ConversationsActivity : QkActivity<ConversationsViewModel, ConversationsState>(), ConversationsView {
|
||||
class MainActivity : QkActivity<MainViewModel, MainState>(), MainView {
|
||||
|
||||
@Inject lateinit var navigator: Navigator
|
||||
|
||||
override val viewModelClass = ConversationsViewModel::class
|
||||
override val viewModelClass = MainViewModel::class
|
||||
override val composeIntent by lazy { compose.clicks() }
|
||||
override val drawerOpenIntent by lazy { drawerLayout.drawerOpen(Gravity.START) }
|
||||
override val archivedIntent by lazy { archived.clicks() }
|
||||
@@ -56,7 +56,7 @@ class ConversationsActivity : QkActivity<ConversationsViewModel, ConversationsSt
|
||||
?.let { threadId -> navigator.showConversation(threadId) }
|
||||
}
|
||||
|
||||
override fun render(state: ConversationsState) {
|
||||
override fun render(state: MainState) {
|
||||
if (conversationList.adapter != state.adapter) {
|
||||
conversationList.adapter = state.adapter
|
||||
}
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
package com.moez.QKSMS.presentation.conversations
|
||||
package com.moez.QKSMS.presentation.main
|
||||
|
||||
import android.support.v7.widget.RecyclerView
|
||||
|
||||
data class ConversationsState(
|
||||
data class MainState(
|
||||
val adapter: RecyclerView.Adapter<*>? = null,
|
||||
val refreshing: Boolean = false,
|
||||
val drawerOpen: Boolean = false
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
package com.moez.QKSMS.presentation.conversations
|
||||
package com.moez.QKSMS.presentation.main
|
||||
|
||||
import com.moez.QKSMS.presentation.base.QkView
|
||||
import io.reactivex.Observable
|
||||
|
||||
interface ConversationsView : QkView<ConversationsState> {
|
||||
interface MainView : QkView<MainState> {
|
||||
|
||||
val composeIntent: Observable<Unit>
|
||||
val drawerOpenIntent: Observable<Boolean>
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package com.moez.QKSMS.presentation.conversations
|
||||
package com.moez.QKSMS.presentation.main
|
||||
|
||||
import com.moez.QKSMS.common.di.AppComponentManager
|
||||
import com.moez.QKSMS.data.repository.MessageRepository
|
||||
@@ -8,7 +8,7 @@ import com.moez.QKSMS.presentation.base.QkViewModel
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import javax.inject.Inject
|
||||
|
||||
class ConversationsViewModel : QkViewModel<ConversationsView, ConversationsState>(ConversationsState()) {
|
||||
class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
|
||||
|
||||
@Inject lateinit var navigator: Navigator
|
||||
@Inject lateinit var messageRepo: MessageRepository
|
||||
@@ -24,7 +24,7 @@ class ConversationsViewModel : QkViewModel<ConversationsView, ConversationsState
|
||||
markAllSeen.execute(Unit)
|
||||
}
|
||||
|
||||
override fun bindIntents(view: ConversationsView) {
|
||||
override fun bindIntents(view: MainView) {
|
||||
super.bindIntents(view)
|
||||
|
||||
intents += view.composeIntent.subscribe {
|
||||
Reference in New Issue
Block a user