move syncmanager to conversationviewmodel using DI, use swipe to refresh instead of menu for syncing conversations

This commit is contained in:
Moez Bhatti
2017-08-28 13:18:36 -07:00
parent 79ec62324e
commit 7996048658
9 changed files with 37 additions and 58 deletions
@@ -2,6 +2,7 @@ package com.moez.QKSMS.dagger
import android.app.Application
import android.content.Context
import com.moez.QKSMS.data.sync.SyncManager
import dagger.Module
import dagger.Provides
import javax.inject.Singleton
@@ -15,4 +16,10 @@ class AppModule(var application: Application) {
return application
}
@Provides
@Singleton
fun provideSyncManager(context: Context): SyncManager {
return SyncManager(context)
}
}
@@ -1,6 +1,7 @@
package com.moez.QKSMS.dagger
import com.moez.QKSMS.data.repository.ConversationRepository
import com.moez.QKSMS.data.sync.SyncManager
import com.moez.QKSMS.ui.conversations.ConversationListViewModel
import dagger.Module
import dagger.Provides
@@ -17,8 +18,8 @@ class ConversationsModule {
@Provides
@Singleton
fun provideViewModel(repository: ConversationRepository): ConversationListViewModel {
return ConversationListViewModel(repository)
fun provideViewModel(syncManager: SyncManager, repository: ConversationRepository): ConversationListViewModel {
return ConversationListViewModel(syncManager, repository)
}
}
@@ -10,10 +10,10 @@ import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import io.realm.Realm
internal object SyncManager {
class SyncManager(val context: Context) {
private val TAG = "SyncManager"
fun copyToRealm(context: Context, completionListener: () -> Unit) {
fun copyToRealm(completionListener: () -> Unit) {
val contentResolver = context.contentResolver
val conversationsCursor = contentResolver.query(ConversationColumns.URI, ConversationColumns.PROJECTION, null, null, "date desc")
@@ -2,10 +2,8 @@ package com.moez.QKSMS.ui.conversations
import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
import android.view.MenuItem
import android.view.View
import com.moez.QKSMS.R
import com.moez.QKSMS.data.sync.SyncManager
import com.moez.QKSMS.ui.base.QkFragment
import kotlinx.android.synthetic.main.conversation_list_fragment.*
import javax.inject.Inject
@@ -25,19 +23,9 @@ class ConversationListFragment : QkFragment() {
override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
conversationList.layoutManager = LinearLayoutManager(context)
conversationList.adapter = ConversationAdapter(context, viewModel.conversations)
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
return when (item.itemId) {
R.id.load_conversations -> { // TODO: This is for testing, remove this
progress.visibility = View.VISIBLE
SyncManager.copyToRealm(context) {
progress.visibility = View.GONE
}
true
}
else -> super.onOptionsItemSelected(item)
swipeRefresh.setOnRefreshListener {
viewModel.onRefresh { swipeRefresh.isRefreshing = false }
}
}
@@ -2,9 +2,14 @@ package com.moez.QKSMS.ui.conversations
import android.arch.lifecycle.ViewModel
import com.moez.QKSMS.data.repository.ConversationRepository
import com.moez.QKSMS.data.sync.SyncManager
class ConversationListViewModel(repository: ConversationRepository) : ViewModel() {
class ConversationListViewModel(val syncManager: SyncManager, repository: ConversationRepository) : ViewModel() {
val conversations = repository.getConversations()
fun onRefresh(completionListener: () -> Unit) {
syncManager.copyToRealm(completionListener::invoke)
}
}
@@ -2,7 +2,6 @@ package com.moez.QKSMS.ui.messages
import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
import android.view.MenuItem
import android.view.View
import com.moez.QKSMS.R
import com.moez.QKSMS.ui.base.QkFragment
@@ -23,10 +22,4 @@ class MessageListFragment : QkFragment() {
messageList.adapter = MessageAdapter(context, viewModel.messages)
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
return when (item.itemId) {
else -> super.onOptionsItemSelected(item)
}
}
}
@@ -6,25 +6,22 @@
android:animateLayoutChanges="true"
android:orientation="vertical">
<ProgressBar
android:id="@+id/progress"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:progressDrawable="@drawable/progress_drawable"
android:indeterminate="true"
android:indeterminateTint="@color/colorPrimary"
android:visibility="gone" />
<android.support.v7.widget.RecyclerView
android:id="@+id/conversationList"
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/swipeRefresh"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:clipChildren="false"
android:clipToPadding="false"
android:paddingBottom="8dp"
android:paddingTop="8dp"
tools:listitem="@layout/conversation_list_item" />
android:layout_weight="1">
<android.support.v7.widget.RecyclerView
android:id="@+id/conversationList"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipChildren="false"
android:clipToPadding="false"
android:paddingBottom="8dp"
android:paddingTop="8dp"
tools:listitem="@layout/conversation_list_item" />
</android.support.v4.widget.SwipeRefreshLayout>
</LinearLayout>
+1 -7
View File
@@ -1,10 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<item
android:id="@+id/load_conversations"
android:title="Sync conversations"
tools:ignore="HardcodedText" />
<menu>
</menu>
+1 -7
View File
@@ -1,10 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<item
android:id="@+id/load_messages"
android:title="Sync messages"
tools:ignore="HardcodedText" />
<menu>
</menu>