From 697918a73a88f78014805997a22d2f2b8761370b Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Wed, 25 Oct 2023 13:11:21 +0800 Subject: [PATCH] Move navItems to top level --- .../com/hippo/ehviewer/ui/MainActivity.kt | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/MainActivity.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/MainActivity.kt index 032f7cf0d..1c32d3553 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/MainActivity.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/MainActivity.kt @@ -94,6 +94,17 @@ import kotlinx.coroutines.launch import splitties.systemservices.clipboardManager import splitties.systemservices.connectivityManager +private val navItems = arrayOf( + Triple(R.id.nav_homepage, R.string.homepage, R.drawable.v_homepage_black_x24), + Triple(R.id.nav_subscription, R.string.subscription, R.drawable.v_eh_subscription_black_x24), + Triple(R.id.nav_whats_hot, R.string.whats_hot, R.drawable.v_fire_black_x24), + Triple(R.id.nav_toplist, R.string.toplist, R.drawable.ic_baseline_format_list_numbered_24), + Triple(R.id.nav_favourite, R.string.favourite, R.drawable.v_heart_x24), + Triple(R.id.nav_history, R.string.history, R.drawable.v_history_black_x24), + Triple(R.id.nav_downloads, R.string.downloads, R.drawable.v_download_x24), + Triple(R.id.nav_settings, R.string.settings, R.drawable.v_settings_black_x24), +) + class MainActivity : EhActivity() { private lateinit var navController: NavController @@ -180,16 +191,6 @@ class MainActivity : EhActivity() { var drawerLocked by mutableStateOf(false) private var openDrawerFlow = MutableSharedFlow(extraBufferCapacity = 1) - private val navItems = arrayOf( - Triple(R.id.nav_homepage, R.string.homepage, R.drawable.v_homepage_black_x24), - Triple(R.id.nav_subscription, R.string.subscription, R.drawable.v_eh_subscription_black_x24), - Triple(R.id.nav_whats_hot, R.string.whats_hot, R.drawable.v_fire_black_x24), - Triple(R.id.nav_toplist, R.string.toplist, R.drawable.ic_baseline_format_list_numbered_24), - Triple(R.id.nav_favourite, R.string.favourite, R.drawable.v_heart_x24), - Triple(R.id.nav_history, R.string.history, R.drawable.v_history_black_x24), - Triple(R.id.nav_downloads, R.string.downloads, R.drawable.v_download_x24), - Triple(R.id.nav_settings, R.string.settings, R.drawable.v_settings_black_x24), - ) override fun onCreate(savedInstanceState: Bundle?) { installSplashScreen()