Merge pull request #4026 from vitorpamplona/claude/shorts-link-naming-0nd6mz

Distinguish media feed from shorts feed in UI labels

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/bottombars/NavBarItem.kt

@@ -119,10 +119,13 @@ val NavBarCatalog: Map<NavBarItem, NavBarItemDef> =
                 icon = MaterialSymbols.Mail,
                 resolveRoute = { Route.Message },
             ),
+        // The combined media feed (VideoFeedFilter): pictures, NIP-94 files and every NIP-71
+        // video kind. Deliberately *not* labelled "Shorts" — NavBarItem.SHORTS below is the
+        // vertical-video-only feed, and the two used to share that label.
         NavBarItem.VIDEO to
             NavBarItemDef(
                 id = NavBarItem.VIDEO,
-                labelRes = R.string.route_video,
+                labelRes = R.string.route_media,
                 icon = MaterialSymbols.Subscriptions,
                 resolveRoute = { Route.Video() },
             ),
@@ -315,6 +318,8 @@ val NavBarCatalog: Map<NavBarItem, NavBarItemDef> =
                 icon = MaterialSymbols.AutoMirrored.FormatListBulleted,
                 resolveRoute = { Route.CalendarCollections },
             ),
+        // Vertical/short video only (ShortsFeedFilter: kinds 22 + 34236). The broader
+        // picture-and-video feed is NavBarItem.VIDEO ("Media") above.
         NavBarItem.SHORTS to
             NavBarItemDef(
                 id = NavBarItem.SHORTS,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/video/NewVideoFeedButton.kt

@@ -225,7 +225,7 @@ fun NewVideoFeedButton(
             ) {
                 Icon(
                     symbol = MaterialSymbols.Close,
-                    contentDescription = stringRes(id = R.string.new_short),
+                    contentDescription = stringRes(id = R.string.new_media),
                     modifier = Size26Modifier,
                     tint = MaterialTheme.colorScheme.onPrimary,
                 )
@@ -238,7 +238,7 @@ fun NewVideoFeedButton(
             ) {
                 Icon(
                     painter = painterRes(R.drawable.ic_compose, 5),
-                    contentDescription = stringRes(id = R.string.new_short),
+                    contentDescription = stringRes(id = R.string.new_media),
                     modifier = Size26Modifier,
                     tint = MaterialTheme.colorScheme.onPrimary,
                 )

amethyst/src/main/res/values/strings.xml

@@ -3201,7 +3201,9 @@
     <string name="route_discover">Discover</string>
     <string name="route_messages">Messages</string>
     <string name="route_notifications">Notifications</string>
-    <string name="route_video">Shorts</string>
+    <!-- Label for the mixed media feed: pictures + every NIP-71 video kind + NIP-94 files.
+         Distinct from the "shorts" string, which labels the vertical/short-video-only feed. -->
+    <string name="route_media">Media</string>
     <string name="route_calendars">Calendars</string>
     <string name="route_calendar_collections">Calendar lists</string>
     <string name="route_chess">Chess</string>
@@ -3474,7 +3476,7 @@
     <string name="route_import_follows">Import Follows</string>
 
     <string name="new_post">New Post</string>
-    <string name="new_short">New Shorts: images or videos</string>
+    <string name="new_media">New Media: image or video</string>
     <string name="new_community_note">New Community Note</string>
     <string name="new_product">New Product</string>
     <string name="new_long_form_post">New Article</string>