Adding alt_text and custom_thumbnail to post form. Fixes #1513

.gitignore

@@ -13,3 +13,4 @@ local.properties
 .project
 .settings
 .classpath
+.kotlin

app/src/main/java/com/jerboa/Utils.kt

@@ -659,6 +659,7 @@ fun validatePostName(
 fun validateUrl(
     ctx: Context,
     url: String,
+    label: String = ctx.getString(R.string.url),
 ): InputField {
     return if (url.isNotEmpty() && !PatternsCompat.WEB_URL.matcher(url).matches()) {
         InputField(
@@ -667,7 +668,7 @@ fun validateUrl(
         )
     } else {
         InputField(
-            label = ctx.getString(R.string.url),
+            label = label,
             hasError = false,
         )
     }

app/src/main/java/com/jerboa/ui/components/common/PictrsImage.kt

@@ -133,6 +133,7 @@ fun PictrsThumbnailImage(
     blur: Boolean,
     roundBottomEndCorner: Boolean,
     modifier: Modifier = Modifier,
+    contentDescription: String? = null,
 ) {
     val ctx = LocalContext.current
     val imageRequest =
@@ -148,7 +149,7 @@ fun PictrsThumbnailImage(
     AsyncImage(
         model = imageRequest,
         placeholder = painterResource(R.drawable.ic_launcher_foreground),
-        contentDescription = null,
+        contentDescription = contentDescription,
         contentScale = ContentScale.Crop,
         modifier =
             modifier
@@ -172,6 +173,7 @@ fun PictrsUrlImage(
     url: String,
     blur: Boolean,
     modifier: Modifier = Modifier,
+    contentDescription: String? = null,
 ) {
     val ctx = LocalContext.current
     val imageRequest =
@@ -187,7 +189,7 @@ fun PictrsUrlImage(
     AsyncImage(
         model = imageRequest,
         placeholder = painterResource(R.drawable.ic_launcher_foreground),
-        contentDescription = null,
+        contentDescription = contentDescription,
         contentScale = ContentScale.FillWidth,
         modifier =
             modifier

app/src/main/java/com/jerboa/ui/components/post/PostListing.kt

@@ -372,6 +372,7 @@ fun PostTitleAndImageLink(
         PictrsUrlImage(
             url = cUrl,
             blur = blurNSFW.needBlur(postView),
+            contentDescription = postView.post.alt_text,
             modifier =
                 Modifier
                     .combinedClickable(
@@ -1499,6 +1500,7 @@ private fun ThumbnailTile(
                     thumbnail = thumbnail,
                     blur = blurNSFW.needBlur(postView),
                     roundBottomEndCorner = postType != PostType.Link,
+                    contentDescription = postView.post.alt_text,
                     modifier = postLinkPicMod,
                 )
             } ?: run {

app/src/main/java/com/jerboa/ui/components/post/composables/PostComposables.kt

@@ -56,6 +56,11 @@ fun CreateEditPostBody(
     url: String,
     urlField: InputField,
     onUrlChange: (url: String) -> Unit,
+    altText: String,
+    onAltTextChange: (altText: String) -> Unit,
+    customThumbnailField: InputField,
+    customThumbnail: String,
+    onCustomThumbnailChange: (customThumbnail: String) -> Unit,
     sharedImage: Uri? = null,
     onImagePicked: (image: Uri) -> Unit,
     isUploadingImage: Boolean = false,
@@ -141,9 +146,36 @@ fun CreateEditPostBody(
             PictrsUrlImage(
                 url = url,
                 blur = false,
+                contentDescription = altText,
+            )
+
+            /**
+             * Alt text field. Only show if its a url image.
+             */
+            OutlinedTextField(
+                value = altText,
+                onValueChange = onAltTextChange,
+                label = {
+                    Text(text = stringResource(R.string.alt_text))
+                },
+                modifier = Modifier.fillMaxWidth(),
             )
         }
 
+        /**
+         * Post custom thumbnail
+         */
+        OutlinedTextField(
+            value = customThumbnail,
+            onValueChange = onCustomThumbnailChange,
+            label = {
+                Text(text = customThumbnailField.label)
+            },
+            isError = customThumbnailField.hasError,
+            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri),
+            modifier = Modifier.fillMaxWidth(),
+        )
+
         /**
          * Markdown field for post body
          */
@@ -240,6 +272,11 @@ fun CreatePostBodyPreview() {
         url = "",
         urlField = InputField(label = "", hasError = false),
         onUrlChange = {},
+        altText = "",
+        onAltTextChange = {},
+        customThumbnailField = InputField(label = "", hasError = false),
+        customThumbnail = "",
+        onCustomThumbnailChange = {},
         onImagePicked = {},
         account = AnonAccount,
         padding = PaddingValues(),
@@ -269,6 +306,11 @@ fun CreatePostBodyPreviewNoCommunity() {
         url = "",
         urlField = InputField(label = "", hasError = false),
         onUrlChange = {},
+        altText = "",
+        onAltTextChange = {},
+        customThumbnailField = InputField(label = "", hasError = false),
+        customThumbnail = "",
+        onCustomThumbnailChange = {},
         onImagePicked = {},
         suggestedTitle = stringResource(R.string.create_post_a_title_here),
         suggestedTitleLoading = false,
@@ -299,6 +341,11 @@ fun EditPostBodyPreview() {
         onNameChange = {},
         onImagePicked = {},
         onUrlChange = {},
+        altText = "",
+        onAltTextChange = {},
+        customThumbnailField = InputField(label = "", hasError = false),
+        customThumbnail = "",
+        onCustomThumbnailChange = {},
         account = AnonAccount,
         isNsfw = false,
         onIsNsfwChange = {},

app/src/main/java/com/jerboa/ui/components/post/create/CreatePostActivity.kt

@@ -93,10 +93,13 @@ fun CreatePostActivity(
         )
     }
     var isUploadingImage by rememberSaveable { mutableStateOf(false) }
+    var altText by rememberSaveable { mutableStateOf("") }
+    var customThumbnail by rememberSaveable { mutableStateOf("") }
 
     val nameField = validatePostName(ctx, name)
     val urlField = validateUrl(ctx, url)
-    val formValid = !nameField.hasError && !urlField.hasError && (selectedCommunity !== null)
+    val customThumbnailField = validateUrl(ctx, customThumbnail, ctx.getString(R.string.custom_thumbnail))
+    val formValid = !nameField.hasError && !urlField.hasError && !customThumbnailField.hasError && (selectedCommunity !== null)
 
     LaunchedEffect(initialUrl) {
         if (initialUrl.isNotEmpty()) {
@@ -137,6 +140,8 @@ fun CreatePostActivity(
                                     name = name,
                                     body = body,
                                     url = url,
+                                    altText = altText,
+                                    customThumbnail = customThumbnail,
                                     isNsfw = isNsfw,
                                     selectedCommunity = selectedCommunity,
                                     createPostViewModel = createPostViewModel,
@@ -179,6 +184,11 @@ fun CreatePostActivity(
                                 }
                             }
                     },
+                    altText = altText,
+                    onAltTextChange = { altText = it },
+                    customThumbnailField = customThumbnailField,
+                    customThumbnail = customThumbnail,
+                    onCustomThumbnailChange = { customThumbnail = it },
                     suggestedTitle = suggestedTitle,
                     suggestedTitleLoading = suggestedTitleLoading,
                     sharedImage = initialImage,
@@ -217,6 +227,8 @@ fun onSubmitClick(
     name: String,
     body: TextFieldValue,
     url: String,
+    altText: String,
+    customThumbnail: String,
     isNsfw: Boolean,
     selectedCommunity: Community?,
     createPostViewModel: CreatePostViewModel,
@@ -227,11 +239,15 @@ fun onSubmitClick(
         val nameOut = name.trim()
         val bodyOut = body.text.trim().ifEmpty { null }
         val urlOut = url.trim().ifEmpty { null }?.padUrlWithHttps()
+        val altTextOut = altText.trim().ifEmpty { null }
+        val customThumbnailOut = customThumbnail.trim().ifEmpty { null }
         createPostViewModel.createPost(
             CreatePost(
                 name = nameOut,
                 community_id = it,
                 url = urlOut,
+                alt_text = altTextOut,
+                custom_thumbnail = customThumbnailOut,
                 body = bodyOut,
                 nsfw = isNsfw,
             ),

app/src/main/java/com/jerboa/ui/components/post/edit/PostEditActivity.kt

@@ -63,10 +63,13 @@ fun PostEditActivity(
         )
     }
     var isUploadingImage by rememberSaveable { mutableStateOf(false) }
+    var altText by rememberSaveable { mutableStateOf(postView.post.alt_text.orEmpty()) }
+    var customThumbnail by rememberSaveable { mutableStateOf("") }
 
     val nameField = validatePostName(ctx, name)
     val urlField = validateUrl(ctx, url)
-    val formValid = !nameField.hasError && !urlField.hasError
+    val customThumbnailField = validateUrl(ctx, customThumbnail, ctx.getString(R.string.custom_thumbnail))
+    val formValid = !nameField.hasError && !urlField.hasError && !customThumbnailField.hasError
 
     Scaffold(
         topBar = {
@@ -88,6 +91,8 @@ fun PostEditActivity(
                                 name = name,
                                 body = body,
                                 url = url,
+                                altText = altText,
+                                customThumbnail = customThumbnail,
                                 postEditViewModel = postEditViewModel,
                                 isNsfw = isNsfw,
                                 appState = appState,
@@ -110,6 +115,11 @@ fun PostEditActivity(
                 url = url,
                 urlField = urlField,
                 onUrlChange = { url = it },
+                altText = altText,
+                onAltTextChange = { altText = it },
+                customThumbnailField = customThumbnailField,
+                customThumbnail = customThumbnail,
+                onCustomThumbnailChange = { customThumbnail = it },
                 onImagePicked = { uri ->
                     if (!account.isAnon()) {
                         val imageIs = imageInputStreamFromUri(ctx, uri)
@@ -140,6 +150,8 @@ fun onSubmitClick(
     name: String,
     body: TextFieldValue,
     url: String,
+    altText: String,
+    customThumbnail: String,
     postEditViewModel: PostEditViewModel,
     isNsfw: Boolean,
     appState: JerboaAppState,
@@ -148,13 +160,17 @@ fun onSubmitClick(
     val nameOut = name.trim()
     val bodyOut = body.text.trim().ifEmpty { null }
     val urlOut = url.trim().ifEmpty { null }
+    val altTextOut = altText.trim().ifEmpty { null }
+    val customThumbnailOut = customThumbnail.trim().ifEmpty { null }
 
     postEditViewModel.editPost(
         form =
             EditPost(
                 post_id = postId,
                 name = nameOut,
                 url = urlOut,
+                alt_text = altTextOut,
+                custom_thumbnail = customThumbnailOut,
                 body = bodyOut,
                 nsfw = isNsfw,
             ),

app/src/main/res/values/strings.xml

@@ -469,4 +469,6 @@
     <string name="site_legal_info_name">%1$s legal info</string>
     <string name="moderators">Moderators</string>
     <string name="admins">Admins</string>
+    <string name="custom_thumbnail">Custom Thumbnail</string>
+    <string name="alt_text">Alt Text</string>
 </resources>