Commit Graph

12644 Commits

Author SHA1 Message Date
Claude f3471be70f Merge remote-tracking branch 'origin/main' into claude/check-live-audio-status-ZEp60
# Conflicts:
#	amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/NestsFeedLoaded.kt
2026-04-28 02:03:57 +00:00
Claude a6d7b4f4a3 refactor: reuse NestRoomFilterAssembler for thumb liveness probe
Drop the dedicated NestThumbStatusFilterAssembler and have the
thumb's liveness gate piggyback on NestRoomFilterAssembler, which
already subscribes to kinds=[1311, 10312, 7] + admin (4312) per
room a-tag. observeRoomLatestPresence is now a private composable
in NestsFeedLoaded.kt that opens NestRoomFilterAssemblerSubscription
and reads the latest cached MeetingRoomPresenceEvent createdAt off
the room's LiveActivitiesChannel.

Trade-off: the thumb pays for the room's full chat + reaction
history, not just presence. Bounded by LazyColumn — only currently-
composed thumbs hold subscriptions — and the cache it warms is
exactly what NestActivity needs when the user opens the room. If
wire load becomes a concern, swap to a limit:1 lite mode on the
existing assembler.

Net: -159 / +51 lines, one less filter assembler in the coordinator.
2026-04-28 02:00:48 +00:00
Claude 98dcaf4155 Apply FabBottomBarPadded to remaining FAB screens
Extends the canPop FAB-position fix to every screen that hosts a
floating action button: Pictures, Videos, Articles, Longs, Shorts,
Polls, Products, Communities, Nests, Badges, Discover, WebBookmarks,
Messages, Home, GeoHash, Hashtag, Relay, Community, OldBookmarks,
EmojiPack, ChessLobby, MarmotGroups, the bookmark management screens
and the migration FAB. Adds a small FabBottomBarPadded helper so call
sites that use named FAB composables stay tidy.

https://claude.ai/code/session_01QSk7CnjNtbcgS3XBD5WEZy
2026-04-28 01:58:45 +00:00
Claude b3da1e87b9 feat: gate nests thumb LiveFlag on kind-10312 presence freshness
The kind-30312 status tag goes stale silently when a host crashes
without publishing a CLOSED replacement, so checkStatus()'s 8-hour
fallback was the only liveness signal — abandoned rooms still
showed LiveFlag for up to 8h after the audio stopped.

Adds a per-thumb relay probe: kinds=[10312], #a=[roomATag], limit=1.
The relay returns the single most-recent presence event among all
speakers in the room, then keeps streaming so fresh heartbeats land
in real time. Speakers re-emit kind-10312 every ~60 s while
publishing, so a presence newer than 180 s means at least one
speaker is still in the room; older flips the badge to EndedFlag
even though the 30312 event still says OPEN.

UX: optimistic on first paint (LiveFlag while we have no presence
data), self-corrects within one round-trip once the relay replies.

Files:
- NestThumbStatusFilterAssembler.kt: per-room limit:1 REQ +
  observeNestRoomLatestPresence composable that scans the
  LiveActivitiesChannel's notes for max(createdAt) of cached
  presence events.
- RelaySubscriptionsCoordinator.kt: register nestThumbStatus.
- NestsFeedLoaded.kt: thread card.id into a private
  RenderLiveOrEndedFromPresence helper that gates the OPEN badge
  on freshness.
2026-04-28 01:53:37 +00:00
Vitor Pamplona b70a5ee31c Fixes weird transparency in the Chat Screen 2026-04-27 21:49:22 -04:00
Vitor Pamplona 833dcf1048 Fixes size of Send icons 2026-04-27 21:49:07 -04:00
Vitor Pamplona b0a2234ae1 Merge pull request #2615 from vitorpamplona/claude/refactor-room-package-YQ22H
refactor(nests): split nests/room flat package into named subpackages
2026-04-27 21:43:21 -04:00
Claude ea4da13110 Merge remote-tracking branch 'origin/main' into claude/refactor-room-package-YQ22H
# Conflicts:
#	amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/nests/create/CreateNestViewModel.kt
2026-04-28 01:42:12 +00:00
Vitor Pamplona 15ae0b9032 Merge pull request #2616 from vitorpamplona/claude/nest-image-upload-We3jR
Add image upload functionality to CreateNestSheet
2026-04-27 21:41:17 -04:00
Claude 618ebabd30 Keep FAB position stable when AppBottomBar is hidden
AppBottomBar returns nothing on canPop entries (drawer pushes, in-app
navigations), so the floating action button drops by the bar's height
when navigating into a screen and rises again on a tab root. Reserve the
50dp gap at the FAB site via a fabBottomBarPadding(nav) modifier so the
button stays at a consistent vertical position regardless of the bar's
visibility on EmojiPacks, BookmarkGroups, and InterestSets.

