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>
252 lines
8.2 KiB
Dart
252 lines
8.2 KiB
Dart
import 'package:flutter/material.dart';
|
|
import 'package:flutter_hooks/flutter_hooks.dart';
|
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
|
import 'package:lucide_icons_flutter/lucide_icons.dart';
|
|
|
|
import '../../shared/theme/theme.dart';
|
|
import '../../shared/widgets/frosted_app_bar.dart';
|
|
import '../../shared/widgets/frosted_scaffold.dart';
|
|
|
|
/// Themes for the current appearance mode, organised the way desktop does it:
|
|
/// System offers the light/dark pairs as single entries, while Light and Dark
|
|
/// each list every theme of that brightness.
|
|
class ThemePickerPage extends HookConsumerWidget {
|
|
const ThemePickerPage({super.key});
|
|
|
|
// ListTile height (~56px) used for scroll offset calculation.
|
|
static const _itemHeight = 56.0;
|
|
|
|
@override
|
|
Widget build(BuildContext context, WidgetRef ref) {
|
|
final preference = ref.watch(communityThemeProvider);
|
|
final mode = preference.mode;
|
|
final selectedScheme = preference.theme;
|
|
final searchQuery = useState('');
|
|
final searchController = useTextEditingController();
|
|
final scrollController = useScrollController();
|
|
|
|
final groups = themeGroups();
|
|
final entries = switch (mode) {
|
|
ThemeMode.system => groups.paired,
|
|
ThemeMode.light => groups.light,
|
|
ThemeMode.dark => groups.dark,
|
|
};
|
|
final isSystem = mode == ThemeMode.system;
|
|
|
|
String labelFor(ThemeColors theme) =>
|
|
isSystem ? pairedThemeLabel(theme.name) : theme.displayName;
|
|
|
|
final query = searchQuery.value.toLowerCase();
|
|
final filtered = query.isEmpty
|
|
? entries
|
|
: entries
|
|
.where((t) => labelFor(t).toLowerCase().contains(query))
|
|
.toList();
|
|
|
|
// In System mode either half of a pair counts as the selection; in the
|
|
// pinned modes the effective theme already accounts for coercion, so the
|
|
// checkmark always names what is actually rendered.
|
|
final active = effectiveTheme(selectedScheme, mode);
|
|
bool isSelected(ThemeColors theme) {
|
|
if (active == null) return false;
|
|
if (!isSystem) return active.name == theme.name;
|
|
return active.name == theme.name ||
|
|
themePairFor(theme.name) == active.name;
|
|
}
|
|
|
|
// Auto-scroll to the selected theme on first build (no search active).
|
|
useEffect(() {
|
|
if (query.isNotEmpty) return null;
|
|
final idx = filtered.indexWhere(isSelected);
|
|
if (idx < 0) return null;
|
|
final offset = idx * _itemHeight;
|
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
|
if (scrollController.hasClients) {
|
|
scrollController.animateTo(
|
|
offset.clamp(0.0, scrollController.position.maxScrollExtent),
|
|
duration: const Duration(milliseconds: 300),
|
|
curve: Curves.easeOut,
|
|
);
|
|
}
|
|
});
|
|
return null;
|
|
}, const []);
|
|
|
|
return FrostedScaffold(
|
|
appBar: const FrostedAppBar(title: Text('Theme')),
|
|
body: Column(
|
|
children: [
|
|
SizedBox(height: frostedAppBarHeight(context)),
|
|
_SearchField(
|
|
controller: searchController,
|
|
query: searchQuery.value,
|
|
onChanged: (v) => searchQuery.value = v,
|
|
onClear: () {
|
|
searchController.clear();
|
|
searchQuery.value = '';
|
|
},
|
|
),
|
|
Expanded(
|
|
child: filtered.isEmpty
|
|
? Padding(
|
|
padding: const EdgeInsets.all(Grid.sm),
|
|
child: Center(
|
|
child: Text(
|
|
'No themes found',
|
|
style: context.textTheme.bodyMedium?.copyWith(
|
|
color: context.colors.onSurfaceVariant,
|
|
),
|
|
),
|
|
),
|
|
)
|
|
: ListView.builder(
|
|
controller: scrollController,
|
|
itemCount: filtered.length,
|
|
itemBuilder: (_, i) {
|
|
final theme = filtered[i];
|
|
final pairName = isSystem
|
|
? themePairFor(theme.name)
|
|
: null;
|
|
return _ThemeRow(
|
|
theme: theme,
|
|
pair: pairName == null ? null : findTheme(pairName),
|
|
label: labelFor(theme),
|
|
selected: isSelected(theme),
|
|
onTap: () => ref
|
|
.read(communityThemeProvider.notifier)
|
|
.setTheme(theme.name),
|
|
);
|
|
},
|
|
),
|
|
),
|
|
],
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
class _SearchField extends StatelessWidget {
|
|
const _SearchField({
|
|
required this.controller,
|
|
required this.query,
|
|
required this.onChanged,
|
|
required this.onClear,
|
|
});
|
|
|
|
final TextEditingController controller;
|
|
final String query;
|
|
final ValueChanged<String> onChanged;
|
|
final VoidCallback onClear;
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return Padding(
|
|
padding: const EdgeInsets.symmetric(
|
|
horizontal: Grid.gutter,
|
|
vertical: Grid.xxs,
|
|
),
|
|
child: Container(
|
|
height: 36,
|
|
padding: const EdgeInsets.symmetric(horizontal: Grid.twelve),
|
|
decoration: BoxDecoration(
|
|
color: context.colors.surfaceContainerHighest,
|
|
borderRadius: BorderRadius.circular(Radii.lg),
|
|
border: Border.all(color: context.colors.outlineVariant),
|
|
),
|
|
child: Row(
|
|
children: [
|
|
Icon(
|
|
LucideIcons.search,
|
|
size: 16,
|
|
color: context.colors.onSurfaceVariant,
|
|
),
|
|
const SizedBox(width: Grid.xxs),
|
|
Expanded(
|
|
child: TextField(
|
|
controller: controller,
|
|
decoration: InputDecoration(
|
|
hintText: 'Search themes...',
|
|
hintStyle: context.textTheme.bodyMedium?.copyWith(
|
|
color: context.colors.onSurfaceVariant,
|
|
),
|
|
border: InputBorder.none,
|
|
enabledBorder: InputBorder.none,
|
|
focusedBorder: InputBorder.none,
|
|
isDense: true,
|
|
contentPadding: EdgeInsets.zero,
|
|
),
|
|
style: context.textTheme.bodyMedium,
|
|
onChanged: onChanged,
|
|
),
|
|
),
|
|
if (query.isNotEmpty)
|
|
GestureDetector(
|
|
onTap: onClear,
|
|
child: Icon(
|
|
LucideIcons.x,
|
|
size: 16,
|
|
color: context.colors.onSurfaceVariant,
|
|
),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
/// A theme row with a colour bar + name + checkmark. When [pair] is supplied the
|
|
/// bar is split down the middle — light stripes on the left, dark on the right —
|
|
/// standing in for desktop's split light/dark preview tile.
|
|
class _ThemeRow extends StatelessWidget {
|
|
const _ThemeRow({
|
|
required this.theme,
|
|
required this.pair,
|
|
required this.label,
|
|
required this.selected,
|
|
required this.onTap,
|
|
});
|
|
|
|
final ThemeColors theme;
|
|
final ThemeColors? pair;
|
|
final String label;
|
|
final bool selected;
|
|
final VoidCallback onTap;
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final swatch = pair == null ? [theme] : [theme, pair!];
|
|
|
|
return ListTile(
|
|
leading: Container(
|
|
width: 56,
|
|
height: 28,
|
|
decoration: BoxDecoration(
|
|
borderRadius: BorderRadius.circular(Radii.sm),
|
|
border: Border.all(color: context.colors.outlineVariant),
|
|
),
|
|
child: ClipRRect(
|
|
borderRadius: BorderRadius.circular(Radii.sm - 1),
|
|
child: Row(
|
|
children: [
|
|
for (final t in swatch)
|
|
for (final color in [t.bg, t.fg, t.comment])
|
|
Expanded(
|
|
child: ColoredBox(
|
|
color: color,
|
|
child: const SizedBox.expand(),
|
|
),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
),
|
|
title: Text(label),
|
|
trailing: selected
|
|
? Icon(LucideIcons.check, size: 18, color: context.colors.primary)
|
|
: null,
|
|
onTap: onTap,
|
|
);
|
|
}
|
|
}
|