mirror of
				https://github.com/mihonapp/mihon.git
				synced 2025-10-31 06:17:57 +01:00 
			
		
		
		
	Minor reorganization
This commit is contained in:
		| @@ -28,6 +28,7 @@ import cafe.adriel.voyager.navigator.LocalNavigator | ||||
| import cafe.adriel.voyager.navigator.currentOrThrow | ||||
| import eu.kanade.domain.base.BasePreferences | ||||
| import eu.kanade.presentation.more.settings.Preference | ||||
| import eu.kanade.presentation.more.settings.screen.advanced.ClearDatabaseScreen | ||||
| import eu.kanade.presentation.more.settings.screen.debug.DebugInfoScreen | ||||
| import eu.kanade.presentation.util.collectAsState | ||||
| import eu.kanade.tachiyomi.R | ||||
|   | ||||
| @@ -44,6 +44,7 @@ import cafe.adriel.voyager.navigator.currentOrThrow | ||||
| import eu.kanade.presentation.components.AppBar | ||||
| import eu.kanade.presentation.components.AppBarActions | ||||
| import eu.kanade.presentation.components.UpIcon | ||||
| import eu.kanade.presentation.more.settings.screen.about.AboutScreen | ||||
| import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget | ||||
| import eu.kanade.presentation.util.LocalBackPress | ||||
| import eu.kanade.presentation.util.Screen | ||||
|   | ||||
| @@ -1,6 +1,5 @@ | ||||
| package eu.kanade.presentation.more.settings.screen | ||||
|  | ||||
| import android.content.res.Resources | ||||
| import androidx.compose.animation.Crossfade | ||||
| import androidx.compose.foundation.clickable | ||||
| import androidx.compose.foundation.layout.Column | ||||
| @@ -39,12 +38,14 @@ import androidx.compose.ui.focus.FocusRequester | ||||
| import androidx.compose.ui.focus.focusRequester | ||||
| import androidx.compose.ui.graphics.SolidColor | ||||
| import androidx.compose.ui.platform.LocalFocusManager | ||||
| import androidx.compose.ui.platform.LocalLayoutDirection | ||||
| import androidx.compose.ui.platform.LocalSoftwareKeyboardController | ||||
| import androidx.compose.ui.res.stringResource | ||||
| import androidx.compose.ui.text.font.FontWeight | ||||
| import androidx.compose.ui.text.input.ImeAction | ||||
| import androidx.compose.ui.text.input.TextFieldValue | ||||
| import androidx.compose.ui.text.style.TextOverflow | ||||
| import androidx.compose.ui.unit.LayoutDirection | ||||
| import androidx.compose.ui.unit.dp | ||||
| import cafe.adriel.voyager.navigator.LocalNavigator | ||||
| import cafe.adriel.voyager.navigator.currentOrThrow | ||||
| @@ -52,7 +53,6 @@ import eu.kanade.presentation.components.UpIcon | ||||
| import eu.kanade.presentation.more.settings.Preference | ||||
| import eu.kanade.presentation.util.Screen | ||||
| import eu.kanade.tachiyomi.R | ||||
| import eu.kanade.tachiyomi.util.system.isLTR | ||||
| import tachiyomi.presentation.core.components.material.Divider | ||||
| import tachiyomi.presentation.core.components.material.Scaffold | ||||
| import tachiyomi.presentation.core.screens.EmptyScreen | ||||
| @@ -165,6 +165,8 @@ private fun SearchResult( | ||||
| ) { | ||||
|     if (searchKey.isEmpty()) return | ||||
|  | ||||
|     val isLtr = LocalLayoutDirection.current == LayoutDirection.Ltr | ||||
|  | ||||
|     val index = getIndex() | ||||
|     val result by produceState<List<SearchResultItem>?>(initialValue = null, searchKey) { | ||||
|         value = index.asSequence() | ||||
| @@ -200,7 +202,7 @@ private fun SearchResult( | ||||
|                         SearchResultItem( | ||||
|                             route = settingsData.route, | ||||
|                             title = p.title, | ||||
|                             breadcrumbs = getLocalizedBreadcrumb(path = settingsData.title, node = categoryTitle), | ||||
|                             breadcrumbs = getLocalizedBreadcrumb(path = settingsData.title, node = categoryTitle, isLtr = isLtr), | ||||
|                             highlightKey = p.title, | ||||
|                         ) | ||||
|                     } | ||||
| @@ -265,11 +267,11 @@ private fun getIndex() = settingScreens | ||||
|         ) | ||||
|     } | ||||
|  | ||||
| private fun getLocalizedBreadcrumb(path: String, node: String?): String { | ||||
| private fun getLocalizedBreadcrumb(path: String, node: String?, isLtr: Boolean): String { | ||||
|     return if (node == null) { | ||||
|         path | ||||
|     } else { | ||||
|         if (Resources.getSystem().isLTR) { | ||||
|         if (isLtr) { | ||||
|             // This locale reads left to right. | ||||
|             "$path > $node" | ||||
|         } else { | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| package eu.kanade.presentation.more.settings.screen | ||||
| package eu.kanade.presentation.more.settings.screen.about | ||||
| 
 | ||||
| import android.content.Context | ||||
| import androidx.compose.animation.AnimatedVisibility | ||||
| @@ -1,4 +1,4 @@ | ||||
| package eu.kanade.presentation.more.settings.screen | ||||
| package eu.kanade.presentation.more.settings.screen.about | ||||
| 
 | ||||
| import androidx.compose.foundation.layout.Column | ||||
| import androidx.compose.foundation.layout.padding | ||||
| @@ -1,4 +1,4 @@ | ||||
| package eu.kanade.presentation.more.settings.screen | ||||
| package eu.kanade.presentation.more.settings.screen.about | ||||
| 
 | ||||
| import androidx.compose.foundation.layout.fillMaxSize | ||||
| import androidx.compose.material3.MaterialTheme | ||||
| @@ -1,4 +1,4 @@ | ||||
| package eu.kanade.presentation.more.settings.screen | ||||
| package eu.kanade.presentation.more.settings.screen.advanced | ||||
| 
 | ||||
| import androidx.compose.foundation.clickable | ||||
| import androidx.compose.foundation.layout.Column | ||||
| @@ -12,7 +12,7 @@ import cafe.adriel.voyager.navigator.LocalNavigator | ||||
| import cafe.adriel.voyager.navigator.currentOrThrow | ||||
| import eu.kanade.presentation.more.settings.Preference | ||||
| import eu.kanade.presentation.more.settings.PreferenceScaffold | ||||
| import eu.kanade.presentation.more.settings.screen.AboutScreen | ||||
| import eu.kanade.presentation.more.settings.screen.about.AboutScreen | ||||
| import eu.kanade.presentation.util.Screen | ||||
| import eu.kanade.tachiyomi.R | ||||
| import eu.kanade.tachiyomi.util.system.DeviceUtil | ||||
|   | ||||
| @@ -12,10 +12,10 @@ import androidx.compose.ui.Modifier | ||||
| import cafe.adriel.voyager.navigator.LocalNavigator | ||||
| import cafe.adriel.voyager.navigator.Navigator | ||||
| import cafe.adriel.voyager.navigator.currentOrThrow | ||||
| import eu.kanade.presentation.more.settings.screen.AboutScreen | ||||
| import eu.kanade.presentation.more.settings.screen.SettingsAppearanceScreen | ||||
| import eu.kanade.presentation.more.settings.screen.SettingsBackupScreen | ||||
| import eu.kanade.presentation.more.settings.screen.SettingsMainScreen | ||||
| import eu.kanade.presentation.more.settings.screen.about.AboutScreen | ||||
| import eu.kanade.presentation.util.DefaultNavigatorScreenTransition | ||||
| import eu.kanade.presentation.util.LocalBackPress | ||||
| import eu.kanade.presentation.util.Screen | ||||
|   | ||||
		Reference in New Issue
	
	Block a user