From 79960486580ca75f2b3fee007095cb515fcfb311 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 28 Aug 2017 13:18:36 -0700 Subject: [PATCH] move syncmanager to conversationviewmodel using DI, use swipe to refresh instead of menu for syncing conversations --- .../java/com/moez/QKSMS/dagger/AppModule.kt | 7 ++++ .../moez/QKSMS/dagger/ConversationsModule.kt | 5 +-- .../com/moez/QKSMS/data/sync/SyncManager.kt | 4 +-- .../conversations/ConversationListFragment.kt | 16 ++------- .../ConversationListViewModel.kt | 7 +++- .../QKSMS/ui/messages/MessageListFragment.kt | 7 ---- .../res/layout/conversation_list_fragment.xml | 33 +++++++++---------- qksms/src/main/res/menu/conversations.xml | 8 +---- qksms/src/main/res/menu/messages.xml | 8 +---- 9 files changed, 37 insertions(+), 58 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/dagger/AppModule.kt b/qksms/src/main/java/com/moez/QKSMS/dagger/AppModule.kt index 64946761..771814d0 100644 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/AppModule.kt +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/AppModule.kt @@ -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) + } + } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/dagger/ConversationsModule.kt b/qksms/src/main/java/com/moez/QKSMS/dagger/ConversationsModule.kt index d65286f7..b9142b82 100644 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/ConversationsModule.kt +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/ConversationsModule.kt @@ -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) } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt b/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt index 92595b46..904db70f 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt @@ -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") diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt index d0faf524..b1ddd396 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListFragment.kt @@ -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 } } } diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewModel.kt index 7d70971c..972b3fda 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewModel.kt @@ -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) + } + } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListFragment.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListFragment.kt index 4766091a..430d9704 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListFragment.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListFragment.kt @@ -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) - } - } - } \ No newline at end of file diff --git a/qksms/src/main/res/layout/conversation_list_fragment.xml b/qksms/src/main/res/layout/conversation_list_fragment.xml index 0f48768b..cd21b7f0 100644 --- a/qksms/src/main/res/layout/conversation_list_fragment.xml +++ b/qksms/src/main/res/layout/conversation_list_fragment.xml @@ -6,25 +6,22 @@ android:animateLayoutChanges="true" android:orientation="vertical"> - - - + android:layout_weight="1"> + + + + \ No newline at end of file diff --git a/qksms/src/main/res/menu/conversations.xml b/qksms/src/main/res/menu/conversations.xml index 6d44e238..e73b6af7 100644 --- a/qksms/src/main/res/menu/conversations.xml +++ b/qksms/src/main/res/menu/conversations.xml @@ -1,10 +1,4 @@ - - - + \ No newline at end of file diff --git a/qksms/src/main/res/menu/messages.xml b/qksms/src/main/res/menu/messages.xml index 597d3e9b..e73b6af7 100644 --- a/qksms/src/main/res/menu/messages.xml +++ b/qksms/src/main/res/menu/messages.xml @@ -1,10 +1,4 @@ - - - + \ No newline at end of file