mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2025-10-05 19:52:34 +02:00
Adding the same button style for before and after granted permissions
This commit is contained in:
@@ -44,43 +44,44 @@ fun UploadFromGallery(
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
Box() {
|
UploadBoxButton(isUploading) {
|
||||||
TextButton(
|
showGallerySelect = true
|
||||||
modifier = Modifier
|
|
||||||
.align(Alignment.TopCenter),
|
|
||||||
enabled = !isUploading,
|
|
||||||
onClick = {
|
|
||||||
showGallerySelect = true
|
|
||||||
}
|
|
||||||
) {
|
|
||||||
Icon(
|
|
||||||
painter = painterResource(id = R.drawable.ic_add_photo),
|
|
||||||
contentDescription = stringResource(id = R.string.upload_image),
|
|
||||||
modifier = Modifier
|
|
||||||
.height(20.dp)
|
|
||||||
.padding(end = 8.dp),
|
|
||||||
tint = MaterialTheme.colors.primary
|
|
||||||
)
|
|
||||||
|
|
||||||
if (!isUploading) {
|
|
||||||
Text(stringResource(R.string.upload_image))
|
|
||||||
} else {
|
|
||||||
Text(stringResource(R.string.uploading))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Column {
|
UploadBoxButton(isUploading) {
|
||||||
Button(
|
cameraPermissionState.launchPermissionRequest()
|
||||||
onClick = { cameraPermissionState.launchPermissionRequest() },
|
}
|
||||||
enabled = !isUploading
|
}
|
||||||
) {
|
}
|
||||||
if (!isUploading) {
|
|
||||||
Text(stringResource(R.string.upload_image))
|
@Composable
|
||||||
} else {
|
private fun UploadBoxButton(
|
||||||
Text(stringResource(R.string.uploading))
|
isUploading: Boolean,
|
||||||
}
|
onClick: () -> Unit
|
||||||
|
) {
|
||||||
|
Box() {
|
||||||
|
TextButton(
|
||||||
|
modifier = Modifier
|
||||||
|
.align(Alignment.TopCenter),
|
||||||
|
enabled = !isUploading,
|
||||||
|
onClick = {
|
||||||
|
onClick()
|
||||||
|
}
|
||||||
|
) {
|
||||||
|
Icon(
|
||||||
|
painter = painterResource(id = R.drawable.ic_add_photo),
|
||||||
|
contentDescription = stringResource(id = R.string.upload_image),
|
||||||
|
modifier = Modifier
|
||||||
|
.height(20.dp)
|
||||||
|
.padding(end = 8.dp),
|
||||||
|
tint = MaterialTheme.colors.primary
|
||||||
|
)
|
||||||
|
|
||||||
|
if (!isUploading) {
|
||||||
|
Text(stringResource(R.string.upload_image))
|
||||||
|
} else {
|
||||||
|
Text(stringResource(R.string.uploading))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user