From cfd0725605702a0104e94d2e9fd6453a84f86cd1 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Mon, 25 Oct 2021 00:47:52 +0530 Subject: [PATCH] all: refactor Modifier ordering Drawns on the suggestions outlined in https://chris.banes.dev/always-provide-a-modifier/ --- .../dev/msfjarvis/claw/android/ui/ClawFab.kt | 2 +- .../msfjarvis/claw/android/ui/HottestPosts.kt | 2 +- .../msfjarvis/claw/android/ui/NetworkPosts.kt | 2 +- .../dev/msfjarvis/claw/android/ui/TopAppBar.kt | 2 +- .../dev/msfjarvis/claw/common/ui/composables.kt | 2 +- .../msfjarvis/claw/common/posts/LobstersItem.kt | 17 +++++++++-------- .../dev/msfjarvis/claw/common/ui/composables.kt | 2 +- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/ClawFab.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/ClawFab.kt index 8b7701e3..399657a5 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/ClawFab.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/ClawFab.kt @@ -41,7 +41,7 @@ fun ClawFab( targetOffsetY = { fullHeight -> fullHeight }, animationSpec = tween(durationMillis = AnimationDuration, easing = FastOutLinearInEasing), ), - modifier = Modifier.then(modifier), + modifier = modifier, ) { FloatingActionButton(onClick = { coroutineScope.launch { listState.animateScrollToItem(0) } }) { Icon( diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/HottestPosts.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/HottestPosts.kt index 635e7d30..57708e18 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/HottestPosts.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/HottestPosts.kt @@ -37,7 +37,7 @@ fun HottestPosts( listState = listState, isSaved = isPostSaved, postActions = postActions, - modifier = Modifier.padding(top = 16.dp).then(modifier), + modifier = modifier.padding(top = 16.dp), ) } } diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/NetworkPosts.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/NetworkPosts.kt index 9e646485..97d1717b 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/NetworkPosts.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/NetworkPosts.kt @@ -31,7 +31,7 @@ fun NetworkPosts( val coroutineScope = rememberCoroutineScope() LazyColumn( state = listState, - modifier = Modifier.then(modifier), + modifier = modifier, ) { items(items) { item -> if (item != null) { diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/TopAppBar.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/TopAppBar.kt index 5349e289..e73c0465 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/TopAppBar.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/TopAppBar.kt @@ -22,6 +22,6 @@ fun ClawAppBar( modifier = Modifier.padding(horizontal = 16.dp), ) }, - modifier = Modifier.then(modifier), + modifier = modifier, ) } diff --git a/common/src/androidMain/kotlin/dev/msfjarvis/claw/common/ui/composables.kt b/common/src/androidMain/kotlin/dev/msfjarvis/claw/common/ui/composables.kt index 6235e882..ce34872b 100644 --- a/common/src/androidMain/kotlin/dev/msfjarvis/claw/common/ui/composables.kt +++ b/common/src/androidMain/kotlin/dev/msfjarvis/claw/common/ui/composables.kt @@ -24,6 +24,6 @@ actual fun NetworkImage( }, ), contentDescription = contentDescription, - modifier = Modifier.then(modifier), + modifier = modifier, ) } diff --git a/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/posts/LobstersItem.kt b/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/posts/LobstersItem.kt index 2cb4ebba..686aec8c 100644 --- a/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/posts/LobstersItem.kt +++ b/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/posts/LobstersItem.kt @@ -44,7 +44,7 @@ fun LobstersCard( modifier: Modifier = Modifier, ) { Card( - modifier = Modifier.background(MaterialTheme.colors.primarySurface).then(modifier), + modifier = modifier.background(MaterialTheme.colors.primarySurface), onClick = { postActions.viewPost(post.url, post.commentsUrl) }, ) { Column( @@ -100,7 +100,7 @@ fun PostTitle( text = title, color = titleColor, fontWeight = FontWeight.Bold, - modifier = Modifier.then(modifier), + modifier = modifier, ) } @@ -112,7 +112,7 @@ fun SubmitterName( modifier: Modifier = Modifier, ) { Row( - modifier = Modifier.then(modifier), + modifier = modifier, verticalAlignment = Alignment.CenterVertically, ) { SubmitterAvatar( @@ -130,11 +130,12 @@ fun SubmitterName( fun SubmitterAvatar( avatarUrl: String, contentDescription: String, + modifier: Modifier = Modifier, ) { NetworkImage( url = avatarUrl, contentDescription = contentDescription, - modifier = Modifier.requiredSize(24.dp).clip(CircleShape), + modifier = modifier.requiredSize(24.dp).clip(CircleShape), ) } @@ -145,7 +146,7 @@ fun SubmitterNameText( ) { Text( text = text, - modifier = Modifier.then(modifier), + modifier = modifier, ) } @@ -158,7 +159,7 @@ fun SaveButton( IconToggleButton( checked = isSaved, onCheckedChange = { onClick.invoke() }, - modifier = Modifier.requiredSize(32.dp).then(modifier), + modifier = modifier.requiredSize(32.dp), ) { Crossfade(targetState = isSaved) { saved -> Icon( @@ -177,7 +178,7 @@ fun CommentsButton( ) { IconButton( onClick = onClick, - modifier = Modifier.requiredSize(32.dp).then(modifier), + modifier = modifier.requiredSize(32.dp), ) { Icon( painter = commentIcon, @@ -193,7 +194,7 @@ fun TagRow( modifier: Modifier = Modifier, ) { Box( - modifier = Modifier.then(modifier), + modifier = modifier, ) { FlowRow( mainAxisSpacing = 8.dp, diff --git a/common/src/desktopMain/kotlin/dev/msfjarvis/claw/common/ui/composables.kt b/common/src/desktopMain/kotlin/dev/msfjarvis/claw/common/ui/composables.kt index 5516528c..64f7aff0 100644 --- a/common/src/desktopMain/kotlin/dev/msfjarvis/claw/common/ui/composables.kt +++ b/common/src/desktopMain/kotlin/dev/msfjarvis/claw/common/ui/composables.kt @@ -14,7 +14,7 @@ actual fun NetworkImage( KamelImage( resource = lazyPainterResource(url), contentDescription = contentDescription, - modifier = Modifier.then(modifier), + modifier = modifier, crossfade = true, ) }