https://claude.ai/code/session_01QSk7CnjNtbcgS3XBD5WEZy
2026-04-28 01:39:30 +00:00
Claude 731d01bf7e Merge remote-tracking branch 'origin/main' into claude/refactor-room-package-YQ22H 2026-04-28 01:37:25 +00:00
Claude d92db861a9 fix: use MeetingSpaceEvent.checkStatus() for nests feed thumb
NestsFeedLoaded.RenderLiveSpacesThumb gates LiveFlag/EndedFlag on
the kind-30312 status tag verbatim, so a host that crashed without
publishing a CLOSED replacement leaves the room flagged "live"
indefinitely. checkStatus() applies the same 8-hour age-out the
event's own helper uses, so abandoned OPEN rooms surface as
EndedFlag instead.

Also drop a stray println debug ("AABBCC …") in the same map block.
2026-04-28 01:36:58 +00:00
Claude cefda4b1f2 Allow uploading the Nest cover image from the gallery
Mirrors the Profile Edit banner upload: a SelectSingleFromGallery
leadingIcon on the Cover Image field picks media, strips metadata,
compresses, and uploads to the user's configured Blossom (or NIP-96)
server. The returned URL fills the field so the existing publish path
tags it on the kind-30312 MeetingSpaceEvent.
2026-04-28 01:36:29 +00:00
Claude c7fba2821a fix(nests): align relocated test packages with their subpackage paths
The previous refactor renamed EditNestViewModelTest and
RoomParticipantActionsTest into edit/ and participants/ subdirs but
the package declarations stayed at the old flat path, so the tests
no longer compiled against the relocated production code.
2026-04-28 01:30:49 +00:00
Claude a0fa2de87d refactor(nests): split nests/room flat package into named subpackages
The nests/room/ package had grown to 23+ files in one flat directory,
making it hard to find related composables and lifecycle helpers. Each
file is now grouped by responsibility:

  activity/     Android Activity entry + AccountViewModel bridge
  lobby/        Pre-join lobby card (NestJoinCard, JoinNestButton)
  lifecycle/    Side-effect composables wiring VM <-> system / cache
  screen/       Top-level layouts (FullScreen, PipScreen, ActionBar)
  stage/        Speaker / audience grids and overlays
  participants/ Per-participant host actions + role mutations
  reactions/    Reaction picker
  chat/         Chat panel and composer (also absorbs the old send/)
  edit/         Edit-room sheet + ViewModel
  theme/        Themed scope + URL font loader

Also drops the unused StagePeopleRow composable from NestCommon and
inlines its remaining one-liner connectingLabel helper into
NestActionBar (the only caller), removing NestCommon entirely.

