From da3036badd6474c2eca48cb13092679f12201603 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 18 Feb 2018 20:03:14 -0500 Subject: [PATCH] Move conversation menu options to ConversationInfoActivity --- qksms/src/main/AndroidManifest.xml | 1 + qksms/src/main/java/common/di/AppComponent.kt | 4 + .../java/presentation/common/Navigator.kt | 9 ++ .../feature/compose/ComposeActivity.kt | 20 +--- .../feature/compose/ComposeView.kt | 3 +- .../feature/compose/ComposeViewModel.kt | 23 +---- .../ConversationInfoActivity.kt | 64 ++++++++++++ .../conversationinfo/ConversationInfoState.kt | 24 +++++ .../conversationinfo/ConversationInfoView.kt | 29 ++++++ .../ConversationInfoViewModel.kt | 98 +++++++++++++++++++ .../res/drawable/ic_delete_black_24dp.xml | 27 +++++ .../drawable/ic_info_outline_black_24dp.xml | 27 +++++ .../res/layout/conversation_info_activity.xml | 63 ++++++++++++ qksms/src/main/res/menu/compose.xml | 13 +-- qksms/src/main/res/values/strings.xml | 6 ++ 15 files changed, 364 insertions(+), 47 deletions(-) create mode 100644 qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt create mode 100644 qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoState.kt create mode 100644 qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoView.kt create mode 100644 qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt create mode 100644 qksms/src/main/res/drawable/ic_delete_black_24dp.xml create mode 100644 qksms/src/main/res/drawable/ic_info_outline_black_24dp.xml create mode 100644 qksms/src/main/res/layout/conversation_info_activity.xml diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml index 3e807f1d..4f7305e6 100644 --- a/qksms/src/main/AndroidManifest.xml +++ b/qksms/src/main/AndroidManifest.xml @@ -65,6 +65,7 @@ + diff --git a/qksms/src/main/java/common/di/AppComponent.kt b/qksms/src/main/java/common/di/AppComponent.kt index 27172e13..02b400e9 100644 --- a/qksms/src/main/java/common/di/AppComponent.kt +++ b/qksms/src/main/java/common/di/AppComponent.kt @@ -25,6 +25,8 @@ import presentation.common.widget.* import presentation.feature.compose.ComposeActivity import presentation.feature.compose.ComposeViewModel import presentation.feature.compose.DetailedChipView +import presentation.feature.conversationinfo.ConversationInfoActivity +import presentation.feature.conversationinfo.ConversationInfoViewModel import presentation.feature.gallery.GalleryActivity import presentation.feature.gallery.GalleryViewModel import presentation.feature.main.MainActivity @@ -49,6 +51,7 @@ interface AppComponent { fun inject(activity: MainActivity) fun inject(activity: SetupActivity) fun inject(activity: ComposeActivity) + fun inject(activity: ConversationInfoActivity) fun inject(activity: GalleryActivity) fun inject(activity: PlusActivity) fun inject(activity: SettingsActivity) @@ -79,6 +82,7 @@ interface AppComponent { fun inject(viewModel: MainViewModel) fun inject(viewModel: SetupViewModel) fun inject(viewModel: ComposeViewModel) + fun inject(viewModel: ConversationInfoViewModel) fun inject(viewModel: GalleryViewModel) fun inject(viewModel: PlusViewModel) fun inject(viewModel: SettingsViewModel) diff --git a/qksms/src/main/java/presentation/common/Navigator.kt b/qksms/src/main/java/presentation/common/Navigator.kt index dc032cc3..23bc826b 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.Telephony import common.util.NotificationManager import presentation.feature.compose.ComposeActivity import presentation.feature.compose.ComposeViewModel +import presentation.feature.conversationinfo.ConversationInfoActivity +import presentation.feature.conversationinfo.ConversationInfoViewModel import presentation.feature.gallery.GalleryActivity import presentation.feature.gallery.GalleryViewModel import presentation.feature.main.MainViewModel @@ -91,6 +93,12 @@ class Navigator @Inject constructor(val context: Context) { startActivity(intent) } + fun showConversationInfo(threadId: Long) { + val intent = Intent(context, ConversationInfoActivity::class.java) + intent.putExtra("threadId", threadId) + startActivity(intent) + } + fun showImage(partId: Long) { val intent = Intent(context, GalleryActivity::class.java) intent.putExtra("partId", partId) @@ -142,6 +150,7 @@ class Navigator @Inject constructor(val context: Context) { PlusViewModel::class.java -> PlusViewModel() SetupViewModel::class.java -> SetupViewModel() ComposeViewModel::class.java -> ComposeViewModel(intent) + ConversationInfoViewModel::class.java -> ConversationInfoViewModel(intent) GalleryViewModel::class.java -> GalleryViewModel(intent) SettingsViewModel::class.java -> SettingsViewModel() ThemePickerViewModel::class.java -> ThemePickerViewModel() diff --git a/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt b/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt index 21951a30..0a5634e8 100644 --- a/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt +++ b/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt @@ -62,8 +62,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { override val chipDeletedIntent: Subject by lazy { chipsAdapter.chipDeleted } override val menuReadyIntent: Observable = menu.map { Unit } override val callIntent: Subject = PublishSubject.create() - override val archiveIntent: Subject = PublishSubject.create() - override val deleteIntent: Subject = PublishSubject.create() + override val infoIntent: Subject = PublishSubject.create() override val copyTextIntent: Subject = PublishSubject.create() override val forwardMessageIntent: Subject = PublishSubject.create() override val deleteMessageIntent: Subject = PublishSubject.create() @@ -194,18 +193,8 @@ class ComposeActivity : QkThemedActivity(), ComposeView { if (state.editingMode && chips.adapter == null) chips.adapter = chipsAdapter if (state.editingMode && contacts.adapter == null) contacts.adapter = contactsAdapter - toolbar.menu.findItem(R.id.call)?.run { - isVisible = !state.editingMode - } - - toolbar.menu.findItem(R.id.archive)?.run { - isVisible = !state.editingMode - setTitle(if (state.archived) R.string.menu_unarchive else R.string.menu_archive) - } - - toolbar.menu.findItem(R.id.delete)?.run { - isVisible = !state.editingMode - } + toolbar.menu.findItem(R.id.call)?.isVisible = !state.editingMode + toolbar.menu.findItem(R.id.info)?.isVisible = !state.editingMode if (chipsAdapter.data.isEmpty() && state.selectedContacts.isNotEmpty()) { message.showKeyboard() @@ -246,8 +235,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { R.id.call -> callIntent.onNext(Unit) - R.id.archive -> archiveIntent.onNext(Unit) - R.id.delete -> deleteIntent.onNext(Unit) + R.id.info -> infoIntent.onNext(Unit) else -> return super.onOptionsItemSelected(item) } diff --git a/qksms/src/main/java/presentation/feature/compose/ComposeView.kt b/qksms/src/main/java/presentation/feature/compose/ComposeView.kt index 7519201d..7bc57b70 100644 --- a/qksms/src/main/java/presentation/feature/compose/ComposeView.kt +++ b/qksms/src/main/java/presentation/feature/compose/ComposeView.kt @@ -36,8 +36,7 @@ interface ComposeView : QkView { val chipDeletedIntent: Subject val menuReadyIntent: Observable val callIntent: Subject - val archiveIntent: Subject - val deleteIntent: Subject + val infoIntent: Subject val copyTextIntent: Subject val forwardMessageIntent: Subject val deleteMessageIntent: Subject diff --git a/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt b/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt index 62f58d45..c52501b5 100644 --- a/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt +++ b/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt @@ -64,9 +64,6 @@ class ComposeViewModel(intent: Intent) : QkViewModel( @Inject lateinit var messageRepo: MessageRepository @Inject lateinit var navigator: Navigator @Inject lateinit var syncContacts: ContactSync - @Inject lateinit var markArchived: MarkArchived - @Inject lateinit var markUnarchived: MarkUnarchived - @Inject lateinit var deleteConversation: DeleteConversation @Inject lateinit var sendMessage: SendMessage @Inject lateinit var retrySending: RetrySending @Inject lateinit var markRead: MarkRead @@ -159,9 +156,6 @@ class ComposeViewModel(intent: Intent) : QkViewModel( disposables += sendMessage disposables += markRead - disposables += markArchived - disposables += markUnarchived - disposables += deleteConversation disposables += conversation.subscribe() disposables += messages.subscribe() disposables += attachments.subscribe { attachments -> newState { it.copy(attachments = attachments) } } @@ -269,22 +263,11 @@ class ComposeViewModel(intent: Intent) : QkViewModel( .autoDisposable(view.scope()) .subscribe { address -> navigator.makePhoneCall(address) } - // Toggle the archived state of the conversation - view.archiveIntent + // Open the conversation settings if info button is clicked + view.infoIntent .withLatestFrom(conversation, { _, conversation -> conversation }) .autoDisposable(view.scope()) - .subscribe { conversation -> - 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) }) - } - } - - // Delete the conversation - view.deleteIntent - .withLatestFrom(conversation, { _, conversation -> conversation }) - .autoDisposable(view.scope()) - .subscribe { conversation -> deleteConversation.execute(conversation.id) } + .subscribe { conversation -> navigator.showConversationInfo(conversation.id) } view.messageClickIntent .filter { message -> message.isFailedMessage() } diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt new file mode 100644 index 00000000..6b2e1772 --- /dev/null +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoActivity.kt @@ -0,0 +1,64 @@ +/* + * 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.conversationinfo + +import android.os.Bundle +import com.jakewharton.rxbinding2.view.clicks +import com.moez.QKSMS.R +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.kotlin.autoDisposable +import common.di.appComponent +import kotlinx.android.synthetic.main.conversation_info_activity.* +import presentation.common.base.QkThemedActivity + +class ConversationInfoActivity : QkThemedActivity(), ConversationInfoView { + + override val viewModelClass = ConversationInfoViewModel::class + override val archiveIntent by lazy { archive.clicks() } + override val deleteIntent by lazy { delete.clicks() } + + init { + appComponent.inject(this) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.conversation_info_activity) + supportActionBar?.setDisplayHomeAsUpEnabled(true) + viewModel.bindView(this) + setTitle(R.string.info_title) + + colors.background + .autoDisposable(scope()) + .subscribe { color -> window.decorView.setBackgroundColor(color) } + } + + override fun render(state: ConversationInfoState) { + if (state.hasError) { + finish() + return + } + + archive.title = getString(when(state.archived) { + true -> R.string.info_unarchive + false -> R.string.info_archive + }) + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoState.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoState.kt new file mode 100644 index 00000000..566f18a8 --- /dev/null +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoState.kt @@ -0,0 +1,24 @@ +/* + * 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.conversationinfo + +data class ConversationInfoState( + val archived: Boolean = false, + 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 new file mode 100644 index 00000000..0725927c --- /dev/null +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoView.kt @@ -0,0 +1,29 @@ +/* + * 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.conversationinfo + +import io.reactivex.Observable +import presentation.common.base.QkView + +interface ConversationInfoView : QkView { + + val archiveIntent: Observable + val deleteIntent: Observable + +} \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt new file mode 100644 index 00000000..af87e3b6 --- /dev/null +++ b/qksms/src/main/java/presentation/feature/conversationinfo/ConversationInfoViewModel.kt @@ -0,0 +1,98 @@ +/* + * 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.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 io.reactivex.Observable +import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxkotlin.withLatestFrom +import presentation.common.base.QkViewModel +import javax.inject.Inject + +class ConversationInfoViewModel(intent: Intent) : QkViewModel(ConversationInfoState()) { + + @Inject lateinit var context: Context + @Inject lateinit var messageRepo: MessageRepository + @Inject lateinit var markArchived: MarkArchived + @Inject lateinit var markUnarchived: MarkUnarchived + @Inject lateinit var deleteConversation: DeleteConversation + + private val conversation: Observable + + init { + appComponent.inject(this) + val threadId = intent.extras?.getLong("threadId") ?: 0L + + conversation = messageRepo.getConversationAsync(threadId) + .asObservable() + .filter { conversation -> conversation.isLoaded } + .doOnNext { conversation -> + if (!conversation.isValid) { + newState { it.copy(hasError = true) } + } + } + .filter { conversation -> conversation.isValid } + .filter { conversation -> conversation.id != 0L } + + disposables += markArchived + disposables += markUnarchived + disposables += deleteConversation + + // Update the view's archived state whenever it changes + disposables += conversation + .map { conversation -> conversation.archived } + .distinctUntilChanged() + .subscribe { archived -> newState { it.copy(archived = archived) } } + } + + override fun bindView(view: ConversationInfoView) { + super.bindView(view) + + // Toggle the archived state of the conversation + view.archiveIntent + .withLatestFrom(conversation, { _, conversation -> conversation }) + .autoDisposable(view.scope()) + .subscribe { conversation -> + 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) }) + } + } + + // Delete the conversation + view.deleteIntent + .withLatestFrom(conversation, { _, conversation -> conversation }) + .autoDisposable(view.scope()) + .subscribe { conversation -> deleteConversation.execute(conversation.id) } + } + +} \ No newline at end of file diff --git a/qksms/src/main/res/drawable/ic_delete_black_24dp.xml b/qksms/src/main/res/drawable/ic_delete_black_24dp.xml new file mode 100644 index 00000000..e35e2b36 --- /dev/null +++ b/qksms/src/main/res/drawable/ic_delete_black_24dp.xml @@ -0,0 +1,27 @@ + + + + diff --git a/qksms/src/main/res/drawable/ic_info_outline_black_24dp.xml b/qksms/src/main/res/drawable/ic_info_outline_black_24dp.xml new file mode 100644 index 00000000..d535bec8 --- /dev/null +++ b/qksms/src/main/res/drawable/ic_info_outline_black_24dp.xml @@ -0,0 +1,27 @@ + + + + diff --git a/qksms/src/main/res/layout/conversation_info_activity.xml b/qksms/src/main/res/layout/conversation_info_activity.xml new file mode 100644 index 00000000..6622d564 --- /dev/null +++ b/qksms/src/main/res/layout/conversation_info_activity.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/menu/compose.xml b/qksms/src/main/res/menu/compose.xml index 887208dd..288c1865 100644 --- a/qksms/src/main/res/menu/compose.xml +++ b/qksms/src/main/res/menu/compose.xml @@ -28,15 +28,10 @@ app:showAsAction="always" /> - - + app:showAsAction="always" /> \ 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 a56a8e5d..749365c7 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -36,6 +36,7 @@ Clear Call + Details Archive conversation Remove from archive Delete @@ -62,6 +63,11 @@ Your scheduled messages will appear here Your blocked senders will appear here + Details + Archive + Unarchive + Delete conversation + Default SMS app QKSMS is your default SMS app Set QKSMS as your default SMS app