mirror of
https://github.com/block/buzz.git
synced 2026-08-18 06:50:31 +02:00
**Category:** new-feature **User Impact:** Mobile now keeps each community’s appearance in sync with desktop, including theme, accent, and system-mode preference. **Problem:** Appearance choices were device-local, so the same account could look different between desktop and mobile. Live sync could also stop after the relay closed a subscription. **Solution:** Store each community’s encrypted appearance preference on its relay using the shared desktop wire contract, restore it from a local identity-scoped cache, and apply replacement events live. Closed subscriptions now recover with guarded backoff and fetch the latest preference so no update is lost during the gap. <details> <summary>File changes</summary> **mobile/lib/app.dart** Connects community appearance state to the authenticated app lifecycle. **mobile/lib/features/settings/accent_picker_page.dart** Aligns mobile accent choices and selection behavior with the shared catalog. **mobile/lib/features/settings/settings_page/appearance_section.dart** Clarifies the active appearance and hides accent controls when the Buzz theme owns its neutral accent. **mobile/lib/features/settings/theme_picker_page.dart** Persists catalog theme choices through the community-scoped provider. **mobile/lib/shared/theme/accent_colors.dart** Matches desktop’s accent catalog and wire values. **mobile/lib/shared/theme/buzz_theme.dart** Keeps Buzz visually neutral without discarding the user’s stored accent for other themes. **mobile/lib/shared/theme/community_theme_preference.dart** Defines and validates the versioned desktop-compatible appearance payload. **mobile/lib/shared/theme/community_theme_provider.dart** Coordinates cache-first appearance loading with account and community changes. **mobile/lib/shared/theme/community_theme_sync.dart** Adds encrypted NIP-78 relay persistence, live replacement handling, deterministic ordering, safe seeding, and resilient subscription recovery. **mobile/lib/shared/theme/theme.dart** Exports the community appearance modules. **mobile/test/features/settings/theme_picker_page_test.dart** Covers the updated settings behavior. **mobile/test/shared/crypto/nip44_interop_test.dart** Proves Dart decrypts a desktop-produced nostr-rs NIP-44 v2 preference. **mobile/test/shared/theme/buzz_theme_test.dart** Covers Buzz’s neutral rendering and stored-accent restoration. **mobile/test/shared/theme/community_theme_preference_test.dart** Covers wire parsing, validation, migration, and future-version handling. **mobile/test/shared/theme/community_theme_sync_test.dart** Covers cache/relay lifecycle, replacement ordering, switching races, absence-only seeding, and closed-subscription recovery. </details> ## Reproduction steps 1. Sign into desktop and mobile with the same account and join the same community relay. 2. On desktop, choose a distinctive non-Buzz theme and accent; mobile should update without a local toggle. 3. Restart mobile and confirm it restores the same appearance. 4. Change the mobile theme and accent and confirm desktop follows. 5. Leave mobile idle or backgrounded through a relay reconnect, then change desktop again; mobile should resubscribe and catch up automatically. 6. Switch communities and confirm each community restores only its own appearance. --------- Signed-off-by: Taylor Ho <taylorkmho@gmail.com> Co-authored-by: npub1223z34hd7vtwc6qj4s7flsxkj644nlre2nthu7lrrmkumhu3xddsrx9r6w <52a228d6edf316ec6812ac3c9fc0d696ab59fc7954d77e7be31eedcddf91335b@buzz.block.builderlab.xyz>
136 lines
4.1 KiB
Dart
136 lines
4.1 KiB
Dart
part of '../settings_page.dart';
|
|
|
|
/// System / Light / Dark, mirroring desktop's appearance-mode selector.
|
|
const _modeOptions = <({ThemeMode mode, String label, IconData icon})>[
|
|
(mode: ThemeMode.system, label: 'System', icon: LucideIcons.sunMoon),
|
|
(mode: ThemeMode.light, label: 'Light', icon: LucideIcons.sun),
|
|
(mode: ThemeMode.dark, label: 'Dark', icon: LucideIcons.moon),
|
|
];
|
|
|
|
String _modeLabel(ThemeMode mode) =>
|
|
_modeOptions.firstWhere((option) => option.mode == mode).label;
|
|
|
|
class _AppearanceSection extends ConsumerWidget {
|
|
const _AppearanceSection();
|
|
|
|
@override
|
|
Widget build(BuildContext context, WidgetRef ref) {
|
|
final preference = ref.watch(communityThemeProvider);
|
|
final mode = preference.mode;
|
|
final schemeName = preference.theme;
|
|
final accentIndex = effectiveAccentIndex(
|
|
preference.theme,
|
|
preference.accent,
|
|
);
|
|
|
|
return AppListCard(
|
|
label: 'Style · This community',
|
|
children: [
|
|
AppListRow(
|
|
icon: LucideIcons.sunMoon,
|
|
title: 'Appearance',
|
|
value: _modeLabel(mode),
|
|
trailing: const _RowChevron(),
|
|
onTap: () => _showAppearanceModeSheet(context),
|
|
),
|
|
AppListRow(
|
|
icon: LucideIcons.palette,
|
|
title: 'Theme',
|
|
value: themeSelectionLabel(schemeName, mode),
|
|
trailing: const _RowChevron(),
|
|
onTap: () => Navigator.of(context).push(
|
|
MaterialPageRoute<void>(builder: (_) => const ThemePickerPage()),
|
|
),
|
|
),
|
|
if (!isBuzzTheme(effectiveTheme(schemeName, mode)?.name ?? schemeName))
|
|
AppListRow(
|
|
icon: LucideIcons.droplet,
|
|
title: 'Accent color',
|
|
// The swatch *is* the value — naming the color as well would say the
|
|
// same thing twice, so it takes the chevron's place.
|
|
trailing: _AccentSwatch(accentIndex: accentIndex),
|
|
onTap: () => Navigator.of(context).push(
|
|
MaterialPageRoute<void>(builder: (_) => const AccentPickerPage()),
|
|
),
|
|
),
|
|
],
|
|
);
|
|
}
|
|
}
|
|
|
|
void _showAppearanceModeSheet(BuildContext context) {
|
|
showBuzzModalBottomSheet<void>(
|
|
context: context,
|
|
showDragHandle: true,
|
|
builder: (_) => const _AppearanceModeSheet(),
|
|
);
|
|
}
|
|
|
|
/// Three choices is too few to warrant a page, so the appearance row opens a
|
|
/// sheet rather than pushing a route.
|
|
class _AppearanceModeSheet extends ConsumerWidget {
|
|
const _AppearanceModeSheet();
|
|
|
|
@override
|
|
Widget build(BuildContext context, WidgetRef ref) {
|
|
final mode = ref.watch(communityThemeProvider).mode;
|
|
|
|
return SafeArea(
|
|
child: Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
children: [
|
|
Padding(
|
|
padding: const EdgeInsets.fromLTRB(
|
|
Grid.gutter,
|
|
0,
|
|
Grid.gutter,
|
|
Grid.xxs,
|
|
),
|
|
child: Text('Appearance', style: context.textTheme.titleMedium),
|
|
),
|
|
for (final option in _modeOptions)
|
|
AppListRow(
|
|
icon: option.icon,
|
|
title: option.label,
|
|
trailing: option.mode == mode
|
|
? Icon(
|
|
LucideIcons.check,
|
|
size: 18,
|
|
color: context.colors.primary,
|
|
)
|
|
: null,
|
|
onTap: () {
|
|
ref.read(communityThemeProvider.notifier).setMode(option.mode);
|
|
Navigator.of(context).pop();
|
|
},
|
|
),
|
|
const SizedBox(height: Grid.xxs),
|
|
],
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
/// The selected accent, shown where a row would otherwise carry a chevron.
|
|
class _AccentSwatch extends StatelessWidget {
|
|
const _AccentSwatch({required this.accentIndex});
|
|
|
|
static const _size = 22.0;
|
|
|
|
final int accentIndex;
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return Container(
|
|
width: _size,
|
|
height: _size,
|
|
decoration: BoxDecoration(
|
|
color: accentColorForScheme(context.colors, accentIndex),
|
|
shape: BoxShape.circle,
|
|
border: Border.all(color: context.colors.outlineVariant),
|
|
),
|
|
);
|
|
}
|
|
}
|