External imports in 7 sibling files were updated to point at the new
subpackage paths.
2026-04-28 01:28:47 +00:00
Vitor Pamplona 68e405c684 Merge branch 'main' of https://github.com/vitorpamplona/amethyst 2026-04-27 21:06:24 -04:00
Vitor Pamplona 9fcf7bc1e5 Merge pull request #2614 from vitorpamplona/claude/fix-nest-activity-layout-zziPP
Refactor NestFullScreen layout: tabs, action bar, and stage grid
2026-04-27 21:04:35 -04:00
Claude 4f391ed74f Merge branch 'main' into claude/fix-nest-activity-layout-zziPP
Resolves NestFullScreen.kt by keeping the redesigned layout (header
strip, stage grid, tabs, sticky NestActionBar) while dropping the
NestThemedScope wrapper that main removed in ff00dcf3 ("screens get
too dark"). The RoomTheme import goes with it; the stale doc-comment
reference to NestThemedScope is updated accordingly.
2026-04-28 01:01:08 +00:00
Vitor Pamplona 6f38c5ec82 Merge pull request #2613 from vitorpamplona/l10n_crowdin_translations
New Crowdin Translations
2026-04-27 20:55:25 -04:00
Vitor Pamplona 637174ef12 Add relays to the broadcast for Nests 2026-04-27 20:54:58 -04:00
Vitor Pamplona 6c284a31bf Removes the rest of the theming 2026-04-27 20:50:13 -04:00
Crowdin Bot d7c6e9b169 New Crowdin translations by GitHub Action 2026-04-28 00:40:23 +00:00
Vitor Pamplona ff00dcf3c6 Removes the implementation of custom designs because our screens get too dark 2026-04-27 20:38:18 -04:00
Claude 9381a7731d feat(nests): redesign room layout with stage grid, tabs, sticky action bar
Replaces the single scrolling Column (title → speakers row → audience
row → host queue → connection chip → talk row → buttons → chat) with
a Scaffold-bounded layout that scales to large rooms:

  - Header strip with LIVE chip + listener count (uses the existing
    nest_listener_count plural for the first time) and a 1-line
    ellipsised summary. Topbar stays slim.
  - StageGrid: vertical adaptive LazyVerticalGrid capped at 220dp,
    so a 30-speaker room scrolls inside the strip without pushing
    the chat below the fold.
  - Tab bar (Chat / Audience · N / Hands · N) with badge counts.
    Hands tab is host-only and only shown while the queue is non-empty.
  - AudienceGrid: vertical adaptive LazyVerticalGrid that fills the
    selected tab — handles 1,000+ listeners without performance issues
    (the old single-row LazyHorizontalGrid only let you see ~5 at a time).
  - NestActionBar: sticky bottom bar consolidating the old ConnectionRow,
    TalkRow, and hand/react/leave row. Layout adapts to connection /
    broadcast / on-stage state; failure messages get a thin status
    strip above the bar instead of stealing button slots.
  - Hand-raise control hides when the user is on stage (the action it
    represents — "I want to speak" — no longer applies).

The PIP screen and chat panel internals are untouched.
2026-04-28 00:37:32 +00:00
Vitor Pamplona 9d0c224c9e New Private FLAG for Nests 2026-04-27 20:36:45 -04:00
Vitor Pamplona 89176048f1 Merge branch 'main' of https://github.com/vitorpamplona/amethyst 2026-04-27 20:36:26 -04:00
Vitor Pamplona 078c5f04a8 Solving the issue of a BackArrow on the Home Screen after a back press 2026-04-27 20:35:40 -04:00
Vitor Pamplona eb305a61f2 Merge pull request #2610 from vitorpamplona/l10n_crowdin_translations
New Crowdin Translations
2026-04-27 19:26:35 -04:00
Vitor Pamplona 96f976449e Merge pull request #2611 from vitorpamplona/claude/add-topbar-profile-screen-yw8IQ
Extract profile top bar into separate composable component
2026-04-27 19:26:25 -04:00
Vitor Pamplona a9f428526b Merge branch 'main' of https://github.com/vitorpamplona/amethyst 2026-04-27 19:25:21 -04:00
Vitor Pamplona a50a360964 Correctly downloads Nest events 2026-04-27 19:23:52 -04:00
Claude 152900688d Move profile back/more buttons into Scaffold topBar
The back button and the more-options menu used to float as
absolute-positioned overlays inside ProfileHeader. They are now
hosted in a transparent ShorterTopAppBar wired into the Scaffold's
topBar slot, so the banner can still render edge-to-edge as the
background by setting contentWindowInsets to zero and only applying
the bottom padding from Scaffold to the body.
2026-04-27 23:09:57 +00:00
Crowdin Bot afde1c8499 New Crowdin translations by GitHub Action 2026-04-27 22:58:19 +00:00
Vitor Pamplona b786b056bb Merge pull request #2609 from vitorpamplona/claude/add-chat-options-nest-PIyCp
Add full-featured composer to nest room chat
2026-04-27 18:56:50 -04:00
Claude 995f8384df feat(nests): wire nest chat composer to NestNewMessageViewModel
Completes the copy approach started in 57ebded6:

  - NestEditFieldRow.kt: copy of EditFieldRow, drops the BackHandler
    (the activity owns back; draft auto-save runs on every keystroke
    so there is nothing to flush) and points every callback at
    NestNewMessageViewModel.
  - NestFileUploadDialog.kt: copy of ChannelFileUploadDialog, header
    shows the room host's avatar + room name from the loaded
    MeetingSpaceEvent.
  - NestChatPanel.kt: replaces the slim inline composer with
    NestEditFieldRow + NestNewMessageViewModel. Chat message list is
    still rendered from NestViewModel.chat — the new VM is scoped to
    *editing and sending* messages only, per the brief.
  - NestNewMessageViewModel.sendPostSync: switched from
    signAndSendPrivately(template, emptySet()) to
    signAndComputeBroadcast(template) so messages actually reach the
    user's default relays (matches the original slim composer's
    behaviour).
