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

Better positioning of the User Search (always at the bottom, independent of screen size)

Browse Source
This commit is contained in:
Vitor Pamplona
2023-02-13 18:08:38 -05:00
parent f5e61b9409
commit 05d71fd27e
1 changed files with 116 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt
+116 -103
View File
@@ -76,119 +76,132 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, account: Account
) )
) { ) {
Surface(modifier = Modifier.fillMaxWidth().fillMaxHeight()) { Surface(modifier = Modifier.fillMaxWidth().fillMaxHeight()) {
Column(modifier = Modifier.padding(10.dp).imePadding().verticalScroll(scroolState)) { Column(modifier = Modifier.fillMaxWidth().fillMaxHeight().border(1.dp, Color.Red)) {
Row( Column(modifier = Modifier.padding(10.dp).imePadding().weight(1f).border(1.dp, Color.Yellow)) {
modifier = Modifier.fillMaxWidth(), Row(
horizontalArrangement = Arrangement.SpaceBetween, modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically horizontalArrangement = Arrangement.SpaceBetween,
) { verticalAlignment = Alignment.CenterVertically
CloseButton(onCancel = {
postViewModel.cancel()
onClose()
})
UploadFromGallery(
isUploading = postViewModel.isUploadingImage,
) { ) {
postViewModel.upload(it, context) CloseButton(onCancel = {
} postViewModel.cancel()
PostButton(
onPost = {
postViewModel.sendPost()
onClose() onClose()
}, })
isActive = postViewModel.message.text.isNotBlank()
&& !postViewModel.isUploadingImage
)
}
if (postViewModel.replyTos != null && baseReplyTo?.event is TextNoteEvent) { UploadFromGallery(
ReplyInformation(postViewModel.replyTos, postViewModel.mentions, "✖ ") { isUploading = postViewModel.isUploadingImage,
postViewModel.removeFromReplyList(it) ) {
postViewModel.upload(it, context)
}
PostButton(
onPost = {
postViewModel.sendPost()
onClose()
},
isActive = postViewModel.message.text.isNotBlank()
&& !postViewModel.isUploadingImage
)
} }
}
OutlinedTextField( Row(
value = postViewModel.message, modifier = Modifier.fillMaxWidth().weight(1f)
onValueChange = {
postViewModel.updateMessage(it)
},
keyboardOptions = KeyboardOptions.Default.copy(
capitalization = KeyboardCapitalization.Sentences
),
modifier = Modifier
.fillMaxWidth().imePadding().heightIn(300.dp, 500.dp)
.border(
width = 1.dp,
color = MaterialTheme.colors.surface,
shape = RoundedCornerShape(8.dp)
)
.focusRequester(focusRequester)
.onFocusChanged {
if (it.isFocused) {
keyboardController?.show()
}
},
placeholder = {
Text(
text = "What's on your mind?",
color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
)
},
colors = TextFieldDefaults
.outlinedTextFieldColors(
unfocusedBorderColor = Color.Transparent,
focusedBorderColor = Color.Transparent
),
visualTransformation = UrlUserTagTransformation(MaterialTheme.colors.primary),
textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
)
val userSuggestions = postViewModel.userSuggestions
if (userSuggestions.isNotEmpty()) {
LazyColumn(
contentPadding = PaddingValues(
top = 10.dp,
bottom = 10.dp
),
modifier = Modifier.heightIn(0.dp, 300.dp)
) { ) {
itemsIndexed(userSuggestions, key = { _, item -> item.pubkeyHex }) { index, item -> Column(modifier = Modifier.fillMaxWidth().verticalScroll(scroolState)) {
UserLine(item, account) { if (postViewModel.replyTos != null && baseReplyTo?.event is TextNoteEvent) {
postViewModel.autocompleteWithUser(item) ReplyInformation(postViewModel.replyTos, postViewModel.mentions, "✖ ") {
postViewModel.removeFromReplyList(it)
}
}
OutlinedTextField(
value = postViewModel.message,
onValueChange = {
postViewModel.updateMessage(it)
},
keyboardOptions = KeyboardOptions.Default.copy(
capitalization = KeyboardCapitalization.Sentences
),
modifier = Modifier
.fillMaxWidth()
.border(
width = 1.dp,
color = MaterialTheme.colors.surface,
shape = RoundedCornerShape(8.dp)
)
.focusRequester(focusRequester)
.onFocusChanged {
if (it.isFocused) {
keyboardController?.show()
}
},
placeholder = {
Text(
text = "What's on your mind?",
color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
)
},
colors = TextFieldDefaults
.outlinedTextFieldColors(
unfocusedBorderColor = Color.Transparent,
focusedBorderColor = Color.Transparent
),
visualTransformation = UrlUserTagTransformation(MaterialTheme.colors.primary),
textStyle = LocalTextStyle.current.copy(textDirection = TextDirection.Content)
)
val myUrlPreview = postViewModel.urlPreview
if (myUrlPreview != null) {
Row(modifier = Modifier.padding(top = 5.dp)) {
if (isValidURL(myUrlPreview)) {
val removedParamsFromUrl =
myUrlPreview.split("?")[0].toLowerCase()
if (imageExtension.matcher(removedParamsFromUrl).matches()) {
AsyncImage(
model = myUrlPreview,
contentDescription = myUrlPreview,
contentScale = ContentScale.FillWidth,
modifier = Modifier
.padding(top = 4.dp)
.fillMaxWidth()
.clip(shape = RoundedCornerShape(15.dp))
.border(
1.dp,
MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
RoundedCornerShape(15.dp)
)
)
} else if (videoExtension.matcher(removedParamsFromUrl)
.matches()
) {
VideoView(myUrlPreview)
} else {
UrlPreview(myUrlPreview, myUrlPreview)
}
} else if (noProtocolUrlValidator.matcher(myUrlPreview).matches()) {
UrlPreview("https://$myUrlPreview", myUrlPreview)
}
}
} }
} }
}
}
val myUrlPreview = postViewModel.urlPreview }
if (myUrlPreview != null) {
Row(modifier = Modifier.padding(top = 5.dp)) { val userSuggestions = postViewModel.userSuggestions
if (isValidURL(myUrlPreview)) { if (userSuggestions.isNotEmpty()) {
val removedParamsFromUrl = myUrlPreview.split("?")[0].toLowerCase() LazyColumn(
if (imageExtension.matcher(removedParamsFromUrl).matches()) { contentPadding = PaddingValues(
AsyncImage( top = 10.dp
model = myUrlPreview, ),
contentDescription = myUrlPreview, modifier = Modifier.heightIn(0.dp, 300.dp)
contentScale = ContentScale.FillWidth, ) {
modifier = Modifier itemsIndexed(
.padding(top = 4.dp) userSuggestions,
.fillMaxWidth() key = { _, item -> item.pubkeyHex }) { index, item ->
.clip(shape = RoundedCornerShape(15.dp)) UserLine(item, account) {
.border( postViewModel.autocompleteWithUser(item)
1.dp, }
MaterialTheme.colors.onSurface.copy(alpha = 0.12f),
RoundedCornerShape(15.dp)
)
)
} else if (videoExtension.matcher(removedParamsFromUrl).matches()) {
VideoView(myUrlPreview)
} else {
UrlPreview(myUrlPreview, myUrlPreview)
} }
} else if (noProtocolUrlValidator.matcher(myUrlPreview).matches()) {
UrlPreview("https://$myUrlPreview", myUrlPreview)
} }
} }
} }