mirror of
https://github.com/block/buzz.git
synced 2026-10-27 04:30:52 +00:00
feat(mobile): refactor Activity behavior and ui (#2889)
**Category:** improvement **User Impact:** Mobile users can scan Activity as a focused conversation inbox and open the exact unread message or thread represented by each item. ## Context Mobile's Activity tab had not kept pace with Desktop: it presented isolated event headlines, advertised categories that were often empty, and opened a channel without clearly landing on the selected item. This PR brings the Mobile surface toward the conversation-oriented direction explored in Clay Delk's Desktop [Inbox refactor PR #2045](https://github.com/block/buzz/pull/2045), while adapting it to Mobile rather than copying the Desktop split-pane implementation. The related product/UX discussion is captured in the originating [Buzz thread](buzz://message?channel=a9bbc0e5-d25d-4740-849c-93c34bb578a4&id=a7d9a4d33dcd8c6bf0dc67d81c328892b9e38dedaa8548920224ef388301b6ab). ## UX decisions in this PR - **Conversation-oriented, not event-oriented:** related updates collapse into one row per thread/DM conversation, represented by the latest update and ordered by latest activity. Separate top-level conversations in the same channel remain separate rows. - **Resume at the oldest unread:** tapping a grouped row opens the represented canonical message/thread/DM at its oldest unread item, rather than merely opening the channel at an arbitrary position. - **Desktop-aligned row hierarchy:** rows lead with a full avatar and sender, followed by contextual location/type metadata, unread dot + time, and a two-line preview. A **New** boundary separates unread and read content. - **Mobile-native navigation:** Mobile keeps a single-column `Activity → canonical conversation → Back` flow. It does not introduce Desktop's persistent detail pane. - **Compact filtering:** the old horizontal chip rail becomes a compact filter menu so the source set fits a phone viewport without horizontal scanning. Filters are All, Mentions, Threads, Needs Action, Activity, Agents, Reminders, and Drafts. - **Focused source semantics:** All covers personally relevant work—DMs, mentions, thread replies, needs-action events, owned-agent activity, due reminders, and active drafts—rather than becoming a generic stream of every channel message. Mobile's standalone Activity source is currently limited to DM traffic because it does not have Desktop's aggregated channel-activity feed. - **Shared read behavior:** rows project canonical channel/thread/message markers, support unread-only and mark-all-read, and use local overrides only where canonical markers cannot represent an item. - **Reminders and drafts are real data:** reminders use the same encrypted NIP-ER events as Desktop. Drafts persist device-local composer state, restore on return, survive failed sends, and clear after successful sends. - **Explain navigation failures:** an unavailable destination produces an explanatory message rather than silently doing nothing or falling back to an unrelated channel position. ## Implementation summary - Adds a Mobile inbox model for conversation grouping, category priority, contextual labels, sorting, filtering, and oldest-unread targets. - Expands relay-backed sources for mentions, approvals, owned-agent lifecycle events, and DM traffic. - Adds fail-closed NIP-ER reminder decryption and device-local compose-draft persistence. - Redesigns Activity rows, boundaries, filters, unread controls, and empty/loading states. - Routes rows through Mobile's existing canonical channel/thread screens with precise target IDs. - Adds model, provider, widget, reminder, read-state, draft-lifecycle, and deep-link coverage. ## Reproduction steps 1. Run Mobile and open **Activity**. 2. Confirm full avatars, sender-first rows, context labels, unread indicators, timestamps, two-line previews, and the compact filter control. 3. Open the filter menu and verify All, Mentions, Threads, Needs Action, Activity, Agents, Reminders, and Drafts. 4. Tap a grouped thread row and confirm the canonical conversation opens at its oldest unread message. 5. Mark rows read/unread, enable unread-only mode, and use mark-all-read; confirm state agrees with the channel/thread destination. 6. Type without sending in a channel or thread, leave, and confirm the draft appears in Activity and restores in the composer. ## Screenshots | Before — merge-base `dd222a509` | After — PR head `52ad40aee` | |---|---| | <img width="1206" height="2622" alt="image" src="https://github.com/user-attachments/assets/ae961b08-bf8a-4bd5-b487-f6321ae8d85b" /> | <img width="1206" height="2622" alt="image" src="https://github.com/user-attachments/assets/bcbe7ab0-552a-417c-9e85-7a85eb4592ee" /> | Recaptured on the same authenticated iPhone 17 simulator, account, theme, and Activity view, at this PR's current merge-base (`dd222a509`) and head (`52ad40aee`). Both frames were taken within a few minutes on the same live feed, so the visible conversation set overlaps closely (the recent Ned/Bart/Tommy items appear in both). The compared change is the row *structure*: Before leads with an `@ Mention` headline over a small inline avatar and a horizontal chip rail; After leads with a full avatar, a compact `labelMedium` sender label, contextual "Mentioned in" metadata, and a filter menu. The sender username now renders at the same compact scale the old `@ Mention` label used. ## Verification - Current rebased head: `5bd87f4f4` on `origin/main` at `dd222a509`; GitHub reports the PR mergeable. - `flutter analyze` — clean at `5bd87f4f4`. - Full Mobile suite — 698 passed, 1 skipped, 4 failed; all four failures reproduce identically on clean `origin/main` (`channels_page_test` create-channel sheet and three `compose_bar_test` agent-mention cases). - The prior PR-specific `home_page_test` failures were fixed by providing the Activity local-state dependency in that harness. - Independent code and simulator UI review — approved. - Post-rebase GitHub checks are running. --------- Signed-off-by: Taylor Ho <taylorkmho@gmail.com> Signed-off-by: npub14vtk7pvazqrq9639qu7e560wnqtl0d53ca4gjuvq6jzf3k2el23qqlwa7f <ab176f059d100602ea25073d9a69ee9817f7b691c76a897180d48498d959faa2@buzz.block.builderlab.xyz> Co-authored-by: npub1223z34hd7vtwc6qj4s7flsxkj644nlre2nthu7lrrmkumhu3xddsrx9r6w <52a228d6edf316ec6812ac3c9fc0d696ab59fc7954d77e7be31eedcddf91335b@buzz.block.builderlab.xyz> Co-authored-by: npub14vtk7pvazqrq9639qu7e560wnqtl0d53ca4gjuvq6jzf3k2el23qqlwa7f <ab176f059d100602ea25073d9a69ee9817f7b691c76a897180d48498d959faa2@buzz.block.builderlab.xyz>
This commit is contained in:
@@ -22,6 +22,7 @@ import 'package:buzz/shared/custom_emoji/custom_emoji.dart';
|
||||
import 'package:buzz/shared/custom_emoji/custom_emoji_provider.dart';
|
||||
import 'package:buzz/shared/relay/relay.dart';
|
||||
import 'package:buzz/shared/theme/theme.dart';
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
|
||||
final _pngBytes = Uint8List.fromList([
|
||||
0x89,
|
||||
@@ -134,6 +135,10 @@ void _setMockMediaUploadPlatformHandler(
|
||||
.setMockMethodCallHandler(_mediaUploadPlatformChannel, handler);
|
||||
}
|
||||
|
||||
/// Shared mock prefs for the compose bar's draft store. Initialized in
|
||||
/// [main].
|
||||
late SharedPreferences _testPrefs;
|
||||
|
||||
Widget _buildComposeBar({
|
||||
required MediaUploadService uploadService,
|
||||
required ComposeBarOnSend onSend,
|
||||
@@ -144,6 +149,7 @@ Widget _buildComposeBar({
|
||||
String? currentPubkey,
|
||||
bool? supportsShowingSystemContextMenu,
|
||||
List<CustomEmoji> customEmoji = const <CustomEmoji>[],
|
||||
RelayConfigNotifier Function()? relayConfig,
|
||||
}) {
|
||||
return ProviderScope(
|
||||
overrides: [
|
||||
@@ -158,7 +164,10 @@ Widget _buildComposeBar({
|
||||
relayClientProvider.overrideWithValue(
|
||||
RelayClient(baseUrl: 'http://localhost:3000'),
|
||||
),
|
||||
relayConfigProvider.overrideWith(() => _FakeRelayConfigNotifier()),
|
||||
relayConfigProvider.overrideWith(
|
||||
relayConfig ?? _FakeRelayConfigNotifier.new,
|
||||
),
|
||||
savedPrefsProvider.overrideWithValue(_testPrefs),
|
||||
channelsProvider.overrideWith(() => _FakeChannelsNotifier(channels)),
|
||||
],
|
||||
child: MaterialApp(
|
||||
@@ -192,6 +201,18 @@ class _FakeRelayConfigNotifier extends RelayConfigNotifier {
|
||||
);
|
||||
}
|
||||
|
||||
/// Relay config that starts from a fixed identity and can be switched
|
||||
/// in place via [RelayConfigNotifier.update] — simulates a community or
|
||||
/// account switch while widgets stay mounted.
|
||||
class _SwitchableRelayConfigNotifier extends RelayConfigNotifier {
|
||||
final RelayConfig initial;
|
||||
|
||||
_SwitchableRelayConfigNotifier(this.initial);
|
||||
|
||||
@override
|
||||
RelayConfig build() => initial;
|
||||
}
|
||||
|
||||
class _RecordingRelaySocket extends RelaySocket {
|
||||
final List<Map<String, dynamic>> events;
|
||||
final void Function(List<dynamic> message) handleMessage;
|
||||
@@ -241,6 +262,11 @@ class _FakeChannelsNotifier extends ChannelsNotifier {
|
||||
void main() {
|
||||
TestWidgetsFlutterBinding.ensureInitialized();
|
||||
|
||||
setUp(() async {
|
||||
SharedPreferences.setMockInitialValues({});
|
||||
_testPrefs = await SharedPreferences.getInstance();
|
||||
});
|
||||
|
||||
setUpAll(() {
|
||||
_setMockMediaUploadPlatformHandler((call) async {
|
||||
switch (call.method) {
|
||||
@@ -262,6 +288,72 @@ void main() {
|
||||
});
|
||||
|
||||
group('ComposeBar', () {
|
||||
testWidgets('mounted composer does not carry draft text across an in-place '
|
||||
'identity switch', (tester) async {
|
||||
final keysA = nostr.Keys.generate();
|
||||
final keysB = nostr.Keys.generate();
|
||||
const relayUrl = 'http://localhost:3000';
|
||||
|
||||
await tester.pumpWidget(
|
||||
_buildComposeBar(
|
||||
uploadService: _testUploadService(keysA.nsec),
|
||||
relayConfig: () => _SwitchableRelayConfigNotifier(
|
||||
RelayConfig(baseUrl: relayUrl, nsec: keysA.nsec),
|
||||
),
|
||||
onSend:
|
||||
(
|
||||
content,
|
||||
mentionPubkeys, {
|
||||
mediaTags = const <List<String>>[],
|
||||
}) async {},
|
||||
),
|
||||
);
|
||||
|
||||
String? storedText(nostr.Keys keys) {
|
||||
final raw = _testPrefs.getString(
|
||||
'compose_drafts_v1:$relayUrl:${keys.public}',
|
||||
);
|
||||
if (raw == null) return null;
|
||||
final drafts = jsonDecode(raw) as List;
|
||||
if (drafts.isEmpty) return null;
|
||||
return (drafts.first as Map<String, dynamic>)['text'] as String?;
|
||||
}
|
||||
|
||||
// Identity A types a draft; it persists into A's namespaced store.
|
||||
await _expandComposer(tester);
|
||||
await tester.enterText(find.byType(TextField), 'identity A secret draft');
|
||||
await tester.pump();
|
||||
expect(storedText(keysA), 'identity A secret draft');
|
||||
|
||||
// Switch identity in place while the composer stays mounted.
|
||||
final container = ProviderScope.containerOf(
|
||||
tester.element(find.byType(ComposeBar)),
|
||||
);
|
||||
container
|
||||
.read(relayConfigProvider.notifier)
|
||||
.update(baseUrl: relayUrl, nsec: keysB.nsec);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
// The mounted composer must not carry identity A's text forward.
|
||||
final textField = tester.widget<TextField>(find.byType(TextField));
|
||||
expect(textField.controller!.text, isEmpty);
|
||||
expect(storedText(keysB), isNull);
|
||||
|
||||
// Identity B's edits persist only into B's store; A's is untouched.
|
||||
await tester.enterText(find.byType(TextField), 'identity B text');
|
||||
await tester.pump();
|
||||
expect(storedText(keysB), 'identity B text');
|
||||
expect(storedText(keysA), 'identity A secret draft');
|
||||
|
||||
// Switching back restores identity A's own draft into the composer.
|
||||
container
|
||||
.read(relayConfigProvider.notifier)
|
||||
.update(baseUrl: relayUrl, nsec: keysA.nsec);
|
||||
await tester.pumpAndSettle();
|
||||
expect(textField.controller!.text, 'identity A secret draft');
|
||||
expect(storedText(keysB), 'identity B text');
|
||||
});
|
||||
|
||||
testWidgets('inserts a community emoji at the cursor from the action row', (
|
||||
tester,
|
||||
) async {
|
||||
|
||||
Reference in New Issue
Block a user