A Portuguese user reported "Skip Intro" rendering in English on Android TV.
The locale files were not the problem - all 22 were structurally complete.
skip_marker_button.dart simply never imported strings.g.dart and assigned
'Skip Intro' / 'Skip Credits' / 'Next Episode' as plain literals. An audit of
lib/ found ~120 more sites in the same state, in four shapes that need
different fixes:
A literal in a file that never imported the i18n layer is the easy one -
skip_marker_button, performance_stats, track_label_builder and codec_utils all
render text with no `t` in the file at all. TrackLabelBuilder._compose now takes
a fallbackLabel builder instead of an English fallbackPrefix, so the caller
supplies t.audioTracks.track / t.videoControls.subtitleTrack and every unnamed
audio and subtitle row in the track menus is localized.
English reaching the user through an exception message is the widest one, and
it needs care: MediaServerException.message feeds both toString() - logs and
Sentry grouping - and verbatim UI display. Localizing it in place would make
bug-report logs follow the user's locale and split one Sentry issue into 22.
The MediaServer and Seerr families instead gain a nullable `display` alongside
the English `message`, and the six screens that print these errors read
`display ?? message`. PlaybackException keeps the opposite rule, because it
already carries a PlaybackFailureReason for logic and classifyPlaybackFailure
already builds it from t.messages: its stragglers are localized at the throw
site. That also removes the literal "Exception: " prefix Live TV users saw on
a tune failure, since PlaybackException.toString() returns the bare message.
Localized parts hand-concatenated with bare English are the shape no search for
Text('...') can find: '${t.common.pause} auto-scroll' on the home carousel,
'${day} at ${time}' on the Live TV schedule row, and an actor-screen count that
hand-rolled its plural as `n == 1 ? 'title' : 'titles'` - wrong for ru and pl
regardless of translation, now a real Slang plural.
Finally a literal assigned to provider state that a widget renders later:
DownloadProgress.errorMessage, and the four background_downloader notification
bodies, which sit inside a plugin config call where no widget-shaped search
reaches them.
Two things surfaced while converting. track_chapter_controls compared a track
label against 'Audio Track N' to swap in a localized version; once the builder
localized its own fallback that branch became unreachable, so it and the
orphaned _joinTrackLabel are gone. And discovery_view's PeerError fallback arm
looks like a leak but is not - its producers already localize, and a test says
so - so it stays as it is.
All 21 non-base locales are translated, including the 21 keys left empty by
earlier commits that were falling back to English. No locale has an empty value.
scripts/check_hardcoded_strings.py guards the three shapes a structural check
can see, and runs in ci_checks.sh after translation hygiene. Its first draft
passed its own tests while missing this very bug, because 'Skip Intro' is bound
to a local rather than handed to Text(); the name-bound rule that closes that
gap is restricted to phrase-shaped literals, or it cannot tell copy from the
identifiers this codebase binds constantly ('cast_row', 'auto', 'liveTv'). It
cannot see English inside a throw or assigned to a provider field - neither is
distinguishable from a log message without dataflow analysis - and the docstring
says so. label: and actionLabel: are deliberately unscanned: here they name a
diagnostic operation, and a check that is chronically red is a check that gets
switched off.
One commit rather than one per area: the keys, the 22 locale files and the
generated output are a single unit, and any partial split fails the repo's own
unused-key scan on the way through.
close #1856
137 lines
4.2 KiB
Dart
137 lines
4.2 KiB
Dart
import 'package:flutter/material.dart';
|
|
import 'package:plezy/widgets/app_icon.dart';
|
|
import 'package:material_symbols_icons/symbols.dart';
|
|
import '../i18n/strings.g.dart';
|
|
|
|
import 'overlay_sheet.dart';
|
|
|
|
/// A reusable header widget for bottom sheets
|
|
/// Provides consistent styling with title, optional leading widget, optional action, and close button
|
|
class BottomSheetHeader extends StatelessWidget {
|
|
/// The title text to display
|
|
final String title;
|
|
|
|
/// Optional leading widget (e.g., icon or back button)
|
|
/// Takes precedence over [icon] and [onBack]
|
|
final Widget? leading;
|
|
|
|
/// Optional action widget (e.g., clear button)
|
|
final Widget? action;
|
|
|
|
/// Optional callback when close button is pressed
|
|
/// Defaults to closing the nearest hosted sheet, with modal-route fallback.
|
|
final VoidCallback? onClose;
|
|
|
|
/// Optional icon to display as leading widget
|
|
/// Only used if [leading] and [onBack] are null
|
|
final IconData? icon;
|
|
|
|
/// Optional color for the icon
|
|
/// Only used when [icon] is provided
|
|
final Color? iconColor;
|
|
|
|
/// Optional callback for back button
|
|
/// When provided, displays a back button as the leading widget
|
|
/// Takes precedence over [icon]
|
|
final VoidCallback? onBack;
|
|
|
|
/// Optional text style for the title
|
|
final TextStyle? titleStyle;
|
|
|
|
/// Optional text color for the title
|
|
/// Only used if [titleStyle] is null
|
|
final Color? titleColor;
|
|
|
|
/// Whether to show the bottom border
|
|
/// Defaults to true
|
|
final bool showBorder;
|
|
|
|
/// Optional focus node for the close button
|
|
final FocusNode? closeFocusNode;
|
|
|
|
const BottomSheetHeader({
|
|
super.key,
|
|
required this.title,
|
|
this.leading,
|
|
this.action,
|
|
this.onClose,
|
|
this.icon,
|
|
this.iconColor,
|
|
this.onBack,
|
|
this.titleStyle,
|
|
this.titleColor,
|
|
this.showBorder = true,
|
|
this.closeFocusNode,
|
|
});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final usesBackButton = leading == null && onBack != null;
|
|
|
|
// Determine the leading widget based on priority: leading > onBack > icon
|
|
Widget? resolvedLeading;
|
|
if (leading != null) {
|
|
resolvedLeading = leading;
|
|
} else if (onBack != null) {
|
|
resolvedLeading = SizedBox(
|
|
width: 24,
|
|
height: kMinInteractiveDimension,
|
|
child: Align(
|
|
alignment: Alignment.centerLeft,
|
|
child: ExcludeSemantics(child: AppIcon(Symbols.arrow_back_rounded, fill: 1, color: iconColor)),
|
|
),
|
|
);
|
|
} else if (icon != null) {
|
|
resolvedLeading = AppIcon(icon!, fill: 1, color: iconColor);
|
|
}
|
|
|
|
final effectiveTitleStyle = titleStyle ?? TextStyle(fontSize: 18, fontWeight: .bold, color: titleColor);
|
|
|
|
return Container(
|
|
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
|
decoration: showBorder
|
|
? BoxDecoration(
|
|
border: Border(bottom: BorderSide(color: Theme.of(context).dividerColor)),
|
|
)
|
|
: null,
|
|
child: Stack(
|
|
children: [
|
|
Row(
|
|
children: [
|
|
if (resolvedLeading != null) ...[resolvedLeading, const SizedBox(width: 8)],
|
|
Expanded(child: Text(title, style: effectiveTitleStyle)),
|
|
?action,
|
|
ExcludeFocusTraversal(
|
|
child: IconButton(
|
|
focusNode: closeFocusNode,
|
|
tooltip: t.common.close,
|
|
icon: AppIcon(Symbols.close_rounded, fill: 1, color: iconColor),
|
|
onPressed: onClose ?? () => OverlaySheetController.closeAdaptive(context),
|
|
),
|
|
),
|
|
],
|
|
),
|
|
if (usesBackButton)
|
|
PositionedDirectional(
|
|
start: 0,
|
|
top: 0,
|
|
bottom: 0,
|
|
width: kMinInteractiveDimension,
|
|
child: ExcludeFocusTraversal(
|
|
child: Semantics(
|
|
label: MaterialLocalizations.of(context).backButtonTooltip,
|
|
button: true,
|
|
child: InkResponse(
|
|
onTap: onBack,
|
|
radius: kMinInteractiveDimension / 2,
|
|
child: const SizedBox.expand(),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
],
|
|
),
|
|
);
|
|
}
|
|
}
|