Add "Share text and link" option (#1995)

Author: jocmp

app/src/main/assets/mercury-parser.js

@@ -14,6 +14,15 @@ fun Context.shareLink(url: String, title: String) {
     startActivity(share)
 }
 
+fun Context.shareText(text: String) {
+    val share = Intent.createChooser(Intent().apply {
+        type = "text/plain"
+        action = Intent.ACTION_SEND
+        putExtra(Intent.EXTRA_TEXT, text)
+    }, null)
+    startActivity(share)
+}
+
 fun Context.shareImage(uri: Uri) {
     val shareIntent = Intent(Intent.ACTION_SEND).apply {
         putExtra(Intent.EXTRA_STREAM, uri)

app/src/main/assets/stylesheet.css

@@ -6,12 +6,8 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.ContentCopy
-import androidx.compose.material.icons.rounded.Share
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.Icon
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.Text
@@ -26,6 +22,7 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import com.capyreader.app.R
 import com.capyreader.app.common.shareLink
+import com.capyreader.app.common.shareText
 import com.capyreader.app.ui.components.DialogCard
 import com.capyreader.app.ui.components.ShareLink
 import com.capyreader.app.ui.components.buildCopyToClipboard
@@ -40,11 +37,17 @@ fun ShareLinkDialog(
         ListItemDefaults.colors(containerColor = CardDefaults.cardColors().containerColor)
 
     val context = LocalContext.current
+
     val shareLink = {
         context.shareLink(url = link.url, title = link.text)
         onClose()
     }
 
+    val shareLinkWithText = {
+        context.shareText(link.string())
+        onClose()
+    }
+
     val copy = buildCopyToClipboard(link.url)
 
     val copyLink = {
@@ -85,12 +88,6 @@ fun ShareLinkDialog(
                             copyLink()
                         },
                         colors = listItemColors,
-                        leadingContent = {
-                            Icon(
-                                Icons.Rounded.ContentCopy,
-                                contentDescription = null
-                            )
-                        },
                         headlineContent = { Text(stringResource(R.string.actions_copy_link)) }
                     )
 
@@ -99,14 +96,16 @@ fun ShareLinkDialog(
                             shareLink()
                         },
                         colors = listItemColors,
-                        leadingContent = {
-                            Icon(
-                                Icons.Rounded.Share,
-                                contentDescription = null
-                            )
-                        },
                         headlineContent = { Text(stringResource(R.string.actions_share_link)) }
                     )
+
+                    ListItem(
+                        modifier = Modifier.clickable {
+                            shareLinkWithText()
+                        },
+                        colors = listItemColors,
+                        headlineContent = { Text(stringResource(R.string.actions_share_link_with_title)) }
+                    )
                 }
             }
         }

app/src/main/java/com/capyreader/app/common/ContextShareLinkExt.kt

@@ -6,14 +6,17 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.Saver
 import androidx.compose.runtime.saveable.rememberSaveable
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
 @Serializable
 data class ShareLink(
     val text: String,
     val url: String,
-)
+) {
+    fun string(): String {
+        return "$text $url"
+    }
+}
 
 val ShareLink.Companion.Saver
     get() = Saver<MutableState<ShareLink?>, String>(

app/src/main/java/com/capyreader/app/ui/articles/detail/ShareLinkDialog.kt

@@ -32,11 +32,13 @@
   <body>
     <article role="main">
       <header>
-        <a class="article__header" href="{{external_link}}">
-          <h1 class="article__title article__title--font-{{title_font_family}}">{{title}}</h1>
+        <div class="article__header">
+          <a href="{{external_link}}">
+            <h1 class="article__title article__title--font-{{title_font_family}}">{{title}}</h1>
+          </a>
           <div>{{byline}}</div>
           <div>{{feed_name}}</div>
-        </a>
+        </div>
       </header>
       <div class="article__body article__body--font-{{font_family}}">
         <div id="article-body-content">{{body}}</div>

app/src/main/java/com/capyreader/app/ui/components/ShareLink.kt

@@ -310,6 +310,7 @@
     <string name="tag_action_edit">Edit Tag</string>
     <string name="actions_copy_link">Copy link</string>
     <string name="actions_share_link">Share link</string>
+    <string name="actions_share_link_with_title">Share text and link</string>
     <string name="widget_receiver_headlines_title">Headlines</string>
     <string name="widget_headlines_title">Latest Headlines</string>
     <string name="widget_headlines_see_more_button">See more articles</string>

app/src/main/res/raw/template.html

@@ -365,9 +365,11 @@ ul:has(img) {
   margin: 0 auto 1rem;
   text-align: var(--article-title-text-align);
 
-  &:link,
-  &:visited {
-    text-decoration: none;
+  a {
+    &:link,
+    &:visited {
+      text-decoration: none;
+    }
   }
 }