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 @@
Private Articles(%1$s)
Public Articles
Public Articles(%1$s)
- Private Hashtags
- Private Hashtags(%1$s)
- Public Hashtags
- Public Hashtags(%1$s)
- Private Links
- Private Links(%1$s)
- Public Links
- Public Links(%1$s)
Wallet Connect Service
Authorizes a Nostr Secret to pay zaps without leaving the app. Keep the secret safe and use a private relay if possible