Refactor Conversations to Main

This commit is contained in:
Moez Bhatti
2017-11-01 17:40:18 -07:00
parent 20af29c1d4
commit 3c63d7b5b3
9 changed files with 23 additions and 23 deletions
+1 -1
View File
@@ -21,7 +21,7 @@
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<activity <activity
android:name="com.moez.QKSMS.presentation.conversations.ConversationsActivity" android:name="com.moez.QKSMS.presentation.main.MainActivity"
android:launchMode="singleTask"> android:launchMode="singleTask">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@@ -1,9 +1,9 @@
package com.moez.QKSMS.common.di package com.moez.QKSMS.common.di
import com.moez.QKSMS.common.util.NotificationManager import com.moez.QKSMS.common.util.NotificationManager
import com.moez.QKSMS.presentation.conversations.ConversationsActivity import com.moez.QKSMS.presentation.main.MainActivity
import com.moez.QKSMS.presentation.conversations.ConversationsAdapter import com.moez.QKSMS.presentation.main.ConversationsAdapter
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.MessagesActivity
import com.moez.QKSMS.presentation.messages.MessagesAdapter import com.moez.QKSMS.presentation.messages.MessagesAdapter
import com.moez.QKSMS.presentation.messages.MessagesViewModel import com.moez.QKSMS.presentation.messages.MessagesViewModel
@@ -17,7 +17,7 @@ import javax.inject.Singleton
@Component(modules = arrayOf(AppModule::class)) @Component(modules = arrayOf(AppModule::class))
interface AppComponent { interface AppComponent {
fun inject(activity: ConversationsActivity) fun inject(activity: MainActivity)
fun inject(activity: MessagesActivity) fun inject(activity: MessagesActivity)
fun inject(adapter: ConversationsAdapter) fun inject(adapter: ConversationsAdapter)
@@ -34,7 +34,7 @@ interface AppComponent {
fun inject(view: AvatarView) fun inject(view: AvatarView)
fun inject(viewModel: ConversationsViewModel) fun inject(viewModel: MainViewModel)
fun inject(viewModel: MessagesViewModel) fun inject(viewModel: MessagesViewModel)
fun inject(viewModel: SettingsViewModel) 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.MarkReadReceiver
import com.moez.QKSMS.receiver.MarkSeenReceiver import com.moez.QKSMS.receiver.MarkSeenReceiver
import com.moez.QKSMS.receiver.RemoteMessagingReceiver 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.Inject
import javax.inject.Singleton import javax.inject.Singleton
@@ -60,7 +60,7 @@ class NotificationManager @Inject constructor(
style.addMessage(message.body, message.date, name) 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 contentPI = PendingIntent.getActivity(context, threadId.toInt() + 10000, contentIntent, PendingIntent.FLAG_UPDATE_CURRENT)
val seenIntent = Intent(context, MarkSeenReceiver::class.java).putExtra("threadId", threadId) 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.arch.lifecycle.ViewModelProvider
import android.content.Context import android.content.Context
import android.content.Intent 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.MessagesActivity
import com.moez.QKSMS.presentation.messages.MessagesViewModel import com.moez.QKSMS.presentation.messages.MessagesViewModel
import com.moez.QKSMS.presentation.settings.SettingsActivity 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 { override fun <T : ViewModel?> create(modelClass: Class<T>): T {
return when (modelClass) { return when (modelClass) {
ConversationsViewModel::class.java -> { MainViewModel::class.java -> {
ConversationsViewModel() MainViewModel()
} }
MessagesViewModel::class.java -> { MessagesViewModel::class.java -> {
@@ -1,4 +1,4 @@
package com.moez.QKSMS.presentation.conversations package com.moez.QKSMS.presentation.main
import android.content.Context import android.content.Context
import android.view.LayoutInflater import android.view.LayoutInflater
@@ -1,4 +1,4 @@
package com.moez.QKSMS.presentation.conversations package com.moez.QKSMS.presentation.main
import android.Manifest import android.Manifest
import android.content.Intent import android.content.Intent
@@ -23,11 +23,11 @@ import kotlinx.android.synthetic.main.toolbar.*
import timber.log.Timber import timber.log.Timber
import javax.inject.Inject import javax.inject.Inject
class ConversationsActivity : QkActivity<ConversationsViewModel, ConversationsState>(), ConversationsView { class MainActivity : QkActivity<MainViewModel, MainState>(), MainView {
@Inject lateinit var navigator: Navigator @Inject lateinit var navigator: Navigator
override val viewModelClass = ConversationsViewModel::class override val viewModelClass = MainViewModel::class
override val composeIntent by lazy { compose.clicks() } override val composeIntent by lazy { compose.clicks() }
override val drawerOpenIntent by lazy { drawerLayout.drawerOpen(Gravity.START) } override val drawerOpenIntent by lazy { drawerLayout.drawerOpen(Gravity.START) }
override val archivedIntent by lazy { archived.clicks() } override val archivedIntent by lazy { archived.clicks() }
@@ -56,7 +56,7 @@ class ConversationsActivity : QkActivity<ConversationsViewModel, ConversationsSt
?.let { threadId -> navigator.showConversation(threadId) } ?.let { threadId -> navigator.showConversation(threadId) }
} }
override fun render(state: ConversationsState) { override fun render(state: MainState) {
if (conversationList.adapter != state.adapter) { if (conversationList.adapter != state.adapter) {
conversationList.adapter = state.adapter conversationList.adapter = state.adapter
} }
@@ -1,8 +1,8 @@
package com.moez.QKSMS.presentation.conversations package com.moez.QKSMS.presentation.main
import android.support.v7.widget.RecyclerView import android.support.v7.widget.RecyclerView
data class ConversationsState( data class MainState(
val adapter: RecyclerView.Adapter<*>? = null, val adapter: RecyclerView.Adapter<*>? = null,
val refreshing: Boolean = false, val refreshing: Boolean = false,
val drawerOpen: Boolean = false val drawerOpen: Boolean = false
@@ -1,9 +1,9 @@
package com.moez.QKSMS.presentation.conversations package com.moez.QKSMS.presentation.main
import com.moez.QKSMS.presentation.base.QkView import com.moez.QKSMS.presentation.base.QkView
import io.reactivex.Observable import io.reactivex.Observable
interface ConversationsView : QkView<ConversationsState> { interface MainView : QkView<MainState> {
val composeIntent: Observable<Unit> val composeIntent: Observable<Unit>
val drawerOpenIntent: Observable<Boolean> val drawerOpenIntent: Observable<Boolean>
@@ -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.common.di.AppComponentManager
import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.data.repository.MessageRepository
@@ -8,7 +8,7 @@ import com.moez.QKSMS.presentation.base.QkViewModel
import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.plusAssign
import javax.inject.Inject import javax.inject.Inject
class ConversationsViewModel : QkViewModel<ConversationsView, ConversationsState>(ConversationsState()) { class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
@Inject lateinit var navigator: Navigator @Inject lateinit var navigator: Navigator
@Inject lateinit var messageRepo: MessageRepository @Inject lateinit var messageRepo: MessageRepository
@@ -24,7 +24,7 @@ class ConversationsViewModel : QkViewModel<ConversationsView, ConversationsState
markAllSeen.execute(Unit) markAllSeen.execute(Unit)
} }
override fun bindIntents(view: ConversationsView) { override fun bindIntents(view: MainView) {
super.bindIntents(view) super.bindIntents(view)
intents += view.composeIntent.subscribe { intents += view.composeIntent.subscribe {