nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixes flow.value warnings.

Browse Source
This commit is contained in:
Vitor Pamplona
2025-09-15 12:08:04 -04:00
parent 7616d01166
commit c84554576c
27 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/composable/VideoView.kt
+1 -1
View File
@@ -105,7 +105,7 @@ fun VideoView(
val automaticallyStartPlayback = val automaticallyStartPlayback =
remember { remember {
mutableStateOf<Boolean>( mutableStateOf<Boolean>(
if (alwaysShowVideo) true else accountViewModel.settings.startVideoPlayback.value, if (alwaysShowVideo) true else accountViewModel.settings.startVideoPlayback(),
) )
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/LoadUrlPreview.kt
+1 -1
View File
@@ -39,7 +39,7 @@ fun LoadUrlPreview(
callbackUri: String? = null, callbackUri: String? = null,
accountViewModel: AccountViewModel, accountViewModel: AccountViewModel,
) { ) {
if (!accountViewModel.settings.showUrlPreview.value) { if (!accountViewModel.settings.showUrlPreview()) {
ClickableUrl(urlText, url) ClickableUrl(urlText, url)
} else { } else {
LoadUrlPreviewDirect(url, urlText, callbackUri, accountViewModel) LoadUrlPreviewDirect(url, urlText, callbackUri, accountViewModel)
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/MyAsyncImage.kt
+1 -1
View File
@@ -57,7 +57,7 @@ fun MyAsyncImage(
onError: (@Composable () -> Unit)?, onError: (@Composable () -> Unit)?,
) { ) {
val ratio = MediaAspectRatioCache.get(imageUrl) val ratio = MediaAspectRatioCache.get(imageUrl)
val showImage = remember { mutableStateOf(accountViewModel.settings.showImages.value) } val showImage = remember { mutableStateOf(accountViewModel.settings.showImages()) }
CrossfadeIfEnabled(targetState = showImage.value, contentAlignment = Alignment.Center, accountViewModel = accountViewModel) { CrossfadeIfEnabled(targetState = showImage.value, contentAlignment = Alignment.Center, accountViewModel = accountViewModel) {
if (it) { if (it) {
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ZoomableContentView.kt
+2 -2
View File
@@ -227,7 +227,7 @@ fun LocalImageView(
val showImage = val showImage =
remember { remember {
mutableStateOf( mutableStateOf(
if (alwayShowImage) true else accountViewModel.settings.showImages.value, if (alwayShowImage) true else accountViewModel.settings.showImages(),
) )
} }
@@ -340,7 +340,7 @@ fun UrlImageView(
val showImage = val showImage =
remember { remember {
mutableStateOf( mutableStateOf(
if (alwayShowImage) true else accountViewModel.settings.showImages.value, if (alwayShowImage) true else accountViewModel.settings.showImages(),
) )
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/MarkdownMediaRenderer.kt
+1 -1
View File
@@ -128,7 +128,7 @@ class MarkdownMediaRenderer(
) )
} }
} else { } else {
if (!accountViewModel.settings.showUrlPreview.value) { if (!accountViewModel.settings.showUrlPreview()) {
renderAsCompleteLink(title ?: uri, uri, richTextStringBuilder) renderAsCompleteLink(title ?: uri, uri, richTextStringBuilder)
} else { } else {
renderInlineFullWidth(richTextStringBuilder) { renderInlineFullWidth(richTextStringBuilder) {
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/drawer/AccountSwitchBottomSheet.kt
+1 -1
View File
@@ -216,7 +216,7 @@ private fun AccountPicture(
model = profilePicture, model = profilePicture,
contentDescription = stringRes(R.string.profile_image), contentDescription = stringRes(R.string.profile_image),
modifier = AccountPictureModifier, modifier = AccountPictureModifier,
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
) )
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/drawer/DrawerContent.kt
+1 -1
View File
@@ -245,7 +245,7 @@ fun ProfileContentTemplate(
.clip(shape = CircleShape) .clip(shape = CircleShape)
.border(3.dp, MaterialTheme.colorScheme.onBackground, CircleShape) .border(3.dp, MaterialTheme.colorScheme.onBackground, CircleShape)
.clickable(onClick = onClick), .clickable(onClick = onClick),
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
) )
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/topbars/UserDrawerSearchTopBar.kt
+1 -1
View File
@@ -85,7 +85,7 @@ private fun LoggedInUserPictureDrawer(
contentDescription = stringRes(id = R.string.your_profile_image), contentDescription = stringRes(id = R.string.your_profile_image),
modifier = HeaderPictureModifier, modifier = HeaderPictureModifier,
contentScale = ContentScale.Crop, contentScale = ContentScale.Crop,
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
) )
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/MultiSetCompose.kt
+1 -1
View File
@@ -603,7 +603,7 @@ fun WatchUserMetadataAndFollowsAndRenderUserProfilePicture(
contentDescription = stringRes(id = R.string.profile_image), contentDescription = stringRes(id = R.string.profile_image),
modifier = MaterialTheme.colorScheme.profile35dpModifier, modifier = MaterialTheme.colorScheme.profile35dpModifier,
contentScale = ContentScale.Crop, contentScale = ContentScale.Crop,
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
) )
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
+1 -1
View File
@@ -1307,7 +1307,7 @@ private fun ChannelNotePicture(
model = model, model = model,
contentDescription = stringRes(R.string.group_picture), contentDescription = stringRes(R.string.group_picture),
modifier = MaterialTheme.colorScheme.channelNotePictureModifier, modifier = MaterialTheme.colorScheme.channelNotePictureModifier,
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
) )
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/RelayListRow.kt
+1 -1
View File
@@ -149,7 +149,7 @@ fun RenderRelay(
RenderRelayIcon( RenderRelayIcon(
displayUrl = relayInfo.id ?: relay.url, displayUrl = relayInfo.id ?: relay.url,
iconUrl = relayInfo.icon, iconUrl = relayInfo.icon,
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
pingInMs = 0, pingInMs = 0,
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
) )
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt
+1 -1
View File
@@ -358,7 +358,7 @@ fun InnerUserPicture(
}, },
modifier = myImageModifier, modifier = myImageModifier,
contentScale = ContentScale.Crop, contentScale = ContentScale.Crop,
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
) )
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/CommunityHeader.kt
+2 -2
View File
@@ -326,7 +326,7 @@ fun ShortCommunityHeader(
contentDescription = stringRes(R.string.profile_image), contentDescription = stringRes(R.string.profile_image),
contentScale = ContentScale.Crop, contentScale = ContentScale.Crop,
modifier = HeaderPictureModifier, modifier = HeaderPictureModifier,
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
) )
} }
@@ -376,7 +376,7 @@ fun ShortCommunityHeaderNoActions(
contentDescription = stringRes(R.string.profile_image), contentDescription = stringRes(R.string.profile_image),
contentScale = ContentScale.Crop, contentScale = ContentScale.Crop,
modifier = HeaderPictureModifier, modifier = HeaderPictureModifier,
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
) )
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Wiki.kt
+1 -4
View File
@@ -88,10 +88,7 @@ private fun WikiNoteHeader(
), ),
) { ) {
Column { Column {
val automaticallyShowUrlPreview = if (accountViewModel.settings.showUrlPreview()) {
remember { accountViewModel.settings.showUrlPreview.value }
if (automaticallyShowUrlPreview) {
image?.let { image?.let {
MyAsyncImage( MyAsyncImage(
imageUrl = it, imageUrl = it,
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/UiSettingsState.kt
+8
View File
@@ -131,4 +131,12 @@ class UiSettingsState(
fun isCompleteUIMode() = uiSettingsFlow.featureSet.value == FeatureSetType.COMPLETE fun isCompleteUIMode() = uiSettingsFlow.featureSet.value == FeatureSetType.COMPLETE
fun isImmersiveScrollingActive() = uiSettingsFlow.automaticallyHideNavigationBars.value == BooleanType.ALWAYS fun isImmersiveScrollingActive() = uiSettingsFlow.automaticallyHideNavigationBars.value == BooleanType.ALWAYS
fun showProfilePictures() = showProfilePictures.value
fun showUrlPreview() = showUrlPreview.value
fun startVideoPlayback() = startVideoPlayback.value
fun showImages() = showImages.value
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/feed/types/RenderCreateChannelNote.kt
+2 -2
View File
@@ -158,7 +158,7 @@ fun RenderChannelData(
model = it, model = it,
contentDescription = stringRes(R.string.channel_image), contentDescription = stringRes(R.string.channel_image),
modifier = MaterialTheme.colorScheme.largeProfilePictureModifier, modifier = MaterialTheme.colorScheme.largeProfilePictureModifier,
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
) )
} }
@@ -253,7 +253,7 @@ fun RenderRelayLinePublicChat(
relay.displayUrl(), relay.displayUrl(),
relayInfo.icon, relayInfo.icon,
clickableModifier, clickableModifier,
showPicture = accountViewModel.settings.showProfilePictures.value, showPicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
) )
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/ephemChat/header/ShortEphemeralChatChannelHeader.kt
+1 -1
View File
@@ -101,7 +101,7 @@ private fun DrawRelayIcon(
contentDescription = stringRes(R.string.profile_image), contentDescription = stringRes(R.string.profile_image),
contentScale = ContentScale.Crop, contentScale = ContentScale.Crop,
modifier = HeaderPictureModifier, modifier = HeaderPictureModifier,
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
) )
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/nip28PublicChat/header/LongPublicChatChannelHeader.kt
+1 -1
View File
@@ -87,7 +87,7 @@ fun LongPublicChatChannelHeader(
model = it, model = it,
contentDescription = stringRes(R.string.channel_image), contentDescription = stringRes(R.string.channel_image),
modifier = MaterialTheme.colorScheme.largeProfilePictureModifier, modifier = MaterialTheme.colorScheme.largeProfilePictureModifier,
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
) )
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/nip28PublicChat/header/ShortPublicChatChannelHeader.kt
+1 -1
View File
@@ -70,7 +70,7 @@ fun ShortPublicChatChannelHeader(
contentDescription = stringRes(R.string.profile_image), contentDescription = stringRes(R.string.profile_image),
contentScale = ContentScale.Crop, contentScale = ContentScale.Crop,
modifier = HeaderPictureModifier, modifier = HeaderPictureModifier,
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
) )
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/send/ChannelFileUploadDialog.kt
+1 -1
View File
@@ -72,7 +72,7 @@ fun ChannelFileUploadDialog(
contentDescription = stringRes(R.string.profile_image), contentDescription = stringRes(R.string.profile_image),
contentScale = ContentScale.Crop, contentScale = ContentScale.Crop,
modifier = HeaderPictureModifier, modifier = HeaderPictureModifier,
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
) )
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/ChatroomHeaderCompose.kt
+2 -2
View File
@@ -195,7 +195,7 @@ private fun ChannelRoomCompose(
channelLastTime = lastMessage.createdAt(), channelLastTime = lastMessage.createdAt(),
channelLastContent = "$authorName: $description", channelLastContent = "$authorName: $description",
hasNewMessages = (noteEvent?.createdAt ?: Long.MIN_VALUE) > lastReadTime, hasNewMessages = (noteEvent?.createdAt ?: Long.MIN_VALUE) > lastReadTime,
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
onClick = { nav.nav(routeFor(channel)) }, onClick = { nav.nav(routeFor(channel)) },
) )
@@ -227,7 +227,7 @@ private fun ChannelRoomCompose(
channelLastTime = lastMessage.createdAt(), channelLastTime = lastMessage.createdAt(),
channelLastContent = "$authorName: $description", channelLastContent = "$authorName: $description",
hasNewMessages = (noteEvent?.createdAt ?: Long.MIN_VALUE) > lastReadTime, hasNewMessages = (noteEvent?.createdAt ?: Long.MIN_VALUE) > lastReadTime,
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
onClick = { nav.nav(routeFor(channel)) }, onClick = { nav.nav(routeFor(channel)) },
) )
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/gallery/GalleryThumb.kt
+2 -2
View File
@@ -197,7 +197,7 @@ fun UrlImageView(
val showImage = val showImage =
remember { remember {
mutableStateOf( mutableStateOf(
if (alwayShowImage) true else accountViewModel.settings.showImages.value, if (alwayShowImage) true else accountViewModel.settings.showImages(),
) )
} }
@@ -267,7 +267,7 @@ fun UrlVideoView(
val automaticallyStartPlayback = val automaticallyStartPlayback =
remember(content) { remember(content) {
mutableStateOf<Boolean>(accountViewModel.settings.startVideoPlayback.value) mutableStateOf<Boolean>(accountViewModel.settings.startVideoPlayback())
} }
Box(defaultModifier, contentAlignment = Alignment.Center) { Box(defaultModifier, contentAlignment = Alignment.Center) {
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/header/badges/DisplayBadges.kt
+1 -1
View File
@@ -201,7 +201,7 @@ private fun RenderBadgeImage(
model = image, model = image,
contentDescription = description, contentDescription = description,
modifier = BadgePictureModifier, modifier = BadgePictureModifier,
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
) )
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/qrcode/ShowQRDialog.kt
+1 -1
View File
@@ -164,7 +164,7 @@ fun ShowQRDialog(
model = user.profilePicture(), model = user.profilePicture(),
contentDescription = stringRes(R.string.profile_image), contentDescription = stringRes(R.string.profile_image),
modifier = MaterialTheme.colorScheme.largeProfilePictureModifier, modifier = MaterialTheme.colorScheme.largeProfilePictureModifier,
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
) )
} }
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/RelayInformationScreen.kt
+1 -1
View File
@@ -156,7 +156,7 @@ fun RelayInformationScreen(
RenderRelayIcon( RenderRelayIcon(
displayUrl = relay.displayUrl(), displayUrl = relay.displayUrl(),
iconUrl = relayInfo.icon, iconUrl = relayInfo.icon,
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
RelayStats.get(relay).pingInMs, RelayStats.get(relay).pingInMs,
iconModifier = LargeRelayIconModifier, iconModifier = LargeRelayIconModifier,
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/relays/common/BasicRelaySetupInfoDialog.kt
+1 -1
View File
@@ -35,7 +35,7 @@ fun BasicRelaySetupInfoDialog(
) { ) {
BasicRelaySetupInfoClickableRow( BasicRelaySetupInfoClickableRow(
item = item, item = item,
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
onDelete = onDelete, onDelete = onDelete,
accountViewModel = accountViewModel, accountViewModel = accountViewModel,
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/search/SearchScreen.kt
+3 -3
View File
@@ -292,7 +292,7 @@ private fun DisplaySearchResults(
channelLastTime = null, channelLastTime = null,
channelLastContent = item.summary(), channelLastContent = item.summary(),
hasNewMessages = false, hasNewMessages = false,
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
onClick = { nav.nav(routeFor(item)) }, onClick = { nav.nav(routeFor(item)) },
) )
@@ -321,7 +321,7 @@ private fun DisplaySearchResults(
channelLastTime = null, channelLastTime = null,
channelLastContent = stringRes(R.string.ephemeral_relay_chat), channelLastContent = stringRes(R.string.ephemeral_relay_chat),
hasNewMessages = false, hasNewMessages = false,
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
onClick = { nav.nav(routeFor(item)) }, onClick = { nav.nav(routeFor(item)) },
) )
@@ -348,7 +348,7 @@ private fun DisplaySearchResults(
channelLastTime = null, channelLastTime = null,
channelLastContent = item.summary(), channelLastContent = item.summary(),
hasNewMessages = false, hasNewMessages = false,
loadProfilePicture = accountViewModel.settings.showProfilePictures.value, loadProfilePicture = accountViewModel.settings.showProfilePictures(),
loadRobohash = accountViewModel.settings.isNotPerformanceMode(), loadRobohash = accountViewModel.settings.isNotPerformanceMode(),
onClick = { nav.nav(routeFor(item)) }, onClick = { nav.nav(routeFor(item)) },
) )