From 7d324ddb8c995843bf0df72dfad966b25dc7a21c Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Mon, 12 Dec 2022 12:47:23 +0530 Subject: [PATCH] refactor(common): tweak visibility of module members --- .../kotlin/dev/msfjarvis/claw/common/NetworkState.kt | 2 +- .../msfjarvis/claw/common/comments/CommentEntry.kt | 6 +++--- .../msfjarvis/claw/common/comments/CommentNode.kt | 12 ++++++------ .../dev/msfjarvis/claw/common/posts/LobstersCard.kt | 12 ++++++------ .../kotlin/dev/msfjarvis/claw/common/theme/Theme.kt | 4 ++-- .../kotlin/dev/msfjarvis/claw/common/ui/Markdown.kt | 4 ++-- .../dev/msfjarvis/claw/common/ui/NetworkError.kt | 2 +- .../dev/msfjarvis/claw/common/ui/NetworkImage.kt | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/NetworkState.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/NetworkState.kt index 0d4fd186..4252a892 100644 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/NetworkState.kt +++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/NetworkState.kt @@ -6,7 +6,7 @@ */ package dev.msfjarvis.claw.common -sealed class NetworkState { +internal sealed class NetworkState { class Success(val data: T) : NetworkState() class Error(val error: Throwable, val description: String) : NetworkState() object Loading : NetworkState() diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt index a065b633..602ed431 100644 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt +++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt @@ -47,7 +47,7 @@ import java.time.Instant import java.time.temporal.TemporalAccessor @Composable -fun CommentsHeader( +internal fun CommentsHeader( postDetails: LobstersPostDetails, postActions: PostActions, htmlConverter: HTMLConverter, @@ -98,7 +98,7 @@ fun CommentsHeader( } @Composable -fun PostLink( +private fun PostLink( linkMetadata: LinkMetadata, modifier: Modifier = Modifier, ) { @@ -130,7 +130,7 @@ private val CommentEntryPadding = 16f.dp @OptIn(ExperimentalAnimationApi::class) @Composable -fun CommentEntry( +internal fun CommentEntry( commentNode: CommentNode, htmlConverter: HTMLConverter, toggleExpanded: (CommentNode) -> Unit, diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentNode.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentNode.kt index f25df8e7..9316de47 100644 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentNode.kt +++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentNode.kt @@ -10,7 +10,7 @@ import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.material3.Divider import dev.msfjarvis.claw.model.Comment -data class CommentNode( +internal data class CommentNode( val comment: Comment, var parent: CommentNode? = null, val children: MutableList = mutableListOf(), @@ -26,7 +26,7 @@ data class CommentNode( } } -fun createListNode(comments: List): MutableList { +internal fun createListNode(comments: List): MutableList { val commentNodes = mutableListOf() for (i in comments.indices) { @@ -40,7 +40,7 @@ fun createListNode(comments: List): MutableList { return commentNodes } -fun toggleAllExpanded(commentNode: CommentNode): CommentNode { +internal fun toggleAllExpanded(commentNode: CommentNode): CommentNode { commentNode.isExpanded = !commentNode.isExpanded if (commentNode.children.isNotEmpty()) { @@ -49,7 +49,7 @@ fun toggleAllExpanded(commentNode: CommentNode): CommentNode { return commentNode } -fun findTopMostParent(node: CommentNode): CommentNode { +internal fun findTopMostParent(node: CommentNode): CommentNode { val parent = node.parent return if (parent != null) { findTopMostParent(parent) @@ -58,7 +58,7 @@ fun findTopMostParent(node: CommentNode): CommentNode { } } -fun LazyListScope.nodes( +internal fun LazyListScope.nodes( nodes: List, htmlConverter: HTMLConverter, toggleExpanded: (CommentNode) -> Unit, @@ -72,7 +72,7 @@ fun LazyListScope.nodes( } } -fun LazyListScope.node( +private fun LazyListScope.node( node: CommentNode, htmlConverter: HTMLConverter, toggleExpanded: (CommentNode) -> Unit, diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt index 61319ca6..22c1fae3 100644 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt +++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt @@ -115,7 +115,7 @@ fun PostDetails(post: SavedPost, modifier: Modifier = Modifier) { } @Composable -fun PostTitle( +internal fun PostTitle( title: String, modifier: Modifier = Modifier, ) { @@ -128,7 +128,7 @@ fun PostTitle( } @Composable -fun Submitter( +internal fun Submitter( text: AnnotatedString, avatarUrl: String, contentDescription: String, @@ -151,7 +151,7 @@ fun Submitter( } @Composable -fun SaveButton( +private fun SaveButton( isSaved: Boolean, modifier: Modifier = Modifier, ) { @@ -169,7 +169,7 @@ fun SaveButton( @Composable @OptIn(ExperimentalMaterial3Api::class) -fun CommentsButton( +private fun CommentsButton( commentCount: Int?, modifier: Modifier = Modifier, ) { @@ -200,7 +200,7 @@ fun CommentsButton( } @Composable -fun TagRow( +internal fun TagRow( tags: List, modifier: Modifier = Modifier, ) { @@ -214,7 +214,7 @@ fun TagRow( } @Composable -fun TagText( +private fun TagText( tag: String, modifier: Modifier = Modifier, ) { diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/theme/Theme.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/theme/Theme.kt index 65c05e17..64f38354 100644 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/theme/Theme.kt +++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/theme/Theme.kt @@ -19,7 +19,7 @@ import androidx.compose.runtime.ProvidedValue import androidx.compose.ui.platform.LocalContext import com.halilibo.richtext.ui.material3.SetupMaterial3RichText -internal val LightThemeColors = +private val LightThemeColors = lightColorScheme( primary = md_theme_light_primary, onPrimary = md_theme_light_onPrimary, @@ -48,7 +48,7 @@ internal val LightThemeColors = inverseSurface = md_theme_light_inverseSurface, ) -internal val DarkThemeColors = +private val DarkThemeColors = darkColorScheme( primary = md_theme_dark_primary, onPrimary = md_theme_dark_onPrimary, diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/Markdown.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/Markdown.kt index a0f4eb56..ad0b57df 100644 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/Markdown.kt +++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/Markdown.kt @@ -23,7 +23,7 @@ import dev.msfjarvis.claw.common.theme.LobstersTheme import dev.msfjarvis.claw.common.ui.preview.ThemePreviews @Composable -fun ThemedRichText( +internal fun ThemedRichText( text: String, modifier: Modifier = Modifier, ) { @@ -50,7 +50,7 @@ fun ThemedRichText( @ThemePreviews @Composable -fun ThemedRichTextPreview() { +internal fun ThemedRichTextPreview() { val text = """ ### Heading diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/NetworkError.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/NetworkError.kt index d6c31ccf..30b9533d 100644 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/NetworkError.kt +++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/NetworkError.kt @@ -72,6 +72,6 @@ fun NetworkError( @ThemePreviews @Composable -fun NetworkErrorPreview() { +internal fun NetworkErrorPreview() { LobstersTheme { NetworkError(label = "Failed to load posts", error = Throwable("Preview")) } } diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/NetworkImage.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/NetworkImage.kt index 871319ef..27bcb60c 100644 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/NetworkImage.kt +++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/NetworkImage.kt @@ -12,7 +12,7 @@ import androidx.compose.ui.graphics.painter.Painter import coil.compose.AsyncImage @Composable -fun NetworkImage( +internal fun NetworkImage( url: String?, placeholder: Painter, contentDescription: String,