From c3fc34a8cc61ddb8fd8b89d9fa151e9fd5699aea Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 5 Mar 2018 19:32:33 -0500 Subject: [PATCH] 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