From f9ad73ab11551e26bb486ea345bacfebd594bf12 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 5 Mar 2018 15:10:41 -0500 Subject: [PATCH 1/9] Add ability to toggle blocked state of conversation --- .../src/main/java/data/model/Conversation.kt | 1 + .../java/data/repository/MessageRepository.kt | 30 +++++++++++++++-- qksms/src/main/java/interactor/MarkBlocked.kt | 32 +++++++++++++++++++ .../src/main/java/interactor/MarkUnblocked.kt | 32 +++++++++++++++++++ .../ConversationInfoActivity.kt | 6 ++++ .../conversationinfo/ConversationInfoState.kt | 1 + .../conversationinfo/ConversationInfoView.kt | 1 + .../ConversationInfoViewModel.kt | 31 ++++++++++++++---- .../res/layout/conversation_info_activity.xml | 7 ++++ qksms/src/main/res/values/strings.xml | 3 +- 10 files changed, 134 insertions(+), 10 deletions(-) create mode 100644 qksms/src/main/java/interactor/MarkBlocked.kt create mode 100644 qksms/src/main/java/interactor/MarkUnblocked.kt diff --git a/qksms/src/main/java/data/model/Conversation.kt b/qksms/src/main/java/data/model/Conversation.kt index d0746ad5..0510d8ee 100644 --- a/qksms/src/main/java/data/model/Conversation.kt +++ b/qksms/src/main/java/data/model/Conversation.kt @@ -27,6 +27,7 @@ open class Conversation : RealmObject() { @PrimaryKey var id: Long = 0 var recipients: RealmList = RealmList() var archived: Boolean = false + var blocked: Boolean = false var draft: String = "" fun getTitle(): String { diff --git a/qksms/src/main/java/data/repository/MessageRepository.kt b/qksms/src/main/java/data/repository/MessageRepository.kt index 44c16bde..67f37ec3 100644 --- a/qksms/src/main/java/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/data/repository/MessageRepository.kt @@ -64,6 +64,7 @@ class MessageRepository @Inject constructor( val conversationFlowable = realm.where(Conversation::class.java) .equalTo("archived", archived) + .equalTo("blocked", false) .findAllAsync() .asFlowable() .filter { it.isLoaded } @@ -87,6 +88,13 @@ class MessageRepository @Inject constructor( }) } + fun getBlockedConversations(): RealmResults { + return Realm.getDefaultInstance() + .where(Conversation::class.java) + .equalTo("blocked", true) + .findAll() + } + fun getConversationAsync(threadId: Long): Conversation { return Realm.getDefaultInstance() .where(Conversation::class.java) @@ -212,7 +220,6 @@ class MessageRepository @Inject constructor( val realm = Realm.getDefaultInstance() val conversation = realm.where(Conversation::class.java) .equalTo("id", threadId) - .equalTo("archived", false) .findFirst() realm.executeTransaction { conversation?.archived = true } @@ -223,13 +230,32 @@ class MessageRepository @Inject constructor( val realm = Realm.getDefaultInstance() val conversation = realm.where(Conversation::class.java) .equalTo("id", threadId) - .equalTo("archived", true) .findFirst() realm.executeTransaction { conversation?.archived = false } realm.close() } + fun markBlocked(threadId: Long) { + val realm = Realm.getDefaultInstance() + val conversation = realm.where(Conversation::class.java) + .equalTo("id", threadId) + .findFirst() + + realm.executeTransaction { conversation?.blocked = true } + realm.close() + } + + fun markUnblocked(threadId: Long) { + val realm = Realm.getDefaultInstance() + val conversation = realm.where(Conversation::class.java) + .equalTo("id", threadId) + .findFirst() + + realm.executeTransaction { conversation?.blocked = false } + realm.close() + } + fun markAllSeen() { val realm = Realm.getDefaultInstance() val messages = realm.where(Message::class.java).equalTo("seen", false).findAll() diff --git a/qksms/src/main/java/interactor/MarkBlocked.kt b/qksms/src/main/java/interactor/MarkBlocked.kt new file mode 100644 index 00000000..3d731322 --- /dev/null +++ b/qksms/src/main/java/interactor/MarkBlocked.kt @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package interactor + +import data.repository.MessageRepository +import io.reactivex.Flowable +import javax.inject.Inject + +class MarkBlocked @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { + + override fun buildObservable(params: Long): Flowable { + return Flowable.just(Unit) + .doOnNext { messageRepo.markBlocked(params) } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/interactor/MarkUnblocked.kt b/qksms/src/main/java/interactor/MarkUnblocked.kt new file mode 100644 index 00000000..02f0ce11 --- /dev/null +++ b/qksms/src/main/java/interactor/MarkUnblocked.kt @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package interactor + +import data.repository.MessageRepository +import io.reactivex.Flowable +import javax.inject.Inject + +class MarkUnblocked @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { + + override fun buildObservable(params: Long): Flowable { + return Flowable.just(Unit) + .doOnNext { messageRepo.markUnblocked(params) } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt index 2b66b4d9..3fb991b8 100644 --- a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt @@ -35,6 +35,7 @@ class ConversationInfoActivity : QkThemedActivity(), override val viewModelClass = ConversationInfoViewModel::class override val notificationsIntent by lazy { notifications.clicks() } override val archiveIntent by lazy { archive.clicks() } + override val blockIntent by lazy { block.clicks() } override val deleteIntent by lazy { delete.clicks() } override val confirmDeleteIntent: PublishSubject = PublishSubject.create() @@ -76,6 +77,11 @@ class ConversationInfoActivity : QkThemedActivity(), false -> R.string.info_archive }) + block.title = getString(when (state.blocked) { + true -> R.string.info_unblock + false -> R.string.info_block + }) + mediaAdapter.data = state.media } diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoState.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoState.kt index 4f6f4739..6e7ca858 100644 --- a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoState.kt +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoState.kt @@ -24,6 +24,7 @@ import data.model.Recipient data class ConversationInfoState( val recipients: List = listOf(), val archived: Boolean = false, + val blocked: Boolean = false, val media: List = ArrayList(), val hasError: Boolean = false ) \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoView.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoView.kt index d45a3e35..55d79d9d 100644 --- a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoView.kt +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoView.kt @@ -25,6 +25,7 @@ interface ConversationInfoView : QkView { val notificationsIntent: Observable val archiveIntent: Observable + val blockIntent: Observable val deleteIntent: Observable val confirmDeleteIntent: Observable diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt index d71f908c..57b1a277 100644 --- a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt @@ -20,17 +20,13 @@ package presentation.feature.conversationinfo import android.content.Context import android.content.Intent -import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable import common.di.appComponent import common.util.extensions.asObservable -import common.util.extensions.makeToast import data.model.Conversation import data.repository.MessageRepository -import interactor.DeleteConversation -import interactor.MarkArchived -import interactor.MarkUnarchived +import interactor.* import io.reactivex.Observable import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom @@ -45,6 +41,8 @@ class ConversationInfoViewModel(intent: Intent) : QkViewModel newState { it.copy(archived = archived) } } + // Update the view's blocked state whenever it changes + disposables += conversation + .map { conversation -> conversation.blocked } + .distinctUntilChanged() + .subscribe { blocked -> newState { it.copy(blocked = blocked) } } + // Load the attachments from the conversation disposables += messageRepo.getPartsForConversation(threadId) .map { parts -> parts.filter { part -> part.isImage() } } @@ -103,8 +109,19 @@ class ConversationInfoViewModel(intent: Intent) : QkViewModel when (conversation.archived) { - true -> markUnarchived.execute(conversation.id, { context.makeToast(R.string.toast_unarchived) }) - false -> markArchived.execute(conversation.id, { context.makeToast(R.string.toast_archived) }) + true -> markUnarchived.execute(conversation.id) + false -> markArchived.execute(conversation.id) + } + } + + // Toggle the blocked state of the conversation + view.blockIntent + .withLatestFrom(conversation, { _, conversation -> conversation }) + .autoDisposable(view.scope()) + .subscribe { conversation -> + when (conversation.blocked) { + true -> markUnblocked.execute(conversation.id) + false -> markBlocked.execute(conversation.id) } } diff --git a/qksms/src/main/res/layout/conversation_info_activity.xml b/qksms/src/main/res/layout/conversation_info_activity.xml index 1fa72b32..b28c692b 100644 --- a/qksms/src/main/res/layout/conversation_info_activity.xml +++ b/qksms/src/main/res/layout/conversation_info_activity.xml @@ -69,6 +69,13 @@ app:icon="@drawable/ic_folder_black_24dp" app:title="@string/info_archive" /> + + Notifications Archive Unarchive + Block + Unblock Delete conversation Default SMS app @@ -138,7 +140,6 @@ Copied Archived conversation - Moved to inbox You must unlock QKSMS+ to use this Message not sent From 89b68672a266653cad008d095d0e827fe86855c4 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 5 Mar 2018 16:37:09 -0500 Subject: [PATCH 2/9] Remove unnecessary result parameter in interactor --- qksms/src/main/java/interactor/ContactSync.kt | 2 +- qksms/src/main/java/interactor/DeleteConversation.kt | 2 +- qksms/src/main/java/interactor/DeleteMessage.kt | 2 +- qksms/src/main/java/interactor/FullSync.kt | 2 +- qksms/src/main/java/interactor/Interactor.kt | 12 +++++++----- qksms/src/main/java/interactor/MarkAllSeen.kt | 2 +- qksms/src/main/java/interactor/MarkArchived.kt | 2 +- qksms/src/main/java/interactor/MarkBlocked.kt | 2 +- qksms/src/main/java/interactor/MarkDelivered.kt | 2 +- qksms/src/main/java/interactor/MarkDeliveryFailed.kt | 2 +- qksms/src/main/java/interactor/MarkFailed.kt | 2 +- qksms/src/main/java/interactor/MarkRead.kt | 2 +- qksms/src/main/java/interactor/MarkSeen.kt | 2 +- qksms/src/main/java/interactor/MarkSent.kt | 2 +- qksms/src/main/java/interactor/MarkUnarchived.kt | 2 +- qksms/src/main/java/interactor/MarkUnblocked.kt | 2 +- qksms/src/main/java/interactor/PartialSync.kt | 2 +- qksms/src/main/java/interactor/ReceiveMms.kt | 2 +- qksms/src/main/java/interactor/ReceiveSms.kt | 2 +- qksms/src/main/java/interactor/RetrySending.kt | 2 +- qksms/src/main/java/interactor/SendMessage.kt | 2 +- qksms/src/main/java/interactor/SyncMessage.kt | 2 +- 22 files changed, 28 insertions(+), 26 deletions(-) diff --git a/qksms/src/main/java/interactor/ContactSync.kt b/qksms/src/main/java/interactor/ContactSync.kt index 3d695122..f9ba546d 100644 --- a/qksms/src/main/java/interactor/ContactSync.kt +++ b/qksms/src/main/java/interactor/ContactSync.kt @@ -24,7 +24,7 @@ import timber.log.Timber import java.util.concurrent.TimeUnit import javax.inject.Inject -open class ContactSync @Inject constructor(private val syncManager: SyncManager) : Interactor() { +open class ContactSync @Inject constructor(private val syncManager: SyncManager) : Interactor() { override fun buildObservable(params: Unit): Flowable { return Flowable.just(System.currentTimeMillis()) diff --git a/qksms/src/main/java/interactor/DeleteConversation.kt b/qksms/src/main/java/interactor/DeleteConversation.kt index 21738d5e..3232c5ee 100644 --- a/qksms/src/main/java/interactor/DeleteConversation.kt +++ b/qksms/src/main/java/interactor/DeleteConversation.kt @@ -22,7 +22,7 @@ import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class DeleteConversation @Inject constructor(private val messageRepo: MessageRepository): Interactor() { +class DeleteConversation @Inject constructor(private val messageRepo: MessageRepository): Interactor() { override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) diff --git a/qksms/src/main/java/interactor/DeleteMessage.kt b/qksms/src/main/java/interactor/DeleteMessage.kt index 537a17c5..066eb991 100644 --- a/qksms/src/main/java/interactor/DeleteMessage.kt +++ b/qksms/src/main/java/interactor/DeleteMessage.kt @@ -22,7 +22,7 @@ import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class DeleteMessage @Inject constructor(private val messageRepository: MessageRepository): Interactor() { +class DeleteMessage @Inject constructor(private val messageRepository: MessageRepository): Interactor() { override fun buildObservable(params: Long): Flowable { return Flowable.just(params) diff --git a/qksms/src/main/java/interactor/FullSync.kt b/qksms/src/main/java/interactor/FullSync.kt index 78fc04ad..25e65778 100644 --- a/qksms/src/main/java/interactor/FullSync.kt +++ b/qksms/src/main/java/interactor/FullSync.kt @@ -28,7 +28,7 @@ import javax.inject.Inject class FullSync @Inject constructor( private val syncManager: SyncManager, private val keys: Keys -) : Interactor() { +) : Interactor() { override fun buildObservable(params: Unit): Flowable { return Flowable.just(System.currentTimeMillis()) diff --git a/qksms/src/main/java/interactor/Interactor.kt b/qksms/src/main/java/interactor/Interactor.kt index d8eef8e4..a76ef5e1 100644 --- a/qksms/src/main/java/interactor/Interactor.kt +++ b/qksms/src/main/java/interactor/Interactor.kt @@ -22,19 +22,21 @@ import io.reactivex.Flowable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.Disposable +import io.reactivex.rxkotlin.plusAssign import io.reactivex.schedulers.Schedulers -abstract class Interactor: Disposable { +abstract class Interactor: Disposable { private val disposables: CompositeDisposable = CompositeDisposable() - abstract fun buildObservable(params: Params): Flowable + abstract fun buildObservable(params: Params): Flowable<*> - fun execute(params: Params, observer: (Result) -> Unit = {}) { - disposables.add(buildObservable(params) + fun execute(params: Params, onComplete: () -> Unit = {}) { + disposables += buildObservable(params) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(observer)) + .doOnComplete(onComplete) + .subscribe() } override fun dispose() { diff --git a/qksms/src/main/java/interactor/MarkAllSeen.kt b/qksms/src/main/java/interactor/MarkAllSeen.kt index c2ba5097..19cd541d 100644 --- a/qksms/src/main/java/interactor/MarkAllSeen.kt +++ b/qksms/src/main/java/interactor/MarkAllSeen.kt @@ -22,7 +22,7 @@ import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkAllSeen @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { +class MarkAllSeen @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { override fun buildObservable(params: Unit): Flowable { return Flowable.just(Unit) diff --git a/qksms/src/main/java/interactor/MarkArchived.kt b/qksms/src/main/java/interactor/MarkArchived.kt index ee9f51e6..9ed9c962 100644 --- a/qksms/src/main/java/interactor/MarkArchived.kt +++ b/qksms/src/main/java/interactor/MarkArchived.kt @@ -22,7 +22,7 @@ import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkArchived @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { +class MarkArchived @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) diff --git a/qksms/src/main/java/interactor/MarkBlocked.kt b/qksms/src/main/java/interactor/MarkBlocked.kt index 3d731322..29b52c6a 100644 --- a/qksms/src/main/java/interactor/MarkBlocked.kt +++ b/qksms/src/main/java/interactor/MarkBlocked.kt @@ -22,7 +22,7 @@ import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkBlocked @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { +class MarkBlocked @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) diff --git a/qksms/src/main/java/interactor/MarkDelivered.kt b/qksms/src/main/java/interactor/MarkDelivered.kt index 8e5fcfe9..32643815 100644 --- a/qksms/src/main/java/interactor/MarkDelivered.kt +++ b/qksms/src/main/java/interactor/MarkDelivered.kt @@ -22,7 +22,7 @@ import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkDelivered @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { +class MarkDelivered @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) diff --git a/qksms/src/main/java/interactor/MarkDeliveryFailed.kt b/qksms/src/main/java/interactor/MarkDeliveryFailed.kt index 11716268..278b0f1a 100644 --- a/qksms/src/main/java/interactor/MarkDeliveryFailed.kt +++ b/qksms/src/main/java/interactor/MarkDeliveryFailed.kt @@ -24,7 +24,7 @@ import javax.inject.Inject class MarkDeliveryFailed @Inject constructor( private val messageRepo: MessageRepository) - : Interactor() { + : Interactor() { data class Params(val id: Long, val resultCode: Int) diff --git a/qksms/src/main/java/interactor/MarkFailed.kt b/qksms/src/main/java/interactor/MarkFailed.kt index 471e8c2a..9578bec1 100644 --- a/qksms/src/main/java/interactor/MarkFailed.kt +++ b/qksms/src/main/java/interactor/MarkFailed.kt @@ -26,7 +26,7 @@ import javax.inject.Inject class MarkFailed @Inject constructor( private val messageRepo: MessageRepository, private val notificationManager: NotificationManager -) : Interactor() { +) : Interactor() { data class Params(val id: Long, val resultCode: Int) diff --git a/qksms/src/main/java/interactor/MarkRead.kt b/qksms/src/main/java/interactor/MarkRead.kt index 8000d2ba..1aee8888 100644 --- a/qksms/src/main/java/interactor/MarkRead.kt +++ b/qksms/src/main/java/interactor/MarkRead.kt @@ -26,7 +26,7 @@ import javax.inject.Inject class MarkRead @Inject constructor( private val messageRepo: MessageRepository, private val notificationManager: NotificationManager -) : Interactor() { +) : Interactor() { override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) diff --git a/qksms/src/main/java/interactor/MarkSeen.kt b/qksms/src/main/java/interactor/MarkSeen.kt index 341487fb..8390485d 100644 --- a/qksms/src/main/java/interactor/MarkSeen.kt +++ b/qksms/src/main/java/interactor/MarkSeen.kt @@ -22,7 +22,7 @@ import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkSeen @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { +class MarkSeen @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) diff --git a/qksms/src/main/java/interactor/MarkSent.kt b/qksms/src/main/java/interactor/MarkSent.kt index 30bf9c15..dcfd5f17 100644 --- a/qksms/src/main/java/interactor/MarkSent.kt +++ b/qksms/src/main/java/interactor/MarkSent.kt @@ -22,7 +22,7 @@ import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkSent @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { +class MarkSent @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) diff --git a/qksms/src/main/java/interactor/MarkUnarchived.kt b/qksms/src/main/java/interactor/MarkUnarchived.kt index 3db71a25..77f820c5 100644 --- a/qksms/src/main/java/interactor/MarkUnarchived.kt +++ b/qksms/src/main/java/interactor/MarkUnarchived.kt @@ -22,7 +22,7 @@ import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkUnarchived @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { +class MarkUnarchived @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) diff --git a/qksms/src/main/java/interactor/MarkUnblocked.kt b/qksms/src/main/java/interactor/MarkUnblocked.kt index 02f0ce11..4be11da5 100644 --- a/qksms/src/main/java/interactor/MarkUnblocked.kt +++ b/qksms/src/main/java/interactor/MarkUnblocked.kt @@ -22,7 +22,7 @@ import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class MarkUnblocked @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { +class MarkUnblocked @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) diff --git a/qksms/src/main/java/interactor/PartialSync.kt b/qksms/src/main/java/interactor/PartialSync.kt index bac0d956..363120db 100644 --- a/qksms/src/main/java/interactor/PartialSync.kt +++ b/qksms/src/main/java/interactor/PartialSync.kt @@ -28,7 +28,7 @@ import javax.inject.Inject open class PartialSync @Inject constructor( private val syncManager: SyncManager, private val permissions: Permissions -) : Interactor() { +) : Interactor() { override fun buildObservable(params: Unit): Flowable { return Flowable.just(System.currentTimeMillis()) diff --git a/qksms/src/main/java/interactor/ReceiveMms.kt b/qksms/src/main/java/interactor/ReceiveMms.kt index d71c2c40..5cab6f1c 100644 --- a/qksms/src/main/java/interactor/ReceiveMms.kt +++ b/qksms/src/main/java/interactor/ReceiveMms.kt @@ -31,7 +31,7 @@ class ReceiveMms @Inject constructor( private val syncManager: SyncManager, private val messageRepo: MessageRepository, private val notificationManager: NotificationManager -) : Interactor() { +) : Interactor() { override fun buildObservable(params: Uri): Flowable { return Flowable.just(params) diff --git a/qksms/src/main/java/interactor/ReceiveSms.kt b/qksms/src/main/java/interactor/ReceiveSms.kt index 7973c678..355067e4 100644 --- a/qksms/src/main/java/interactor/ReceiveSms.kt +++ b/qksms/src/main/java/interactor/ReceiveSms.kt @@ -29,7 +29,7 @@ import javax.inject.Inject class ReceiveSms @Inject constructor( private val messageRepo: MessageRepository, private val notificationManager: NotificationManager) - : Interactor, Conversation>() { + : Interactor>() { override fun buildObservable(params: Array): Flowable { return Flowable.just(params) diff --git a/qksms/src/main/java/interactor/RetrySending.kt b/qksms/src/main/java/interactor/RetrySending.kt index 889530b3..1bab0bb5 100644 --- a/qksms/src/main/java/interactor/RetrySending.kt +++ b/qksms/src/main/java/interactor/RetrySending.kt @@ -23,7 +23,7 @@ import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class RetrySending @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { +class RetrySending @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { override fun buildObservable(params: Message): Flowable { diff --git a/qksms/src/main/java/interactor/SendMessage.kt b/qksms/src/main/java/interactor/SendMessage.kt index 8191c4b3..67b2f370 100644 --- a/qksms/src/main/java/interactor/SendMessage.kt +++ b/qksms/src/main/java/interactor/SendMessage.kt @@ -35,7 +35,7 @@ class SendMessage @Inject constructor( private val context: Context, private val prefs: Preferences, private val messageRepo: MessageRepository -) : Interactor() { +) : Interactor() { data class Params(val threadId: Long, val addresses: List, val body: String, val attachments: List = listOf()) diff --git a/qksms/src/main/java/interactor/SyncMessage.kt b/qksms/src/main/java/interactor/SyncMessage.kt index 6b05fdae..9f22d017 100644 --- a/qksms/src/main/java/interactor/SyncMessage.kt +++ b/qksms/src/main/java/interactor/SyncMessage.kt @@ -28,7 +28,7 @@ import javax.inject.Inject class SyncMessage @Inject constructor( private val syncManager: SyncManager, private val messageRepo: MessageRepository -) : Interactor() { +) : Interactor() { override fun buildObservable(params: Uri): Flowable { return Flowable.just(params) From 545319756e7a956f982186ef78445264582c9664 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 5 Mar 2018 16:37:20 -0500 Subject: [PATCH 3/9] Don't notify for blocked messages --- qksms/src/main/java/interactor/ReceiveMms.kt | 1 + qksms/src/main/java/interactor/ReceiveSms.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/qksms/src/main/java/interactor/ReceiveMms.kt b/qksms/src/main/java/interactor/ReceiveMms.kt index 5cab6f1c..3315a79d 100644 --- a/qksms/src/main/java/interactor/ReceiveMms.kt +++ b/qksms/src/main/java/interactor/ReceiveMms.kt @@ -37,6 +37,7 @@ class ReceiveMms @Inject constructor( return Flowable.just(params) .flatMap { uri -> syncManager.syncMessage(uri) } // Sync the message .mapNotNull { message -> messageRepo.getOrCreateConversation(message.threadId) } // Map message to conversation + .filter { conversation -> !conversation.blocked } // Don't notify for blocked conversations .doOnNext { conversation -> if (conversation.archived) messageRepo.markUnarchived(conversation.id) } // Unarchive conversation if necessary .doOnNext { conversation -> notificationManager.update(conversation.id) } // Update the notification } diff --git a/qksms/src/main/java/interactor/ReceiveSms.kt b/qksms/src/main/java/interactor/ReceiveSms.kt index 355067e4..beaca33e 100644 --- a/qksms/src/main/java/interactor/ReceiveSms.kt +++ b/qksms/src/main/java/interactor/ReceiveSms.kt @@ -44,6 +44,7 @@ class ReceiveSms @Inject constructor( messageRepo.insertReceivedSms(address, body, time) // Add the message to the db } .mapNotNull { message -> messageRepo.getOrCreateConversation(message.threadId) } // Map message to conversation + .filter { conversation -> !conversation.blocked } // Don't notify for blocked conversations .doOnNext { conversation -> if (conversation.archived) messageRepo.markUnarchived(conversation.id) } // Unarchive conversation if necessary .doOnNext { conversation -> notificationManager.update(conversation.id) } // Update the notification } From a45c49c54bbdd17b5234ebfd902aa732f154cf33 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 5 Mar 2018 17:51:21 -0500 Subject: [PATCH 4/9] Add isInEditMode support for AvatarView --- .../presentation/common/widget/AvatarView.kt | 44 +++++++++++-------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/qksms/src/main/java/presentation/common/widget/AvatarView.kt b/qksms/src/main/java/presentation/common/widget/AvatarView.kt index b79b70cf..04cff991 100644 --- a/qksms/src/main/java/presentation/common/widget/AvatarView.kt +++ b/qksms/src/main/java/presentation/common/widget/AvatarView.kt @@ -50,8 +50,11 @@ class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet } init { + if (!isInEditMode) { + appComponent.inject(this) + } + View.inflate(context, R.layout.avatar_view, this) - appComponent.inject(this) setBackgroundResource(R.drawable.circle) clipToOutline = true @@ -59,28 +62,31 @@ class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet override fun onAttachedToWindow() { super.onAttachedToWindow() - colors.theme - .autoDisposable(scope()) - .subscribe { color -> background.setTint(color) } - colors.textPrimaryOnTheme - .autoDisposable(scope()) - .subscribe { color -> icon.setTint(color) } + if (!isInEditMode) { + colors.theme + .autoDisposable(scope()) + .subscribe { color -> background.setTint(color) } - clicks() - .autoDisposable(scope()) - .subscribe { - if (contact?.lookupKey.isNullOrEmpty()) { - contact?.numbers?.firstOrNull()?.let { number -> - navigator.addContact(number.address) + colors.textPrimaryOnTheme + .autoDisposable(scope()) + .subscribe { color -> icon.setTint(color) } + + clicks() + .autoDisposable(scope()) + .subscribe { + if (contact?.lookupKey.isNullOrEmpty()) { + contact?.numbers?.firstOrNull()?.let { number -> + navigator.addContact(number.address) + } + } else { + val key = contact?.lookupKey + val uri = Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_LOOKUP_URI, key) + ContactsContract.QuickContact.showQuickContact(context, this@AvatarView, uri, + ContactsContract.QuickContact.MODE_MEDIUM, null) } - } else { - val key = contact?.lookupKey - val uri = Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_LOOKUP_URI, key) - ContactsContract.QuickContact.showQuickContact(context, this@AvatarView, uri, - ContactsContract.QuickContact.MODE_MEDIUM, null) } - } + } } override fun onFinishInflate() { From 45d6e5cb6f2d0f9d61e035b43da0ef8923f7dc24 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 5 Mar 2018 17:51:52 -0500 Subject: [PATCH 5/9] Display blocked conversations in blocked tab --- .../java/data/repository/MessageRepository.kt | 7 ++- .../feature/blocked/BlockedAdapter.kt | 50 ++++++++++++++++++ .../presentation/feature/main/MainActivity.kt | 14 ++--- .../presentation/feature/main/MainState.kt | 3 +- .../feature/main/MainViewModel.kt | 12 ++++- .../src/main/res/layout/blocked_list_item.xml | 52 +++++++++++++++++++ qksms/src/main/res/layout/drawer_view.xml | 31 ++++++----- 7 files changed, 143 insertions(+), 26 deletions(-) create mode 100644 qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt create mode 100644 qksms/src/main/res/layout/blocked_list_item.xml diff --git a/qksms/src/main/java/data/repository/MessageRepository.kt b/qksms/src/main/java/data/repository/MessageRepository.kt index 67f37ec3..2c780659 100644 --- a/qksms/src/main/java/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/data/repository/MessageRepository.kt @@ -88,11 +88,14 @@ class MessageRepository @Inject constructor( }) } - fun getBlockedConversations(): RealmResults { + fun getBlockedConversations(): Flowable> { return Realm.getDefaultInstance() .where(Conversation::class.java) .equalTo("blocked", true) - .findAll() + .findAllAsync() + .asFlowable() + .filter { it.isLoaded } + .map { it.toList() } } fun getConversationAsync(threadId: Long): Conversation { diff --git a/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt b/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt new file mode 100644 index 00000000..c8990e6c --- /dev/null +++ b/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package presentation.feature.blocked + +import android.content.Context +import android.view.LayoutInflater +import android.view.ViewGroup +import com.moez.QKSMS.R +import data.model.Contact +import data.model.Conversation +import data.model.PhoneNumber +import kotlinx.android.synthetic.main.blocked_list_item.view.* +import presentation.common.base.FlowableAdapter +import presentation.common.base.QkViewHolder +import javax.inject.Inject + +class BlockedAdapter @Inject constructor(private val context: Context) : FlowableAdapter() { + + override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder { + return QkViewHolder(LayoutInflater.from(context).inflate(R.layout.blocked_list_item, parent, false)) + } + + override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + val conversation = getItem(position) + val view = holder.itemView + + view.avatars.contacts = conversation.recipients.map { recipient -> + recipient.contact ?: Contact().apply { numbers.add(PhoneNumber().apply { address = recipient.address }) } + } + + view.title.text = conversation.getTitle() + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/main/MainActivity.kt b/qksms/src/main/java/presentation/feature/main/MainActivity.kt index 63cc93e7..ced5ed3b 100644 --- a/qksms/src/main/java/presentation/feature/main/MainActivity.kt +++ b/qksms/src/main/java/presentation/feature/main/MainActivity.kt @@ -51,6 +51,7 @@ import kotlinx.android.synthetic.main.toolbar_search.* import presentation.common.MenuItemAdapter import presentation.common.Navigator import presentation.common.base.QkThemedActivity +import presentation.feature.blocked.BlockedAdapter import presentation.feature.conversations.ConversationItemTouchCallback import presentation.feature.conversations.ConversationsAdapter import javax.inject.Inject @@ -58,6 +59,7 @@ import javax.inject.Inject class MainActivity : QkThemedActivity(), MainView { @Inject lateinit var navigator: Navigator + @Inject lateinit var blockedAdapter: BlockedAdapter @Inject lateinit var conversationsAdapter: ConversationsAdapter @Inject lateinit var itemTouchCallback: ConversationItemTouchCallback @Inject lateinit var menuItemAdapter: MenuItemAdapter @@ -111,7 +113,6 @@ class MainActivity : QkThemedActivity(), MainView { drawer.clicks().subscribe() scheduled.isEnabled = false - blocked.isEnabled = false colors.background .doOnNext { color -> window.decorView.setBackgroundColor(color) } @@ -197,8 +198,8 @@ class MainActivity : QkThemedActivity(), MainView { when (state.page) { is Inbox -> { if (!inbox.isSelected) toolbarSearch.text = null - if (recyclerView.adapter != conversationsAdapter) recyclerView.adapter = conversationsAdapter - if (conversationsAdapter.flowable != state.page.data) conversationsAdapter.flowable = state.page.data + if (recyclerView.adapter !== conversationsAdapter) recyclerView.adapter = conversationsAdapter + conversationsAdapter.flowable = state.page.data itemTouchHelper.attachToRecyclerView(recyclerView) menuItemAdapter.data = state.page.menu empty.setText(R.string.inbox_empty_text) @@ -207,8 +208,8 @@ class MainActivity : QkThemedActivity(), MainView { is Archived -> { if (!archived.isSelected) toolbarSearch.setText(R.string.title_archived) - if (recyclerView.adapter != conversationsAdapter) recyclerView.adapter = conversationsAdapter - if (conversationsAdapter.flowable != state.page.data) conversationsAdapter.flowable = state.page.data + if (recyclerView.adapter !== conversationsAdapter) recyclerView.adapter = conversationsAdapter + conversationsAdapter.flowable = state.page.data itemTouchHelper.attachToRecyclerView(null) menuItemAdapter.data = state.page.menu empty.setText(R.string.archived_empty_text) @@ -226,7 +227,8 @@ class MainActivity : QkThemedActivity(), MainView { is Blocked -> { if (!blocked.isSelected) toolbarSearch.setText(R.string.title_blocked) - recyclerView.adapter = null + if (recyclerView.adapter != blockedAdapter) recyclerView.adapter = blockedAdapter + blockedAdapter.flowable = state.page.data itemTouchHelper.attachToRecyclerView(null) menuItemAdapter.data = ArrayList() empty.setText(R.string.blocked_empty_text) diff --git a/qksms/src/main/java/presentation/feature/main/MainState.kt b/qksms/src/main/java/presentation/feature/main/MainState.kt index 0cc58854..d3a0f5e0 100644 --- a/qksms/src/main/java/presentation/feature/main/MainState.kt +++ b/qksms/src/main/java/presentation/feature/main/MainState.kt @@ -18,6 +18,7 @@ */ package presentation.feature.main +import data.model.Conversation import data.model.InboxItem import data.model.MenuItem import io.reactivex.Flowable @@ -47,5 +48,5 @@ data class Scheduled( val empty: Boolean = false) : MainPage() data class Blocked( - val data: Any? = null, + val data: Flowable>? = null, val empty: Boolean = false) : MainPage() \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/main/MainViewModel.kt b/qksms/src/main/java/presentation/feature/main/MainViewModel.kt index e6a8bac5..a6dca004 100644 --- a/qksms/src/main/java/presentation/feature/main/MainViewModel.kt +++ b/qksms/src/main/java/presentation/feature/main/MainViewModel.kt @@ -74,6 +74,16 @@ class MainViewModel : QkViewModel(MainState()) { }) } + private val blockedConversations by lazy { + messageRepo.getBlockedConversations() + .withLatestFrom(state.toFlowable(), { conversations, state -> + (state.page as? Blocked)?.let { page -> + newState { it.copy(page = page.copy(empty = conversations.isEmpty())) } + } + conversations + }) + } + private val menuArchive by lazy { MenuItem(context.getString(R.string.menu_archive), 0) } private val menuUnarchive by lazy { MenuItem(context.getString(R.string.menu_unarchive), 1) } private val menuDelete by lazy { MenuItem(context.getString(R.string.menu_delete), 2) } @@ -158,7 +168,7 @@ class MainViewModel : QkViewModel(MainState()) { DrawerItem.INBOX -> newState { it.copy(page = Inbox(data = conversations)) } DrawerItem.ARCHIVED -> newState { it.copy(page = Archived(archivedConversations)) } DrawerItem.SCHEDULED -> newState { it.copy(page = Scheduled()) } - DrawerItem.BLOCKED -> newState { it.copy(page = Blocked()) } + DrawerItem.BLOCKED -> newState { it.copy(page = Blocked(blockedConversations)) } else -> { } // Do nothing } diff --git a/qksms/src/main/res/layout/blocked_list_item.xml b/qksms/src/main/res/layout/blocked_list_item.xml new file mode 100644 index 00000000..60ad8ef8 --- /dev/null +++ b/qksms/src/main/res/layout/blocked_list_item.xml @@ -0,0 +1,52 @@ + + + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/layout/drawer_view.xml b/qksms/src/main/res/layout/drawer_view.xml index f0db39f8..93133d44 100644 --- a/qksms/src/main/res/layout/drawer_view.xml +++ b/qksms/src/main/res/layout/drawer_view.xml @@ -55,6 +55,21 @@ + + + + + + + + - - - - - - - - Date: Mon, 5 Mar 2018 18:07:19 -0500 Subject: [PATCH 6/9] Tap conversation to show unblock dialog --- .../feature/blocked/BlockedAdapter.kt | 5 +++++ .../presentation/feature/main/MainActivity.kt | 15 +++++++++++++++ .../java/presentation/feature/main/MainView.kt | 10 ++++++---- .../presentation/feature/main/MainViewModel.kt | 12 ++++++++++++ qksms/src/main/res/values/strings.xml | 5 ++++- 5 files changed, 42 insertions(+), 5 deletions(-) diff --git a/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt b/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt index c8990e6c..1cfcddb1 100644 --- a/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt +++ b/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt @@ -25,6 +25,7 @@ import com.moez.QKSMS.R import data.model.Contact import data.model.Conversation import data.model.PhoneNumber +import io.reactivex.subjects.PublishSubject import kotlinx.android.synthetic.main.blocked_list_item.view.* import presentation.common.base.FlowableAdapter import presentation.common.base.QkViewHolder @@ -32,6 +33,8 @@ import javax.inject.Inject class BlockedAdapter @Inject constructor(private val context: Context) : FlowableAdapter() { + val unblock = PublishSubject.create() + override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder { return QkViewHolder(LayoutInflater.from(context).inflate(R.layout.blocked_list_item, parent, false)) } @@ -40,6 +43,8 @@ class BlockedAdapter @Inject constructor(private val context: Context) : Flowabl val conversation = getItem(position) val view = holder.itemView + view.setOnClickListener { unblock.onNext(conversation.id) } + view.avatars.contacts = conversation.recipients.map { recipient -> recipient.contact ?: Contact().apply { numbers.add(PhoneNumber().apply { address = recipient.address }) } } diff --git a/qksms/src/main/java/presentation/feature/main/MainActivity.kt b/qksms/src/main/java/presentation/feature/main/MainActivity.kt index ced5ed3b..9e176d6f 100644 --- a/qksms/src/main/java/presentation/feature/main/MainActivity.kt +++ b/qksms/src/main/java/presentation/feature/main/MainActivity.kt @@ -83,6 +83,8 @@ class MainActivity : QkThemedActivity(), MainView { override val conversationLongClickIntent by lazy { conversationsAdapter.longClicks } override val conversationMenuItemIntent by lazy { menuItemAdapter.menuItemClicks } override val confirmDeleteIntent: Subject = PublishSubject.create() + override val unblockIntent by lazy { blockedAdapter.unblock } + override val confirmUnblockIntent: Subject = PublishSubject.create() override val swipeConversationIntent by lazy { itemTouchCallback.swipes } override val undoSwipeConversationIntent: Subject = PublishSubject.create() @@ -204,6 +206,7 @@ class MainActivity : QkThemedActivity(), MainView { menuItemAdapter.data = state.page.menu empty.setText(R.string.inbox_empty_text) empty.setVisible(state.page.empty && !state.syncing) + compose.setVisible(true) } is Archived -> { @@ -214,6 +217,7 @@ class MainActivity : QkThemedActivity(), MainView { menuItemAdapter.data = state.page.menu empty.setText(R.string.archived_empty_text) empty.setVisible(state.page.empty && !state.syncing) + compose.setVisible(true) } is Scheduled -> { @@ -223,6 +227,7 @@ class MainActivity : QkThemedActivity(), MainView { menuItemAdapter.data = ArrayList() empty.setText(R.string.scheduled_empty_text) empty.setVisible(state.page.empty && !state.syncing) + compose.setVisible(false) } is Blocked -> { @@ -233,6 +238,7 @@ class MainActivity : QkThemedActivity(), MainView { menuItemAdapter.data = ArrayList() empty.setText(R.string.blocked_empty_text) empty.setVisible(state.page.empty && !state.syncing) + compose.setVisible(false) } } @@ -281,6 +287,15 @@ class MainActivity : QkThemedActivity(), MainView { .show() } + override fun showUnblockDialog() { + AlertDialog.Builder(this) + .setTitle(R.string.dialog_unblock_title) + .setMessage(R.string.dialog_unblock_message) + .setPositiveButton(R.string.button_unblock, { _, _ -> confirmUnblockIntent.onNext(Unit) }) + .setNegativeButton(R.string.button_cancel, null) + .show() + } + override fun onCreateOptionsMenu(menu: Menu?): Boolean { menuInflater.inflate(R.menu.main, menu) return super.onCreateOptionsMenu(menu) diff --git a/qksms/src/main/java/presentation/feature/main/MainView.kt b/qksms/src/main/java/presentation/feature/main/MainView.kt index e6e2dba5..d52f68dd 100644 --- a/qksms/src/main/java/presentation/feature/main/MainView.kt +++ b/qksms/src/main/java/presentation/feature/main/MainView.kt @@ -19,7 +19,6 @@ package presentation.feature.main import io.reactivex.Observable -import io.reactivex.subjects.Subject import presentation.common.base.QkView interface MainView : QkView { @@ -31,13 +30,16 @@ interface MainView : QkView { val drawerItemIntent: Observable val conversationClickIntent: Observable val conversationLongClickIntent: Observable - val conversationMenuItemIntent: Subject - val confirmDeleteIntent: Subject + val conversationMenuItemIntent: Observable + val confirmDeleteIntent: Observable + val unblockIntent: Observable + val confirmUnblockIntent: Observable val swipeConversationIntent: Observable - val undoSwipeConversationIntent: Subject + val undoSwipeConversationIntent: Observable fun clearSearch() fun showDeleteDialog() + fun showUnblockDialog() } diff --git a/qksms/src/main/java/presentation/feature/main/MainViewModel.kt b/qksms/src/main/java/presentation/feature/main/MainViewModel.kt index a6dca004..e4e0efe5 100644 --- a/qksms/src/main/java/presentation/feature/main/MainViewModel.kt +++ b/qksms/src/main/java/presentation/feature/main/MainViewModel.kt @@ -52,6 +52,7 @@ class MainViewModel : QkViewModel(MainState()) { @Inject lateinit var deleteConversation: DeleteConversation @Inject lateinit var markArchived: MarkArchived @Inject lateinit var markUnarchived: MarkUnarchived + @Inject lateinit var markUnblocked: MarkUnblocked @Inject lateinit var partialSync: PartialSync private val conversations by lazy { @@ -258,6 +259,17 @@ class MainViewModel : QkViewModel(MainState()) { .withLatestFrom(swipedConversation, { _, threadId -> threadId }) .autoDisposable(view.scope()) .subscribe { threadId -> markUnarchived.execute(threadId) } + + // Show confirm unblock conversation dialog + view.unblockIntent + .autoDisposable(view.scope()) + .subscribe { view.showUnblockDialog() } + + // Unblock conversation + view.confirmUnblockIntent + .withLatestFrom(view.unblockIntent, { _, threadId -> threadId }) + .autoDisposable(view.scope()) + .subscribe { threadId -> markUnblocked.execute(threadId)} } } \ No newline at end of file diff --git a/qksms/src/main/res/values/strings.xml b/qksms/src/main/res/values/strings.xml index dafee092..194cbc1d 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -62,10 +62,12 @@ Your conversations will appear here Your archived conversations will appear here Your scheduled messages will appear here - Your blocked senders will appear here + Your blocked conversations will appear here Delete Are you sure you would like to delete this conversation? + Unblock + Would you like to unblock this conversation? Details Notifications @@ -135,6 +137,7 @@ Yes Cancel Delete + Unblock Undo More From c3fc34a8cc61ddb8fd8b89d9fa151e9fd5699aea Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 5 Mar 2018 19:32:33 -0500 Subject: [PATCH 7/9] Move blocked conversations to separate activity --- qksms/src/main/AndroidManifest.xml | 1 + qksms/src/main/java/common/di/AppComponent.kt | 8 +- .../java/presentation/common/Navigator.kt | 8 ++ .../feature/blocked/BlockedActivity.kt | 74 +++++++++++++++++++ .../feature/blocked/BlockedAdapter.kt | 2 +- .../feature/blocked/BlockedState.kt | 27 +++++++ .../feature/blocked/BlockedView.kt | 31 ++++++++ .../feature/blocked/BlockedViewModel.kt | 59 +++++++++++++++ .../presentation/feature/main/MainActivity.kt | 29 -------- .../presentation/feature/main/MainState.kt | 4 - .../presentation/feature/main/MainView.kt | 3 - .../feature/main/MainViewModel.kt | 23 ------ .../feature/settings/SettingsViewModel.kt | 2 + .../src/main/res/layout/blocked_activity.xml | 67 +++++++++++++++++ .../src/main/res/layout/blocked_list_item.xml | 2 +- qksms/src/main/res/layout/drawer_view.xml | 15 ---- .../src/main/res/layout/settings_activity.xml | 6 ++ qksms/src/main/res/values/strings.xml | 12 +-- 18 files changed, 290 insertions(+), 83 deletions(-) create mode 100644 qksms/src/main/java/presentation/feature/blocked/BlockedActivity.kt create mode 100644 qksms/src/main/java/presentation/feature/blocked/BlockedState.kt create mode 100644 qksms/src/main/java/presentation/feature/blocked/BlockedView.kt create mode 100644 qksms/src/main/java/presentation/feature/blocked/BlockedViewModel.kt create mode 100644 qksms/src/main/res/layout/blocked_activity.xml diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml index cc16c453..552c72d1 100644 --- a/qksms/src/main/AndroidManifest.xml +++ b/qksms/src/main/AndroidManifest.xml @@ -67,6 +67,7 @@ android:theme="@style/AppThemeBlack" /> + diff --git a/qksms/src/main/java/common/di/AppComponent.kt b/qksms/src/main/java/common/di/AppComponent.kt index 83892e98..e48a7cc9 100644 --- a/qksms/src/main/java/common/di/AppComponent.kt +++ b/qksms/src/main/java/common/di/AppComponent.kt @@ -22,6 +22,8 @@ import common.QKApplication import common.util.ContactImageLoader import dagger.Component import presentation.common.widget.* +import presentation.feature.blocked.BlockedActivity +import presentation.feature.blocked.BlockedViewModel import presentation.feature.compose.ComposeActivity import presentation.feature.compose.ComposeViewModel import presentation.feature.compose.DetailedChipView @@ -31,10 +33,10 @@ import presentation.feature.gallery.GalleryActivity import presentation.feature.gallery.GalleryViewModel import presentation.feature.main.MainActivity import presentation.feature.main.MainViewModel -import presentation.feature.plus.PlusActivity -import presentation.feature.plus.PlusViewModel import presentation.feature.notificationprefs.NotificationPrefsActivity import presentation.feature.notificationprefs.NotificationPrefsViewModel +import presentation.feature.plus.PlusActivity +import presentation.feature.plus.PlusViewModel import presentation.feature.settings.SettingsActivity import presentation.feature.settings.SettingsViewModel import presentation.feature.setup.SetupActivity @@ -52,6 +54,7 @@ interface AppComponent { fun inject(activity: MainActivity) fun inject(activity: SetupActivity) + fun inject(activity: BlockedActivity) fun inject(activity: ComposeActivity) fun inject(activity: ConversationInfoActivity) fun inject(activity: GalleryActivity) @@ -84,6 +87,7 @@ interface AppComponent { fun inject(viewModel: MainViewModel) fun inject(viewModel: SetupViewModel) + fun inject(viewModel: BlockedViewModel) fun inject(viewModel: ComposeViewModel) fun inject(viewModel: ConversationInfoViewModel) fun inject(viewModel: GalleryViewModel) diff --git a/qksms/src/main/java/presentation/common/Navigator.kt b/qksms/src/main/java/presentation/common/Navigator.kt index 5b937be8..25cd0c5d 100644 --- a/qksms/src/main/java/presentation/common/Navigator.kt +++ b/qksms/src/main/java/presentation/common/Navigator.kt @@ -28,6 +28,8 @@ import android.provider.ContactsContract import android.provider.Settings import android.provider.Telephony import common.util.NotificationManager +import presentation.feature.blocked.BlockedActivity +import presentation.feature.blocked.BlockedViewModel import presentation.feature.compose.ComposeActivity import presentation.feature.compose.ComposeViewModel import presentation.feature.conversationinfo.ConversationInfoActivity @@ -111,6 +113,11 @@ class Navigator @Inject constructor(private val context: Context, private val no startActivity(intent) } + fun showBlockedConversations() { + val intent = Intent(context, BlockedActivity::class.java) + startActivity(intent) + } + fun showThemePicker() { val intent = Intent(context, ThemePickerActivity::class.java) startActivity(intent) @@ -165,6 +172,7 @@ class Navigator @Inject constructor(private val context: Context, private val no GalleryViewModel::class.java -> GalleryViewModel(intent) NotificationPrefsViewModel::class.java -> NotificationPrefsViewModel(intent) SettingsViewModel::class.java -> SettingsViewModel() + BlockedViewModel::class.java -> BlockedViewModel() ThemePickerViewModel::class.java -> ThemePickerViewModel() else -> throw IllegalArgumentException("Invalid ViewModel class. If this is a new ViewModel, please add it to Navigator.kt") } as T diff --git a/qksms/src/main/java/presentation/feature/blocked/BlockedActivity.kt b/qksms/src/main/java/presentation/feature/blocked/BlockedActivity.kt new file mode 100644 index 00000000..cdeaa62d --- /dev/null +++ b/qksms/src/main/java/presentation/feature/blocked/BlockedActivity.kt @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package presentation.feature.blocked + +import android.app.AlertDialog +import android.os.Bundle +import com.moez.QKSMS.R +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.kotlin.autoDisposable +import common.di.appComponent +import common.util.extensions.setVisible +import io.reactivex.subjects.PublishSubject +import io.reactivex.subjects.Subject +import kotlinx.android.synthetic.main.blocked_activity.* +import presentation.common.base.QkThemedActivity +import javax.inject.Inject + +class BlockedActivity : QkThemedActivity(), BlockedView { + + @Inject lateinit var blockedAdapter: BlockedAdapter + + override val viewModelClass = BlockedViewModel::class + override val unblockIntent by lazy { blockedAdapter.unblock } + override val confirmUnblockIntent: Subject = PublishSubject.create() + + init { + appComponent.inject(this) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.blocked_activity) + setTitle(R.string.blocked_title) + supportActionBar?.setDisplayHomeAsUpEnabled(true) + viewModel.bindView(this) + + colors.background + .autoDisposable(scope()) + .subscribe { color -> window.decorView.setBackgroundColor(color) } + + conversations.adapter = blockedAdapter + } + + override fun render(state: BlockedState) { + blockedAdapter.flowable = state.data + empty.setVisible(state.empty) + } + + override fun showUnblockDialog() { + AlertDialog.Builder(this) + .setTitle(R.string.blocked_unblock_dialog_title) + .setMessage(R.string.blocked_unblock_dialog_message) + .setPositiveButton(R.string.button_unblock, { _, _ -> confirmUnblockIntent.onNext(Unit) }) + .setNegativeButton(R.string.button_cancel, null) + .show() + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt b/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt index 1cfcddb1..6b32e872 100644 --- a/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt +++ b/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt @@ -33,7 +33,7 @@ import javax.inject.Inject class BlockedAdapter @Inject constructor(private val context: Context) : FlowableAdapter() { - val unblock = PublishSubject.create() + val unblock: PublishSubject = PublishSubject.create() override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder { return QkViewHolder(LayoutInflater.from(context).inflate(R.layout.blocked_list_item, parent, false)) diff --git a/qksms/src/main/java/presentation/feature/blocked/BlockedState.kt b/qksms/src/main/java/presentation/feature/blocked/BlockedState.kt new file mode 100644 index 00000000..8e33fa8e --- /dev/null +++ b/qksms/src/main/java/presentation/feature/blocked/BlockedState.kt @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package presentation.feature.blocked + +import data.model.Conversation +import io.reactivex.Flowable + +data class BlockedState( + val data: Flowable>? = null, + val empty: Boolean = false +) \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/blocked/BlockedView.kt b/qksms/src/main/java/presentation/feature/blocked/BlockedView.kt new file mode 100644 index 00000000..028d8230 --- /dev/null +++ b/qksms/src/main/java/presentation/feature/blocked/BlockedView.kt @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package presentation.feature.blocked + +import io.reactivex.Observable +import presentation.common.base.QkView + +interface BlockedView : QkView { + + val unblockIntent: Observable + val confirmUnblockIntent: Observable + + fun showUnblockDialog() + +} \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/blocked/BlockedViewModel.kt b/qksms/src/main/java/presentation/feature/blocked/BlockedViewModel.kt new file mode 100644 index 00000000..d208bb53 --- /dev/null +++ b/qksms/src/main/java/presentation/feature/blocked/BlockedViewModel.kt @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package presentation.feature.blocked + +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.kotlin.autoDisposable +import common.di.appComponent +import data.repository.MessageRepository +import interactor.MarkUnblocked +import io.reactivex.rxkotlin.withLatestFrom +import presentation.common.base.QkViewModel +import javax.inject.Inject + +class BlockedViewModel : QkViewModel(BlockedState()) { + + @Inject lateinit var markUnblocked: MarkUnblocked + @Inject lateinit var messageRepo: MessageRepository + + init { + appComponent.inject(this) + + val conversations = messageRepo.getBlockedConversations() + .doOnNext { conversations -> newState { it.copy(empty = conversations.isEmpty()) } } + + newState { it.copy(data = conversations) } + } + + override fun bindView(view: BlockedView) { + super.bindView(view) + + // Show confirm unblock conversation dialog + view.unblockIntent + .autoDisposable(view.scope()) + .subscribe { view.showUnblockDialog() } + + // Unblock conversation + view.confirmUnblockIntent + .withLatestFrom(view.unblockIntent, { _, threadId -> threadId }) + .autoDisposable(view.scope()) + .subscribe { threadId -> markUnblocked.execute(threadId) } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/main/MainActivity.kt b/qksms/src/main/java/presentation/feature/main/MainActivity.kt index 9e176d6f..57bc761a 100644 --- a/qksms/src/main/java/presentation/feature/main/MainActivity.kt +++ b/qksms/src/main/java/presentation/feature/main/MainActivity.kt @@ -51,7 +51,6 @@ import kotlinx.android.synthetic.main.toolbar_search.* import presentation.common.MenuItemAdapter import presentation.common.Navigator import presentation.common.base.QkThemedActivity -import presentation.feature.blocked.BlockedAdapter import presentation.feature.conversations.ConversationItemTouchCallback import presentation.feature.conversations.ConversationsAdapter import javax.inject.Inject @@ -59,7 +58,6 @@ import javax.inject.Inject class MainActivity : QkThemedActivity(), MainView { @Inject lateinit var navigator: Navigator - @Inject lateinit var blockedAdapter: BlockedAdapter @Inject lateinit var conversationsAdapter: ConversationsAdapter @Inject lateinit var itemTouchCallback: ConversationItemTouchCallback @Inject lateinit var menuItemAdapter: MenuItemAdapter @@ -74,7 +72,6 @@ class MainActivity : QkThemedActivity(), MainView { inbox.clicks().map { DrawerItem.INBOX }, archived.clicks().map { DrawerItem.ARCHIVED }, scheduled.clicks().map { DrawerItem.SCHEDULED }, - blocked.clicks().map { DrawerItem.BLOCKED }, settings.clicks().map { DrawerItem.SETTINGS }, plus.clicks().map { DrawerItem.PLUS }, help.clicks().map { DrawerItem.HELP })) @@ -83,8 +80,6 @@ class MainActivity : QkThemedActivity(), MainView { override val conversationLongClickIntent by lazy { conversationsAdapter.longClicks } override val conversationMenuItemIntent by lazy { menuItemAdapter.menuItemClicks } override val confirmDeleteIntent: Subject = PublishSubject.create() - override val unblockIntent by lazy { blockedAdapter.unblock } - override val confirmUnblockIntent: Subject = PublishSubject.create() override val swipeConversationIntent by lazy { itemTouchCallback.swipes } override val undoSwipeConversationIntent: Subject = PublishSubject.create() @@ -154,7 +149,6 @@ class MainActivity : QkThemedActivity(), MainView { .doOnNext { tintList -> inboxIcon.imageTintList = tintList } .doOnNext { tintList -> archivedIcon.imageTintList = tintList } .doOnNext { tintList -> scheduledIcon.imageTintList = tintList } - .doOnNext { tintList -> blockedIcon.imageTintList = tintList } .doOnNext { tintList -> settingsIcon.imageTintList = tintList } .doOnNext { tintList -> plusIcon.imageTintList = tintList } .doOnNext { tintList -> helpIcon.imageTintList = tintList } @@ -166,7 +160,6 @@ class MainActivity : QkThemedActivity(), MainView { .doOnNext { color -> inbox.background = rowBackground(color) } .doOnNext { color -> archived.background = rowBackground(color) } .doOnNext { color -> scheduled.background = rowBackground(color) } - .doOnNext { color -> blocked.background = rowBackground(color) } .autoDisposable(scope()) .subscribe() @@ -229,17 +222,6 @@ class MainActivity : QkThemedActivity(), MainView { empty.setVisible(state.page.empty && !state.syncing) compose.setVisible(false) } - - is Blocked -> { - if (!blocked.isSelected) toolbarSearch.setText(R.string.title_blocked) - if (recyclerView.adapter != blockedAdapter) recyclerView.adapter = blockedAdapter - blockedAdapter.flowable = state.page.data - itemTouchHelper.attachToRecyclerView(null) - menuItemAdapter.data = ArrayList() - empty.setText(R.string.blocked_empty_text) - empty.setVisible(state.page.empty && !state.syncing) - compose.setVisible(false) - } } when (state.page is Inbox && state.page.showArchivedSnackbar) { @@ -253,8 +235,6 @@ class MainActivity : QkThemedActivity(), MainView { archivedIcon.isSelected = state.page is Archived scheduled.isSelected = state.page is Scheduled scheduledIcon.isSelected = state.page is Scheduled - blocked.isSelected = state.page is Blocked - blockedIcon.isSelected = state.page is Blocked if (drawerLayout.isDrawerOpen(Gravity.START) && !state.drawerOpen) drawerLayout.closeDrawer(Gravity.START) else if (!drawerLayout.isDrawerVisible(Gravity.START) && state.drawerOpen) drawerLayout.openDrawer(Gravity.START) @@ -287,15 +267,6 @@ class MainActivity : QkThemedActivity(), MainView { .show() } - override fun showUnblockDialog() { - AlertDialog.Builder(this) - .setTitle(R.string.dialog_unblock_title) - .setMessage(R.string.dialog_unblock_message) - .setPositiveButton(R.string.button_unblock, { _, _ -> confirmUnblockIntent.onNext(Unit) }) - .setNegativeButton(R.string.button_cancel, null) - .show() - } - override fun onCreateOptionsMenu(menu: Menu?): Boolean { menuInflater.inflate(R.menu.main, menu) return super.onCreateOptionsMenu(menu) diff --git a/qksms/src/main/java/presentation/feature/main/MainState.kt b/qksms/src/main/java/presentation/feature/main/MainState.kt index d3a0f5e0..0853da5e 100644 --- a/qksms/src/main/java/presentation/feature/main/MainState.kt +++ b/qksms/src/main/java/presentation/feature/main/MainState.kt @@ -45,8 +45,4 @@ data class Archived( data class Scheduled( val data: Any? = null, - val empty: Boolean = false) : MainPage() - -data class Blocked( - val data: Flowable>? = null, val empty: Boolean = false) : MainPage() \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/main/MainView.kt b/qksms/src/main/java/presentation/feature/main/MainView.kt index d52f68dd..59fe5f01 100644 --- a/qksms/src/main/java/presentation/feature/main/MainView.kt +++ b/qksms/src/main/java/presentation/feature/main/MainView.kt @@ -32,14 +32,11 @@ interface MainView : QkView { val conversationLongClickIntent: Observable val conversationMenuItemIntent: Observable val confirmDeleteIntent: Observable - val unblockIntent: Observable - val confirmUnblockIntent: Observable val swipeConversationIntent: Observable val undoSwipeConversationIntent: Observable fun clearSearch() fun showDeleteDialog() - fun showUnblockDialog() } diff --git a/qksms/src/main/java/presentation/feature/main/MainViewModel.kt b/qksms/src/main/java/presentation/feature/main/MainViewModel.kt index e4e0efe5..1e62d8b2 100644 --- a/qksms/src/main/java/presentation/feature/main/MainViewModel.kt +++ b/qksms/src/main/java/presentation/feature/main/MainViewModel.kt @@ -52,7 +52,6 @@ class MainViewModel : QkViewModel(MainState()) { @Inject lateinit var deleteConversation: DeleteConversation @Inject lateinit var markArchived: MarkArchived @Inject lateinit var markUnarchived: MarkUnarchived - @Inject lateinit var markUnblocked: MarkUnblocked @Inject lateinit var partialSync: PartialSync private val conversations by lazy { @@ -75,16 +74,6 @@ class MainViewModel : QkViewModel(MainState()) { }) } - private val blockedConversations by lazy { - messageRepo.getBlockedConversations() - .withLatestFrom(state.toFlowable(), { conversations, state -> - (state.page as? Blocked)?.let { page -> - newState { it.copy(page = page.copy(empty = conversations.isEmpty())) } - } - conversations - }) - } - private val menuArchive by lazy { MenuItem(context.getString(R.string.menu_archive), 0) } private val menuUnarchive by lazy { MenuItem(context.getString(R.string.menu_unarchive), 1) } private val menuDelete by lazy { MenuItem(context.getString(R.string.menu_delete), 2) } @@ -169,7 +158,6 @@ class MainViewModel : QkViewModel(MainState()) { DrawerItem.INBOX -> newState { it.copy(page = Inbox(data = conversations)) } DrawerItem.ARCHIVED -> newState { it.copy(page = Archived(archivedConversations)) } DrawerItem.SCHEDULED -> newState { it.copy(page = Scheduled()) } - DrawerItem.BLOCKED -> newState { it.copy(page = Blocked(blockedConversations)) } else -> { } // Do nothing } @@ -259,17 +247,6 @@ class MainViewModel : QkViewModel(MainState()) { .withLatestFrom(swipedConversation, { _, threadId -> threadId }) .autoDisposable(view.scope()) .subscribe { threadId -> markUnarchived.execute(threadId) } - - // Show confirm unblock conversation dialog - view.unblockIntent - .autoDisposable(view.scope()) - .subscribe { view.showUnblockDialog() } - - // Unblock conversation - view.confirmUnblockIntent - .withLatestFrom(view.unblockIntent, { _, threadId -> threadId }) - .autoDisposable(view.scope()) - .subscribe { threadId -> markUnblocked.execute(threadId)} } } \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt b/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt index 1d258783..427a20d7 100644 --- a/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt +++ b/qksms/src/main/java/presentation/feature/settings/SettingsViewModel.kt @@ -122,6 +122,8 @@ class SettingsViewModel : QkViewModel(SettingsState R.id.notifications -> navigator.showNotificationSettings() + R.id.blocked -> navigator.showBlockedConversations() + R.id.delivery -> prefs.delivery.set(!prefs.delivery.get()) R.id.unicode -> prefs.unicode.set(!prefs.unicode.get()) diff --git a/qksms/src/main/res/layout/blocked_activity.xml b/qksms/src/main/res/layout/blocked_activity.xml new file mode 100644 index 00000000..4cb5a091 --- /dev/null +++ b/qksms/src/main/res/layout/blocked_activity.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/layout/blocked_list_item.xml b/qksms/src/main/res/layout/blocked_list_item.xml index 60ad8ef8..b39bc040 100644 --- a/qksms/src/main/res/layout/blocked_list_item.xml +++ b/qksms/src/main/res/layout/blocked_list_item.xml @@ -47,6 +47,6 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@id/avatars" app:layout_constraintTop_toTopOf="parent" - tools:text="Moez Bhatti" /> + tools:text="@tools:sample/full_names" /> \ No newline at end of file diff --git a/qksms/src/main/res/layout/drawer_view.xml b/qksms/src/main/res/layout/drawer_view.xml index 93133d44..b39c195f 100644 --- a/qksms/src/main/res/layout/drawer_view.xml +++ b/qksms/src/main/res/layout/drawer_view.xml @@ -55,21 +55,6 @@ - - - - - - - - + + Archived Scheduled - Blocked Settings Notifications Theme @@ -62,12 +61,9 @@ Your conversations will appear here Your archived conversations will appear here Your scheduled messages will appear here - Your blocked conversations will appear here Delete Are you sure you would like to delete this conversation? - Unblock - Would you like to unblock this conversation? Details Notifications @@ -86,9 +82,10 @@ End time Automatic emoji Convert text like :) to an emoji like 🙂 - Message notifications + Notifications Vibration Sound + Blocked Delivery confirmations Confirm that messages were sent successfully Strip accents @@ -98,6 +95,11 @@ Sync messages Re-sync your messages with the native Android SMS database + Blocked + Your blocked conversations will appear here + Unblock + Would you like to unblock this conversation? + Support development, unlock everything You can save a starving developer for just %s Unlock for %1$s %2$s From 8d30482f339697216572114d8eb1b768dfe91f5d Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 5 Mar 2018 19:37:23 -0500 Subject: [PATCH 8/9] Hide archive and notification options when conversation is blocked --- .../feature/conversationinfo/ConversationInfoActivity.kt | 4 ++++ qksms/src/main/res/layout/conversation_info_activity.xml | 1 + 2 files changed, 5 insertions(+) diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt index 3fb991b8..2091bc54 100644 --- a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt @@ -25,6 +25,7 @@ import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable import common.di.appComponent +import common.util.extensions.setVisible import io.reactivex.subjects.PublishSubject import kotlinx.android.synthetic.main.conversation_info_activity.* import presentation.common.base.QkThemedActivity @@ -72,6 +73,9 @@ class ConversationInfoActivity : QkThemedActivity(), recipientAdapter.data = state.recipients + notifications.setVisible(!state.blocked) + + archive.setVisible(!state.blocked) archive.title = getString(when (state.archived) { true -> R.string.info_unarchive false -> R.string.info_archive diff --git a/qksms/src/main/res/layout/conversation_info_activity.xml b/qksms/src/main/res/layout/conversation_info_activity.xml index b28c692b..e768e143 100644 --- a/qksms/src/main/res/layout/conversation_info_activity.xml +++ b/qksms/src/main/res/layout/conversation_info_activity.xml @@ -38,6 +38,7 @@ Date: Mon, 5 Mar 2018 19:40:34 -0500 Subject: [PATCH 9/9] Flatten layout for conversation details --- .../res/layout/conversation_info_activity.xml | 151 +++++++++--------- 1 file changed, 78 insertions(+), 73 deletions(-) diff --git a/qksms/src/main/res/layout/conversation_info_activity.xml b/qksms/src/main/res/layout/conversation_info_activity.xml index e768e143..cba2acc9 100644 --- a/qksms/src/main/res/layout/conversation_info_activity.xml +++ b/qksms/src/main/res/layout/conversation_info_activity.xml @@ -17,97 +17,102 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - + android:layout_height="match_parent"> - + - + app:layoutManager="android.support.v7.widget.LinearLayoutManager" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/toolbar"> - + android:layout_height="match_parent" + android:animateLayoutChanges="true" + android:orientation="vertical"> - + android:layout_height="wrap_content" + android:paddingBottom="8dp" + android:paddingTop="8dp" + app:layoutManager="android.support.v7.widget.LinearLayoutManager" + tools:layout_height="72dp" + tools:listitem="@layout/conversation_recipient_list_item" /> - + - + - + - + - + - + - + - + - + - + - - - - - \ No newline at end of file + \ No newline at end of file