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/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..2c780659 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,16 @@ class MessageRepository @Inject constructor( }) } + fun getBlockedConversations(): Flowable> { + return Realm.getDefaultInstance() + .where(Conversation::class.java) + .equalTo("blocked", true) + .findAllAsync() + .asFlowable() + .filter { it.isLoaded } + .map { it.toList() } + } + fun getConversationAsync(threadId: Long): Conversation { return Realm.getDefaultInstance() .where(Conversation::class.java) @@ -212,7 +223,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 +233,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/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 new file mode 100644 index 00000000..29b52c6a --- /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/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 new file mode 100644 index 00000000..4be11da5 --- /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/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..3315a79d 100644 --- a/qksms/src/main/java/interactor/ReceiveMms.kt +++ b/qksms/src/main/java/interactor/ReceiveMms.kt @@ -31,12 +31,13 @@ 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) .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 7973c678..beaca33e 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) @@ -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 } 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) diff --git a/qksms/src/main/java/presentation/common/Navigator.kt b/qksms/src/main/java/presentation/common/Navigator.kt index 3a4dd03a..deac552d 100644 --- a/qksms/src/main/java/presentation/common/Navigator.kt +++ b/qksms/src/main/java/presentation/common/Navigator.kt @@ -31,6 +31,8 @@ import android.provider.Settings import android.provider.Telephony import android.view.View 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 @@ -126,6 +128,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) @@ -180,6 +187,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/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() { 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 new file mode 100644 index 00000000..6b32e872 --- /dev/null +++ b/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt @@ -0,0 +1,55 @@ +/* + * 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 io.reactivex.subjects.PublishSubject +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() { + + 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)) + } + + override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + 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 }) } + } + + view.title.text = conversation.getTitle() + } + +} \ No newline at end of file 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/conversationinfo/ConversationInfoActivity.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt index 232cdabe..61b3a816 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.Navigator @@ -36,6 +37,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() @@ -77,11 +79,19 @@ 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 }) + 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/java/presentation/feature/main/MainActivity.kt b/qksms/src/main/java/presentation/feature/main/MainActivity.kt index 63cc93e7..57bc761a 100644 --- a/qksms/src/main/java/presentation/feature/main/MainActivity.kt +++ b/qksms/src/main/java/presentation/feature/main/MainActivity.kt @@ -72,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 })) @@ -111,7 +110,6 @@ class MainActivity : QkThemedActivity(), MainView { drawer.clicks().subscribe() scheduled.isEnabled = false - blocked.isEnabled = false colors.background .doOnNext { color -> window.decorView.setBackgroundColor(color) } @@ -151,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 } @@ -163,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() @@ -197,22 +193,24 @@ 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) empty.setVisible(state.page.empty && !state.syncing) + compose.setVisible(true) } 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) empty.setVisible(state.page.empty && !state.syncing) + compose.setVisible(true) } is Scheduled -> { @@ -222,15 +220,7 @@ class MainActivity : QkThemedActivity(), MainView { menuItemAdapter.data = ArrayList() empty.setText(R.string.scheduled_empty_text) empty.setVisible(state.page.empty && !state.syncing) - } - - is Blocked -> { - if (!blocked.isSelected) toolbarSearch.setText(R.string.title_blocked) - recyclerView.adapter = null - itemTouchHelper.attachToRecyclerView(null) - menuItemAdapter.data = ArrayList() - empty.setText(R.string.blocked_empty_text) - empty.setVisible(state.page.empty && !state.syncing) + compose.setVisible(false) } } @@ -245,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) diff --git a/qksms/src/main/java/presentation/feature/main/MainState.kt b/qksms/src/main/java/presentation/feature/main/MainState.kt index 0cc58854..0853da5e 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 @@ -43,9 +44,5 @@ data class Archived( val menu: List = ArrayList()) : MainPage() data class Scheduled( - val data: Any? = null, - val empty: Boolean = false) : MainPage() - -data class Blocked( val data: Any? = 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 e6e2dba5..59fe5f01 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,10 +30,10 @@ 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 swipeConversationIntent: Observable - val undoSwipeConversationIntent: Subject + val undoSwipeConversationIntent: Observable fun clearSearch() fun showDeleteDialog() diff --git a/qksms/src/main/java/presentation/feature/main/MainViewModel.kt b/qksms/src/main/java/presentation/feature/main/MainViewModel.kt index e6a8bac5..1e62d8b2 100644 --- a/qksms/src/main/java/presentation/feature/main/MainViewModel.kt +++ b/qksms/src/main/java/presentation/feature/main/MainViewModel.kt @@ -158,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()) } else -> { } // Do nothing } 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 new file mode 100644 index 00000000..b39bc040 --- /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/conversation_info_activity.xml b/qksms/src/main/res/layout/conversation_info_activity.xml index 1fa72b32..cba2acc9 100644 --- a/qksms/src/main/res/layout/conversation_info_activity.xml +++ b/qksms/src/main/res/layout/conversation_info_activity.xml @@ -17,89 +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 diff --git a/qksms/src/main/res/layout/drawer_view.xml b/qksms/src/main/res/layout/drawer_view.xml index f0db39f8..b39c195f 100644 --- a/qksms/src/main/res/layout/drawer_view.xml +++ b/qksms/src/main/res/layout/drawer_view.xml @@ -71,22 +71,6 @@ - - - - - - - - + + Archived Scheduled - Blocked Settings Notifications Theme @@ -62,7 +61,6 @@ Your conversations will appear here Your archived conversations will appear here Your scheduled messages will appear here - Your blocked senders will appear here Delete Are you sure you would like to delete this conversation? @@ -71,6 +69,8 @@ Notifications Archive Unarchive + Block + Unblock Delete conversation Default SMS app @@ -82,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 @@ -94,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 @@ -133,12 +139,12 @@ Yes Cancel Delete + Unblock Undo More Copied Archived conversation - Moved to inbox You must unlock QKSMS+ to use this Message not sent