From 34cff8c8cbc1f04843321a968304a5a05a407ab4 Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Wed, 16 Jul 2025 23:20:34 +0800 Subject: [PATCH] Extract `NavigationIcon` --- .../com/hippo/ehviewer/ui/main/NavigationIcon.kt | 14 ++++++++++++++ .../ehviewer/ui/screen/GalleryCommentsScreen.kt | 8 ++------ .../ehviewer/ui/screen/GalleryDetailScreen.kt | 11 ++--------- .../com/hippo/ehviewer/ui/settings/AboutScreen.kt | 11 ++--------- .../hippo/ehviewer/ui/settings/AdvancedScreen.kt | 11 ++--------- .../hippo/ehviewer/ui/settings/DownloadScreen.kt | 11 ++--------- .../com/hippo/ehviewer/ui/settings/EhScreen.kt | 8 ++------ .../com/hippo/ehviewer/ui/settings/FilterScreen.kt | 8 ++------ .../hippo/ehviewer/ui/settings/LicenseScreen.kt | 11 ++--------- .../com/hippo/ehviewer/ui/settings/MyTagsScreen.kt | 11 ++--------- .../hippo/ehviewer/ui/settings/PrivacyScreen.kt | 11 ++--------- .../hippo/ehviewer/ui/settings/SettingsScreen.kt | 10 ++-------- .../hippo/ehviewer/ui/settings/UConfigScreen.kt | 8 ++------ 13 files changed, 38 insertions(+), 95 deletions(-) create mode 100644 app/src/main/kotlin/com/hippo/ehviewer/ui/main/NavigationIcon.kt diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/main/NavigationIcon.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/main/NavigationIcon.kt new file mode 100644 index 000000000..6679d72c6 --- /dev/null +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/main/NavigationIcon.kt @@ -0,0 +1,14 @@ +package com.hippo.ehviewer.ui.main + +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.runtime.Composable +import com.ramcosta.composedestinations.navigation.DestinationsNavigator + +context(navigator: DestinationsNavigator) +@Composable +fun NavigationIcon() = IconButton(onClick = { navigator.popBackStack() }) { + Icon(imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = null) +} diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryCommentsScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryCommentsScreen.kt index d99a6d19e..da0a747d7 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryCommentsScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryCommentsScreen.kt @@ -31,7 +31,6 @@ import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.BasicTextField import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.automirrored.filled.Reply import androidx.compose.material.icons.automirrored.filled.Send import androidx.compose.material3.CircularWavyProgressIndicator @@ -96,6 +95,7 @@ import com.hippo.ehviewer.dao.FilterMode import com.hippo.ehviewer.ui.Screen import com.hippo.ehviewer.ui.jumpToReaderByPage import com.hippo.ehviewer.ui.main.GalleryCommentCard +import com.hippo.ehviewer.ui.main.NavigationIcon import com.hippo.ehviewer.ui.openBrowser import com.hippo.ehviewer.ui.tools.animateFloatMergePredictiveBackAsState import com.hippo.ehviewer.ui.tools.awaitConfirmationOrCancel @@ -275,11 +275,7 @@ fun AnimatedVisibilityScope.GalleryCommentsScreen(gid: Long, navigator: Destinat topBar = { TopAppBar( title = { Text(text = stringResource(id = R.string.gallery_comments)) }, - navigationIcon = { - IconButton(onClick = { navigator.popBackStack() }) { - Icon(imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = null) - } - }, + navigationIcon = { NavigationIcon() }, scrollBehavior = scrollBehavior, ) }, diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailScreen.kt index 8143d0a30..d9643a8e1 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryDetailScreen.kt @@ -6,7 +6,6 @@ import androidx.compose.animation.AnimatedVisibilityScope import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.MoreVert import androidx.compose.material.icons.filled.NewLabel import androidx.compose.material.icons.filled.Refresh @@ -55,6 +54,7 @@ import com.hippo.ehviewer.spider.SpiderDen import com.hippo.ehviewer.ui.MainActivity import com.hippo.ehviewer.ui.Screen import com.hippo.ehviewer.ui.main.GalleryDetailErrorTip +import com.hippo.ehviewer.ui.main.NavigationIcon import com.hippo.ehviewer.ui.navToReader import com.hippo.ehviewer.ui.openBrowser import com.hippo.ehviewer.ui.tools.LocalWindowSizeClass @@ -182,14 +182,7 @@ fun AnimatedVisibilityScope.GalleryDetailScreen(args: GalleryDetailScreenArgs, n ) } }, - navigationIcon = { - IconButton(onClick = { navigator.popBackStack() }) { - Icon( - imageVector = Icons.AutoMirrored.Default.ArrowBack, - contentDescription = null, - ) - } - }, + navigationIcon = { NavigationIcon() }, scrollBehavior = scrollBehavior, actions = { AppBarRow( diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AboutScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AboutScreen.kt index 3592396bd..4654e5a77 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AboutScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AboutScreen.kt @@ -8,10 +8,6 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text @@ -32,6 +28,7 @@ import com.hippo.ehviewer.Settings import com.hippo.ehviewer.download.downloadLocation import com.hippo.ehviewer.ui.Screen import com.hippo.ehviewer.ui.destinations.LicenseScreenDestination +import com.hippo.ehviewer.ui.main.NavigationIcon import com.hippo.ehviewer.ui.tools.DialogState import com.hippo.ehviewer.ui.tools.awaitConfirmationOrCancel import com.hippo.ehviewer.ui.tools.observed @@ -72,11 +69,7 @@ fun AnimatedVisibilityScope.AboutScreen(navigator: DestinationsNavigator) = Scre topBar = { TopAppBar( title = { Text(text = stringResource(id = R.string.settings_about)) }, - navigationIcon = { - IconButton(onClick = { navigator.popBackStack() }) { - Icon(imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = null) - } - }, + navigationIcon = { NavigationIcon() }, scrollBehavior = scrollBehavior, ) }, diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt index e298bc8fc..9e1032786 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt @@ -16,10 +16,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar @@ -43,6 +39,7 @@ import com.hippo.ehviewer.client.EhEngine import com.hippo.ehviewer.client.data.FavListUrlBuilder import com.hippo.ehviewer.collectAsState import com.hippo.ehviewer.ui.Screen +import com.hippo.ehviewer.ui.main.NavigationIcon import com.hippo.ehviewer.ui.showRestartDialog import com.hippo.ehviewer.ui.tools.observed import com.hippo.ehviewer.ui.tools.rememberedAccessor @@ -120,11 +117,7 @@ fun AnimatedVisibilityScope.AdvancedScreen(navigator: DestinationsNavigator) = S topBar = { TopAppBar( title = { Text(text = stringResource(id = R.string.settings_advanced)) }, - navigationIcon = { - IconButton(onClick = { navigator.popBackStack() }) { - Icon(imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = null) - } - }, + navigationIcon = { NavigationIcon() }, scrollBehavior = scrollBehavior, ) }, diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/DownloadScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/DownloadScreen.kt index 639c643ef..4aa99fe3e 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/DownloadScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/DownloadScreen.kt @@ -16,10 +16,6 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar @@ -54,6 +50,7 @@ import com.hippo.ehviewer.spider.readCompatFromPath import com.hippo.ehviewer.spider.speedLevelToSpeed import com.hippo.ehviewer.ui.Screen import com.hippo.ehviewer.ui.keepNoMediaFileStatus +import com.hippo.ehviewer.ui.main.NavigationIcon import com.hippo.ehviewer.ui.tools.awaitConfirmationOrCancel import com.hippo.ehviewer.ui.tools.observed import com.hippo.ehviewer.ui.tools.rememberedAccessor @@ -92,11 +89,7 @@ fun AnimatedVisibilityScope.DownloadScreen(navigator: DestinationsNavigator) = S topBar = { TopAppBar( title = { Text(text = stringResource(id = R.string.settings_download)) }, - navigationIcon = { - IconButton(onClick = { navigator.popBackStack() }) { - Icon(imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = null) - } - }, + navigationIcon = { NavigationIcon() }, scrollBehavior = scrollBehavior, ) }, diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/EhScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/EhScreen.kt index 1153bb287..128bc3b59 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/EhScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/EhScreen.kt @@ -10,7 +10,6 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.text.input.rememberTextFieldState import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.ContentCopy import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -39,6 +38,7 @@ import com.hippo.ehviewer.ui.Screen import com.hippo.ehviewer.ui.destinations.FilterScreenDestination import com.hippo.ehviewer.ui.destinations.MyTagsScreenDestination import com.hippo.ehviewer.ui.destinations.UConfigScreenDestination +import com.hippo.ehviewer.ui.main.NavigationIcon import com.hippo.ehviewer.ui.tools.awaitConfirmationOrCancel import com.hippo.ehviewer.ui.tools.awaitSelectItem import com.hippo.ehviewer.ui.tools.awaitSelectTime @@ -65,11 +65,7 @@ fun AnimatedVisibilityScope.EhScreen(navigator: DestinationsNavigator) = Screen( topBar = { TopAppBar( title = { Text(text = stringResource(id = R.string.settings_eh)) }, - navigationIcon = { - IconButton(onClick = { navigator.popBackStack() }) { - Icon(imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = null) - } - }, + navigationIcon = { NavigationIcon() }, scrollBehavior = scrollBehavior, ) }, diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/FilterScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/FilterScreen.kt index c951d316b..b3d0991e0 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/FilterScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/FilterScreen.kt @@ -17,7 +17,6 @@ import androidx.compose.foundation.text.input.TextFieldLineLimits import androidx.compose.foundation.text.input.rememberTextFieldState import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.automirrored.filled.Help import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.Delete @@ -62,6 +61,7 @@ import com.hippo.ehviewer.collectAsState import com.hippo.ehviewer.dao.Filter import com.hippo.ehviewer.dao.FilterMode import com.hippo.ehviewer.ui.Screen +import com.hippo.ehviewer.ui.main.NavigationIcon import com.hippo.ehviewer.ui.tools.Await import com.hippo.ehviewer.ui.tools.awaitConfirmationOrCancel import com.hippo.ehviewer.ui.tools.dialog @@ -186,11 +186,7 @@ fun AnimatedVisibilityScope.FilterScreen(navigator: DestinationsNavigator) = Scr topBar = { TopAppBar( title = { Text(text = stringResource(id = R.string.filter)) }, - navigationIcon = { - IconButton(onClick = { navigator.popBackStack() }) { - Icon(imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = null) - } - }, + navigationIcon = { NavigationIcon() }, actions = { IconButton(onClick = { launch { diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/LicenseScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/LicenseScreen.kt index 2980927af..364b90cb9 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/LicenseScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/LicenseScreen.kt @@ -2,10 +2,6 @@ package com.hippo.ehviewer.ui.settings import androidx.compose.animation.AnimatedVisibilityScope import androidx.compose.foundation.layout.PaddingValues -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text @@ -19,6 +15,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.hippo.ehviewer.R import com.hippo.ehviewer.ui.Screen +import com.hippo.ehviewer.ui.main.NavigationIcon import com.hippo.ehviewer.ui.openBrowser import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults import com.mikepenz.aboutlibraries.ui.compose.android.rememberLibraries @@ -35,11 +32,7 @@ fun AnimatedVisibilityScope.LicenseScreen(navigator: DestinationsNavigator) = Sc topBar = { TopAppBar( title = { Text(text = stringResource(id = R.string.license)) }, - navigationIcon = { - IconButton(onClick = { navigator.popBackStack() }) { - Icon(imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = null) - } - }, + navigationIcon = { NavigationIcon() }, scrollBehavior = scrollBehavior, ) }, diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/MyTagsScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/MyTagsScreen.kt index 7cdd15a9c..074a13a3d 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/MyTagsScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/MyTagsScreen.kt @@ -3,10 +3,6 @@ package com.hippo.ehviewer.ui.settings import androidx.compose.animation.AnimatedVisibilityScope import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar @@ -18,6 +14,7 @@ import com.google.accompanist.web.rememberWebViewState import com.hippo.ehviewer.R import com.hippo.ehviewer.client.EhUrl import com.hippo.ehviewer.ui.Screen +import com.hippo.ehviewer.ui.main.NavigationIcon import com.hippo.ehviewer.util.setDefaultSettings import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootGraph @@ -31,11 +28,7 @@ fun AnimatedVisibilityScope.MyTagsScreen(navigator: DestinationsNavigator) = Scr topBar = { TopAppBar( title = { Text(text = stringResource(id = R.string.my_tags)) }, - navigationIcon = { - IconButton(onClick = { navigator.popBackStack() }) { - Icon(imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = null) - } - }, + navigationIcon = { NavigationIcon() }, ) }, ) { paddingValues -> diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/PrivacyScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/PrivacyScreen.kt index 54698ffd4..34ea94a31 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/PrivacyScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/PrivacyScreen.kt @@ -4,10 +4,6 @@ import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.AnimatedVisibilityScope import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar @@ -22,6 +18,7 @@ import com.hippo.ehviewer.Settings import com.hippo.ehviewer.asMutableState import com.hippo.ehviewer.ui.Screen import com.hippo.ehviewer.ui.isAuthenticationSupported +import com.hippo.ehviewer.ui.main.NavigationIcon import com.hippo.ehviewer.ui.tools.awaitConfirmationOrCancel import com.hippo.ehviewer.ui.tools.observed import com.hippo.ehviewer.ui.tools.rememberedAccessor @@ -40,11 +37,7 @@ fun AnimatedVisibilityScope.PrivacyScreen(navigator: DestinationsNavigator) = Sc topBar = { TopAppBar( title = { Text(text = stringResource(id = R.string.settings_privacy)) }, - navigationIcon = { - IconButton(onClick = { navigator.popBackStack() }) { - Icon(imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = null) - } - }, + navigationIcon = { NavigationIcon() }, scrollBehavior = scrollBehavior, ) }, diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/SettingsScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/SettingsScreen.kt index 5dd96d897..6718c20d5 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/SettingsScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/SettingsScreen.kt @@ -4,13 +4,10 @@ import androidx.compose.animation.AnimatedVisibilityScope import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.Adb import androidx.compose.material.icons.filled.Download import androidx.compose.material.icons.filled.Info import androidx.compose.material.icons.filled.Security -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar @@ -28,6 +25,7 @@ import com.hippo.ehviewer.ui.destinations.AdvancedScreenDestination import com.hippo.ehviewer.ui.destinations.DownloadScreenDestination import com.hippo.ehviewer.ui.destinations.EhScreenDestination import com.hippo.ehviewer.ui.destinations.PrivacyScreenDestination +import com.hippo.ehviewer.ui.main.NavigationIcon import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootGraph import com.ramcosta.composedestinations.navigation.DestinationsNavigator @@ -40,11 +38,7 @@ fun AnimatedVisibilityScope.SettingsScreen(navigator: DestinationsNavigator) = S topBar = { TopAppBar( title = { Text(text = stringResource(id = R.string.settings)) }, - navigationIcon = { - IconButton(onClick = { navigator.navigateUp() }) { - Icon(imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = null) - } - }, + navigationIcon = { NavigationIcon() }, scrollBehavior = scrollBehavior, ) }, diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/UConfigScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/UConfigScreen.kt index e8671813f..cb83207ef 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/UConfigScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/UConfigScreen.kt @@ -5,7 +5,6 @@ import androidx.compose.animation.AnimatedVisibilityScope import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.Check import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -23,6 +22,7 @@ import com.hippo.ehviewer.R import com.hippo.ehviewer.client.EhCookieStore import com.hippo.ehviewer.client.EhUrl import com.hippo.ehviewer.ui.Screen +import com.hippo.ehviewer.ui.main.NavigationIcon import com.hippo.ehviewer.util.setDefaultSettings import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.RootGraph @@ -41,11 +41,7 @@ fun AnimatedVisibilityScope.UConfigScreen(navigator: DestinationsNavigator) = Sc topBar = { TopAppBar( title = { Text(text = stringResource(id = R.string.u_config)) }, - navigationIcon = { - IconButton(onClick = { navigator.popBackStack() }) { - Icon(imageVector = Icons.AutoMirrored.Default.ArrowBack, contentDescription = null) - } - }, + navigationIcon = { NavigationIcon() }, actions = { IconButton( onClick = {