From fa8e71649597effdeddda7116a432116f487c783 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Mon, 2 Mar 2026 19:25:46 -0800 Subject: [PATCH] feat(settings): Make About page a separate activity accessible from the drawer --- presentation/src/main/AndroidManifest.xml | 1 + .../java/com/moez/QKSMS/common/Navigator.kt | 6 ++++ .../moez/QKSMS/feature/main/MainActivity.kt | 1 + .../com/moez/QKSMS/feature/main/MainView.kt | 2 +- .../moez/QKSMS/feature/main/MainViewModel.kt | 1 + .../feature/settings/about/AboutActivity.kt | 32 +++++++++++++++++++ .../android/ActivityBuilderModule.kt | 5 +++ .../src/main/res/layout/drawer_view.xml | 15 +++++++++ 8 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutActivity.kt diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml index d717b91f..5a3ca000 100644 --- a/presentation/src/main/AndroidManifest.xml +++ b/presentation/src/main/AndroidManifest.xml @@ -106,6 +106,7 @@ + { fun drawerToggled(opened: Boolean) } -enum class NavItem { BACK, INBOX, ARCHIVED, BACKUP, SCHEDULED, BLOCKING, MESSAGE_UTILS, SETTINGS, PLUS, HELP, INVITE } +enum class NavItem { BACK, INBOX, ARCHIVED, BACKUP, SCHEDULED, BLOCKING, MESSAGE_UTILS, SETTINGS, ABOUT, PLUS, HELP, INVITE } 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 8eb18c14..5b5f22b1 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 @@ -333,6 +333,7 @@ class MainViewModel @Inject constructor( NavItem.BLOCKING -> navigator.showBlockedConversations() NavItem.MESSAGE_UTILS -> navigator.showMessageUtils() NavItem.SETTINGS -> navigator.showSettings() + NavItem.ABOUT -> navigator.showAbout() // NavItem.PLUS -> navigator.showQksmsPlusActivity("main_menu") // NavItem.HELP -> navigator.showSupport() NavItem.INVITE -> navigator.showInvite() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutActivity.kt new file mode 100644 index 00000000..bcb43271 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutActivity.kt @@ -0,0 +1,32 @@ +package dev.octoshrimpy.quik.feature.settings.about + +import android.os.Bundle +import com.bluelinelabs.conductor.Conductor +import com.bluelinelabs.conductor.Router +import com.bluelinelabs.conductor.RouterTransaction +import dagger.android.AndroidInjection +import dev.octoshrimpy.quik.common.base.QkThemedActivity +import dev.octoshrimpy.quik.databinding.ContainerActivityBinding + +class AboutActivity : QkThemedActivity() { + private lateinit var binding: ContainerActivityBinding + private lateinit var router: Router + + override fun onCreate(savedInstanceState: Bundle?) { + AndroidInjection.inject(this) + super.onCreate(savedInstanceState) + binding = ContainerActivityBinding.inflate(layoutInflater) + setContentView(binding.root) + + router = Conductor.attachRouter(this, binding.container, savedInstanceState) + if (!router.hasRootController()) { + router.setRoot(RouterTransaction.with(AboutController())) + } + } + + override fun onBackPressed() { + if (!router.handleBack()) { + super.onBackPressed() + } + } +} diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt index 14db8648..80b400b4 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt @@ -41,6 +41,7 @@ import dev.octoshrimpy.quik.feature.qkreply.QkReplyActivityModule import dev.octoshrimpy.quik.feature.scheduled.ScheduledActivity import dev.octoshrimpy.quik.feature.scheduled.ScheduledActivityModule import dev.octoshrimpy.quik.feature.settings.SettingsActivity +import dev.octoshrimpy.quik.feature.settings.about.AboutActivity import dev.octoshrimpy.quik.injection.scope.ActivityScope @Module @@ -94,6 +95,10 @@ abstract class ActivityBuilderModule { @ContributesAndroidInjector(modules = []) abstract fun bindSettingsActivity(): SettingsActivity + @ActivityScope + @ContributesAndroidInjector(modules = []) + abstract fun bindAboutActivity(): AboutActivity + @ActivityScope @ContributesAndroidInjector(modules = []) abstract fun bindBlockingActivity(): BlockingActivity diff --git a/presentation/src/main/res/layout/drawer_view.xml b/presentation/src/main/res/layout/drawer_view.xml index ce31f2cb..b44cf461 100644 --- a/presentation/src/main/res/layout/drawer_view.xml +++ b/presentation/src/main/res/layout/drawer_view.xml @@ -176,6 +176,21 @@ + + + + + + + +