forked from upstream-mirrors/quik
Perform manual sync from settings screen
This commit is contained in:
@@ -45,7 +45,7 @@
|
|||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
<activity android:name="com.moez.QKSMS.presentation.messages.MessagesActivity" />
|
<activity android:name="com.moez.QKSMS.presentation.messages.MessagesActivity" />
|
||||||
<activity android:name=".presentation.settings.SettingActivity" />
|
<activity android:name=".presentation.settings.SettingsActivity" />
|
||||||
|
|
||||||
<receiver
|
<receiver
|
||||||
android:name=".receiver.SmsReceiver"
|
android:name=".receiver.SmsReceiver"
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import com.moez.QKSMS.presentation.conversations.ConversationsViewModel
|
|||||||
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
|
||||||
|
import com.moez.QKSMS.presentation.settings.SettingsViewModel
|
||||||
import com.moez.QKSMS.presentation.view.AvatarView
|
import com.moez.QKSMS.presentation.view.AvatarView
|
||||||
import com.moez.QKSMS.receiver.*
|
import com.moez.QKSMS.receiver.*
|
||||||
import dagger.Component
|
import dagger.Component
|
||||||
@@ -35,5 +36,6 @@ interface AppComponent {
|
|||||||
|
|
||||||
fun inject(viewModel: ConversationsViewModel)
|
fun inject(viewModel: ConversationsViewModel)
|
||||||
fun inject(viewModel: MessagesViewModel)
|
fun inject(viewModel: MessagesViewModel)
|
||||||
|
fun inject(viewModel: SettingsViewModel)
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -7,7 +7,7 @@ import android.content.Intent
|
|||||||
import com.moez.QKSMS.presentation.conversations.ConversationsViewModel
|
import com.moez.QKSMS.presentation.conversations.ConversationsViewModel
|
||||||
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.SettingActivity
|
import com.moez.QKSMS.presentation.settings.SettingsActivity
|
||||||
import com.moez.QKSMS.presentation.settings.SettingsViewModel
|
import com.moez.QKSMS.presentation.settings.SettingsViewModel
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
import javax.inject.Singleton
|
import javax.inject.Singleton
|
||||||
@@ -27,7 +27,7 @@ class Navigator @Inject constructor(val context: Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun showSettings() {
|
fun showSettings() {
|
||||||
val intent = Intent(context, SettingActivity::class.java)
|
val intent = Intent(context, SettingsActivity::class.java)
|
||||||
startActivity(intent)
|
startActivity(intent)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -44,9 +44,6 @@ class ConversationsActivity : QkActivity<ConversationsViewModel, ConversationsSt
|
|||||||
|
|
||||||
// Don't allow clicks to pass through the drawer layout
|
// Don't allow clicks to pass through the drawer layout
|
||||||
drawer.clicks().subscribe()
|
drawer.clicks().subscribe()
|
||||||
|
|
||||||
// Refresh support for debugging purposes
|
|
||||||
swipeRefresh.setOnRefreshListener { viewModel.onRefresh() } // TODO remove
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onNewIntent(intent: Intent?) {
|
override fun onNewIntent(intent: Intent?) {
|
||||||
@@ -60,8 +57,6 @@ class ConversationsActivity : QkActivity<ConversationsViewModel, ConversationsSt
|
|||||||
if (conversationList.adapter == null && state.conversations?.isValid == true) {
|
if (conversationList.adapter == null && state.conversations?.isValid == true) {
|
||||||
conversationList.adapter = ConversationsAdapter(state.conversations)
|
conversationList.adapter = ConversationsAdapter(state.conversations)
|
||||||
}
|
}
|
||||||
|
|
||||||
swipeRefresh.isRefreshing = state.refreshing
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun requestPermissions() {
|
private fun requestPermissions() {
|
||||||
|
|||||||
-10
@@ -4,7 +4,6 @@ import com.moez.QKSMS.common.di.AppComponentManager
|
|||||||
import com.moez.QKSMS.data.model.Message
|
import com.moez.QKSMS.data.model.Message
|
||||||
import com.moez.QKSMS.data.repository.MessageRepository
|
import com.moez.QKSMS.data.repository.MessageRepository
|
||||||
import com.moez.QKSMS.domain.interactor.MarkAllSeen
|
import com.moez.QKSMS.domain.interactor.MarkAllSeen
|
||||||
import com.moez.QKSMS.domain.interactor.SyncConversations
|
|
||||||
import com.moez.QKSMS.presentation.Navigator
|
import com.moez.QKSMS.presentation.Navigator
|
||||||
import com.moez.QKSMS.presentation.base.QkViewModel
|
import com.moez.QKSMS.presentation.base.QkViewModel
|
||||||
import io.realm.RealmResults
|
import io.realm.RealmResults
|
||||||
@@ -14,7 +13,6 @@ class ConversationsViewModel : QkViewModel<ConversationsView, ConversationsState
|
|||||||
|
|
||||||
@Inject lateinit var navigator: Navigator
|
@Inject lateinit var navigator: Navigator
|
||||||
@Inject lateinit var messageRepo: MessageRepository
|
@Inject lateinit var messageRepo: MessageRepository
|
||||||
@Inject lateinit var syncConversations: SyncConversations
|
|
||||||
@Inject lateinit var markAllSeen: MarkAllSeen
|
@Inject lateinit var markAllSeen: MarkAllSeen
|
||||||
|
|
||||||
private val conversations: RealmResults<Message>
|
private val conversations: RealmResults<Message>
|
||||||
@@ -38,16 +36,8 @@ class ConversationsViewModel : QkViewModel<ConversationsView, ConversationsState
|
|||||||
view.settingsIntent.subscribe { navigator.showSettings() }
|
view.settingsIntent.subscribe { navigator.showSettings() }
|
||||||
}
|
}
|
||||||
|
|
||||||
fun onRefresh() {
|
|
||||||
newState { it.copy(refreshing = true) }
|
|
||||||
syncConversations.execute(Unit, {
|
|
||||||
newState { it.copy(refreshing = false) }
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onCleared() {
|
override fun onCleared() {
|
||||||
super.onCleared()
|
super.onCleared()
|
||||||
syncConversations.dispose()
|
|
||||||
markAllSeen.dispose()
|
markAllSeen.dispose()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
package com.moez.QKSMS.presentation.settings
|
|
||||||
|
|
||||||
import android.os.Bundle
|
|
||||||
import com.moez.QKSMS.R
|
|
||||||
import com.moez.QKSMS.presentation.base.QkActivity
|
|
||||||
|
|
||||||
class SettingActivity : QkActivity<SettingsViewModel, SettingsState>(), SettingsView {
|
|
||||||
|
|
||||||
override val viewModelClass = SettingsViewModel::class
|
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
|
||||||
super.onCreate(savedInstanceState)
|
|
||||||
setContentView(R.layout.settings_activity)
|
|
||||||
setTitle(R.string.title_settings)
|
|
||||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
|
||||||
viewModel.setView(this)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun render(state: SettingsState) {
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
package com.moez.QKSMS.presentation.settings
|
||||||
|
|
||||||
|
import android.app.ProgressDialog
|
||||||
|
import android.os.Bundle
|
||||||
|
import com.moez.QKSMS.R
|
||||||
|
import com.moez.QKSMS.presentation.base.QkActivity
|
||||||
|
import kotlinx.android.synthetic.main.settings_activity.*
|
||||||
|
|
||||||
|
class SettingsActivity : QkActivity<SettingsViewModel, SettingsState>(), SettingsView {
|
||||||
|
|
||||||
|
override val viewModelClass = SettingsViewModel::class
|
||||||
|
override val preferenceClickIntent by lazy { fragment.preferenceClicks }
|
||||||
|
override val preferenceChangeIntent by lazy { fragment.preferenceChanges }
|
||||||
|
|
||||||
|
private lateinit var fragment: SettingsFragment
|
||||||
|
private lateinit var progressDialog: ProgressDialog // TODO remove this
|
||||||
|
|
||||||
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
|
super.onCreate(savedInstanceState)
|
||||||
|
setContentView(R.layout.settings_activity)
|
||||||
|
setTitle(R.string.title_settings)
|
||||||
|
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
||||||
|
|
||||||
|
progressDialog = ProgressDialog(this)
|
||||||
|
progressDialog.isIndeterminate = true
|
||||||
|
progressDialog.setCancelable(false)
|
||||||
|
progressDialog.setCanceledOnTouchOutside(false)
|
||||||
|
|
||||||
|
fragment = fragmentManager.findFragmentById(fragmentFrame.id) as? SettingsFragment ?: SettingsFragment()
|
||||||
|
viewModel.setView(this)
|
||||||
|
|
||||||
|
fragmentManager.beginTransaction()
|
||||||
|
.replace(fragmentFrame.id, fragment)
|
||||||
|
.commit()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun render(state: SettingsState) {
|
||||||
|
if (progressDialog.isShowing && !state.syncing) progressDialog.hide()
|
||||||
|
else if (!progressDialog.isShowing && state.syncing) progressDialog.show()
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
package com.moez.QKSMS.presentation.settings
|
||||||
|
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.preference.Preference
|
||||||
|
import android.preference.PreferenceFragment
|
||||||
|
import com.moez.QKSMS.R
|
||||||
|
import io.reactivex.subjects.PublishSubject
|
||||||
|
|
||||||
|
class SettingsFragment : PreferenceFragment() {
|
||||||
|
|
||||||
|
val preferenceClicks: PublishSubject<Preference> = PublishSubject.create()
|
||||||
|
val preferenceChanges: PublishSubject<PreferenceChange> = PublishSubject.create()
|
||||||
|
|
||||||
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
|
super.onCreate(savedInstanceState)
|
||||||
|
addPreferencesFromResource(R.xml.settings)
|
||||||
|
|
||||||
|
val clickListener = Preference.OnPreferenceClickListener {
|
||||||
|
preferenceClicks.onNext(it)
|
||||||
|
true
|
||||||
|
}
|
||||||
|
|
||||||
|
val changeListener = Preference.OnPreferenceChangeListener { preference, newValue ->
|
||||||
|
preferenceChanges.onNext(PreferenceChange(preference, newValue))
|
||||||
|
true
|
||||||
|
}
|
||||||
|
|
||||||
|
(0 until preferenceScreen.preferenceCount)
|
||||||
|
.map { index -> preferenceScreen.getPreference(index) }
|
||||||
|
.forEach { preference ->
|
||||||
|
preference.onPreferenceClickListener = clickListener
|
||||||
|
preference.onPreferenceChangeListener = changeListener
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
package com.moez.QKSMS.presentation.settings
|
package com.moez.QKSMS.presentation.settings
|
||||||
|
|
||||||
data class SettingsState(
|
data class SettingsState(
|
||||||
val ignored: String = ""
|
val syncing: Boolean = false
|
||||||
)
|
)
|
||||||
@@ -1,7 +1,14 @@
|
|||||||
package com.moez.QKSMS.presentation.settings
|
package com.moez.QKSMS.presentation.settings
|
||||||
|
|
||||||
|
import android.preference.Preference
|
||||||
import com.moez.QKSMS.presentation.base.QkView
|
import com.moez.QKSMS.presentation.base.QkView
|
||||||
|
import io.reactivex.Observable
|
||||||
|
|
||||||
interface SettingsView : QkView<SettingsState> {
|
interface SettingsView : QkView<SettingsState> {
|
||||||
|
|
||||||
}
|
val preferenceClickIntent: Observable<Preference>
|
||||||
|
val preferenceChangeIntent: Observable<PreferenceChange>
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
data class PreferenceChange(val preference: Preference, val newValue: Any)
|
||||||
@@ -1,7 +1,38 @@
|
|||||||
package com.moez.QKSMS.presentation.settings
|
package com.moez.QKSMS.presentation.settings
|
||||||
|
|
||||||
|
import com.moez.QKSMS.common.di.AppComponentManager
|
||||||
|
import com.moez.QKSMS.domain.interactor.SyncConversations
|
||||||
import com.moez.QKSMS.presentation.base.QkViewModel
|
import com.moez.QKSMS.presentation.base.QkViewModel
|
||||||
|
import timber.log.Timber
|
||||||
|
import javax.inject.Inject
|
||||||
|
|
||||||
class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState()) {
|
class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState()) {
|
||||||
|
|
||||||
|
@Inject lateinit var syncConversations: SyncConversations
|
||||||
|
|
||||||
|
init {
|
||||||
|
AppComponentManager.appComponent.inject(this)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun bindIntents(view: SettingsView) {
|
||||||
|
super.bindIntents(view)
|
||||||
|
|
||||||
|
view.preferenceClickIntent.subscribe {
|
||||||
|
Timber.v("Preference click: ${it.key}")
|
||||||
|
|
||||||
|
when (it.key) {
|
||||||
|
"sync" -> {
|
||||||
|
newState { it.copy(syncing = true) }
|
||||||
|
syncConversations.execute(Unit, {
|
||||||
|
newState { it.copy(syncing = false) }
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onCleared() {
|
||||||
|
super.onCleared()
|
||||||
|
syncConversations.dispose()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -19,22 +19,15 @@
|
|||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
android:layout_weight="1">
|
android:layout_weight="1">
|
||||||
|
|
||||||
<android.support.v4.widget.SwipeRefreshLayout
|
<android.support.v7.widget.RecyclerView
|
||||||
android:id="@+id/swipeRefresh"
|
android:id="@+id/conversationList"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent"
|
||||||
|
android:clipChildren="false"
|
||||||
<android.support.v7.widget.RecyclerView
|
android:clipToPadding="false"
|
||||||
android:id="@+id/conversationList"
|
android:paddingBottom="8dp"
|
||||||
android:layout_width="match_parent"
|
android:paddingTop="8dp"
|
||||||
android:layout_height="match_parent"
|
tools:listitem="@layout/conversation_list_item" />
|
||||||
android:clipChildren="false"
|
|
||||||
android:clipToPadding="false"
|
|
||||||
android:paddingBottom="8dp"
|
|
||||||
android:paddingTop="8dp"
|
|
||||||
tools:listitem="@layout/conversation_list_item" />
|
|
||||||
|
|
||||||
</android.support.v4.widget.SwipeRefreshLayout>
|
|
||||||
|
|
||||||
<View
|
<View
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|||||||
@@ -6,9 +6,16 @@
|
|||||||
|
|
||||||
<include layout="@layout/toolbar" />
|
<include layout="@layout/toolbar" />
|
||||||
|
|
||||||
<View
|
<FrameLayout
|
||||||
|
android:id="@+id/fragmentFrame"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="8dp"
|
android:layout_height="match_parent">
|
||||||
android:background="@drawable/ab_shadow" />
|
|
||||||
|
<View
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="8dp"
|
||||||
|
android:background="@drawable/ab_shadow" />
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
@@ -11,6 +11,9 @@
|
|||||||
<string name="drawer_blocked">Blocked</string>
|
<string name="drawer_blocked">Blocked</string>
|
||||||
<string name="drawer_settings">Settings</string>
|
<string name="drawer_settings">Settings</string>
|
||||||
|
|
||||||
|
<string name="settings_sync_title">Sync messages</string>
|
||||||
|
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
|
||||||
|
|
||||||
<string name="notification_reply">Reply</string>
|
<string name="notification_reply">Reply</string>
|
||||||
<string name="notification_read">Mark read</string>
|
<string name="notification_read">Mark read</string>
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
|
<Preference
|
||||||
|
android:key="sync"
|
||||||
|
android:summary="@string/settings_sync_summary"
|
||||||
|
android:title="@string/settings_sync_title" />
|
||||||
|
|
||||||
|
</PreferenceScreen>
|
||||||
Reference in New Issue
Block a user