diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoAdapter.kt index 9f7e0464..fa67e48e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoAdapter.kt @@ -94,7 +94,6 @@ class ConversationInfoAdapter @Inject constructor( } is ConversationInfoSettings -> { - holder.groupName.isVisible = item.recipients.size > 1 holder.groupName.summary = item.name holder.notifications.isEnabled = !item.blocked diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt index 972b9f3c..ab6ead29 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt @@ -61,6 +61,7 @@ import dev.octoshrimpy.quik.repository.SyncRepository import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.autoDisposable import dagger.android.AndroidInjection +import dev.octoshrimpy.quik.common.widget.TextInputDialog import io.reactivex.Observable import io.reactivex.disposables.CompositeDisposable import io.reactivex.subjects.PublishSubject @@ -111,6 +112,7 @@ class MainActivity : QkThemedActivity(), MainView { override val rateIntent by lazy { rateOkay.clicks() } override val conversationsSelectedIntent by lazy { conversationsAdapter.selectionChanges } override val confirmDeleteIntent: Subject> = PublishSubject.create() + override val renameConversationIntent: Subject = PublishSubject.create() override val swipeConversationIntent by lazy { itemTouchCallback.swipes } override val changelogMoreIntent by lazy { changelogDialog.moreClicks } override val undoArchiveIntent: Subject = PublishSubject.create() @@ -234,6 +236,7 @@ class MainActivity : QkThemedActivity(), MainView { toolbar.menu.findItem(R.id.read)?.isVisible = markRead && selectedConversations != 0 toolbar.menu.findItem(R.id.unread)?.isVisible = !markRead && selectedConversations != 0 toolbar.menu.findItem(R.id.block)?.isVisible = selectedConversations != 0 + toolbar.menu.findItem(R.id.rename)?.isVisible = selectedConversations == 1 listOf(plusBadge1, plusBadge2).forEach { badge -> badge.isVisible = drawerBadgesExperiment.variant && !state.upgraded @@ -398,6 +401,14 @@ class MainActivity : QkThemedActivity(), MainView { .show() } + override fun showRenameDialog(conversationName: String) { + TextInputDialog( + this, + getString(R.string.info_name), + renameConversationIntent::onNext + ).setText(conversationName).show() + } + override fun showChangelog(changelog: ChangelogManager.CumulativeChangelog) { changelogDialog.show(changelog) } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt index c23bd7b8..81fef28a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt @@ -38,6 +38,7 @@ interface MainView : QkView { val rateIntent: Observable<*> val conversationsSelectedIntent: Observable> val confirmDeleteIntent: Observable> + val renameConversationIntent: Observable val swipeConversationIntent: Observable> val changelogMoreIntent: Observable<*> val undoArchiveIntent: Observable @@ -50,6 +51,7 @@ interface MainView : QkView { fun themeChanged() fun showBlockingDialog(conversations: List, block: Boolean) fun showDeleteDialog(conversations: List) + fun showRenameDialog(conversationName: String) fun showChangelog(changelog: ChangelogManager.CumulativeChangelog) fun showArchivedSnackbar() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt index 2e8f4ba4..fe8db8ca 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt @@ -18,9 +18,6 @@ */ package dev.octoshrimpy.quik.feature.main -import android.content.Intent -import android.net.Uri -import android.provider.Settings import androidx.recyclerview.widget.ItemTouchHelper import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator @@ -420,6 +417,13 @@ class MainViewModel @Inject constructor( .autoDisposable(view.scope()) .subscribe() + view.optionsItemIntent + .filter { itemId -> itemId == R.id.rename } + .withLatestFrom(view.conversationsSelectedIntent) { _, conversationIds -> conversationIds.first() } + .mapNotNull { conversationId -> conversationRepo.getConversation(conversationId) } + .autoDisposable(view.scope()) + .subscribe { conversation -> view.showRenameDialog(conversation.name) } + // view.plusBannerIntent // .autoDisposable(view.scope()) // .subscribe { @@ -476,6 +480,23 @@ class MainViewModel @Inject constructor( view.clearSelection() } + view.renameConversationIntent + .withLatestFrom(view.conversationsSelectedIntent) { newConversationName, selectedConversationIds -> + Pair(newConversationName, selectedConversationIds.first()) + } + .doOnNext { view.clearSelection() } + .map { newNameAndConversationId -> + conversationRepo.setConversationName( + newNameAndConversationId.second, + newNameAndConversationId.first + ) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + } + .flatMapCompletable { it } + .autoDisposable(view.scope()) + .subscribe() + view.swipeConversationIntent .autoDisposable(view.scope()) .subscribe { (threadId, direction) -> diff --git a/presentation/src/main/res/layout/conversation_info_settings.xml b/presentation/src/main/res/layout/conversation_info_settings.xml index a00919dd..2a52ef13 100644 --- a/presentation/src/main/res/layout/conversation_info_settings.xml +++ b/presentation/src/main/res/layout/conversation_info_settings.xml @@ -33,7 +33,6 @@ android:id="@+id/groupName" android:layout_width="match_parent" android:layout_height="wrap_content" - android:visibility="gone" app:icon="@drawable/ic_people_black_24dp" app:title="@string/info_name" /> diff --git a/presentation/src/main/res/layout/text_input_dialog.xml b/presentation/src/main/res/layout/text_input_dialog.xml index 5ab3030a..e7798abe 100644 --- a/presentation/src/main/res/layout/text_input_dialog.xml +++ b/presentation/src/main/res/layout/text_input_dialog.xml @@ -29,5 +29,4 @@ android:padding="24dp" android:singleLine="true" android:textStyle="bold" - app:textSize="dialog" - tools:hint="Enter something" /> + app:textSize="dialog" /> diff --git a/presentation/src/main/res/menu/main.xml b/presentation/src/main/res/menu/main.xml index b8f22b0f..457453d7 100644 --- a/presentation/src/main/res/menu/main.xml +++ b/presentation/src/main/res/menu/main.xml @@ -83,4 +83,11 @@ android:visible="false" app:showAsAction="ifRoom" /> + + \ No newline at end of file diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 386e4a84..cd19dda3 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -53,6 +53,7 @@ Mark read Mark unread Block + Rename conversation Syncing messages… You: %s Draft