From 9b3b391fef1ac5b14347cf22a1b559ab1751ae7c Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Fri, 9 Aug 2024 14:39:54 +0800 Subject: [PATCH] Refactor(Function): Make non-essentially public methods private --- .../fatweb/oxygen/toolbox/ui/about/AboutScreen.kt | 4 ++-- .../oxygen/toolbox/ui/about/LibrariesScreen.kt | 2 +- .../oxygen/toolbox/ui/component/LibraryCard.kt | 8 ++++---- .../fatweb/oxygen/toolbox/ui/component/Navigation.kt | 4 ++-- .../fatweb/oxygen/toolbox/ui/component/ToolCard.kt | 12 ++++++------ 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/about/AboutScreen.kt b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/about/AboutScreen.kt index 1503a2d..0d15c1c 100644 --- a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/about/AboutScreen.kt +++ b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/about/AboutScreen.kt @@ -164,7 +164,7 @@ private fun AboutFooter( @OxygenPreviews @Composable -fun AboutAppInfoPreview() { +private fun AboutAppInfoPreview() { OxygenTheme { AboutAppInfo() } @@ -172,7 +172,7 @@ fun AboutAppInfoPreview() { @OxygenPreviews @Composable -fun AboutScreenPreview() { +private fun AboutScreenPreview() { OxygenTheme { AboutScreen(onBackClick = {}, onNavigateToLibraries = {}) } diff --git a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/about/LibrariesScreen.kt b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/about/LibrariesScreen.kt index 679a58d..267cab8 100644 --- a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/about/LibrariesScreen.kt +++ b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/about/LibrariesScreen.kt @@ -273,7 +273,7 @@ internal fun LibrariesScreen( } } -fun howManyItems(librariesScreenUiState: LibrariesScreenUiState) = +private fun howManyItems(librariesScreenUiState: LibrariesScreenUiState) = when (librariesScreenUiState) { LibrariesScreenUiState.Loading, LibrariesScreenUiState.Nothing, LibrariesScreenUiState.NotFound -> 0 diff --git a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/component/LibraryCard.kt b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/component/LibraryCard.kt index 1290d62..8290490 100644 --- a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/component/LibraryCard.kt +++ b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/component/LibraryCard.kt @@ -76,7 +76,7 @@ fun LibraryCard( } @Composable -fun LibraryTitle( +private fun LibraryTitle( modifier: Modifier = Modifier, name: String, developers: String, @@ -107,7 +107,7 @@ fun LibraryTitle( } @Composable -fun LibraryContent( +private fun LibraryContent( modifier: Modifier = Modifier, text: String ) { @@ -120,7 +120,7 @@ fun LibraryContent( @OptIn(ExperimentalLayoutApi::class) @Composable -fun LibraryFooter( +private fun LibraryFooter( modifier: Modifier = Modifier, licenses: Map, onClickLicense: (key: String) -> Unit @@ -140,7 +140,7 @@ fun LibraryFooter( @OxygenPreviews @Composable -fun LibraryCardPreview() { +private fun LibraryCardPreview() { LibraryCard( library = Library( uniqueId = "androidx.activity:activity", diff --git a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/component/Navigation.kt b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/component/Navigation.kt index 5982bf2..7670dd2 100644 --- a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/component/Navigation.kt +++ b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/component/Navigation.kt @@ -119,7 +119,7 @@ object OxygenNavigationDefaults { @OxygenPreviews @Composable -fun OxygenNavigationBarPreview() { +private fun OxygenNavigationBarPreview() { val items = TopLevelDestination.entries OxygenTheme { @@ -150,7 +150,7 @@ fun OxygenNavigationBarPreview() { @OxygenPreviews @Composable -fun OxygenNavigationRailPreview() { +private fun OxygenNavigationRailPreview() { val items = TopLevelDestination.entries OxygenTheme { diff --git a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/component/ToolCard.kt b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/component/ToolCard.kt index 0ae9a9e..fad7295 100644 --- a/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/component/ToolCard.kt +++ b/app/src/main/kotlin/top/fatweb/oxygen/toolbox/ui/component/ToolCard.kt @@ -82,7 +82,7 @@ fun ToolCard( } @Composable -fun ToolHeader( +private fun ToolHeader( modifier: Modifier = Modifier, ver: String, actionIcon: ImageVector?, @@ -106,7 +106,7 @@ fun ToolHeader( } @Composable -fun ToolVer( +private fun ToolVer( modifier: Modifier = Modifier, ver: String ) { @@ -133,7 +133,7 @@ fun ToolVer( } @Composable -fun ToolAction( +private fun ToolAction( modifier: Modifier = Modifier, actionIcon: ImageVector, actionIconContentDescription: String, @@ -165,7 +165,7 @@ fun ToolAction( } @Composable -fun ToolIcon( +private fun ToolIcon( modifier: Modifier = Modifier, icon: String ) { @@ -183,7 +183,7 @@ fun ToolIcon( } @Composable -fun ToolInfo( +private fun ToolInfo( modifier: Modifier = Modifier, toolName: String, toolId: String, @@ -215,7 +215,7 @@ fun ToolInfo( } @Composable -fun AuthorInfo( +private fun AuthorInfo( modifier: Modifier = Modifier, avatar: String, nickname: String