Change the UI of BookmarkGroupItem to add buttons for viewing parts of the bookmark group.

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/BookmarkType.kt

@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.ui.screen.loggedIn.bookmarkgroups
+
+sealed interface BookmarkType {
+    object PostBookmark : BookmarkType
+
+    object ArticleBookmark : BookmarkType
+
+    object LinkBookmark : BookmarkType
+
+    object HashtagBookmark : BookmarkType
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/list/BookmarkGroupItem.kt

@@ -20,32 +20,39 @@
  */
 package com.vitorpamplona.amethyst.ui.screen.loggedIn.bookmarkgroups.list
 
+import androidx.compose.animation.animateContentSize
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.offset
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.outlined.ArrowForward
+import androidx.compose.material.icons.automirrored.outlined.Article
 import androidx.compose.material.icons.outlined.CollectionsBookmark
+import androidx.compose.material.icons.outlined.Link
 import androidx.compose.material.icons.outlined.Lock
+import androidx.compose.material.icons.outlined.Numbers
 import androidx.compose.material.icons.outlined.Public
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontStyle
@@ -58,86 +65,155 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.nip51Lists.labeledBookmarkLists.LabeledBookmarkList
 import com.vitorpamplona.amethyst.ui.components.ClickableBox
 import com.vitorpamplona.amethyst.ui.note.VerticalDotsIcon
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.bookmarkgroups.BookmarkType
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer
 import com.vitorpamplona.amethyst.ui.theme.Font10SP
 import com.vitorpamplona.amethyst.ui.theme.NoSoTinyBorders
 import com.vitorpamplona.amethyst.ui.theme.Size10Modifier
-import com.vitorpamplona.amethyst.ui.theme.Size50ModifierOffset10
+import com.vitorpamplona.amethyst.ui.theme.Size40Modifier
 import com.vitorpamplona.amethyst.ui.theme.Size5dp
 import com.vitorpamplona.amethyst.ui.theme.SpacedBy2dp
 import com.vitorpamplona.amethyst.ui.theme.SpacedBy5dp
+import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
 
 @Composable
 fun BookmarkGroupItem(
     modifier: Modifier = Modifier,
     bookmarkList: LabeledBookmarkList,
-    onClick: () -> Unit,
+    onClick: (bookmarkItemType: BookmarkType) -> Unit,
     onRename: (String) -> Unit,
     onDescriptionChange: (String?) -> Unit,
     onClone: (customName: String?, customDescription: String?) -> Unit,
     onDelete: () -> Unit,
 ) {
-    ListItem(
+    var isExpanded by remember { mutableStateOf(false) }
-        modifier = modifier,
+    Row(
-        headlineContent = {
+        modifier = modifier.clickable(onClick = { isExpanded = !isExpanded }),
-            Row(
+    ) {
-                modifier = Modifier.fillMaxWidth(),
+        Column(
-                horizontalArrangement = Arrangement.SpaceBetween,
+            modifier = Modifier.animateContentSize(),
-            ) {
+            verticalArrangement = Arrangement.Center,
-                Text(bookmarkList.title, maxLines = 1, overflow = TextOverflow.Ellipsis)
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            ListItem(
+                headlineContent = {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                    ) {
+                        Text(bookmarkList.title, maxLines = 1, overflow = TextOverflow.Ellipsis)
 
-                Column(
+                        Column(
-                    modifier = NoSoTinyBorders,
+                            modifier = NoSoTinyBorders,
-                    verticalArrangement = Arrangement.Center,
+                            verticalArrangement = Arrangement.Center,
-                    horizontalAlignment = Alignment.End,
+                            horizontalAlignment = Alignment.End,
-                ) {
+                        ) {
-                    BookmarkGroupOptionsButton(
+                            BookmarkGroupOptionsButton(
-                        bookmarkGroupName = bookmarkList.title,
+                                bookmarkGroupName = bookmarkList.title,
-                        bookmarkGroupDescription = bookmarkList.description,
+                                bookmarkGroupDescription = bookmarkList.description,
-                        onGroupRename = onRename,
+                                onGroupRename = onRename,
-                        onGroupDescriptionChange = onDescriptionChange,
+                                onGroupDescriptionChange = onDescriptionChange,
-                        onGroupCloneCreate = onClone,
+                                onGroupCloneCreate = onClone,
-                        onGroupDelete = onDelete,
+                                onGroupDelete = onDelete,
-                    )
+                            )
-                }
+                        }
-            }
+                    }
-        },
+                },
-        supportingContent = {
+                supportingContent = {
-            Text(
+                    Column(
-                bookmarkList.description ?: "",
+                        modifier = Modifier.fillMaxWidth(),
-                overflow = TextOverflow.Ellipsis,
+                    ) {
-                maxLines = 2,
+                        Text(
+                            bookmarkList.description ?: "",
+                            overflow = TextOverflow.Ellipsis,
+                            maxLines = 2,
+                        )
+                    }
+                },
+                leadingContent = {
+                    Column(
+                        verticalArrangement = Arrangement.Center,
+                        horizontalAlignment = Alignment.CenterHorizontally,
+                    ) {
+                        Icon(
+                            imageVector = Icons.Outlined.CollectionsBookmark,
+                            contentDescription = "Icon for bookmark group",
+                            modifier = Size40Modifier,
+                        )
+                        Spacer(StdVertSpacer)
+                        BookmarkMembershipStatusAndNumberDisplay(
+                            modifier = Modifier.align(Alignment.CenterHorizontally),
+                            privateBookmarksSize = bookmarkList.privateBookmarks.size,
+                            publicBookmarksSize = bookmarkList.publicBookmarks.size,
+                        )
+                    }
+                },
             )
-        },
+            if (isExpanded) {
-        leadingContent = {
+                BookmarkGroupActions(
-            Box(contentAlignment = Alignment.Center) {
+                    modifier = Modifier.fillMaxWidth(),
-                Icon(
+                    openPostBookmarks = { onClick(BookmarkType.PostBookmark) },
-                    imageVector = Icons.Outlined.CollectionsBookmark,
+                    openArticleBookmarks = { onClick(BookmarkType.ArticleBookmark) },
-                    contentDescription = "Icon for bookmark group",
-                    modifier = Size50ModifierOffset10,
-                )
-                BookmarkMembershipStatusAndNumberDisplay(
-                    modifier = Modifier.align(Alignment.BottomCenter),
-                    privateBookmarksSize = bookmarkList.privateBookmarks.size,
-                    publicBookmarksSize = bookmarkList.publicBookmarks.size,
                 )
             }
-        },
+        }
-        trailingContent = {
+    }
-            IconButton(
+}
-                onClick = onClick,
+
-            ) {
+@Composable
-                Column(
+private fun BookmarkGroupActions(
-                    verticalArrangement = Arrangement.Center,
+    modifier: Modifier = Modifier,
-                    horizontalAlignment = Alignment.CenterHorizontally,
+    openPostBookmarks: () -> Unit = {},
-                ) {
+    openArticleBookmarks: () -> Unit = {},
-                    Icon(imageVector = Icons.AutoMirrored.Outlined.ArrowForward, contentDescription = null)
+    openLinkBookmarks: () -> Unit = {},
-                    Text(text = "View")
+    openHashtagBookmarks: () -> Unit = {},
-                }
+) {
-            }
+    FlowRow(
-        },
+        modifier = modifier,
-    )
+        horizontalArrangement = Arrangement.spacedBy(20.dp, Alignment.CenterHorizontally),
+        verticalArrangement = Arrangement.SpaceAround,
+        itemVerticalAlignment = Alignment.CenterVertically,
+        maxLines = 2,
+        maxItemsInEachRow = 2,
+    ) {
+        FilledTonalButton(
+            onClick = openPostBookmarks,
+        ) {
+            Icon(
+                painter = painterResource(R.drawable.post),
+                contentDescription = null,
+            )
+            Text("View Posts")
+        }
+        FilledTonalButton(
+            onClick = openArticleBookmarks,
+        ) {
+            Icon(
+                imageVector = Icons.AutoMirrored.Outlined.Article,
+                contentDescription = null,
+            )
+            Text("View Articles")
+        }
+        FilledTonalButton(
+            onClick = openLinkBookmarks,
+        ) {
+            Icon(
+                imageVector = Icons.Outlined.Link,
+                contentDescription = null,
+            )
+            Text("View Links")
+        }
+        FilledTonalButton(
+            onClick = openHashtagBookmarks,
+        ) {
+            Icon(
+                imageVector = Icons.Outlined.Numbers,
+                contentDescription = null,
+            )
+            Text("View Hashtags")
+        }
+    }
 }
 
 @Composable

amethyst/src/main/res/drawable/post.xml

@@ -0,0 +1 @@
+<!-- drawable/post.xml --><vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M3 3V21H21V3H3M18 18H6V17H18V18M18 16H6V15H18V16M18 12H6V6H18V12Z" /></vector>