Adding a markdown helper. Fixes #38

LemmyNet · Feb 21, 2022 · d586476 · d586476
1 parent e590369
commit d586476
Show file tree

Hide file tree

Showing 12 changed files with 576 additions and 112 deletions.
diff --git a/app/src/main/java/com/jerboa/ui/components/comment/edit/CommentEdit.kt b/app/src/main/java/com/jerboa/ui/components/comment/edit/CommentEdit.kt
@@ -1,7 +1,6 @@
 package com.jerboa.ui.components.comment.edit
 
 import android.net.Uri
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.*
@@ -10,14 +9,14 @@ import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Save
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.input.TextFieldValue
 import androidx.navigation.NavController
 import androidx.navigation.compose.rememberNavController
 import com.jerboa.datatypes.CommentView
-import com.jerboa.ui.components.common.PickImage
-import com.jerboa.ui.components.common.ReplyTextField
+import com.jerboa.db.Account
+import com.jerboa.ui.components.common.MarkdownTextField
 import com.jerboa.ui.components.common.simpleVerticalScrollbar
 import com.jerboa.ui.theme.APP_BAR_ELEVATION
-import com.jerboa.ui.theme.MEDIUM_PADDING
 
 @Composable
 fun CommentEditHeader(
@@ -66,9 +65,10 @@ fun CommentEditHeader(
 
 @Composable
 fun CommentEdit(
-    content: String,
-    onContentChange: (String) -> Unit,
+    content: TextFieldValue,
+    onContentChange: (TextFieldValue) -> Unit,
     onPickedImage: (image: Uri) -> Unit,
+    account: Account?,
 ) {
     val listState = rememberLazyListState()
 
@@ -77,13 +77,7 @@ fun CommentEdit(
         modifier = Modifier.simpleVerticalScrollbar(listState)
     ) {
         item {
-            ReplyTextField(reply = content, onReplyChange = onContentChange)
-        }
-        item {
-            PickImage(
-                onPickedImage = onPickedImage,
-                modifier = Modifier.padding(MEDIUM_PADDING)
-            )
+            MarkdownTextField(reply = content, onReplyChange = onContentChange, account = account)
         }
     }
 }

diff --git a/app/src/main/java/com/jerboa/ui/components/comment/edit/CommentEditActivity.kt b/app/src/main/java/com/jerboa/ui/components/comment/edit/CommentEditActivity.kt
@@ -5,9 +5,9 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Scaffold
 import androidx.compose.material.Surface
 import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.text.input.TextFieldValue
 import androidx.navigation.NavController
 import com.jerboa.api.uploadPictrsImage
 import com.jerboa.appendMarkdownImage
@@ -34,7 +34,8 @@ fun CommentEditActivity(
     val ctx = LocalContext.current
     val account = getCurrentAccount(accountViewModel = accountViewModel)
     val scope = rememberCoroutineScope()
-    var content by rememberSaveable { mutableStateOf(commentEditViewModel.commentView.value?.comment?.content.orEmpty()) }
+
+    var content by remember { mutableStateOf(TextFieldValue(commentEditViewModel.commentView.value?.comment?.content.orEmpty())) }
 
     val focusManager = LocalFocusManager.current
 
@@ -47,7 +48,7 @@ fun CommentEditActivity(
                     onSaveClick = {
                         account?.also { acct ->
                             commentEditViewModel.editComment(
-                                content = content,
+                                content = content.text,
                                 ctx = ctx,
                                 navController = navController,
                                 focusManager = focusManager,
@@ -63,14 +64,15 @@ fun CommentEditActivity(
             content = {
                 CommentEdit(
                     content = content,
+                    account = account,
                     onContentChange = { content = it },
                     onPickedImage = { uri ->
                         val imageIs = imageInputStreamFromUri(ctx, uri)
                         scope.launch {
                             account?.also { acct ->
                                 val url = uploadPictrsImage(acct, imageIs, ctx)
                                 url?.also {
-                                    content = appendMarkdownImage(content, it)
+                                    content = TextFieldValue(appendMarkdownImage(content.text, it))
                                 }
                             }
                         }

diff --git a/app/src/main/java/com/jerboa/ui/components/comment/reply/CommentReply.kt b/app/src/main/java/com/jerboa/ui/components/comment/reply/CommentReply.kt
@@ -12,15 +12,16 @@ import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Send
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.navigation.NavController
 import androidx.navigation.compose.rememberNavController
 import com.jerboa.datatypes.CommentView
 import com.jerboa.datatypes.PostView
 import com.jerboa.datatypes.sampleCommentView
+import com.jerboa.db.Account
 import com.jerboa.ui.components.comment.CommentNodeHeader
-import com.jerboa.ui.components.common.PickImage
-import com.jerboa.ui.components.common.ReplyTextField
+import com.jerboa.ui.components.common.MarkdownTextField
 import com.jerboa.ui.components.common.simpleVerticalScrollbar
 import com.jerboa.ui.components.post.PostNodeHeader
 import com.jerboa.ui.theme.LARGE_PADDING
@@ -122,11 +123,12 @@ fun RepliedPost(
 @Composable
 fun CommentReply(
     commentView: CommentView,
-    reply: String,
-    onReplyChange: (String) -> Unit,
+    reply: TextFieldValue,
+    onReplyChange: (TextFieldValue) -> Unit,
     onPersonClick: (personId: Int) -> Unit,
     onPickedImage: (image: Uri) -> Unit,
     isModerator: Boolean,
+    account: Account?,
 ) {
     val listState = rememberLazyListState()
 
@@ -145,25 +147,19 @@ fun CommentReply(
             Divider(modifier = Modifier.padding(vertical = LARGE_PADDING))
         }
         item {
-            ReplyTextField(reply = reply, onReplyChange = onReplyChange)
-        }
-        item {
-            PickImage(
-                onPickedImage = onPickedImage,
-                modifier = Modifier.padding(MEDIUM_PADDING)
-            )
+            MarkdownTextField(reply = reply, onReplyChange = onReplyChange, account = account)
         }
     }
 }
 
 @Composable
 fun PostReply(
     postView: PostView,
-    reply: String,
-    onReplyChange: (String) -> Unit,
+    reply: TextFieldValue,
+    onReplyChange: (TextFieldValue) -> Unit,
     onPersonClick: (personId: Int) -> Unit,
-    onPickedImage: (image: Uri) -> Unit,
     isModerator: Boolean,
+    account: Account?,
 ) {
     val listState = rememberLazyListState()
 
@@ -182,13 +178,7 @@ fun PostReply(
             Divider(modifier = Modifier.padding(vertical = LARGE_PADDING))
         }
         item {
-            ReplyTextField(reply = reply, onReplyChange = onReplyChange)
-        }
-        item {
-            PickImage(
-                onPickedImage = onPickedImage,
-                modifier = Modifier.padding(MEDIUM_PADDING)
-            )
+            MarkdownTextField(reply = reply, onReplyChange = onReplyChange, account = account)
         }
     }
 }

diff --git a/app/src/main/java/com/jerboa/ui/components/comment/reply/CommentReplyActivity.kt b/app/src/main/java/com/jerboa/ui/components/comment/reply/CommentReplyActivity.kt
@@ -7,10 +7,10 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Scaffold
 import androidx.compose.material.Surface
 import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.text.input.TextFieldValue
 import androidx.navigation.NavController
 import com.jerboa.api.uploadPictrsImage
 import com.jerboa.appendMarkdownImage
@@ -39,7 +39,7 @@ fun CommentReplyActivity(
     val ctx = LocalContext.current
     val account = getCurrentAccount(accountViewModel = accountViewModel)
     val scope = rememberCoroutineScope()
-    var reply by rememberSaveable { mutableStateOf("") }
+    var reply by remember { mutableStateOf(TextFieldValue("")) }
 
     val focusManager = LocalFocusManager.current
 
@@ -52,7 +52,7 @@ fun CommentReplyActivity(
                     onSendClick = {
                         account?.also { acct ->
                             commentReplyViewModel.createComment(
-                                content = reply,
+                                content = reply.text,
                                 account = acct,
                                 ctx = ctx,
                                 navController = navController,
@@ -73,6 +73,7 @@ fun CommentReplyActivity(
                     commentReplyViewModel.commentParentView.value?.also { commentView ->
                         CommentReply(
                             commentView = commentView,
+                            account = account,
                             reply = reply,
                             onReplyChange = { reply = it },
                             onPersonClick = { personId ->
@@ -90,17 +91,27 @@ fun CommentReplyActivity(
                                     account?.also { acct ->
                                         val url = uploadPictrsImage(acct, imageIs, ctx)
                                         url?.also {
-                                            reply = appendMarkdownImage(reply, it)
+                                            reply = TextFieldValue(
+                                                appendMarkdownImage(
+                                                    reply.text,
+                                                    it
+                                                )
+                                            )
                                         }
                                     }
                                 }
                             },
-                            isModerator(commentView.creator, postViewModel.moderators)
+                            isModerator = isModerator(
+                                commentView.creator,
+                                postViewModel
+                                    .moderators
+                            ),
                         )
                     } ?: run {
                         commentReplyViewModel.postView.value?.also { postView ->
                             PostReply(
                                 postView = postView,
+                                account = account,
                                 reply = reply,
                                 onReplyChange = { reply = it },
                                 onPersonClick = { personId ->
@@ -112,17 +123,6 @@ fun CommentReplyActivity(
                                         ctx
                                     )
                                 },
-                                onPickedImage = { uri ->
-                                    val imageIs = imageInputStreamFromUri(ctx, uri)
-                                    scope.launch {
-                                        account?.also { acct ->
-                                            val url = uploadPictrsImage(acct, imageIs, ctx)
-                                            url?.also {
-                                                reply = appendMarkdownImage(reply, it)
-                                            }
-                                        }
-                                    }
-                                },
                                 isModerator = isModerator(postView.creator, postViewModel.moderators)
                             )
                         }

diff --git a/app/src/main/java/com/jerboa/ui/components/common/AppBars.kt b/app/src/main/java/com/jerboa/ui/components/common/AppBars.kt
@@ -258,7 +258,7 @@ fun ActionBarButton(
 }
 
 @Composable
-fun DotSpacer(padding: Dp = MEDIUM_PADDING) {
+fun DotSpacer(padding: Dp = SMALL_PADDING) {
     Text(
         text = "·",
         modifier = Modifier.padding(horizontal = padding)