feat(i18n): full RTL/CJK support — fonts, Japanese locale, directional fixes
Bundle Noto Sans Arabic + Noto Sans JP (SIL OFL 1.1) as per-glyph fallbacks for both the UI text theme and every generated PDF, so RTL (Arabic) and CJK render on all platforms — including desktop, where the system font may lack them — instead of tofu. A shared pdf_fonts.dart centralizes the PDF theme and the three label/catalog/recovery services reuse it. Add Japanese (ja) as the CJK reference locale — fittingly, the app's own name is Japanese (種, tane, 'seed'). Core strings translated; the rest fall back to English via slang. Wired into supportedLocales (automatic) and the settings picker. Fix three physical Alignment.centerLeft -> AlignmentDirectional.centerStart in variety_detail_screen, and make month-abbreviation and avatar-initial truncation grapheme-safe (.characters) so CJK text is never cut mid-character. Tests: CJK/Arabic PDF glyph render, ja locale resolution + English fallback. The chat-bubble mirroring flagged by the audit was verified correct (already respects Directionality) and left unchanged.
This commit is contained in:
parent
41ea6735d2
commit
baa8867287
31 changed files with 686 additions and 104 deletions
|
|
@ -1,11 +1,11 @@
|
|||
import 'dart:math' as math;
|
||||
import 'dart:typed_data';
|
||||
|
||||
import 'package:flutter/services.dart' show rootBundle;
|
||||
import 'package:pdf/pdf.dart';
|
||||
import 'package:pdf/widgets.dart' as pw;
|
||||
|
||||
import 'file_service.dart';
|
||||
import 'pdf_fonts.dart';
|
||||
|
||||
/// How the labels are tiled on the page: many small stickers to peel onto
|
||||
/// packets, or fewer larger cards for jars and boxes.
|
||||
|
|
@ -65,9 +65,10 @@ class _Geometry {
|
|||
/// platform channels apart from loading the bundled font, so it runs (and is
|
||||
/// tested) on the host.
|
||||
///
|
||||
/// The embedded DejaVu face covers Latin (extended), Cyrillic and Greek. Like
|
||||
/// the OCR traineddata, the PDF font is a per-locale resource: wider scripts
|
||||
/// (Arabic, CJK) ship alongside their locales, not hardcoded here.
|
||||
/// The embedded DejaVu face covers Latin (extended), Cyrillic and Greek, with
|
||||
/// Noto Arabic + Noto CJK as per-glyph fallbacks (see [buildPdfTheme]) so RTL
|
||||
/// and CJK text render. Fonts are a per-locale resource, extensible to any
|
||||
/// script.
|
||||
class LabelSheetService {
|
||||
LabelSheetService({required FileService files}) : _files = files;
|
||||
|
||||
|
|
@ -103,15 +104,8 @@ class LabelSheetService {
|
|||
bool rtl = false,
|
||||
}) async {
|
||||
final textDirection = rtl ? pw.TextDirection.rtl : pw.TextDirection.ltr;
|
||||
final base = pw.Font.ttf(
|
||||
await rootBundle.load('assets/fonts/DejaVuSans.ttf'),
|
||||
);
|
||||
final bold = pw.Font.ttf(
|
||||
await rootBundle.load('assets/fonts/DejaVuSans-Bold.ttf'),
|
||||
);
|
||||
final doc = pw.Document(
|
||||
theme: pw.ThemeData.withFont(base: base, bold: bold, italic: base),
|
||||
);
|
||||
final fonts = await loadPdfFonts();
|
||||
final doc = pw.Document(theme: fonts.theme);
|
||||
|
||||
final g = _geometryOf(format);
|
||||
final labelWidth = (PdfPageFormat.a4.width - _margin * 2) / g.columns;
|
||||
|
|
@ -150,7 +144,7 @@ class LabelSheetService {
|
|||
maxLines: 1,
|
||||
overflow: pw.TextOverflow.clip,
|
||||
style: pw.TextStyle(
|
||||
font: bold,
|
||||
font: fonts.bold,
|
||||
fontSize: g.common,
|
||||
color: PdfColors.grey800,
|
||||
),
|
||||
|
|
@ -159,7 +153,7 @@ class LabelSheetService {
|
|||
label.varietyLabel,
|
||||
maxLines: 2,
|
||||
overflow: pw.TextOverflow.clip,
|
||||
style: pw.TextStyle(font: bold, fontSize: g.title),
|
||||
style: pw.TextStyle(font: fonts.bold, fontSize: g.title),
|
||||
),
|
||||
if (label.scientificName != null)
|
||||
pw.Text(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue