From 07f82d3a229897e3d38c78b6fdcec9a03a01e29c Mon Sep 17 00:00:00 2001 From: KotlinGeekDev Date: Wed, 26 Nov 2025 22:44:16 +0100 Subject: [PATCH] String resources. Remove unneeded Todo. --- .../bookmarkgroups/display/ArticleListView.kt | 1 - .../display/BookmarkGroupItemOptions.kt | 2 +- .../ArticleBookmarkListManagementScreen.kt | 2 +- .../BookmarkGroupManagementItem.kt | 14 +++++++------- .../PostBookmarkListManagementScreen.kt | 2 +- amethyst/src/main/res/values/strings.xml | 10 ++++++++++ 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/display/ArticleListView.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/display/ArticleListView.kt index 1f4f595d5..11317e928 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/display/ArticleListView.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/display/ArticleListView.kt @@ -92,7 +92,6 @@ fun ArticleList( state = listState, ) { itemsIndexed(articles, key = { _, item -> item.toNAddr() }) { _, item -> - // TODO: Find a way to integrate bookmark group callbacks into the note below NoteCompose( baseNote = item, modifier = Modifier.animateContentSize(), diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/display/BookmarkGroupItemOptions.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/display/BookmarkGroupItemOptions.kt index 3ed9f76cd..e734d78d9 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/display/BookmarkGroupItemOptions.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/display/BookmarkGroupItemOptions.kt @@ -150,7 +150,7 @@ fun BookmarkGroupItemOptionsMenu( val scope = rememberCoroutineScope() DropdownMenuItem( - text = { Text("Remove from Bookmark List") }, + text = { Text(stringRes(R.string.bookmark_remove_action_label)) }, onClick = { onDeleteBookmarkItem() onDismiss() diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/membershipManagement/ArticleBookmarkListManagementScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/membershipManagement/ArticleBookmarkListManagementScreen.kt index a6b992a7c..d47880432 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/membershipManagement/ArticleBookmarkListManagementScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/membershipManagement/ArticleBookmarkListManagementScreen.kt @@ -80,7 +80,7 @@ private fun ListManagementView( Scaffold( modifier = modifier, topBar = { - TopBarWithBackButton(caption = "Bookmark this article", nav::popBack) + TopBarWithBackButton(caption = stringRes(R.string.article_bookmark_management_title), nav::popBack) }, floatingActionButton = { NewListButton { } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/membershipManagement/BookmarkGroupManagementItem.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/membershipManagement/BookmarkGroupManagementItem.kt index 5c07cd9ee..ae084ac4d 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/membershipManagement/BookmarkGroupManagementItem.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/membershipManagement/BookmarkGroupManagementItem.kt @@ -110,11 +110,11 @@ fun BookmarkStatusInList( ) { val text = if (isPublicMemberBookmark) { - "is a public bookmark here" + stringRes(R.string.public_bookmark_presence_indicator) } else if (isPrivateMemberBookmark) { - "is a private bookmark here" + stringRes(R.string.private_bookmark_presence_indicator) } else { - "is not a bookmark here" + stringRes(R.string.bookmark_absence_indicator) } val icon = @@ -175,13 +175,13 @@ fun BookmarkManagementOptions( if (isBookmarkInList) { Icon( imageVector = Icons.Filled.BookmarkRemove, - contentDescription = "Remove bookmark from list", + contentDescription = stringRes(R.string.bookmark_remove_action_desc), tint = MaterialTheme.colorScheme.onErrorContainer, ) } else { Icon( imageVector = Icons.Filled.BookmarkAdd, - contentDescription = "Add bookmark to list", + contentDescription = stringRes(R.string.bookmark_add_action_desc), tint = MaterialTheme.colorScheme.onPrimary, ) } @@ -193,7 +193,7 @@ fun BookmarkManagementOptions( ) { DropdownMenuItem( text = { - Text(text = "Add as public bookmark") + Text(text = stringRes(R.string.public_bookmark_add_action_label)) }, onClick = { onAddBookmark(false) @@ -202,7 +202,7 @@ fun BookmarkManagementOptions( ) DropdownMenuItem( text = { - Text(text = "Add as private bookmark") + Text(text = stringRes(R.string.private_bookmark_add_action_label)) }, onClick = { onAddBookmark(true) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/membershipManagement/PostBookmarkListManagementScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/membershipManagement/PostBookmarkListManagementScreen.kt index e7c9c6da5..04d0be2c3 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/membershipManagement/PostBookmarkListManagementScreen.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/bookmarkgroups/membershipManagement/PostBookmarkListManagementScreen.kt @@ -79,7 +79,7 @@ private fun ListManagementView( Scaffold( modifier = modifier, topBar = { - TopBarWithBackButton(caption = "Bookmark this post", nav::popBack) + TopBarWithBackButton(caption = stringRes(R.string.post_bookmark_management_title), nav::popBack) }, floatingActionButton = { NewListButton { } diff --git a/amethyst/src/main/res/values/strings.xml b/amethyst/src/main/res/values/strings.xml index 72d08e497..6282089f3 100644 --- a/amethyst/src/main/res/values/strings.xml +++ b/amethyst/src/main/res/values/strings.xml @@ -408,6 +408,16 @@ Public Articles Public Articles(%1$s) Manage %1$s in Bookmark Lists + Bookmark this post + Bookmark this article + is a public bookmark here + is a private bookmark here + is not a bookmark here + Remove bookmark from list + Add bookmark to list + Add as public bookmark + Add as private bookmark + Remove from Bookmark List 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