diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/uploads/SelectFromFiles.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/uploads/SelectFromFiles.kt index 776addedf..354853720 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/uploads/SelectFromFiles.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/uploads/SelectFromFiles.kt @@ -83,7 +83,7 @@ private fun FileSelectButton( Icon( imageVector = Icons.Default.AttachFile, contentDescription = stringRes(id = R.string.upload_file), - modifier = Modifier.height(25.dp), + modifier = Modifier.height(20.dp), tint = tint, ) } else { diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostScreen.kt index 3b09dedd2..d1651dacf 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostScreen.kt @@ -486,6 +486,14 @@ private fun BottomRowActions(postViewModel: ShortNotePostViewModel) { postViewModel.selectImage(it) } + SelectFromFiles( + isUploading = postViewModel.isUploadingImage, + tint = MaterialTheme.colorScheme.onBackground, + modifier = Modifier, + ) { + postViewModel.selectImage(it) + } + TakePictureButton( onPictureTaken = { postViewModel.selectImage(it) @@ -505,14 +513,6 @@ private fun BottomRowActions(postViewModel: ShortNotePostViewModel) { maxDurationSeconds = MAX_VOICE_RECORD_SECONDS, ) - SelectFromFiles( - isUploading = postViewModel.isUploadingImage, - tint = MaterialTheme.colorScheme.onBackground, - modifier = Modifier, - ) { - postViewModel.selectImage(it) - } - if (postViewModel.canUsePoll) { // These should be hashtag recommendations the user selects in the future. // val hashtag = stringRes(R.string.poll_hashtag) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip02FollowList/ContactListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip02FollowList/ContactListEvent.kt index df90aa526..69fce5ddd 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip02FollowList/ContactListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip02FollowList/ContactListEvent.kt @@ -130,8 +130,6 @@ class ContactListEvent( val follows = earlierVersion.verifiedFollowKeySet() val toBeAdded = users.filter { it.pubKey !in follows }.distinctBy { it.pubKey }.map { it.toTagArray() } - println("AABBCC Adding ${toBeAdded.size} users from ${users.size} users with ${follows.size} already there") - if (toBeAdded.isEmpty()) return earlierVersion return create(