Conflicts resolved by hand, our fork changes carried over: - MainActivity.kt: keep the unread widget hooks next to upstream's scroll capture (attach and detach both). - app_settings_screen.dart: upstream wrapped the list in MeshSettingsTileTheme; image-message and translation sections stay gated on kOnDeviceMl (ML-free build). - channel_chat_screen.dart: upstream split build() into methods; took theirs and re-applied the terminal-theme list padding. - chat_composer.dart: both imports (terminal_theme, radio_guard). - mesh_nav_tile.dart: upstream's meshTileTitleStyle, with the smaller terminal-theme title kept. flutter analyze clean, flutter test 1522 passed (CI image, local). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
165 lines
5.0 KiB
Dart
165 lines
5.0 KiB
Dart
import 'package:flutter/material.dart';
|
|
|
|
import '../theme/terminal_theme.dart';
|
|
|
|
/// Title style of settings rows: [MeshNavTile] and, through
|
|
/// [MeshSettingsTileTheme], stock [ListTile]s and [SwitchListTile]s.
|
|
TextStyle? meshTileTitleStyle(ThemeData theme) =>
|
|
theme.textTheme.bodyLarge?.copyWith(fontWeight: FontWeight.w600);
|
|
|
|
/// Gives the [ListTile]s, [SwitchListTile]s and [CheckboxListTile]s below it
|
|
/// the same semibold title as [MeshNavTile], so settings rows built from
|
|
/// either read alike. Subtitles already match (`bodyMedium`,
|
|
/// `onSurfaceVariant`). Wrap a settings screen's body in it.
|
|
class MeshSettingsTileTheme extends StatelessWidget {
|
|
final Widget child;
|
|
|
|
const MeshSettingsTileTheme({super.key, required this.child});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return ListTileTheme.merge(
|
|
titleTextStyle: meshTileTitleStyle(Theme.of(context)),
|
|
child: child,
|
|
);
|
|
}
|
|
}
|
|
|
|
/// Settings-style navigation row: leading icon, bold title, secondary
|
|
/// subtitle and an optional trailing chevron.
|
|
///
|
|
/// Sized for readability (24px icons, `bodyLarge` titles, `bodyMedium`
|
|
/// subtitles). When [onTap] is null the row is rendered dimmed and reported
|
|
/// as disabled to accessibility services, so a tile that cannot be used never
|
|
/// looks identical to one that can.
|
|
class MeshNavTile extends StatelessWidget {
|
|
final IconData icon;
|
|
final String title;
|
|
final String? subtitle;
|
|
final VoidCallback? onTap;
|
|
final Color? titleColor;
|
|
final Color? iconColor;
|
|
final bool showChevron;
|
|
final Widget? trailing;
|
|
final int? subtitleMaxLines;
|
|
final EdgeInsetsGeometry padding;
|
|
|
|
const MeshNavTile({
|
|
super.key,
|
|
required this.icon,
|
|
required this.title,
|
|
this.subtitle,
|
|
this.onTap,
|
|
this.titleColor,
|
|
this.iconColor,
|
|
this.showChevron = true,
|
|
this.trailing,
|
|
this.subtitleMaxLines,
|
|
this.padding = const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
|
|
});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final theme = Theme.of(context);
|
|
final scheme = theme.colorScheme;
|
|
final textTheme = theme.textTheme;
|
|
final enabled = onTap != null;
|
|
final effectiveIconColor = iconColor ?? scheme.onSurfaceVariant;
|
|
final terminal = MeshStyle.of(context).terminal;
|
|
final iconSize = terminal ? 18.0 : 24.0;
|
|
|
|
final row = Row(
|
|
children: [
|
|
Icon(icon, size: iconSize, color: effectiveIconColor),
|
|
SizedBox(width: terminal ? 10 : 16),
|
|
Expanded(
|
|
child: Column(
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
children: [
|
|
Text(
|
|
title,
|
|
style:
|
|
(terminal
|
|
? textTheme.bodyMedium?.copyWith(
|
|
fontWeight: FontWeight.w600,
|
|
)
|
|
: meshTileTitleStyle(theme))
|
|
?.copyWith(color: titleColor),
|
|
),
|
|
if (subtitle != null) ...[
|
|
const SizedBox(height: 2),
|
|
Text(
|
|
subtitle!,
|
|
maxLines: subtitleMaxLines,
|
|
overflow: subtitleMaxLines == null
|
|
? null
|
|
: TextOverflow.ellipsis,
|
|
style: (terminal ? textTheme.bodySmall : textTheme.bodyMedium)
|
|
?.copyWith(
|
|
color: titleColor != null
|
|
? titleColor!.withValues(alpha: 0.8)
|
|
: scheme.onSurfaceVariant,
|
|
),
|
|
),
|
|
],
|
|
],
|
|
),
|
|
),
|
|
?trailing,
|
|
if (showChevron && trailing == null)
|
|
Icon(
|
|
Icons.chevron_right,
|
|
color: scheme.onSurfaceVariant,
|
|
size: iconSize,
|
|
),
|
|
],
|
|
);
|
|
|
|
return MergeSemantics(
|
|
child: Semantics(
|
|
button: true,
|
|
enabled: enabled,
|
|
child: InkWell(
|
|
onTap: onTap,
|
|
child: Padding(
|
|
padding: terminal
|
|
? const EdgeInsets.symmetric(horizontal: 8, vertical: 5)
|
|
: padding,
|
|
// Dimmed rather than recoloured so warn/alert tints still read as
|
|
// such while clearly unavailable.
|
|
child: Opacity(opacity: enabled ? 1 : 0.5, child: row),
|
|
),
|
|
),
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
/// One radio-style option row inside a bottom sheet picker.
|
|
class MeshSheetOption extends StatelessWidget {
|
|
final String label;
|
|
final bool selected;
|
|
final VoidCallback onTap;
|
|
|
|
const MeshSheetOption({
|
|
super.key,
|
|
required this.label,
|
|
required this.selected,
|
|
required this.onTap,
|
|
});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final scheme = Theme.of(context).colorScheme;
|
|
return ListTile(
|
|
leading: Icon(
|
|
selected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
|
|
size: 24,
|
|
color: selected ? scheme.primary : scheme.onSurfaceVariant,
|
|
),
|
|
title: Text(label),
|
|
onTap: onTap,
|
|
);
|
|
}
|
|
}
|