2026-04-27 22:37:18 +00:00
Claude 57ebded68b wip(nests): start copying ChannelNewMessageViewModel into nest package
Pivot from sharing ChannelNewMessageViewModel (previous commit) to a
literal per-nest copy as requested.

State of this commit (incomplete — DO NOT MERGE):
  - EditFieldRow.kt: reverted to original (no interceptBackPress flag)
  - NestNewMessageViewModel.kt: new file, copy of ChannelNewMessageViewModel
    narrowed to MeetingSpaceEvent + LiveActivitiesChatMessageEvent only

Still TODO before this branch is usable:
  - Copy EditFieldRow into nests/room/send/NestEditFieldRow.kt
  - Copy ChannelFileUploadDialog into nests/room/send/NestFileUploadDialog.kt
  - Rewire NestChatPanel to use these copies (it currently still calls
    ChannelNewMessageViewModel + EditFieldRow from the previous commit's
    approach, which won't compile against the reverted EditFieldRow
    signature once NestChatPanel is also reverted)

User asked to stop mid-work — committing as WIP so the tree is clean.
2026-04-27 22:31:46 +00:00
Claude 46cfab4fa1 feat(nests): use shared EditFieldRow for nest chat composer
Wire the in-room chat composer to ChannelNewMessageViewModel +
EditFieldRow so nest chat picks up @-mention picker, file/image/
video upload, reply preview, NIP-37 draft auto-save, emoji
suggestions, content warnings, expiration, geohash, and zap-
split forwarding — the same affordances every other public chat
surface has.

The composer is backed by a LiveActivitiesChannel keyed by the
meeting space's address. ChannelNewMessageViewModel.createTemplate()
already handles the LiveActivitiesChannel branch: when channel.info
is null (which it always is for kind-30312, since info is typed to
the kind-30311 LiveActivitiesEvent), it falls through to
LiveActivitiesChatMessageEvent.message(post, channel.toATag()) —
the exact event shape the previous slim composer was emitting.

