diff --git a/l10n.yaml b/l10n.yaml index b5c43912..cffe1be9 100644 --- a/l10n.yaml +++ b/l10n.yaml @@ -1,5 +1,4 @@ arb-dir: lib/l10n template-arb-file: app_en.arb output-localization-file: l10n.dart -output-class: S untranslated-messages-file: untranlated.json \ No newline at end of file diff --git a/lib/app.dart b/lib/app.dart index cca3c08c..99104129 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -65,8 +65,8 @@ class MyApp extends StatelessWidget { return MaterialApp( locale: locale, - localizationsDelegates: S.localizationsDelegates, - supportedLocales: S.supportedLocales, + localizationsDelegates: AppLocalizations.localizationsDelegates, + supportedLocales: AppLocalizations.supportedLocales, title: BuildData.name, themeMode: themeMode, theme: light, diff --git a/lib/core/extension/context/locale.dart b/lib/core/extension/context/locale.dart index e6f163ef..c3cac2ee 100644 --- a/lib/core/extension/context/locale.dart +++ b/lib/core/extension/context/locale.dart @@ -1,7 +1,4 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:flutter_gen/gen_l10n/l10n_en.dart'; -late S _s; -S get l10n => _s; -set l10n(S s) { - _s = s; -} +AppLocalizations l10n = AppLocalizationsEn(); diff --git a/lib/data/model/server/wol_cfg.dart b/lib/data/model/server/wol_cfg.dart index 78098190..c73b040e 100644 --- a/lib/data/model/server/wol_cfg.dart +++ b/lib/data/model/server/wol_cfg.dart @@ -3,6 +3,8 @@ import 'dart:io'; import 'package:hive_flutter/hive_flutter.dart'; import 'package:wake_on_lan/wake_on_lan.dart'; +part 'wol_cfg.g.dart'; + @HiveType(typeId: 8) final class WakeOnLanCfg { @HiveField(0) diff --git a/lib/data/model/server/wol_cfg.g.dart b/lib/data/model/server/wol_cfg.g.dart new file mode 100644 index 00000000..e1dd9a5b --- /dev/null +++ b/lib/data/model/server/wol_cfg.g.dart @@ -0,0 +1,47 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'wol_cfg.dart'; + +// ************************************************************************** +// TypeAdapterGenerator +// ************************************************************************** + +class WakeOnLanCfgAdapter extends TypeAdapter { + @override + final int typeId = 8; + + @override + WakeOnLanCfg read(BinaryReader reader) { + final numOfFields = reader.readByte(); + final fields = { + for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(), + }; + return WakeOnLanCfg( + mac: fields[0] as String, + ip: fields[1] as String, + pwd: fields[2] as String?, + ); + } + + @override + void write(BinaryWriter writer, WakeOnLanCfg obj) { + writer + ..writeByte(3) + ..writeByte(0) + ..write(obj.mac) + ..writeByte(1) + ..write(obj.ip) + ..writeByte(2) + ..write(obj.pwd); + } + + @override + int get hashCode => typeId.hashCode; + + @override + bool operator ==(Object other) => + identical(this, other) || + other is WakeOnLanCfgAdapter && + runtimeType == other.runtimeType && + typeId == other.typeId; +} diff --git a/lib/view/page/home/home.dart b/lib/view/page/home/home.dart index c995da36..ab6f1ca6 100644 --- a/lib/view/page/home/home.dart +++ b/lib/view/page/home/home.dart @@ -63,7 +63,7 @@ class _HomePageState extends State @override void didChangeDependencies() { super.didChangeDependencies(); - l10n = S.of(context)!; + l10n = AppLocalizations.of(context)!; _isLandscape.value = MediaQuery.of(context).orientation == Orientation.landscape; } diff --git a/lib/view/page/setting/entry.dart b/lib/view/page/setting/entry.dart index 802b19cd..595a2c07 100644 --- a/lib/view/page/setting/entry.dart +++ b/lib/view/page/setting/entry.dart @@ -532,7 +532,7 @@ class _SettingPageState extends State { onTap: () async { final selected = await context.showPickSingleDialog( title: l10n.language, - items: S.supportedLocales, + items: AppLocalizations.supportedLocales, name: (p0) => p0.code, initial: _setting.locale.fetch().toLocale, ); diff --git a/pubspec.lock b/pubspec.lock index c5c5f365..0c7cc2c4 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -637,10 +637,10 @@ packages: dependency: "direct main" description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf url: "https://pub.dev" source: hosted - version: "0.18.1" + version: "0.19.0" io: dependency: transitive description: @@ -669,26 +669,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "10.0.4" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.3" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" linked_scroll_controller: dependency: transitive description: @@ -781,10 +781,10 @@ packages: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.12.0" mime: dependency: transitive description: @@ -1210,10 +1210,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" timing: dependency: transitive description: @@ -1354,10 +1354,10 @@ packages: dependency: transitive description: name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" url: "https://pub.dev" source: hosted - version: "13.0.0" + version: "14.2.1" wake_on_lan: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index f9bf7430..9d146282 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -27,7 +27,7 @@ dependencies: ref: main # path: ../circle_chart easy_isolate: ^1.3.0 - intl: ^0.18.0 + intl: ^0.19.0 # xterm: ^3.5.0 xterm: # path: ../xterm.dart