Fix some detekt issues

markocic · markocic · commit 71801b3402a6 · 2024-11-29T19:26:33.000+01:00
diff --git a/app/src/main/kotlin/net/primal/android/core/compose/AvatarThumbnailListItemImage.kt b/app/src/main/kotlin/net/primal/android/core/compose/AvatarThumbnailListItemImage.kt
@@ -144,7 +144,7 @@ private fun AvatarThumbnailListItemImage(
         listOf(AppTheme.colorScheme.primary, AppTheme.colorScheme.primary),
     ),
     borderSize: Dp = 2.dp,
-    hasGlow: Boolean = false,
+    @Suppress("UnusedParameter") hasGlow: Boolean = false,
     backgroundColor: Color = AppTheme.extraColorScheme.surfaceVariantAlt1,
     onClick: (() -> Unit)? = null,
     defaultAvatar: @Composable () -> Unit,
diff --git a/app/src/main/kotlin/net/primal/android/drawer/PrimalDrawer.kt b/app/src/main/kotlin/net/primal/android/drawer/PrimalDrawer.kt
@@ -60,6 +60,7 @@ import net.primal.android.core.compose.icons.primaliconpack.LightMode
 import net.primal.android.core.compose.icons.primaliconpack.QrCode
 import net.primal.android.core.compose.preview.PrimalPreview
 import net.primal.android.core.utils.formatNip05Identifier
+import net.primal.android.premium.legend.LegendaryCustomization
 import net.primal.android.premium.legend.LegendaryStyle
 import net.primal.android.premium.legend.asLegendaryCustomization
 import net.primal.android.theme.AppTheme
