Move scheduled management to separate activity

This commit is contained in:
Moez Bhatti
2018-06-27 14:31:48 -04:00
parent d3ceec01fd
commit e8765a22df
13 changed files with 168 additions and 23 deletions
@@ -49,7 +49,6 @@ import com.moez.QKSMS.common.util.extensions.setTint
import com.moez.QKSMS.common.util.extensions.setVisible
import com.moez.QKSMS.feature.conversations.ConversationItemTouchCallback
import com.moez.QKSMS.feature.conversations.ConversationsAdapter
import com.moez.QKSMS.feature.scheduled.ScheduledMessageAdapter
import com.moez.QKSMS.repository.SyncRepository
import com.uber.autodispose.kotlin.autoDisposable
import dagger.android.AndroidInjection
@@ -64,7 +63,6 @@ class MainActivity : QkThemedActivity(), MainView {
@Inject lateinit var navigator: Navigator
@Inject lateinit var conversationsAdapter: ConversationsAdapter
@Inject lateinit var scheduledMessageAdapter: ScheduledMessageAdapter
@Inject lateinit var searchAdapter: SearchAdapter
@Inject lateinit var itemTouchCallback: ConversationItemTouchCallback
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
@@ -194,7 +192,6 @@ class MainActivity : QkThemedActivity(), MainView {
compose.setVisible(state.page is Inbox || state.page is Archived)
conversationsAdapter.emptyView = empty.takeIf { state.page is Inbox || state.page is Archived }
scheduledMessageAdapter.emptyView = empty.takeIf { state.page is Archived }
when (state.page) {
is Inbox -> {
@@ -225,14 +222,6 @@ class MainActivity : QkThemedActivity(), MainView {
itemTouchHelper.attachToRecyclerView(null)
empty.setText(R.string.archived_empty_text)
}
is Scheduled -> {
setTitle(R.string.title_scheduled)
if (recyclerView.adapter !== scheduledMessageAdapter) recyclerView.adapter = scheduledMessageAdapter
scheduledMessageAdapter.updateData(state.page.data)
itemTouchHelper.attachToRecyclerView(null)
empty.setText(R.string.scheduled_empty_text)
}
}
when (state.page is Inbox && state.page.showArchivedSnackbar) {
@@ -242,7 +231,6 @@ class MainActivity : QkThemedActivity(), MainView {
inbox.isSelected = state.page is Inbox
archived.isSelected = state.page is Archived
scheduled.isSelected = state.page is Scheduled
if (drawerLayout.isDrawerOpen(Gravity.START) && !state.drawerOpen) drawerLayout.closeDrawer(Gravity.START)
else if (!drawerLayout.isDrawerVisible(Gravity.START) && state.drawerOpen) drawerLayout.openDrawer(Gravity.START)
@@ -18,9 +18,7 @@
*/
package com.moez.QKSMS.feature.main
import com.moez.QKSMS.feature.scheduled.ScheduledMessageAdapter
import com.moez.QKSMS.model.Conversation
import com.moez.QKSMS.model.ScheduledMessage
import com.moez.QKSMS.model.SearchResult
import com.moez.QKSMS.repository.SyncRepository
import io.realm.RealmResults
@@ -54,7 +52,4 @@ data class Archived(
val showClearButton: Boolean = false,
val markRead: Boolean = false,
val data: RealmResults<Conversation>? = null,
val selected: Int = 0) : MainPage()
data class Scheduled(
val data: RealmResults<ScheduledMessage>) : MainPage()
val selected: Int = 0) : MainPage()
@@ -36,7 +36,6 @@ import com.moez.QKSMS.manager.PermissionManager
import com.moez.QKSMS.manager.RatingManager
import com.moez.QKSMS.model.SyncLog
import com.moez.QKSMS.repository.ConversationRepository
import com.moez.QKSMS.repository.ScheduledMessageRepository
import com.moez.QKSMS.repository.SyncRepository
import com.uber.autodispose.kotlin.autoDisposable
import io.reactivex.Observable
@@ -62,7 +61,6 @@ class MainViewModel @Inject constructor(
private val navigator: Navigator,
private val permissionManager: PermissionManager,
private val ratingManager: RatingManager,
private val scheduledMessageRepo: ScheduledMessageRepository,
private val syncMessages: SyncMessages,
private val syncRepository: SyncRepository
) : QkViewModel<MainView, MainState>(MainState(page = Inbox(data = conversationRepo.getConversations()))) {
@@ -182,6 +180,7 @@ class MainViewModel @Inject constructor(
view.drawerItemIntent
.doOnNext { newState { copy(drawerOpen = false) } }
.doOnNext { if (it == DrawerItem.SCHEDULED) navigator.showScheduled() }
.doOnNext { if (it == DrawerItem.SETTINGS) navigator.showSettings() }
.doOnNext { if (it == DrawerItem.PLUS) navigator.showQksmsPlusActivity() }
.doOnNext { if (it == DrawerItem.HELP) navigator.showSupport() }
@@ -190,7 +189,6 @@ class MainViewModel @Inject constructor(
when (it) {
DrawerItem.INBOX -> newState { copy(page = Inbox(data = conversationRepo.getConversations())) }
DrawerItem.ARCHIVED -> newState { copy(page = Archived(data = conversationRepo.getConversations(true))) }
DrawerItem.SCHEDULED -> newState { copy(page = Scheduled(data = scheduledMessageRepo.getScheduledMessages())) }
else -> {
} // Do nothing
}
@@ -0,0 +1,35 @@
package com.moez.QKSMS.feature.scheduled
import android.os.Bundle
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.ViewModelProviders
import com.moez.QKSMS.R
import com.moez.QKSMS.common.base.QkThemedActivity
import dagger.android.AndroidInjection
import kotlinx.android.synthetic.main.scheduled_activity.*
import javax.inject.Inject
class ScheduledActivity : QkThemedActivity(), ScheduledView {
@Inject lateinit var adapter: ScheduledMessageAdapter
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java] }
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
super.onCreate(savedInstanceState)
setContentView(R.layout.scheduled_activity)
setTitle(R.string.scheduled_title)
showBackButton(true)
viewModel.bindView(this)
adapter.emptyView = empty
messages.adapter = adapter
}
override fun render(state: ScheduledState) {
adapter.updateData(state.scheduledMessages)
}
}
@@ -0,0 +1,17 @@
package com.moez.QKSMS.feature.scheduled
import androidx.lifecycle.ViewModel
import com.moez.QKSMS.injection.ViewModelKey
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoMap
@Module
class ScheduledActivityModule {
@Provides
@IntoMap
@ViewModelKey(ScheduledViewModel::class)
fun provideScheduledViewModel(viewModel: ScheduledViewModel): ViewModel = viewModel
}
@@ -0,0 +1,8 @@
package com.moez.QKSMS.feature.scheduled
import com.moez.QKSMS.model.ScheduledMessage
import io.realm.RealmResults
data class ScheduledState(
val scheduledMessages: RealmResults<ScheduledMessage>? = null
)
@@ -0,0 +1,7 @@
package com.moez.QKSMS.feature.scheduled
import com.moez.QKSMS.common.base.QkView
interface ScheduledView : QkView<ScheduledState> {
}
@@ -0,0 +1,13 @@
package com.moez.QKSMS.feature.scheduled
import com.moez.QKSMS.common.base.QkViewModel
import com.moez.QKSMS.repository.ScheduledMessageRepository
import javax.inject.Inject
class ScheduledViewModel @Inject constructor(
scheduledMessageRepo: ScheduledMessageRepository
) : QkViewModel<ScheduledView, ScheduledState>(ScheduledState(
scheduledMessages = scheduledMessageRepo.getScheduledMessages()
)) {
}