Moves the upload file button closer to the image upload

This commit is contained in:
Vitor Pamplona
2026-03-10 15:54:03 -04:00
parent b2a8a422b2
commit b4184d2235
3 changed files with 9 additions and 11 deletions
@@ -83,7 +83,7 @@ private fun FileSelectButton(
Icon( Icon(
imageVector = Icons.Default.AttachFile, imageVector = Icons.Default.AttachFile,
contentDescription = stringRes(id = R.string.upload_file), contentDescription = stringRes(id = R.string.upload_file),
modifier = Modifier.height(25.dp), modifier = Modifier.height(20.dp),
tint = tint, tint = tint,
) )
} else { } else {
@@ -486,6 +486,14 @@ private fun BottomRowActions(postViewModel: ShortNotePostViewModel) {
postViewModel.selectImage(it) postViewModel.selectImage(it)
} }
SelectFromFiles(
isUploading = postViewModel.isUploadingImage,
tint = MaterialTheme.colorScheme.onBackground,
modifier = Modifier,
) {
postViewModel.selectImage(it)
}
TakePictureButton( TakePictureButton(
onPictureTaken = { onPictureTaken = {
postViewModel.selectImage(it) postViewModel.selectImage(it)
@@ -505,14 +513,6 @@ private fun BottomRowActions(postViewModel: ShortNotePostViewModel) {
maxDurationSeconds = MAX_VOICE_RECORD_SECONDS, maxDurationSeconds = MAX_VOICE_RECORD_SECONDS,
) )
SelectFromFiles(
isUploading = postViewModel.isUploadingImage,
tint = MaterialTheme.colorScheme.onBackground,
modifier = Modifier,
) {
postViewModel.selectImage(it)
}
if (postViewModel.canUsePoll) { if (postViewModel.canUsePoll) {
// These should be hashtag recommendations the user selects in the future. // These should be hashtag recommendations the user selects in the future.
// val hashtag = stringRes(R.string.poll_hashtag) // val hashtag = stringRes(R.string.poll_hashtag)
@@ -130,8 +130,6 @@ class ContactListEvent(
val follows = earlierVersion.verifiedFollowKeySet() val follows = earlierVersion.verifiedFollowKeySet()
val toBeAdded = users.filter { it.pubKey !in follows }.distinctBy { it.pubKey }.map { it.toTagArray() } 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 if (toBeAdded.isEmpty()) return earlierVersion
return create( return create(