@@ -118,10 +119,8 @@ fun PrimalDrawer(
         ) {
             DrawerHeader(
                 userAccount = state.activeUserAccount,
-                customBadge = state.customBadge,
-                avatarGlow = state.avatarGlow,
-                legendaryStyle = state.legendaryStyle,
                 onQrCodeClick = onQrCodeClick,
+                legendaryCustomization = state.legendaryCustomization,
             )
 
             DrawerMenu(
@@ -150,9 +149,7 @@ fun PrimalDrawer(
 @Composable
 private fun DrawerHeader(
     userAccount: UserAccount?,
-    customBadge: Boolean,
-    avatarGlow: Boolean,
-    legendaryStyle: LegendaryStyle?,
+    legendaryCustomization: LegendaryCustomization?,
     onQrCodeClick: () -> Unit,
 ) {
     val numberFormat = remember { NumberFormat.getNumberInstance() }
@@ -169,7 +166,7 @@ private fun DrawerHeader(
             },
             avatarSize = 52.dp,
             avatarCdnImage = userAccount?.avatarCdnImage,
-            legendaryCustomization = userAccount?.primalLegendProfile?.asLegendaryCustomization(),
+            legendaryCustomization = legendaryCustomization,
         )
 
         NostrUserText(
@@ -181,7 +178,11 @@ private fun DrawerHeader(
                 top.linkTo(avatarRef.bottom, margin = 16.dp)
                 width = Dimension.preferredValue(220.dp)
             },
-            customBadgeStyle = if (customBadge) legendaryStyle else null,
+            customBadgeStyle = if (legendaryCustomization?.customBadge == true) {
+                legendaryCustomization.legendaryStyle
+            } else {
+                null
+            },
         )
 
         IconButton(
diff --git a/app/src/main/kotlin/net/primal/android/drawer/PrimalDrawerContract.kt b/app/src/main/kotlin/net/primal/android/drawer/PrimalDrawerContract.kt
@@ -1,5 +1,6 @@
 package net.primal.android.drawer
 
+import net.primal.android.premium.legend.LegendaryCustomization
 import net.primal.android.premium.legend.LegendaryStyle
 import net.primal.android.user.domain.Badges
 import net.primal.android.user.domain.UserAccount
@@ -12,9 +13,7 @@ interface PrimalDrawerContract {
         val activeUserAccount: UserAccount? = null,
         val badges: Badges = Badges(),
         val showPremiumBadge: Boolean = false,
-        val customBadge: Boolean = false,
-        val avatarGlow: Boolean = false,
-        val legendaryStyle: LegendaryStyle? = null,
+        val legendaryCustomization: LegendaryCustomization? = null,
     )
 
     sealed class UiEvent {
diff --git a/app/src/main/kotlin/net/primal/android/drawer/PrimalDrawerViewModel.kt b/app/src/main/kotlin/net/primal/android/drawer/PrimalDrawerViewModel.kt
@@ -14,6 +14,7 @@ import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.getAndUpdate
 import kotlinx.coroutines.launch
 import net.primal.android.premium.legend.LegendaryStyle
+import net.primal.android.premium.legend.asLegendaryCustomization
 import net.primal.android.profile.repository.ProfileRepository
 import net.primal.android.theme.active.ActiveThemeStore
 import net.primal.android.theme.domain.PrimalTheme
@@ -82,9 +83,7 @@ class PrimalDrawerViewModel @Inject constructor(
             profileRepository.observeProfile(profileId = activeAccountStore.activeUserId()).collect {
                 setState {
                     copy(
-                        avatarGlow = it.metadata?.primalLegendProfile?.avatarGlow == true,
-                        customBadge = it.metadata?.primalLegendProfile?.customBadge == true,
-                        legendaryStyle = LegendaryStyle.valueById(it.metadata?.primalLegendProfile?.styleId),
+                        legendaryCustomization = it.metadata?.primalLegendProfile?.asLegendaryCustomization(),
                     )
                 }
             }
diff --git a/app/src/main/kotlin/net/primal/android/notes/feed/note/ui/NoteHeader.kt b/app/src/main/kotlin/net/primal/android/notes/feed/note/ui/NoteHeader.kt
@@ -88,36 +88,14 @@ fun FeedNoteHeader(
                 )
             }
 
-            WrappedContentWithSuffix(
-                wrappedContent = {
-                    NostrUserText(
-                        displayName = authorDisplayName,
-                        internetIdentifier = authorInternetIdentifier,
-                        annotatedStringSuffixBuilder = {
-                            append(suffixText)
-                        },
-                        style = topRowTextStyle,
-                        internetIdentifierBadgeSize = topRowTextStyle.fontSize.value.dp,
-                        overflow = TextOverflow.Ellipsis,
-                        customBadgeStyle = if (authorLegendaryCustomization?.customBadge == true) {
-                            authorLegendaryCustomization.legendaryStyle
-                        } else {
-                            null
-                        },
-                    )
-                },
-                suffixFixedContent = {
-                    if (postTimestamp != null) {
-                        Text(
-                            text = " • ${postTimestamp.asBeforeNowFormat()}",
-                            textAlign = TextAlign.Center,
-                            maxLines = 1,
-                            style = topRowTextStyle,
-                            fontSize = (displaySettings.contentAppearance.noteUsernameSize.value).sp,
-                            color = AppTheme.extraColorScheme.onSurfaceVariantAlt2,
-                        )
-                    }
-                },
+            NoteAuthorBadgeAndTimestampSection(
+                authorDisplayName = authorDisplayName,
+                authorInternetIdentifier = authorInternetIdentifier,
+                suffixText = suffixText,
+                topRowTextStyle = topRowTextStyle,
+                authorLegendaryCustomization = authorLegendaryCustomization,
+                postTimestamp = postTimestamp,
+                displaySettings = displaySettings,
             )
 
             if (!label.isNullOrEmpty() && !singleLine) {
@@ -142,6 +120,49 @@ fun FeedNoteHeader(
     }
 }
 
+@Composable
+private fun NoteAuthorBadgeAndTimestampSection(
+    authorDisplayName: String,
+    authorInternetIdentifier: String?,
+    suffixText: AnnotatedString,
+    topRowTextStyle: TextStyle,
+    authorLegendaryCustomization: LegendaryCustomization?,
+    postTimestamp: Instant?,
+    displaySettings: ContentDisplaySettings,
+) {
+    WrappedContentWithSuffix(
+        wrappedContent = {
+            NostrUserText(
+                displayName = authorDisplayName,
+                internetIdentifier = authorInternetIdentifier,
+                annotatedStringSuffixBuilder = {
+                    append(suffixText)
+                },
+                style = topRowTextStyle,
+                internetIdentifierBadgeSize = topRowTextStyle.fontSize.value.dp,
+                overflow = TextOverflow.Ellipsis,
+                customBadgeStyle = if (authorLegendaryCustomization?.customBadge == true) {
+                    authorLegendaryCustomization.legendaryStyle
+                } else {
+                    null
+                },
+            )
+        },
+        suffixFixedContent = {
+            if (postTimestamp != null) {
+                Text(
+                    text = " • ${postTimestamp.asBeforeNowFormat()}",
+                    textAlign = TextAlign.Center,
+                    maxLines = 1,
+                    style = topRowTextStyle,
+                    fontSize = (displaySettings.contentAppearance.noteUsernameSize.value).sp,
+                    color = AppTheme.extraColorScheme.onSurfaceVariantAlt2,
+                )
+            }
+        },
+    )
+}
+
 @Preview
 @Composable
 fun PreviewLightNoteHeader() {

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import kotlinx.coroutines.flow.firstOrNull`
`14`	`14`	`import kotlinx.coroutines.flow.getAndUpdate`
`15`	`15`	`import kotlinx.coroutines.launch`
`16`	`16`	`import net.primal.android.premium.legend.LegendaryStyle`
	`17`	`+import net.primal.android.premium.legend.asLegendaryCustomization`
`17`	`18`	`import net.primal.android.profile.repository.ProfileRepository`
`18`	`19`	`import net.primal.android.theme.active.ActiveThemeStore`
`19`	`20`	`import net.primal.android.theme.domain.PrimalTheme`
`@@ -82,9 +83,7 @@ class PrimalDrawerViewModel @Inject constructor(`
`82`	`83`	`profileRepository.observeProfile(profileId = activeAccountStore.activeUserId()).collect {`
`83`	`84`	`setState {`
`84`	`85`	`copy(`
`85`		`- avatarGlow = it.metadata?.primalLegendProfile?.avatarGlow == true,`
`86`		`- customBadge = it.metadata?.primalLegendProfile?.customBadge == true,`
`87`		`- legendaryStyle = LegendaryStyle.valueById(it.metadata?.primalLegendProfile?.styleId),`
	`86`	`+ legendaryCustomization = it.metadata?.primalLegendProfile?.asLegendaryCustomization(),`
`88`	`87`	`)`
`89`	`88`	`}`
`90`	`89`	`}`