EditFieldRow gains an interceptBackPress flag so nest can opt out
of the channel-screen back-handler that would clear the field and
call nav.popBack() (a no-op on BouncingIntentNav).
2026-04-27 22:09:45 +00:00
Vitor Pamplona 3c3e327bcb Fixes test cases 2026-04-27 18:01:44 -04:00
Vitor Pamplona 40fa069a98 Merge branch 'main' of https://github.com/vitorpamplona/amethyst 2026-04-27 17:55:15 -04:00
Vitor Pamplona 1e86e15291 Adjustments to the loading and updating of the nest event in a PiPActivity 2026-04-27 17:54:16 -04:00
Vitor Pamplona 81b82198e2 Corrects the name of the room in Nests feed 2026-04-27 17:27:11 -04:00
Vitor Pamplona f37f1907a4 Merge pull request #2608 from vitorpamplona/l10n_crowdin_translations
New Crowdin Translations
2026-04-27 16:59:06 -04:00
Crowdin Bot 950f226375 New Crowdin translations by GitHub Action 2026-04-27 20:53:31 +00:00
Vitor Pamplona 414707c3cb Merge pull request #2607 from vitorpamplona/l10n_crowdin_translations
New Crowdin Translations
2026-04-27 16:51:52 -04:00
Vitor Pamplona f403ae9615 Merge pull request #2585 from vitorpamplona/claude/audio-rooms-android-ui-PIpFN
Add NIP-53 audio room speaker/broadcaster support
2026-04-27 16:51:31 -04:00
Claude 6da4483fa3 Merge remote-tracking branch 'origin/main' into claude/audio-rooms-android-ui-PIpFN
# Conflicts:
#	amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/audiorooms/AudioRoomsScreen.kt
2026-04-27 20:45:04 +00:00
Crowdin Bot f1fc9d43fb New Crowdin translations by GitHub Action 2026-04-27 20:43:16 +00:00
Vitor Pamplona a0f45b49e8 Merge pull request #2606 from vitorpamplona/claude/fix-nav-back-arrow-99NGn
Adds a BottomNavBar for screens that didn't have before
2026-04-27 16:41:37 -04:00
Claude 8c5804063e feat(nests): wrap room screen in Scaffold; title + overflow → TopAppBar
The room name and the MoreVert overflow lived inline at the top of
the metadata Column, so they scrolled with the rest. Hoist them into
a Material 3 TopAppBar inside a Scaffold, matching every other major
screen in the app.

NestTopAppBar — new private composable:
  - Title is `event.room()`, single-line ellipsis.
  - Actions: Box wrapping the MoreVert IconButton + DropdownMenu
    (Share for everyone, Edit gated on `isHost`).
  - containerColor = Transparent so the themed background painted by
    NestThemedScope's Surface (and any optional `bg` image) shows
    through cleanly without a double-paint.

NestFullScreen body now:
  Scaffold(
    containerColor = Color.Transparent,
    topBar = { NestTopAppBar(...) },
  ) { padding ->
    Column(fillMaxSize.padding(padding)) {
      Column(weight(1, false), verticalScroll, hpad+top pad) {
        // summary, listener count, participants grid, host actions
        // sheet, hand-raise queue, connection row, talk row, action
        // row, reaction picker, host-leave confirm dialog
      }
      NestChatPanel(weight(1, true), hpad+bottom pad)
    }
  }

Side effects:
  - Drops the manual windowInsetsPadding(safeDrawing) — Scaffold's
    contentWindowInsets handles that and the TopAppBar's own
    windowInsets handles the top edge.
  - The EditNestSheet conditional moves to NestThemedScope's body
    (after the Scaffold). It's a ModalBottomSheet, so position in
    the tree doesn't change layout, but adjacency to the Scaffold
    keeps the sheet/dialog boundary obvious.

https://claude.ai/code/session_01RDpuki4t8StSg1CZcXnV5b
2026-04-27 20:36:28 +00:00
Claude baaee94555 feat(nav): add bottom bar to remaining tab-eligible screens
The bottom-nav settings let users place any of these routes in the bar,
but the screens themselves never rendered AppBottomBar — so even when
configured as a tab, the bar was missing on Profile, Wallet, Lists,
BookmarkGroups, WebBookmarks, Drafts, InterestSets, EmojiPacks,
BrowseEmojiSets, and AllSettings.

AppBottomBar self-hides via nav.canPop(), so adding the bar is safe on
every entry: it appears only when the screen is the tab root, hidden
otherwise (drawer / deep link).

Same-tab tap scrolls the screen's main list to the top, mirroring the
existing tab behavior. State is hoisted as needed:
- WebBookmarks, Drafts, BrowseEmojiSets: feedState.sendToTop()
- Lists, BookmarkGroups, EmojiPacks: hoisted LazyListState/LazyGridState
  through the feed-view helper, animateScrollTo(0)
- Wallet, InterestSets: hoisted LazyListState locally
- AllSettings: hoisted ScrollState (verticalScroll column)
- Profile: wrapped in Scaffold, hoisted ScrollState from RenderSurface

https://claude.ai/code/session_01PrirRcL7g8iX7vTqqLTkBS
2026-04-27 20:35:56 +00:00