forked from upstream-mirrors/quik
feat(settings): Make About page a separate activity accessible from the drawer
This commit is contained in:
@@ -106,6 +106,7 @@
|
|||||||
</activity>
|
</activity>
|
||||||
<activity android:name=".feature.messageutils.MessageUtilsActivity" />
|
<activity android:name=".feature.messageutils.MessageUtilsActivity" />
|
||||||
<activity android:name=".feature.settings.SettingsActivity" />
|
<activity android:name=".feature.settings.SettingsActivity" />
|
||||||
|
<activity android:name=".feature.settings.about.AboutActivity" />
|
||||||
<activity android:name=".feature.plus.PlusActivity" />
|
<activity android:name=".feature.plus.PlusActivity" />
|
||||||
<activity
|
<activity
|
||||||
android:name=".feature.gallery.GalleryActivity"
|
android:name=".feature.gallery.GalleryActivity"
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ import android.provider.Telephony
|
|||||||
import dev.octoshrimpy.quik.BuildConfig
|
import dev.octoshrimpy.quik.BuildConfig
|
||||||
import dev.octoshrimpy.quik.compat.TelephonyCompat
|
import dev.octoshrimpy.quik.compat.TelephonyCompat
|
||||||
import dev.octoshrimpy.quik.extensions.resourceExists
|
import dev.octoshrimpy.quik.extensions.resourceExists
|
||||||
|
import dev.octoshrimpy.quik.feature.settings.about.AboutActivity
|
||||||
import dev.octoshrimpy.quik.feature.backup.BackupActivity
|
import dev.octoshrimpy.quik.feature.backup.BackupActivity
|
||||||
import dev.octoshrimpy.quik.feature.blocking.BlockingActivity
|
import dev.octoshrimpy.quik.feature.blocking.BlockingActivity
|
||||||
import dev.octoshrimpy.quik.feature.compose.ComposeActivity
|
import dev.octoshrimpy.quik.feature.compose.ComposeActivity
|
||||||
@@ -183,6 +184,11 @@ class Navigator @Inject constructor(
|
|||||||
startActivity(intent)
|
startActivity(intent)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun showAbout() {
|
||||||
|
val intent = Intent(context, AboutActivity::class.java)
|
||||||
|
startActivity(intent)
|
||||||
|
}
|
||||||
|
|
||||||
fun showDeveloper() {
|
fun showDeveloper() {
|
||||||
val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/octoshrimpy"))
|
val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/octoshrimpy"))
|
||||||
startActivityExternal(intent)
|
startActivityExternal(intent)
|
||||||
|
|||||||
@@ -104,6 +104,7 @@ class MainActivity : QkThemedActivity(), MainView {
|
|||||||
binding.drawer.blocking.clicks().map { NavItem.BLOCKING },
|
binding.drawer.blocking.clicks().map { NavItem.BLOCKING },
|
||||||
binding.drawer.messageUtils.clicks().map { NavItem.MESSAGE_UTILS },
|
binding.drawer.messageUtils.clicks().map { NavItem.MESSAGE_UTILS },
|
||||||
binding.drawer.settings.clicks().map { NavItem.SETTINGS },
|
binding.drawer.settings.clicks().map { NavItem.SETTINGS },
|
||||||
|
binding.drawer.about.clicks().map { NavItem.ABOUT },
|
||||||
// plus.clicks().map { NavItem.PLUS },
|
// plus.clicks().map { NavItem.PLUS },
|
||||||
// help.clicks().map { NavItem.HELP },
|
// help.clicks().map { NavItem.HELP },
|
||||||
binding.drawer.invite.clicks().map { NavItem.INVITE }))
|
binding.drawer.invite.clicks().map { NavItem.INVITE }))
|
||||||
|
|||||||
@@ -58,4 +58,4 @@ interface MainView : QkView<MainState> {
|
|||||||
fun drawerToggled(opened: Boolean)
|
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 }
|
||||||
|
|||||||
@@ -333,6 +333,7 @@ class MainViewModel @Inject constructor(
|
|||||||
NavItem.BLOCKING -> navigator.showBlockedConversations()
|
NavItem.BLOCKING -> navigator.showBlockedConversations()
|
||||||
NavItem.MESSAGE_UTILS -> navigator.showMessageUtils()
|
NavItem.MESSAGE_UTILS -> navigator.showMessageUtils()
|
||||||
NavItem.SETTINGS -> navigator.showSettings()
|
NavItem.SETTINGS -> navigator.showSettings()
|
||||||
|
NavItem.ABOUT -> navigator.showAbout()
|
||||||
// NavItem.PLUS -> navigator.showQksmsPlusActivity("main_menu")
|
// NavItem.PLUS -> navigator.showQksmsPlusActivity("main_menu")
|
||||||
// NavItem.HELP -> navigator.showSupport()
|
// NavItem.HELP -> navigator.showSupport()
|
||||||
NavItem.INVITE -> navigator.showInvite()
|
NavItem.INVITE -> navigator.showInvite()
|
||||||
|
|||||||
@@ -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()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -41,6 +41,7 @@ import dev.octoshrimpy.quik.feature.qkreply.QkReplyActivityModule
|
|||||||
import dev.octoshrimpy.quik.feature.scheduled.ScheduledActivity
|
import dev.octoshrimpy.quik.feature.scheduled.ScheduledActivity
|
||||||
import dev.octoshrimpy.quik.feature.scheduled.ScheduledActivityModule
|
import dev.octoshrimpy.quik.feature.scheduled.ScheduledActivityModule
|
||||||
import dev.octoshrimpy.quik.feature.settings.SettingsActivity
|
import dev.octoshrimpy.quik.feature.settings.SettingsActivity
|
||||||
|
import dev.octoshrimpy.quik.feature.settings.about.AboutActivity
|
||||||
import dev.octoshrimpy.quik.injection.scope.ActivityScope
|
import dev.octoshrimpy.quik.injection.scope.ActivityScope
|
||||||
|
|
||||||
@Module
|
@Module
|
||||||
@@ -94,6 +95,10 @@ abstract class ActivityBuilderModule {
|
|||||||
@ContributesAndroidInjector(modules = [])
|
@ContributesAndroidInjector(modules = [])
|
||||||
abstract fun bindSettingsActivity(): SettingsActivity
|
abstract fun bindSettingsActivity(): SettingsActivity
|
||||||
|
|
||||||
|
@ActivityScope
|
||||||
|
@ContributesAndroidInjector(modules = [])
|
||||||
|
abstract fun bindAboutActivity(): AboutActivity
|
||||||
|
|
||||||
@ActivityScope
|
@ActivityScope
|
||||||
@ContributesAndroidInjector(modules = [])
|
@ContributesAndroidInjector(modules = [])
|
||||||
abstract fun bindBlockingActivity(): BlockingActivity
|
abstract fun bindBlockingActivity(): BlockingActivity
|
||||||
|
|||||||
@@ -176,6 +176,21 @@
|
|||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/about"
|
||||||
|
style="@style/DrawerRow">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
style="@style/DrawerIcon"
|
||||||
|
android:src="@drawable/ic_info_black_24dp"
|
||||||
|
app:tint="?android:attr/textColorSecondary" />
|
||||||
|
|
||||||
|
<dev.octoshrimpy.quik.common.widget.QkTextView
|
||||||
|
style="@style/DrawerText"
|
||||||
|
android:text="@string/settings_about_title" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
<!-- <LinearLayout-->
|
<!-- <LinearLayout-->
|
||||||
<!-- android:id="@+id/plus"-->
|
<!-- android:id="@+id/plus"-->
|
||||||
<!-- style="@style/DrawerRow">-->
|
<!-- style="@style/DrawerRow">-->
|
||||||
|
|||||||
Reference in New Issue
Block a user