Style(Code): Optimize code style
This commit is contained in:
@@ -11,7 +11,7 @@ import top.fatweb.oxygen.toolbox.ui.about.AboutRoute
|
||||
const val ABOUT_ROUTE = "about_route"
|
||||
|
||||
fun NavController.navigateToAbout(navOptions: NavOptions? = null) =
|
||||
navigate(ABOUT_ROUTE, navOptions)
|
||||
navigate(route = ABOUT_ROUTE, navOptions = navOptions)
|
||||
|
||||
fun NavGraphBuilder.aboutScreen(
|
||||
onNavigateToLibraries: () -> Unit,
|
||||
|
||||
@@ -11,7 +11,7 @@ import top.fatweb.oxygen.toolbox.ui.about.LibrariesRoute
|
||||
const val LIBRARIES_ROUTE = "libraries_route"
|
||||
|
||||
fun NavController.navigateToLibraries(navOptions: NavOptions? = null) =
|
||||
navigate(LIBRARIES_ROUTE, navOptions)
|
||||
navigate(route = LIBRARIES_ROUTE, navOptions = navOptions)
|
||||
|
||||
fun NavGraphBuilder.librariesScreen(
|
||||
onBackClick: () -> Unit
|
||||
@@ -28,4 +28,4 @@ fun NavGraphBuilder.librariesScreen(
|
||||
) {
|
||||
LibrariesRoute(onBackClick = onBackClick)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,4 +50,4 @@ fun OxygenNavHost(
|
||||
onBackClick = navController::popBackStack
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,8 @@ import top.fatweb.oxygen.toolbox.ui.star.StarRoute
|
||||
|
||||
const val STAR_ROUTE = "star_route"
|
||||
|
||||
fun NavController.navigateToStar(navOptions: NavOptions) = navigate(STAR_ROUTE, navOptions)
|
||||
fun NavController.navigateToStar(navOptions: NavOptions) =
|
||||
navigate(route = STAR_ROUTE, navOptions = navOptions)
|
||||
|
||||
fun NavGraphBuilder.starScreen(
|
||||
isVertical: Boolean,
|
||||
@@ -45,4 +46,4 @@ fun NavGraphBuilder.starScreen(
|
||||
onNavigateToToolView = onNavigateToToolView
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ import top.fatweb.oxygen.toolbox.ui.store.ToolStoreRoute
|
||||
const val TOOL_STORE_ROUTE = "tool_store_route"
|
||||
|
||||
fun NavController.navigateToToolStore(navOptions: NavOptions? = null) =
|
||||
navigate(TOOL_STORE_ROUTE, navOptions)
|
||||
navigate(route = TOOL_STORE_ROUTE, navOptions = navOptions)
|
||||
|
||||
fun NavGraphBuilder.toolStoreScreen(
|
||||
isVertical: Boolean,
|
||||
|
||||
@@ -19,7 +19,11 @@ internal const val TOOL_ID_ARG = "toolId"
|
||||
internal const val PREVIEW_ARG = "preview"
|
||||
const val TOOL_VIEW_ROUTE = "tool_view_route"
|
||||
|
||||
internal class ToolViewArgs(val username: String, val toolId: String, val preview: Boolean) {
|
||||
internal class ToolViewArgs(
|
||||
val username: String,
|
||||
val toolId: String,
|
||||
val preview: Boolean
|
||||
) {
|
||||
constructor(savedStateHandle: SavedStateHandle) :
|
||||
this(
|
||||
URLDecoder.decode(
|
||||
|
||||
@@ -12,14 +12,15 @@ import top.fatweb.oxygen.toolbox.ui.tools.ToolsRoute
|
||||
|
||||
const val TOOLS_ROUTE = "tools_route"
|
||||
|
||||
fun NavController.navigateToTools(navOptions: NavOptions) = navigate(TOOLS_ROUTE, navOptions)
|
||||
fun NavController.navigateToTools(navOptions: NavOptions) =
|
||||
navigate(route = TOOLS_ROUTE, navOptions = navOptions)
|
||||
|
||||
fun NavGraphBuilder.toolsScreen(
|
||||
isVertical: Boolean,
|
||||
searchValue: String,
|
||||
onShowSnackbar: suspend (message: String, action: String?) -> Boolean,
|
||||
onNavigateToToolView: (username: String, toolId: String, preview: Boolean) -> Unit,
|
||||
onNavigateToToolStore: () -> Unit
|
||||
onNavigateToToolStore: () -> Unit,
|
||||
onShowSnackbar: suspend (message: String, action: String?) -> Boolean
|
||||
) {
|
||||
composable(
|
||||
route = TOOLS_ROUTE,
|
||||
@@ -52,9 +53,9 @@ fun NavGraphBuilder.toolsScreen(
|
||||
) {
|
||||
ToolsRoute(
|
||||
searchValue = searchValue,
|
||||
onShowSnackbar = onShowSnackbar,
|
||||
onNavigateToToolView = onNavigateToToolView,
|
||||
onNavigateToToolStore = onNavigateToToolStore
|
||||
onNavigateToToolStore = onNavigateToToolStore,
|
||||
onShowSnackbar = onShowSnackbar
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,4 +35,4 @@ enum class TopLevelDestination(
|
||||
iconTextId = R.string.feature_star_title,
|
||||
titleTextId = R.string.feature_star_title
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user