Add more infos to share template feature (#299)

christophehenry · web-flow · commit 848b74b60a3b · 2025-05-30T19:23:37.000+02:00
diff --git a/app/src/main/java/com/readrops/app/item/ItemScreen.kt b/app/src/main/java/com/readrops/app/item/ItemScreen.kt
@@ -133,7 +133,7 @@ class ItemScreen(
                                     context.openInCustomTab(url, state.theme, accentColor)
                                 }
                             },
-                            onShareItem = { screenModel.shareItem(item, context) },
+                            onShareItem = { screenModel.shareItem(itemWithFeed, context) },
                             onSetReadState = { screenModel.setItemReadState(item) },
                             onSetStarState = { screenModel.setItemStarState(item) },
                             onOpenImageDialog = { screenModel.openImageDialog(it) },
diff --git a/app/src/main/java/com/readrops/app/item/ItemScreenModel.kt b/app/src/main/java/com/readrops/app/item/ItemScreenModel.kt
@@ -356,8 +356,8 @@ class ItemScreenModel(
         return FileProvider.getUriForFile(context, context.packageName, image)
     }
 
-    fun shareItem(item: Item, context: Context) = Utils.shareItem(
-        item, context, useCustomShareIntentTpl.value, customShareIntentTpl.value
+    fun shareItem(itemWithFeed: ItemWithFeed, context: Context) = Utils.shareItem(
+        itemWithFeed, context, useCustomShareIntentTpl.value, customShareIntentTpl.value
     )
 
     override fun onDispose() {
diff --git a/app/src/main/java/com/readrops/app/more/preferences/PreferencesScreenModel.kt b/app/src/main/java/com/readrops/app/more/preferences/PreferencesScreenModel.kt
@@ -1,13 +1,18 @@
 package com.readrops.app.more.preferences
 
+import android.content.ClipData
 import android.content.Context
+import androidx.room.ColumnInfo
+import androidx.room.Embedded
 import cafe.adriel.voyager.core.model.StateScreenModel
 import cafe.adriel.voyager.core.model.screenModelScope
 import com.readrops.app.R
 import com.readrops.app.util.Preference
 import com.readrops.app.util.Preferences
 import com.readrops.db.Database
 import com.readrops.db.entities.Item
+import com.readrops.db.pojo.ItemWithFeed
+import com.readrops.db.queries.ItemSelectionQueryBuilder
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.combine
@@ -37,7 +42,7 @@ class PreferencesScreenModel(
                     useCustomShareIntentTpl.flow,
                     customShareIntentTpl.flow,
                     swipeToLeft.flow,
-                    swipeToRight.flow
+                    swipeToRight.flow,
                 )
 
                 combine(
@@ -56,16 +61,21 @@ class PreferencesScreenModel(
                         customShareIntentTpl = (list[9] as String) to customShareIntentTpl,
                         swipeToLeft = (list[10] as String) to swipeToLeft,
                         swipeToRight = (list[11] as String) to swipeToRight,
-                        exampleItem = if (database.itemDao().count() > 0) {
-                            database.itemDao().selectFirst()
-                        } else {
-                            Item(
+                        exampleItem = ItemWithFeed(
+                            item = Item(
                                 title = context.getString(R.string.example_item_title),
                                 author = context.getString(R.string.example_item_author),
                                 content = context.getString(R.string.example_item_content),
-                                link = "https://example.org"
-                            )
-                        }
+                                link = "https://example.org/feed1"
+                            ),
+                            feedName = "Example feed",
+                            feedId = -1,
+                            color = 0,
+                            feedIconUrl = "https://example.org/icon.webp",
+                            websiteUrl = "https://example.org",
+                            folder = null,
+                            openIn = null,
+                        )
                     )
                 }.collect { theme ->
                     mutableState.update { previous ->
@@ -106,7 +116,7 @@ sealed class PreferencesScreenState {
         val customShareIntentTpl: PreferenceState<String>,
         val swipeToLeft: PreferenceState<String>,
         val swipeToRight: PreferenceState<String>,
-        val exampleItem: Item,
+        val exampleItem: ItemWithFeed,
         val showDialog: Boolean = false
     ) : PreferencesScreenState()
 
diff --git a/app/src/main/java/com/readrops/app/more/preferences/components/CustomShareIntentTextWidget.kt b/app/src/main/java/com/readrops/app/more/preferences/components/CustomShareIntentTextWidget.kt
@@ -3,12 +3,7 @@ package com.readrops.app.more.preferences.components
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.KeyboardArrowDown
-import androidx.compose.material.icons.filled.KeyboardArrowUp
 import androidx.compose.material3.AlertDialogDefaults
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
@@ -25,7 +20,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.SpanStyle
@@ -38,14 +32,14 @@ import com.readrops.app.util.Preference
 import com.readrops.app.util.ShareIntentTextRenderer
 import com.readrops.app.util.theme.MediumSpacer
 import com.readrops.app.util.theme.ShortSpacer
-import com.readrops.db.entities.Item
+import com.readrops.db.pojo.ItemWithFeed
 import kotlinx.coroutines.launch
 
 @Composable
 fun CustomShareIntentTextWidget(
     preference: Preference<String>,
     template: String,
-    exampleItem: Item,
+    exampleItem: ItemWithFeed,
     onDismiss: () -> Unit,
 ) {
     var localTemplate by remember { mutableStateOf(template) }
@@ -100,7 +94,7 @@ fun CustomShareIntentTextWidget(
                     modifier = Modifier.weight(1f),
                     onClick = {
                         localTemplate = """
-                            {{ title|remove_author|capitalize }} — {{ author }}
+                            {{ title|remove_author|capitalize }} — {{ feedName }}
                             
                             {{ url }}
                         """.trimIndent()
diff --git a/app/src/main/java/com/readrops/app/timelime/TimelineScreenModel.kt b/app/src/main/java/com/readrops/app/timelime/TimelineScreenModel.kt
@@ -482,8 +482,8 @@ class TimelineScreenModel(
         }
     }
 
-    fun shareItem(item: Item, context: Context) = Utils.shareItem(
-        item, context, useCustomShareIntentTpl.value, customShareIntentTpl.value
+    fun shareItem(itemWithFeed: ItemWithFeed, context: Context) = Utils.shareItem(
+        itemWithFeed, context, useCustomShareIntentTpl.value, customShareIntentTpl.value
     )
 }
 
diff --git a/app/src/main/java/com/readrops/app/timelime/TimelineTab.kt b/app/src/main/java/com/readrops/app/timelime/TimelineTab.kt
@@ -348,10 +348,7 @@ object TimelineTab : Tab {
                                                         screenModel.updateStarState(itemWithFeed.item)
                                                     },
                                                     onShare = {
-                                                        screenModel.shareItem(
-                                                            itemWithFeed.item,
-                                                            context
-                                                        )
+                                                        screenModel.shareItem(itemWithFeed, context)
                                                     },
                                                     onSetReadState = {
                                                         screenModel.updateItemReadState(itemWithFeed.item)
diff --git a/app/src/main/java/com/readrops/app/util/ShareIntentTextRenderer.kt b/app/src/main/java/com/readrops/app/util/ShareIntentTextRenderer.kt
@@ -2,8 +2,6 @@ package com.readrops.app.util
 
 import android.content.Context
 import androidx.annotation.VisibleForTesting
-import androidx.compose.ui.util.fastJoinToString
-import com.readrops.db.entities.Item
 import io.pebbletemplates.pebble.PebbleEngine
 import io.pebbletemplates.pebble.extension.AbstractExtension
 import io.pebbletemplates.pebble.extension.Filter
@@ -13,6 +11,7 @@ import io.pebbletemplates.pebble.template.PebbleTemplate
 import org.koin.core.component.KoinComponent
 import java.io.StringWriter
 import com.readrops.app.R
+import com.readrops.db.pojo.ItemWithFeed
 import org.koin.core.component.get
 
 
@@ -84,7 +83,7 @@ class FrenchTypography : DocumentedFilter() {
     }
 }
 
-class ShareIntentTextRenderer(private val item: Item): KoinComponent {
+class ShareIntentTextRenderer(private val itemWithFeed: ItemWithFeed): KoinComponent {
     val documentation by lazy {
         filters.entries.joinToString(prefix = "<br/>", separator = ",<br/>") { (key, filter) ->
             val str = get<Context>().getString(
@@ -98,10 +97,11 @@ class ShareIntentTextRenderer(private val item: Item): KoinComponent {
 
     val context
         get() = mapOf(
-            "title" to item.title,
-            "author" to item.author,
-            "url" to item.link,
-            "content" to item.content
+            "title" to itemWithFeed.item.title,
+            "author" to itemWithFeed.item.author,
+            "url" to itemWithFeed.item.link,
+            "content" to itemWithFeed.item.content,
+            "feedName" to itemWithFeed.feedName,
         )
 
     private fun renderSafe(template: String) = runCatching {
@@ -111,7 +111,7 @@ class ShareIntentTextRenderer(private val item: Item): KoinComponent {
     }
 
     fun renderOrError(template: String) = renderSafe(template).getOrElse { it.toString() }
-    fun render(template: String) = renderSafe(template).getOrDefault(item.link)
+    fun render(template: String) = renderSafe(template).getOrDefault(itemWithFeed.item.link)
 
     companion object {
         private val filters: Map<String, DocumentedFilter> = mapOf(
diff --git a/app/src/main/java/com/readrops/app/util/Utils.kt b/app/src/main/java/com/readrops/app/util/Utils.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Color
 import androidx.annotation.ColorInt
-import com.readrops.db.entities.Item
+import com.readrops.db.pojo.ItemWithFeed
 import java.util.Locale
 
 object Utils {
@@ -41,14 +41,14 @@ object Utils {
     }
 
     fun shareItem(
-        item: Item,
+        itemWithFeed: ItemWithFeed,
         context: Context,
         useCustomShareIntentTpl: Boolean,
         customShareIntentTpl: String
     ) {
         val intentContent =
-            if(!useCustomShareIntentTpl || customShareIntentTpl.isBlank()) item.link
-            else ShareIntentTextRenderer(item).render(customShareIntentTpl)
+            if(!useCustomShareIntentTpl || customShareIntentTpl.isBlank()) itemWithFeed.item.link
+            else ShareIntentTextRenderer(itemWithFeed).render(customShareIntentTpl)
         Intent().apply {
             action = Intent.ACTION_SEND
             type = "text/plain"

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ class ItemScreen(`
`133`	`133`	`context.openInCustomTab(url, state.theme, accentColor)`
`134`	`134`	`}`
`135`	`135`	`},`
`136`		`- onShareItem = { screenModel.shareItem(item, context) },`
	`136`	`+ onShareItem = { screenModel.shareItem(itemWithFeed, context) },`
`137`	`137`	`onSetReadState = { screenModel.setItemReadState(item) },`
`138`	`138`	`onSetStarState = { screenModel.setItemStarState(item) },`
`139`	`139`	`onOpenImageDialog = { screenModel.openImageDialog(it) },`
Original file line number	Diff line number	Diff line change
`@@ -356,8 +356,8 @@ class ItemScreenModel(`
`356`	`356`	`return FileProvider.getUriForFile(context, context.packageName, image)`
`357`	`357`	`}`
`358`	`358`
`359`		`- fun shareItem(item: Item, context: Context) = Utils.shareItem(`
`360`		`- item, context, useCustomShareIntentTpl.value, customShareIntentTpl.value`
	`359`	`+ fun shareItem(itemWithFeed: ItemWithFeed, context: Context) = Utils.shareItem(`
	`360`	`+ itemWithFeed, context, useCustomShareIntentTpl.value, customShareIntentTpl.value`
`361`	`361`	`)`
`362`	`362`
`363`	`363`	`override fun onDispose() {`
Original file line number	Diff line number	Diff line change
`@@ -482,8 +482,8 @@ class TimelineScreenModel(`
`482`	`482`	`}`
`483`	`483`	`}`
`484`	`484`
`485`		`- fun shareItem(item: Item, context: Context) = Utils.shareItem(`
`486`		`- item, context, useCustomShareIntentTpl.value, customShareIntentTpl.value`
	`485`	`+ fun shareItem(itemWithFeed: ItemWithFeed, context: Context) = Utils.shareItem(`
	`486`	`+ itemWithFeed, context, useCustomShareIntentTpl.value, customShareIntentTpl.value`
`487`	`487`	`)`
`488`	`488`	`}`
`489`	`489`