From 38a5daad17e60bb3b1d7a1e076a2853ffbc540a4 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Wed, 10 Dec 2025 11:26:49 -0800 Subject: [PATCH] Navigate back to main screen from contacts activity Before this change, when the back button was pressed, the app would navigate to an empty compose activity. --- .../moez/QKSMS/feature/contacts/ContactsActivity.kt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt index 4792d559..c0205b65 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt @@ -21,6 +21,7 @@ package dev.octoshrimpy.quik.feature.contacts import android.app.Activity import android.content.Intent import android.os.Bundle +import androidx.activity.OnBackPressedCallback import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProviders import com.jakewharton.rxbinding2.view.clicks @@ -28,6 +29,7 @@ import com.jakewharton.rxbinding2.widget.editorActions import com.jakewharton.rxbinding2.widget.textChanges import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R +import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.ViewModelFactory import dev.octoshrimpy.quik.common.base.QkThemedActivity import dev.octoshrimpy.quik.common.util.extensions.hideKeyboard @@ -54,6 +56,7 @@ class ContactsActivity : QkThemedActivity(), ContactsContract { @Inject lateinit var contactsAdapter: ComposeItemAdapter @Inject lateinit var phoneNumberAdapter: PhoneNumberPickerAdapter @Inject lateinit var viewModelFactory: ViewModelFactory + @Inject lateinit var navigator: Navigator override val queryChangedIntent: Observable by lazy { search.textChanges() } override val queryClearedIntent: Observable<*> by lazy { cancel.clicks() } @@ -85,6 +88,13 @@ class ContactsActivity : QkThemedActivity(), ContactsContract { viewModel.bindView(this) contacts.adapter = contactsAdapter + + val callback = object : OnBackPressedCallback(true) { + override fun handleOnBackPressed() { + navigator.showMainActivity() + } + } + onBackPressedDispatcher.addCallback(this, callback) } override fun render(state: ContactsState) {