From b00eb413fa39f079f99bba520f3719ba9ad299e8 Mon Sep 17 00:00:00 2001
From: KotlinGeekDev <kotlingeek@protonmail.com>
Date: Wed, 26 Nov 2025 19:49:16 +0100
Subject: [PATCH] Other Hashtag/Link related refactors.

---
 .../display/BookmarkGroupScreen.kt            |  9 -------
 .../bookmarkgroups/list/BookmarkGroupItem.kt  | 24 +------------------
 amethyst/src/main/res/values/strings.xml      |  8 -------
 3 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/display/BookmarkGroupScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/display/BookmarkGroupScreen.kt
index 7fb6aba8f..e06eaea47 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/display/BookmarkGroupScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/display/BookmarkGroupScreen.kt
@@ -189,8 +189,6 @@ fun BookmarkGroupScreenView(
                         },
                         nav,
                     )
-                BookmarkType.HashtagBookmark -> RenderHashtagList(bookmarkGroupViewModel, pagerState)
-                BookmarkType.LinkBookmark -> RenderLinksList(bookmarkGroupViewModel, pagerState)
             }
         }
     }
@@ -238,10 +236,6 @@ fun BookmarkGroupHeaderTabs(
                 bookmarkGroup?.let {
                     stringRes(R.string.private_articles_count, it.privateArticleBookmarks.size)
                 } ?: stringRes(R.string.private_posts_label)
-
-            // TODO: Match the implementations in the pair below to the pair above.
-            BookmarkType.HashtagBookmark -> stringRes(R.string.private_hashtags_label)
-            BookmarkType.LinkBookmark -> stringRes(R.string.private_links_label)
         }
 
     val publicItemTypeLabel =
@@ -254,9 +248,6 @@ fun BookmarkGroupHeaderTabs(
                 bookmarkGroup?.let {
                     stringRes(R.string.public_articles_count, it.publicArticleBookmarks.size)
                 } ?: stringRes(R.string.public_articles_label)
-            // TODO: Match the implementations in the pair below to the pair above.
-            BookmarkType.HashtagBookmark -> stringRes(R.string.public_hashtags_label)
-            BookmarkType.LinkBookmark -> stringRes(R.string.public_links_label)
         }
 
     TabRow(
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/list/BookmarkGroupItem.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/list/BookmarkGroupItem.kt
index 67c8cb6cb..6f2916cb1 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/list/BookmarkGroupItem.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/list/BookmarkGroupItem.kt
@@ -32,9 +32,7 @@ import androidx.compose.foundation.layout.offset
 import androidx.compose.material.icons.Icons
 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
@@ -166,8 +164,6 @@ private fun BookmarkGroupActions(
     modifier: Modifier = Modifier,
     openPostBookmarks: () -> Unit = {},
     openArticleBookmarks: () -> Unit = {},
-    openLinkBookmarks: () -> Unit = {},
-    openHashtagBookmarks: () -> Unit = {},
 ) {
     FlowRow(
         modifier = modifier,
@@ -195,24 +191,6 @@ private fun BookmarkGroupActions(
             )
             Text(stringRes(R.string.bookmark_list_articles_btn_label))
         }
-        FilledTonalButton(
-            onClick = openLinkBookmarks,
-        ) {
-            Icon(
-                imageVector = Icons.Outlined.Link,
-                contentDescription = null,
-            )
-            Text(stringRes(R.string.bookmark_list_links_btn_label))
-        }
-        FilledTonalButton(
-            onClick = openHashtagBookmarks,
-        ) {
-            Icon(
-                imageVector = Icons.Outlined.Numbers,
-                contentDescription = null,
-            )
-            Text(stringRes(R.string.bookmark_list_hashtags_btn_label))
-        }
     }
 }
 
@@ -394,7 +372,7 @@ private fun GroupOptionsMenu(
                 optionalCloneDescription.value = it
             },
             onCloneCreate = { name, description ->
-                onGroupClone(optionalCloneName.value, optionalCloneDescription.value)
+                onGroupClone(name, description)
             },
             onDismiss = { isCopyDialogOpen.value = false },
         )
diff --git a/amethyst/src/main/res/values/strings.xml b/amethyst/src/main/res/values/strings.xml
index beae57c2c..8e1d4542e 100644
--- a/amethyst/src/main/res/values/strings.xml
+++ b/amethyst/src/main/res/values/strings.xml
@@ -406,14 +406,6 @@
     <string name="private_articles_count">Private Articles(%1$s)</string>
     <string name="public_articles_label">Public Articles</string>
     <string name="public_articles_count">Public Articles(%1$s)</string>
-    <string name="private_hashtags_label">Private Hashtags</string>
-    <string name="private_hashtags_count">Private Hashtags(%1$s)</string>
-    <string name="public_hashtags_label">Public Hashtags</string>
-    <string name="public_hashtags_count">Public Hashtags(%1$s)</string>
-    <string name="private_links_label">Private Links</string>
-    <string name="private_links_count">Private Links(%1$s)</string>
-    <string name="public_links_label">Public Links</string>
-    <string name="public_links_count">Public Links(%1$s)</string>
 
     <string name="wallet_connect_service">Wallet Connect Service</string>
     <string name="wallet_connect_service_explainer">Authorizes a Nostr Secret to pay zaps without leaving the app. Keep the secret safe and use a private relay if possible</string>