#12 new: custom theme mode

.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled.
 
 version:
-  revision: b06b8b2710955028a6b562f5aa6fe62941d6febf
+  revision: 9944297138845a94256f1cf37beb88ff9a8e811a
   channel: stable
 
 project_type: app
@@ -13,11 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf
+      create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
-      base_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf
+      base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
     - platform: macos
-      create_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf
+      create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
-      base_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf
+      base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a
 
   # User provided section
 

ios/Podfile.lock

@@ -49,10 +49,10 @@ SPEC CHECKSUMS:
   file_picker: 1d63c4949e05e386da864365f8c13e1e64787675
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
-  path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852
+  path_provider_foundation: c68054786f1b4f3343858c1e1d0caaded73f0be9
   r_upgrade: 44d715c61914cce3d01ea225abffe894fd51c114
   share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
-  url_launcher_ios: ae1517e5e344f5544fb090b079e11f399dfbe4d2
+  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
 
 PODFILE CHECKSUM: 7fb15c416f8685fca4966867a8da218ec592ec2e
 

ios/Runner.xcodeproj/project.pbxproj

@@ -356,7 +356,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 225;
+				CURRENT_PROJECT_VERSION = 227;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -364,7 +364,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.225;
+				MARKETING_VERSION = 1.0.227;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -486,7 +486,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 225;
+				CURRENT_PROJECT_VERSION = 227;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -494,7 +494,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.225;
+				MARKETING_VERSION = 1.0.227;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -510,7 +510,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 225;
+				CURRENT_PROJECT_VERSION = 227;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -518,7 +518,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.225;
+				MARKETING_VERSION = 1.0.227;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

l10n.yaml

@@ -0,0 +1,4 @@
+arb-dir: lib/l10n
+template-arb-file: app_en.arb
+output-localization-file: l10n.dart
+output-class: S

lib/app.dart

@@ -1,30 +1,38 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 import '/core/extension/colorx.dart';
 import 'core/utils/ui.dart';
 import 'data/res/build_data.dart';
 import 'data/res/color.dart';
 import 'data/store/setting.dart';
-import 'generated/l10n.dart';
 import 'locator.dart';
 import 'view/page/home.dart';
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key? key}) : super(key: key);
+  MyApp({Key? key}) : super(key: key);
+
+  final _setting = locator<SettingStore>();
 
   @override
   Widget build(BuildContext context) {
     setTransparentNavigationBar(context);
     return ValueListenableBuilder<int>(
-      valueListenable: locator<SettingStore>().primaryColor.listenable(),
+      valueListenable: _setting.primaryColor.listenable(),
       builder: (_, colorValue, __) {
         primaryColor = Color(colorValue);
+        return ValueListenableBuilder<int>(
+          valueListenable: _setting.nightMode.listenable(),
+          builder: (_, mode, __) => _buildApp(mode),
+        );
+      },
+    );
+  }
 
+  Widget _buildApp(int nightMode) {
     final textStyle = TextStyle(color: primaryColor);
     final materialColor = primaryColor.materialStateColor;
-        final materialColorAlpha =
+    final materialColorAlpha = primaryColor.withOpacity(0.7).materialStateColor;
-            primaryColor.withOpacity(0.7).materialStateColor;
     final fabTheme =
         FloatingActionButtonThemeData(backgroundColor: primaryColor);
     final switchTheme = SwitchThemeData(
@@ -42,15 +50,15 @@ class MyApp extends StatelessWidget {
     final radioTheme = RadioThemeData(
       fillColor: materialColor,
     );
+    final ok = nightMode >= 0 && nightMode <= ThemeMode.values.length - 1;
+    final themeMode = ok ? ThemeMode.values[nightMode] : ThemeMode.system;
 
     return MaterialApp(
       debugShowCheckedModeBanner: false,
-          localizationsDelegates: const [
+      localizationsDelegates: S.localizationsDelegates,
-            S.delegate,
+      supportedLocales: S.supportedLocales,
-            ...GlobalMaterialLocalizations.delegates,
-          ],
-          supportedLocales: S.delegate.supportedLocales,
       title: BuildData.name,
+      themeMode: themeMode,
       theme: ThemeData(
         useMaterial3: false,
         primaryColor: primaryColor,
@@ -77,9 +85,8 @@ class MyApp extends StatelessWidget {
           accentColor: primaryColor,
         ),
       ),
+      themeAnimationDuration: const Duration(milliseconds: 237),
       home: const MyHomePage(),
     );
-      },
-    );
   }
 }

lib/core/update.dart

@@ -2,6 +2,7 @@ import 'dart:io';
 
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:logging/logging.dart';
 import 'package:r_upgrade/r_upgrade.dart';
 
@@ -9,7 +10,6 @@ import '../data/model/app/update.dart';
 import '../data/provider/app.dart';
 import '../data/res/build_data.dart';
 import '../data/service/app.dart';
-import '../generated/l10n.dart';
 import '../locator.dart';
 import 'utils/ui.dart';
 
@@ -53,7 +53,7 @@ Future<void> doUpdate(BuildContext context, {bool force = false}) async {
     return;
   }
 
-  final s = S.of(context);
+  final s = S.of(context)!;
 
   if (update.min > BuildData.build) {
     showRoundDialog(

lib/core/utils/misc.dart

@@ -3,10 +3,9 @@ import 'dart:io';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:share_plus/share_plus.dart';
 
-import '../../generated/l10n.dart';
-
 Future<bool> shareFiles(BuildContext context, List<String> filePaths) async {
   for (final filePath in filePaths) {
     if (!await File(filePath).exists()) {
@@ -17,7 +16,7 @@ Future<bool> shareFiles(BuildContext context, List<String> filePaths) async {
   if (filePaths.length == 1) {
     text = filePaths.first.split('/').last;
   } else {
-    text = '${filePaths.length} ${S.of(context).files}';
+    text = '${filePaths.length} ${S.of(context)!.files}';
   }
   final xfiles = filePaths.map((e) => XFile(e)).toList();
   await Share.shareXFiles(xfiles, text: 'ServerBox -> $text');

lib/core/utils/ui.dart

@@ -2,10 +2,10 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:toolbox/core/extension/stringx.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import '../../generated/l10n.dart';
 import '../../view/widget/card_dialog.dart';
 import '../persistant_store.dart';
 
@@ -89,7 +89,7 @@ Widget buildPopuopMenu(
 }
 
 String tabTitleName(BuildContext context, int i) {
-  final s = S.of(context);
+  final s = S.of(context)!;
   switch (i) {
     case 0:
       return s.server;

lib/data/res/build_data.dart

@@ -2,8 +2,9 @@
 
 class BuildData {
   static const String name = "ServerBox";
-  static const int build = 225;
+  static const int build = 227;
-  static const String engine = "Flutter 3.7.3 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision 9944297138 (9 days ago) • 2023-02-08 15:46:04 -0800\nEngine • revision 248290d6d5\nTools • Dart 2.19.2 • DevTools 2.20.1\n";
+  static const String engine =
-  static const String buildAt = "2023-02-18 13:22:17.786805";
+      "Flutter 3.7.3 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision 9944297138 (2 weeks ago) • 2023-02-08 15:46:04 -0800\nEngine • revision 248290d6d5\nTools • Dart 2.19.2 • DevTools 2.20.1\n";
-  static const int modifications = 3;
+  static const String buildAt = "2023-02-25 18:23:00.718232";
+  static const int modifications = 13;
 }

lib/data/res/menu.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-import '../../generated/l10n.dart';
 import '../../view/widget/dropdown_menu.dart';
 
 class ServerTabMenuItems {

lib/data/store/setting.dart

@@ -29,4 +29,8 @@ class SettingStore extends PersistentStore {
   /// Max retry count when connect to server
   StoreProperty<int> get maxRetryCount =>
       property('maxRetryCount', defaultValue: 7);
+
+  /// Night mode: 0 -> auto, 1 -> light, 2 -> dark
+  StoreProperty<int> get nightMode =>
+      property('nightMode', defaultValue: ThemeMode.system.index);
 }

lib/generated/intl/messages_all.dart

@@ -1,67 +0,0 @@
-// DO NOT EDIT. This is code generated via package:intl/generate_localized.dart
-// This is a library that looks up messages for specific locales by
-// delegating to the appropriate library.
-
-// Ignore issues from commonly used lints in this file.
-// ignore_for_file:implementation_imports, file_names, unnecessary_new
-// ignore_for_file:unnecessary_brace_in_string_interps, directives_ordering
-// ignore_for_file:argument_type_not_assignable, invalid_assignment
-// ignore_for_file:prefer_single_quotes, prefer_generic_function_type_aliases
-// ignore_for_file:comment_references
-
-import 'dart:async';
-
-import 'package:flutter/foundation.dart';
-import 'package:intl/intl.dart';
-import 'package:intl/message_lookup_by_library.dart';
-import 'package:intl/src/intl_helpers.dart';
-
-import 'messages_en.dart' as messages_en;
-import 'messages_zh.dart' as messages_zh;
-
-typedef Future<dynamic> LibraryLoader();
-Map<String, LibraryLoader> _deferredLibraries = {
-  'en': () => new SynchronousFuture(null),
-  'zh': () => new SynchronousFuture(null),
-};
-
-MessageLookupByLibrary? _findExact(String localeName) {
-  switch (localeName) {
-    case 'en':
-      return messages_en.messages;
-    case 'zh':
-      return messages_zh.messages;
-    default:
-      return null;
-  }
-}
-
-/// User programs should call this before using [localeName] for messages.
-Future<bool> initializeMessages(String localeName) {
-  var availableLocale = Intl.verifiedLocale(
-      localeName, (locale) => _deferredLibraries[locale] != null,
-      onFailure: (_) => null);
-  if (availableLocale == null) {
-    return new SynchronousFuture(false);
-  }
-  var lib = _deferredLibraries[availableLocale];
-  lib == null ? new SynchronousFuture(false) : lib();
-  initializeInternalMessageLookup(() => new CompositeMessageLookup());
-  messageLookup.addLocale(availableLocale, _findGeneratedMessagesFor);
-  return new SynchronousFuture(true);
-}
-
-bool _messagesExistFor(String locale) {
-  try {
-    return _findExact(locale) != null;
-  } catch (e) {
-    return false;
-  }
-}
-
-MessageLookupByLibrary? _findGeneratedMessagesFor(String locale) {
-  var actualLocale =
-      Intl.verifiedLocale(locale, _messagesExistFor, onFailure: (_) => null);
-  if (actualLocale == null) return null;
-  return _findExact(actualLocale);
-}

lib/generated/intl/messages_en.dart

@@ -1,284 +0,0 @@
-// DO NOT EDIT. This is code generated via package:intl/generate_localized.dart
-// This is a library that provides messages for a en locale. All the
-// messages from the main program should be duplicated here with the same
-// function name.
-
-// Ignore issues from commonly used lints in this file.
-// ignore_for_file:unnecessary_brace_in_string_interps, unnecessary_new
-// ignore_for_file:prefer_single_quotes,comment_references, directives_ordering
-// ignore_for_file:annotate_overrides,prefer_generic_function_type_aliases
-// ignore_for_file:unused_import, file_names, avoid_escaping_inner_quotes
-// ignore_for_file:unnecessary_string_interpolations, unnecessary_string_escapes
-
-import 'package:intl/intl.dart';
-import 'package:intl/message_lookup_by_library.dart';
-
-final messages = new MessageLookup();
-
-typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
-
-class MessageLookup extends MessageLookupByLibrary {
-  String get localeName => 'en';
-
-  static String m0(fileName) => "Download [${fileName}] to local?";
-
-  static String m1(count) => "${count} images";
-
-  static String m2(runningCount, stoppedCount) =>
-      "${runningCount} running, ${stoppedCount} container stopped.";
-
-  static String m3(count) => "${count} container running.";
-
-  static String m4(percent, size) => "${percent}% of ${size}";
-
-  static String m5(file) => "${file} not exist";
-
-  static String m6(file, size, sizeMax) =>
-      "File \'${file}\' too large ${size}, max ${sizeMax}";
-
-  static String m7(count) => "Found ${count} update";
-
-  static String m8(code) => "request failed, status code: ${code}";
-
-  static String m9(url) =>
-      "Please make sure that docker is installed correctly, or that you are using a non-self-compiled version. If you don\'t have the above issues, please submit an issue on ${url}.";
-
-  static String m10(myGithub) => "\nMade with ❤️ by ${myGithub}";
-
-  static String m11(url) => "Please report bugs on ${url}";
-
-  static String m12(date) => "Are you sure to restore from ${date} ?";
-
-  static String m13(time) => "Spent time: ${time}";
-
-  static String m14(url) =>
-      "This function is now in the experimental stage.\n\nPlease report bugs on ${url} or join our development.";
-
-  static String m15(name) => "Are you sure to delete [${name}]?";
-
-  static String m16(server) => "Are you sure to delete server [${server}]?";
-
-  static String m17(newest) => "Update: v1.0.${newest}";
-
-  static String m18(newest) =>
-      "Current version is too low, please update to v1.0.${newest}";
-
-  static String m19(build) => "Found: v1.0.${build}, click to update";
-
-  static String m20(build) => "Current: v1.0.${build}";
-
-  static String m21(build) => "Current: v1.0.${build}, is up to date";
-
-  final messages = _notInlinedMessages(_notInlinedMessages);
-  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
-        "about": MessageLookupByLibrary.simpleMessage("About"),
-        "aboutThanks": MessageLookupByLibrary.simpleMessage(
-            "\n\nThanks to the following people who participated in the test."),
-        "addAServer": MessageLookupByLibrary.simpleMessage("add a server"),
-        "addOne": MessageLookupByLibrary.simpleMessage("Add one"),
-        "addPrivateKey":
-            MessageLookupByLibrary.simpleMessage("Add private key"),
-        "alreadyLastDir":
-            MessageLookupByLibrary.simpleMessage("Already in last directory."),
-        "appPrimaryColor":
-            MessageLookupByLibrary.simpleMessage("App primary color"),
-        "attention": MessageLookupByLibrary.simpleMessage("Attention"),
-        "backDir": MessageLookupByLibrary.simpleMessage("Back"),
-        "backup": MessageLookupByLibrary.simpleMessage("Backup"),
-        "backupTip": MessageLookupByLibrary.simpleMessage(
-            "The exported data is simply encrypted. \nPlease keep it safe.\nRestoring will not overwrite existing data (except setting)."),
-        "backupVersionNotMatch": MessageLookupByLibrary.simpleMessage(
-            "Backup version is not match."),
-        "cancel": MessageLookupByLibrary.simpleMessage("Cancel"),
-        "choose": MessageLookupByLibrary.simpleMessage("Choose"),
-        "chooseDestination":
-            MessageLookupByLibrary.simpleMessage("Choose destination"),
-        "choosePrivateKey":
-            MessageLookupByLibrary.simpleMessage("Choose private key"),
-        "clear": MessageLookupByLibrary.simpleMessage("Clear"),
-        "clickSee": MessageLookupByLibrary.simpleMessage("Click here"),
-        "close": MessageLookupByLibrary.simpleMessage("Close"),
-        "cmd": MessageLookupByLibrary.simpleMessage("Command"),
-        "containerStatus":
-            MessageLookupByLibrary.simpleMessage("Container status"),
-        "convert": MessageLookupByLibrary.simpleMessage("Convert"),
-        "copy": MessageLookupByLibrary.simpleMessage("Copy"),
-        "copyPath": MessageLookupByLibrary.simpleMessage("Copy path"),
-        "createFile": MessageLookupByLibrary.simpleMessage("Create file"),
-        "createFolder": MessageLookupByLibrary.simpleMessage("Create folder"),
-        "currentMode": MessageLookupByLibrary.simpleMessage("Current Mode"),
-        "debug": MessageLookupByLibrary.simpleMessage("Debug"),
-        "decode": MessageLookupByLibrary.simpleMessage("Decode"),
-        "delete": MessageLookupByLibrary.simpleMessage("Delete"),
-        "disconnected": MessageLookupByLibrary.simpleMessage("Disconnected"),
-        "dl2Local": m0,
-        "dockerContainerName":
-            MessageLookupByLibrary.simpleMessage("Container name"),
-        "dockerEditHost":
-            MessageLookupByLibrary.simpleMessage("Edit DOCKER_HOST"),
-        "dockerEmptyRunningItems": MessageLookupByLibrary.simpleMessage(
-            "No running container. \nIt may be that the env DOCKER_HOST is not read correctly. You can found it by running `echo \$DOCKER_HOST` in terminal."),
-        "dockerImage": MessageLookupByLibrary.simpleMessage("Image"),
-        "dockerImagesFmt": m1,
-        "dockerNotInstalled":
-            MessageLookupByLibrary.simpleMessage("Docker not installed"),
-        "dockerStatusRunningAndStoppedFmt": m2,
-        "dockerStatusRunningFmt": m3,
-        "download": MessageLookupByLibrary.simpleMessage("Download"),
-        "downloadFinished":
-            MessageLookupByLibrary.simpleMessage("Download finished"),
-        "downloadStatus": m4,
-        "edit": MessageLookupByLibrary.simpleMessage("Edit"),
-        "encode": MessageLookupByLibrary.simpleMessage("Encode"),
-        "error": MessageLookupByLibrary.simpleMessage("Error"),
-        "exampleName": MessageLookupByLibrary.simpleMessage("Example name"),
-        "experimentalFeature":
-            MessageLookupByLibrary.simpleMessage("Experimental feature"),
-        "export": MessageLookupByLibrary.simpleMessage("Export"),
-        "extraArgs": MessageLookupByLibrary.simpleMessage("Extra args"),
-        "feedback": MessageLookupByLibrary.simpleMessage("Feedback"),
-        "feedbackOnGithub": MessageLookupByLibrary.simpleMessage(
-            "If you have any questions, please feedback on Github."),
-        "fieldMustNotEmpty": MessageLookupByLibrary.simpleMessage(
-            "These fields must not be empty."),
-        "fileNotExist": m5,
-        "fileTooLarge": m6,
-        "files": MessageLookupByLibrary.simpleMessage("Files"),
-        "foundNUpdate": m7,
-        "go": MessageLookupByLibrary.simpleMessage("Go"),
-        "goto": MessageLookupByLibrary.simpleMessage("Go to"),
-        "host": MessageLookupByLibrary.simpleMessage("Host"),
-        "httpFailedWithCode": m8,
-        "imagesList": MessageLookupByLibrary.simpleMessage("Images list"),
-        "import": MessageLookupByLibrary.simpleMessage("Import"),
-        "importAndExport":
-            MessageLookupByLibrary.simpleMessage("Import and Export"),
-        "inputDomainHere":
-            MessageLookupByLibrary.simpleMessage("Input Domain here"),
-        "install": MessageLookupByLibrary.simpleMessage("install"),
-        "installDockerWithUrl": MessageLookupByLibrary.simpleMessage(
-            "Please https://docs.docker.com/engine/install docker first."),
-        "invalidJson": MessageLookupByLibrary.simpleMessage("Invalid JSON"),
-        "invalidVersion":
-            MessageLookupByLibrary.simpleMessage("Invalid version"),
-        "invalidVersionHelp": m9,
-        "isBusy": MessageLookupByLibrary.simpleMessage("Is busy now"),
-        "keepForeground":
-            MessageLookupByLibrary.simpleMessage("Keep app foreground!"),
-        "keyAuth": MessageLookupByLibrary.simpleMessage("Key Auth"),
-        "lastTry": MessageLookupByLibrary.simpleMessage("Last try!"),
-        "launchPage": MessageLookupByLibrary.simpleMessage("Launch page"),
-        "license": MessageLookupByLibrary.simpleMessage("License"),
-        "loadingFiles":
-            MessageLookupByLibrary.simpleMessage("Loading files..."),
-        "loss": MessageLookupByLibrary.simpleMessage("loss"),
-        "madeWithLove": m10,
-        "max": MessageLookupByLibrary.simpleMessage("max"),
-        "maxRetryCount": MessageLookupByLibrary.simpleMessage(
-            "Number of server reconnection"),
-        "maxRetryCountEqual0":
-            MessageLookupByLibrary.simpleMessage("Will retry again and again."),
-        "min": MessageLookupByLibrary.simpleMessage("min"),
-        "ms": MessageLookupByLibrary.simpleMessage("ms"),
-        "name": MessageLookupByLibrary.simpleMessage("Name"),
-        "newContainer": MessageLookupByLibrary.simpleMessage("New container"),
-        "noClient": MessageLookupByLibrary.simpleMessage("No client"),
-        "noInterface": MessageLookupByLibrary.simpleMessage("No interface"),
-        "noResult": MessageLookupByLibrary.simpleMessage("No result"),
-        "noSavedPrivateKey":
-            MessageLookupByLibrary.simpleMessage("No saved private keys."),
-        "noSavedSnippet":
-            MessageLookupByLibrary.simpleMessage("No saved snippets."),
-        "noServerAvailable":
-            MessageLookupByLibrary.simpleMessage("No server available."),
-        "noUpdateAvailable":
-            MessageLookupByLibrary.simpleMessage("No update available"),
-        "ok": MessageLookupByLibrary.simpleMessage("OK"),
-        "onServerDetailPage":
-            MessageLookupByLibrary.simpleMessage("On server detail page"),
-        "open": MessageLookupByLibrary.simpleMessage("Open"),
-        "path": MessageLookupByLibrary.simpleMessage("Path"),
-        "pickFile": MessageLookupByLibrary.simpleMessage("Pick file"),
-        "ping": MessageLookupByLibrary.simpleMessage("Ping"),
-        "pingAvg": MessageLookupByLibrary.simpleMessage("Avg:"),
-        "pingInputIP": MessageLookupByLibrary.simpleMessage(
-            "Please input a target IP/domain."),
-        "pingNoServer": MessageLookupByLibrary.simpleMessage(
-            "No server to ping.\nPlease add a server in server tab."),
-        "pkg": MessageLookupByLibrary.simpleMessage("Pkg"),
-        "platformNotSupportUpdate": MessageLookupByLibrary.simpleMessage(
-            "Current platform does not support in app update.\nPlease build from source and install it."),
-        "plzEnterHost":
-            MessageLookupByLibrary.simpleMessage("Please enter host."),
-        "plzSelectKey":
-            MessageLookupByLibrary.simpleMessage("Please select a key."),
-        "port": MessageLookupByLibrary.simpleMessage("Port"),
-        "preview": MessageLookupByLibrary.simpleMessage("Preview"),
-        "privateKey": MessageLookupByLibrary.simpleMessage("Private Key"),
-        "pwd": MessageLookupByLibrary.simpleMessage("Password"),
-        "rename": MessageLookupByLibrary.simpleMessage("Rename"),
-        "reportBugsOnGithubIssue": m11,
-        "restore": MessageLookupByLibrary.simpleMessage("Restore"),
-        "restoreSuccess": MessageLookupByLibrary.simpleMessage(
-            "Restore success. Restart app to apply."),
-        "restoreSureWithDate": m12,
-        "result": MessageLookupByLibrary.simpleMessage("Result"),
-        "run": MessageLookupByLibrary.simpleMessage("Run"),
-        "save": MessageLookupByLibrary.simpleMessage("Save"),
-        "second": MessageLookupByLibrary.simpleMessage("s"),
-        "server": MessageLookupByLibrary.simpleMessage("Server"),
-        "serverTabConnecting":
-            MessageLookupByLibrary.simpleMessage("Connecting..."),
-        "serverTabEmpty": MessageLookupByLibrary.simpleMessage(
-            "There is no server.\nClick the fab to add one."),
-        "serverTabFailed": MessageLookupByLibrary.simpleMessage("Failed"),
-        "serverTabLoading": MessageLookupByLibrary.simpleMessage("Loading..."),
-        "serverTabPlzSave": MessageLookupByLibrary.simpleMessage(
-            "Please \'save\' this private key again."),
-        "serverTabUnkown":
-            MessageLookupByLibrary.simpleMessage("Unknown state"),
-        "setting": MessageLookupByLibrary.simpleMessage("Setting"),
-        "sftpDlPrepare":
-            MessageLookupByLibrary.simpleMessage("Preparing to connect..."),
-        "sftpNoDownloadTask":
-            MessageLookupByLibrary.simpleMessage("No download task."),
-        "sftpSSHConnected":
-            MessageLookupByLibrary.simpleMessage("SFTP Connected"),
-        "showDistLogo":
-            MessageLookupByLibrary.simpleMessage("Show distribution logo"),
-        "snippet": MessageLookupByLibrary.simpleMessage("Snippet"),
-        "spentTime": m13,
-        "sshTip": m14,
-        "start": MessageLookupByLibrary.simpleMessage("Start"),
-        "stop": MessageLookupByLibrary.simpleMessage("Stop"),
-        "sureDelete": m15,
-        "sureNoPwd": MessageLookupByLibrary.simpleMessage(
-            "Are you sure to use no password?"),
-        "sureToDeleteServer": m16,
-        "termTheme": MessageLookupByLibrary.simpleMessage("Terminal theme"),
-        "times": MessageLookupByLibrary.simpleMessage("Times"),
-        "ttl": MessageLookupByLibrary.simpleMessage("ttl"),
-        "unknown": MessageLookupByLibrary.simpleMessage("unknown"),
-        "unknownError": MessageLookupByLibrary.simpleMessage("Unknown error"),
-        "unkownConvertMode":
-            MessageLookupByLibrary.simpleMessage("Unknown convert mode"),
-        "update": MessageLookupByLibrary.simpleMessage("Update"),
-        "updateAll": MessageLookupByLibrary.simpleMessage("Update all"),
-        "updateIntervalEqual0": MessageLookupByLibrary.simpleMessage(
-            "You set to 0, will not update automatically.\nCan\'t calculate CPU status."),
-        "updateServerStatusInterval": MessageLookupByLibrary.simpleMessage(
-            "Server status update interval"),
-        "updateTip": m17,
-        "updateTipTooLow": m18,
-        "upsideDown": MessageLookupByLibrary.simpleMessage("Upside Down"),
-        "urlOrJson": MessageLookupByLibrary.simpleMessage("URL or JSON"),
-        "user": MessageLookupByLibrary.simpleMessage("User"),
-        "versionHaveUpdate": m19,
-        "versionUnknownUpdate": m20,
-        "versionUpdated": m21,
-        "waitConnection": MessageLookupByLibrary.simpleMessage(
-            "Please wait for the connection to be established."),
-        "willTakEeffectImmediately":
-            MessageLookupByLibrary.simpleMessage("Will take effect immediately")
-      };
-}

lib/generated/intl/messages_zh.dart

@@ -1,247 +0,0 @@
-// DO NOT EDIT. This is code generated via package:intl/generate_localized.dart
-// This is a library that provides messages for a zh locale. All the
-// messages from the main program should be duplicated here with the same
-// function name.
-
-// Ignore issues from commonly used lints in this file.
-// ignore_for_file:unnecessary_brace_in_string_interps, unnecessary_new
-// ignore_for_file:prefer_single_quotes,comment_references, directives_ordering
-// ignore_for_file:annotate_overrides,prefer_generic_function_type_aliases
-// ignore_for_file:unused_import, file_names, avoid_escaping_inner_quotes
-// ignore_for_file:unnecessary_string_interpolations, unnecessary_string_escapes
-
-import 'package:intl/intl.dart';
-import 'package:intl/message_lookup_by_library.dart';
-
-final messages = new MessageLookup();
-
-typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
-
-class MessageLookup extends MessageLookupByLibrary {
-  String get localeName => 'zh';
-
-  static String m0(fileName) => "下载 [${fileName}] 到本地？";
-
-  static String m1(count) => "共 ${count} 个镜像";
-
-  static String m2(runningCount, stoppedCount) =>
-      "${runningCount}个正在运行, ${stoppedCount}个已停止";
-
-  static String m3(count) => "${count}个容器正在运行";
-
-  static String m4(percent, size) => "${size} 的 ${percent}%";
-
-  static String m5(file) => "${file} 不存在";
-
-  static String m6(file, size, sizeMax) =>
-      "文件 \'${file}\' 过大 \'${size}\'，超过了 ${sizeMax}";
-
-  static String m7(count) => "找到 ${count} 个更新";
-
-  static String m8(code) => "请求失败, 状态码: ${code}";
-
-  static String m9(url) =>
-      "请确保正确安装了docker，或者使用的非自编译版本。如果没有以上问题，请在 ${url} 提交问题。";
-
-  static String m10(myGithub) => "\n用❤️制作 by ${myGithub}";
-
-  static String m11(url) => "请到 ${url} 提交问题";
-
-  static String m12(date) => "确定恢复 ${date} 的备份吗？";
-
-  static String m13(time) => "耗时: ${time}";
-
-  static String m14(url) => "该功能目前处于测试阶段。\n\n请在 ${url} 反馈问题，或者加入我们开发。";
-
-  static String m15(name) => "确定删除[${name}]？";
-
-  static String m16(server) => "你确定要删除服务器 [${server}] 吗？";
-
-  static String m17(newest) => "新版本: v1.0.${newest}";
-
-  static String m18(newest) => "当前版本过低，请升级至 v1.0.${newest}";
-
-  static String m19(build) => "找到新版本：v1.0.${build}, 点击更新";
-
-  static String m20(build) => "当前：v1.0.${build}";
-
-  static String m21(build) => "当前：v1.0.${build}, 已是最新版本";
-
-  final messages = _notInlinedMessages(_notInlinedMessages);
-  static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
-        "about": MessageLookupByLibrary.simpleMessage("关于"),
-        "aboutThanks":
-            MessageLookupByLibrary.simpleMessage("\n\n感谢以下参与软件测试的各位。"),
-        "addAServer": MessageLookupByLibrary.simpleMessage("添加服务器"),
-        "addOne": MessageLookupByLibrary.simpleMessage("前去新增"),
-        "addPrivateKey": MessageLookupByLibrary.simpleMessage("添加一个私钥"),
-        "alreadyLastDir": MessageLookupByLibrary.simpleMessage("已经是最上层目录了"),
-        "appPrimaryColor": MessageLookupByLibrary.simpleMessage("App主要色"),
-        "attention": MessageLookupByLibrary.simpleMessage("注意"),
-        "backDir": MessageLookupByLibrary.simpleMessage("返回上一级"),
-        "backup": MessageLookupByLibrary.simpleMessage("备份"),
-        "backupTip": MessageLookupByLibrary.simpleMessage(
-            "导出的数据仅进行了简单加密，请妥善保管。\n除了设置项，恢复的数据不会覆盖现有数据。"),
-        "backupVersionNotMatch":
-            MessageLookupByLibrary.simpleMessage("备份版本不匹配，无法恢复"),
-        "cancel": MessageLookupByLibrary.simpleMessage("取消"),
-        "choose": MessageLookupByLibrary.simpleMessage("选择"),
-        "chooseDestination": MessageLookupByLibrary.simpleMessage("选择目标"),
-        "choosePrivateKey": MessageLookupByLibrary.simpleMessage("选择私钥"),
-        "clear": MessageLookupByLibrary.simpleMessage("清除"),
-        "clickSee": MessageLookupByLibrary.simpleMessage("点击查看"),
-        "close": MessageLookupByLibrary.simpleMessage("关闭"),
-        "cmd": MessageLookupByLibrary.simpleMessage("命令"),
-        "containerStatus": MessageLookupByLibrary.simpleMessage("容器状态"),
-        "convert": MessageLookupByLibrary.simpleMessage("转换"),
-        "copy": MessageLookupByLibrary.simpleMessage("复制"),
-        "copyPath": MessageLookupByLibrary.simpleMessage("复制路径"),
-        "createFile": MessageLookupByLibrary.simpleMessage("创建文件"),
-        "createFolder": MessageLookupByLibrary.simpleMessage("创建文件夹"),
-        "currentMode": MessageLookupByLibrary.simpleMessage("当前模式"),
-        "debug": MessageLookupByLibrary.simpleMessage("调试"),
-        "decode": MessageLookupByLibrary.simpleMessage("解码"),
-        "delete": MessageLookupByLibrary.simpleMessage("删除"),
-        "disconnected": MessageLookupByLibrary.simpleMessage("连接断开"),
-        "dl2Local": m0,
-        "dockerContainerName": MessageLookupByLibrary.simpleMessage("容器名"),
-        "dockerEditHost":
-            MessageLookupByLibrary.simpleMessage("编辑 DOCKER_HOST"),
-        "dockerEmptyRunningItems": MessageLookupByLibrary.simpleMessage(
-            "没有正在运行的容器。\n这可能是因为环境变量 DOCKER_HOST 没有被正确读取。你可以通过在终端内运行 `echo \$DOCKER_HOST` 来获取。"),
-        "dockerImage": MessageLookupByLibrary.simpleMessage("镜像"),
-        "dockerImagesFmt": m1,
-        "dockerNotInstalled": MessageLookupByLibrary.simpleMessage("Docker未安装"),
-        "dockerStatusRunningAndStoppedFmt": m2,
-        "dockerStatusRunningFmt": m3,
-        "download": MessageLookupByLibrary.simpleMessage("下载"),
-        "downloadFinished": MessageLookupByLibrary.simpleMessage("下载完成！"),
-        "downloadStatus": m4,
-        "edit": MessageLookupByLibrary.simpleMessage("编辑"),
-        "encode": MessageLookupByLibrary.simpleMessage("编码"),
-        "error": MessageLookupByLibrary.simpleMessage("出错了"),
-        "exampleName": MessageLookupByLibrary.simpleMessage("名称示例"),
-        "experimentalFeature": MessageLookupByLibrary.simpleMessage("实验性功能"),
-        "export": MessageLookupByLibrary.simpleMessage("导出"),
-        "extraArgs": MessageLookupByLibrary.simpleMessage("额外参数"),
-        "feedback": MessageLookupByLibrary.simpleMessage("反馈"),
-        "feedbackOnGithub":
-            MessageLookupByLibrary.simpleMessage("如果你有任何问题，请在GitHub反馈"),
-        "fieldMustNotEmpty": MessageLookupByLibrary.simpleMessage("这些输入框不能为空。"),
-        "fileNotExist": m5,
-        "fileTooLarge": m6,
-        "files": MessageLookupByLibrary.simpleMessage("文件"),
-        "foundNUpdate": m7,
-        "go": MessageLookupByLibrary.simpleMessage("开始"),
-        "goto": MessageLookupByLibrary.simpleMessage("前往"),
-        "host": MessageLookupByLibrary.simpleMessage("主机"),
-        "httpFailedWithCode": m8,
-        "imagesList": MessageLookupByLibrary.simpleMessage("镜像列表"),
-        "import": MessageLookupByLibrary.simpleMessage("导入"),
-        "importAndExport": MessageLookupByLibrary.simpleMessage("导入或导出"),
-        "inputDomainHere": MessageLookupByLibrary.simpleMessage("在这里输入域名"),
-        "install": MessageLookupByLibrary.simpleMessage("安装"),
-        "installDockerWithUrl": MessageLookupByLibrary.simpleMessage(
-            "请先 https://docs.docker.com/engine/install docker"),
-        "invalidJson": MessageLookupByLibrary.simpleMessage("无效的json，存在格式问题"),
-        "invalidVersion": MessageLookupByLibrary.simpleMessage("不支持的版本"),
-        "invalidVersionHelp": m9,
-        "isBusy": MessageLookupByLibrary.simpleMessage("当前正忙"),
-        "keepForeground": MessageLookupByLibrary.simpleMessage("请保持应用处于前台！"),
-        "keyAuth": MessageLookupByLibrary.simpleMessage("公钥认证"),
-        "lastTry": MessageLookupByLibrary.simpleMessage("最后尝试"),
-        "launchPage": MessageLookupByLibrary.simpleMessage("启动页"),
-        "license": MessageLookupByLibrary.simpleMessage("开源证书"),
-        "loadingFiles": MessageLookupByLibrary.simpleMessage("正在加载目录。。。"),
-        "loss": MessageLookupByLibrary.simpleMessage("丢包率"),
-        "madeWithLove": m10,
-        "max": MessageLookupByLibrary.simpleMessage("最大"),
-        "maxRetryCount": MessageLookupByLibrary.simpleMessage("服务器尝试重连次数"),
-        "maxRetryCountEqual0": MessageLookupByLibrary.simpleMessage("会无限重试"),
-        "min": MessageLookupByLibrary.simpleMessage("最小"),
-        "ms": MessageLookupByLibrary.simpleMessage("毫秒"),
-        "name": MessageLookupByLibrary.simpleMessage("名称"),
-        "newContainer": MessageLookupByLibrary.simpleMessage("新建容器"),
-        "noClient": MessageLookupByLibrary.simpleMessage("没有SSH连接"),
-        "noInterface": MessageLookupByLibrary.simpleMessage("没有可用的接口"),
-        "noResult": MessageLookupByLibrary.simpleMessage("无结果"),
-        "noSavedPrivateKey": MessageLookupByLibrary.simpleMessage("没有已保存的私钥。"),
-        "noSavedSnippet": MessageLookupByLibrary.simpleMessage("没有已保存的代码片段。"),
-        "noServerAvailable": MessageLookupByLibrary.simpleMessage("没有可用的服务器。"),
-        "noUpdateAvailable": MessageLookupByLibrary.simpleMessage("没有可用更新"),
-        "ok": MessageLookupByLibrary.simpleMessage("好"),
-        "onServerDetailPage": MessageLookupByLibrary.simpleMessage("在服务器详情页"),
-        "open": MessageLookupByLibrary.simpleMessage("打开"),
-        "path": MessageLookupByLibrary.simpleMessage("路径"),
-        "pickFile": MessageLookupByLibrary.simpleMessage("选择文件"),
-        "ping": MessageLookupByLibrary.simpleMessage("Ping"),
-        "pingAvg": MessageLookupByLibrary.simpleMessage("平均:"),
-        "pingInputIP": MessageLookupByLibrary.simpleMessage("请输入目标IP或域名"),
-        "pingNoServer": MessageLookupByLibrary.simpleMessage(
-            "没有服务器可用于Ping\n请在服务器tab添加服务器后再试"),
-        "pkg": MessageLookupByLibrary.simpleMessage("包管理"),
-        "platformNotSupportUpdate":
-            MessageLookupByLibrary.simpleMessage("当前平台不支持更新，请编译最新源码后手动安装"),
-        "plzEnterHost": MessageLookupByLibrary.simpleMessage("请输入主机"),
-        "plzSelectKey": MessageLookupByLibrary.simpleMessage("请选择私钥"),
-        "port": MessageLookupByLibrary.simpleMessage("端口"),
-        "preview": MessageLookupByLibrary.simpleMessage("预览"),
-        "privateKey": MessageLookupByLibrary.simpleMessage("私钥"),
-        "pwd": MessageLookupByLibrary.simpleMessage("密码"),
-        "rename": MessageLookupByLibrary.simpleMessage("重命名"),
-        "reportBugsOnGithubIssue": m11,
-        "restore": MessageLookupByLibrary.simpleMessage("恢复"),
-        "restoreSuccess":
-            MessageLookupByLibrary.simpleMessage("恢复成功，需要重启App来应用更改"),
-        "restoreSureWithDate": m12,
-        "result": MessageLookupByLibrary.simpleMessage("结果"),
-        "run": MessageLookupByLibrary.simpleMessage("运行"),
-        "save": MessageLookupByLibrary.simpleMessage("保存"),
-        "second": MessageLookupByLibrary.simpleMessage("秒"),
-        "server": MessageLookupByLibrary.simpleMessage("服务器"),
-        "serverTabConnecting": MessageLookupByLibrary.simpleMessage("连接中..."),
-        "serverTabEmpty":
-            MessageLookupByLibrary.simpleMessage("现在没有服务器。\n点击右下方按钮来添加。"),
-        "serverTabFailed": MessageLookupByLibrary.simpleMessage("失败"),
-        "serverTabLoading": MessageLookupByLibrary.simpleMessage("加载中..."),
-        "serverTabPlzSave": MessageLookupByLibrary.simpleMessage("请再次保存该私钥"),
-        "serverTabUnkown": MessageLookupByLibrary.simpleMessage("未知状态"),
-        "setting": MessageLookupByLibrary.simpleMessage("设置"),
-        "sftpDlPrepare": MessageLookupByLibrary.simpleMessage("准备连接至服务器..."),
-        "sftpNoDownloadTask": MessageLookupByLibrary.simpleMessage("没有下载任务"),
-        "sftpSSHConnected":
-            MessageLookupByLibrary.simpleMessage("SFTP 已连接，即将开始下载..."),
-        "showDistLogo": MessageLookupByLibrary.simpleMessage("显示发行版 Logo"),
-        "snippet": MessageLookupByLibrary.simpleMessage("代码片段"),
-        "spentTime": m13,
-        "sshTip": m14,
-        "start": MessageLookupByLibrary.simpleMessage("开始"),
-        "stop": MessageLookupByLibrary.simpleMessage("停止"),
-        "sureDelete": m15,
-        "sureNoPwd": MessageLookupByLibrary.simpleMessage("确认使用无密码？"),
-        "sureToDeleteServer": m16,
-        "termTheme": MessageLookupByLibrary.simpleMessage("终端主题"),
-        "times": MessageLookupByLibrary.simpleMessage("次"),
-        "ttl": MessageLookupByLibrary.simpleMessage("缓存时间"),
-        "unknown": MessageLookupByLibrary.simpleMessage("未知"),
-        "unknownError": MessageLookupByLibrary.simpleMessage("未知错误"),
-        "unkownConvertMode": MessageLookupByLibrary.simpleMessage("未知转换模式"),
-        "update": MessageLookupByLibrary.simpleMessage("更新"),
-        "updateAll": MessageLookupByLibrary.simpleMessage("更新全部"),
-        "updateIntervalEqual0": MessageLookupByLibrary.simpleMessage(
-            "你设置为0，服务器状态不会自动刷新。\n且不能计算CPU使用情况。"),
-        "updateServerStatusInterval":
-            MessageLookupByLibrary.simpleMessage("服务器状态刷新间隔"),
-        "updateTip": m17,
-        "updateTipTooLow": m18,
-        "upsideDown": MessageLookupByLibrary.simpleMessage("上下交换"),
-        "urlOrJson": MessageLookupByLibrary.simpleMessage("链接或JSON"),
-        "user": MessageLookupByLibrary.simpleMessage("用户"),
-        "versionHaveUpdate": m19,
-        "versionUnknownUpdate": m20,
-        "versionUpdated": m21,
-        "waitConnection": MessageLookupByLibrary.simpleMessage("请等待连接建立"),
-        "willTakEeffectImmediately":
-            MessageLookupByLibrary.simpleMessage("更改将会立即生效")
-      };
-}

lib/l10n/app_en.arb

@@ -7,6 +7,7 @@
   "alreadyLastDir": "Already in last directory.",
   "appPrimaryColor": "App primary color",
   "attention": "Attention",
+  "auto": "Auto",
   "backDir": "Back",
   "backup": "Backup",
   "backupTip": "The exported data is simply encrypted. \nPlease keep it safe.\nRestoring will not overwrite existing data (except setting).",
@@ -26,6 +27,7 @@
   "createFile": "Create file",
   "createFolder": "Create folder",
   "currentMode": "Current Mode",
+  "dark": "Dark",
   "debug": "Debug",
   "decode": "Decode",
   "delete": "Delete",
@@ -75,6 +77,7 @@
   "lastTry": "Last try!",
   "launchPage": "Launch page",
   "license": "License",
+  "light": "Light",
   "loadingFiles": "Loading files...",
   "loss": "loss",
   "madeWithLove": "\nMade with ❤️ by {myGithub}",
@@ -139,6 +142,7 @@
   "sureNoPwd": "Are you sure to use no password?",
   "sureToDeleteServer": "Are you sure to delete server [{server}]?",
   "termTheme": "Terminal theme",
+  "themeMode": "Theme mode",
   "times": "Times",
   "ttl": "ttl",
   "unknown": "unknown",

lib/l10n/app_zh.arb

@@ -7,6 +7,7 @@
   "alreadyLastDir": "已经是最上层目录了",
   "appPrimaryColor": "App主要色",
   "attention": "注意",
+  "auto": "自动",
   "backDir": "返回上一级",
   "backup": "备份",
   "backupTip": "导出的数据仅进行了简单加密，请妥善保管。\n除了设置项，恢复的数据不会覆盖现有数据。",
@@ -26,6 +27,7 @@
   "createFile": "创建文件",
   "createFolder": "创建文件夹",
   "currentMode": "当前模式",
+  "dark": "暗",
   "debug": "调试",
   "decode": "解码",
   "delete": "删除",
@@ -75,6 +77,7 @@
   "lastTry": "最后尝试",
   "launchPage": "启动页",
   "license": "开源证书",
+  "light": "亮",
   "loadingFiles": "正在加载目录。。。",
   "loss": "丢包率",
   "madeWithLove": "\n用❤️制作 by {myGithub}",
@@ -139,6 +142,7 @@
   "sureNoPwd": "确认使用无密码？",
   "sureToDeleteServer": "你确定要删除服务器 [{server}] 吗？",
   "termTheme": "终端主题",
+  "themeMode": "主题模式",
   "times": "次",
   "ttl": "缓存时间",
   "unknown": "未知",

lib/main.dart

@@ -89,7 +89,7 @@ Future<void> main() async {
           ChangeNotifierProvider(
               create: (_) => locator<SftpDownloadProvider>()),
         ],
-        child: const MyApp(),
+        child: MyApp(),
       ),
     );
   });

lib/view/page/backup.dart

@@ -4,6 +4,7 @@ import 'dart:convert';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:toolbox/data/res/color.dart';
 
 import '../../core/extension/colorx.dart';
@@ -14,7 +15,6 @@ import '../../data/store/private_key.dart';
 import '../../data/store/server.dart';
 import '../../data/store/setting.dart';
 import '../../data/store/snippet.dart';
-import '../../generated/l10n.dart';
 import '../../locator.dart';
 
 const backupFormatVersion = 1;
@@ -30,7 +30,7 @@ class BackupPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final media = MediaQuery.of(context);
-    final s = S.of(context);
+    final s = S.of(context)!;
     return Scaffold(
       appBar: AppBar(
         title: Text(s.importAndExport, style: textSize18),

lib/view/page/convert.dart

@@ -2,10 +2,10 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 import '../../core/utils/ui.dart';
 import '../../data/res/color.dart';
-import '../../generated/l10n.dart';
 import '../widget/input_field.dart';
 import '../widget/round_rect_card.dart';
 
@@ -38,7 +38,7 @@ class _ConvertPageState extends State<ConvertPage>
     super.didChangeDependencies();
     _media = MediaQuery.of(context);
     _theme = Theme.of(context);
-    _s = S.of(context);
+    _s = S.of(context)!;
   }
 
   @override

lib/view/page/docker.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:provider/provider.dart';
 
 import '../../core/utils/ui.dart';
@@ -11,7 +12,6 @@ import '../../data/res/font_style.dart';
 import '../../data/res/menu.dart';
 import '../../data/res/url.dart';
 import '../../data/store/docker.dart';
-import '../../generated/l10n.dart';
 import '../../locator.dart';
 import '../widget/center_loading.dart';
 import '../widget/dropdown_menu.dart';
@@ -41,7 +41,7 @@ class _DockerManagePageState extends State<DockerManagePage> {
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    _s = S.of(context);
+    _s = S.of(context)!;
   }
 
   @override

lib/view/page/home.dart

@@ -1,5 +1,6 @@
 import 'package:after_layout/after_layout.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:get_it/get_it.dart';
 
 import '../../core/analysis.dart';
@@ -15,7 +16,6 @@ import '../../data/res/icon.dart';
 import '../../data/res/tab.dart';
 import '../../data/res/url.dart';
 import '../../data/store/setting.dart';
-import '../../generated/l10n.dart';
 import '../../locator.dart';
 import '../widget/url_text.dart';
 import 'backup.dart';
@@ -61,7 +61,7 @@ class _MyHomePageState extends State<MyHomePage>
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    _s = S.of(context);
+    _s = S.of(context)!;
     _width = MediaQuery.of(context).size.width;
   }
 

lib/view/page/ping.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:after_layout/after_layout.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 import '../../core/extension/uint8list.dart';
 import '../../core/utils/ui.dart';
@@ -9,7 +10,6 @@ import '../../data/model/server/ping_result.dart';
 import '../../data/provider/server.dart';
 import '../../data/res/color.dart';
 import '../../data/res/font_style.dart';
-import '../../generated/l10n.dart';
 import '../../locator.dart';
 import '../widget/input_field.dart';
 import '../widget/round_rect_card.dart';
@@ -45,7 +45,7 @@ class _PingPageState extends State<PingPage>
   void didChangeDependencies() {
     super.didChangeDependencies();
     _media = MediaQuery.of(context);
-    s = S.of(context);
+    s = S.of(context)!;
   }
 
   @override

lib/view/page/pkg.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:provider/provider.dart';
 
 import '../../data/model/pkg/upgrade_info.dart';
@@ -8,7 +9,6 @@ import '../../data/model/server/server_private_info.dart';
 import '../../data/provider/pkg.dart';
 import '../../data/provider/server.dart';
 import '../../data/res/font_style.dart';
-import '../../generated/l10n.dart';
 import '../../locator.dart';
 import '../widget/center_loading.dart';
 import '../widget/round_rect_card.dart';
@@ -36,7 +36,7 @@ class _PkgManagePageState extends State<PkgManagePage>
   void didChangeDependencies() {
     super.didChangeDependencies();
     _media = MediaQuery.of(context);
-    _s = S.of(context);
+    _s = S.of(context)!;
   }
 
   @override

lib/view/page/private_key/edit.dart

@@ -4,6 +4,7 @@ import 'package:after_layout/after_layout.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:toolbox/core/extension/numx.dart';
 import 'package:toolbox/core/utils/misc.dart';
 import 'package:toolbox/data/res/misc.dart';
@@ -13,7 +14,6 @@ import '../../../core/utils/ui.dart';
 import '../../../data/model/server/private_key_info.dart';
 import '../../../data/provider/private_key.dart';
 import '../../../data/res/font_style.dart';
-import '../../../generated/l10n.dart';
 import '../../../locator.dart';
 import '../../widget/input_decoration.dart';
 
@@ -53,7 +53,7 @@ class _PrivateKeyEditPageState extends State<PrivateKeyEditPage>
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    _s = S.of(context);
+    _s = S.of(context)!;
     _focusScope = FocusScope.of(context);
   }
 

lib/view/page/private_key/list.dart

@@ -1,11 +1,12 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:provider/provider.dart';
-import 'package:toolbox/core/route.dart';
+
-import 'package:toolbox/data/provider/private_key.dart';
+import '../../../core/route.dart';
-import 'package:toolbox/data/res/font_style.dart';
+import '../../../data/provider/private_key.dart';
-import 'package:toolbox/generated/l10n.dart';
+import '../../../data/res/font_style.dart';
-import 'package:toolbox/view/page/private_key/edit.dart';
+import 'edit.dart';
-import 'package:toolbox/view/widget/round_rect_card.dart';
+import '../../../view/widget/round_rect_card.dart';
 
 class PrivateKeysListPage extends StatefulWidget {
   const PrivateKeysListPage({Key? key}) : super(key: key);
@@ -20,7 +21,7 @@ class _PrivateKeyListState extends State<PrivateKeysListPage> {
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    _s = S.of(context);
+    _s = S.of(context)!;
   }
 
   @override

lib/view/page/server/detail.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:provider/provider.dart';
 
 import '../../../core/extension/numx.dart';
@@ -12,7 +13,6 @@ import '../../../data/res/font_style.dart';
 import '../../../data/res/padding.dart';
 import '../../../data/res/sizedbox.dart';
 import '../../../data/store/setting.dart';
-import '../../../generated/l10n.dart';
 import '../../../locator.dart';
 import '../../widget/round_rect_card.dart';
 
@@ -35,7 +35,7 @@ class _ServerDetailPageState extends State<ServerDetailPage>
   void didChangeDependencies() {
     super.didChangeDependencies();
     _media = MediaQuery.of(context);
-    _s = S.of(context);
+    _s = S.of(context)!;
     _showDistLogo = locator<SettingStore>().showDistLogo.fetch()!;
   }
 

lib/view/page/server/edit.dart

@@ -1,5 +1,6 @@
 import 'package:after_layout/after_layout.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:provider/provider.dart';
 
 import '../../../core/route.dart';
@@ -11,7 +12,6 @@ import '../../../data/provider/server.dart';
 import '../../../data/res/color.dart';
 import '../../../data/res/font_style.dart';
 import '../../../data/store/private_key.dart';
-import '../../../generated/l10n.dart';
 import '../../../locator.dart';
 import '../../widget/input_decoration.dart';
 import '../private_key/edit.dart';
@@ -53,7 +53,7 @@ class _ServerEditPageState extends State<ServerEditPage> with AfterLayoutMixin {
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    _s = S.of(context);
+    _s = S.of(context)!;
     _focusScope = FocusScope.of(context);
   }
 

lib/view/page/server/tab.dart

@@ -1,6 +1,7 @@
 import 'package:after_layout/after_layout.dart';
 import 'package:circle_chart/circle_chart.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:get_it/get_it.dart';
 import 'package:provider/provider.dart';
 
@@ -16,7 +17,6 @@ import '../../../data/res/font_style.dart';
 import '../../../data/res/menu.dart';
 import '../../../data/res/url.dart';
 import '../../../data/store/setting.dart';
-import '../../../generated/l10n.dart';
 import '../../../locator.dart';
 import '../../widget/dropdown_menu.dart';
 import '../../widget/picker.dart';
@@ -57,7 +57,7 @@ class _ServerPageState extends State<ServerPage>
     super.didChangeDependencies();
     _media = MediaQuery.of(context);
     _theme = Theme.of(context);
-    _s = S.of(context);
+    _s = S.of(context)!;
   }
 
   @override

lib/view/page/setting.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:flutter_material_color_picker/flutter_material_color_picker.dart';
 import 'package:provider/provider.dart';
 
@@ -12,7 +13,6 @@ import '../../data/res/color.dart';
 import '../../data/res/font_style.dart';
 import '../../data/res/tab.dart';
 import '../../data/store/setting.dart';
-import '../../generated/l10n.dart';
 import '../../locator.dart';
 import '../widget/round_rect_card.dart';
 
@@ -32,6 +32,7 @@ class _SettingPageState extends State<SettingPage> {
   late int _selectedColorValue;
   late int _launchPageIdx;
   late int _termThemeIdx;
+  late int _nightMode;
   late double _maxRetryCount;
   late double _updateInterval;
 
@@ -39,7 +40,7 @@ class _SettingPageState extends State<SettingPage> {
   void didChangeDependencies() {
     super.didChangeDependencies();
     _media = MediaQuery.of(context);
-    _s = S.of(context);
+    _s = S.of(context)!;
   }
 
   @override
@@ -49,6 +50,7 @@ class _SettingPageState extends State<SettingPage> {
     _setting = locator<SettingStore>();
     _launchPageIdx = _setting.launchPage.fetch()!;
     _termThemeIdx = _setting.termColorIdx.fetch()!;
+    _nightMode = _setting.nightMode.fetch()!;
     _updateInterval = _setting.serverStatusUpdateInterval.fetch()!.toDouble();
     _maxRetryCount = _setting.maxRetryCount.fetch()!.toDouble();
   }
@@ -88,6 +90,7 @@ class _SettingPageState extends State<SettingPage> {
   Widget _buildApp() {
     return Column(
       children: [
+        _buildNightMode(),
         _buildAppColorPreview(),
         _buildLaunchPage(),
         _buildCheckUpdate(),
@@ -371,4 +374,49 @@ class _SettingPageState extends State<SettingPage> {
       ],
     );
   }
+
+  Widget _buildNightMode() {
+    return ExpansionTile(
+      textColor: primaryColor,
+      title: Text(
+        _s.themeMode,
+        style: textSize13,
+        textAlign: TextAlign.start,
+      ),
+      trailing: Text(
+        _buildNightModeStr(_nightMode),
+        style: textSize13,
+      ),
+      children: [
+        Slider(
+          thumbColor: primaryColor,
+          activeColor: primaryColor.withOpacity(0.7),
+          min: 0,
+          max: 2,
+          value: _nightMode.toDouble(),
+          onChanged: (newValue) {
+            setState(() {
+              _nightMode = newValue.toInt();
+            });
+          },
+          onChangeEnd: (val) {
+            _setting.nightMode.put(val.toInt());
+          },
+          label: _buildNightModeStr(_nightMode),
+          divisions: 2,
+        ),
+      ],
+    );
+  }
+
+  String _buildNightModeStr(int n) {
+    switch (n) {
+      case 1:
+        return _s.light;
+      case 2:
+        return _s.dark;
+      default:
+        return _s.auto;
+    }
+  }
 }

lib/view/page/sftp/downloaded.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 import '../../../core/extension/numx.dart';
 import '../../../core/extension/stringx.dart';
@@ -10,7 +11,6 @@ import '../../../core/utils/ui.dart';
 import '../../../data/model/app/path_with_prefix.dart';
 import '../../../data/res/font_style.dart';
 import '../../../data/res/path.dart';
-import '../../../generated/l10n.dart';
 import '../../widget/fade_in.dart';
 import 'downloading.dart';
 
@@ -39,7 +39,7 @@ class _SFTPDownloadedPageState extends State<SFTPDownloadedPage> {
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    _s = S.of(context);
+    _s = S.of(context)!;
   }
 
   @override

lib/view/page/sftp/downloading.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:provider/provider.dart';
 
 import '../../../core/extension/numx.dart';
@@ -7,7 +8,6 @@ import '../../../core/utils/ui.dart';
 import '../../../data/model/sftp/download_status.dart';
 import '../../../data/provider/sftp_download.dart';
 import '../../../data/res/font_style.dart';
-import '../../../generated/l10n.dart';
 import '../../widget/center_loading.dart';
 import '../../widget/round_rect_card.dart';
 
@@ -24,7 +24,7 @@ class _SFTPDownloadingPageState extends State<SFTPDownloadingPage> {
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    _s = S.of(context);
+    _s = S.of(context)!;
   }
 
   @override

lib/view/page/sftp/view.dart

@@ -2,6 +2,7 @@ import 'dart:typed_data';
 
 import 'package:dartssh2/dartssh2.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 import '../../../core/extension/numx.dart';
 import '../../../core/extension/stringx.dart';
@@ -16,7 +17,6 @@ import '../../../data/provider/server.dart';
 import '../../../data/provider/sftp_download.dart';
 import '../../../data/res/path.dart';
 import '../../../data/store/private_key.dart';
-import '../../../generated/l10n.dart';
 import '../../../locator.dart';
 import '../../widget/fade_in.dart';
 import '../../widget/two_line_text.dart';
@@ -44,7 +44,7 @@ class _SFTPPageState extends State<SFTPPage> {
   void didChangeDependencies() {
     super.didChangeDependencies();
     _media = MediaQuery.of(context);
-    _s = S.of(context);
+    _s = S.of(context)!;
   }
 
   @override

lib/view/page/snippet/edit.dart

@@ -1,11 +1,11 @@
 import 'package:after_layout/after_layout.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 import '../../../core/utils/ui.dart';
 import '../../../data/model/server/snippet.dart';
 import '../../../data/provider/snippet.dart';
 import '../../../data/res/font_style.dart';
-import '../../../generated/l10n.dart';
 import '../../../locator.dart';
 import '../../widget/input_decoration.dart';
 
@@ -36,7 +36,7 @@ class _SnippetEditPageState extends State<SnippetEditPage>
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    _s = S.of(context);
+    _s = S.of(context)!;
   }
 
   @override

lib/view/page/snippet/list.dart

@@ -1,11 +1,12 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:provider/provider.dart';
-import 'package:toolbox/core/route.dart';
+
-import 'package:toolbox/data/provider/snippet.dart';
+import '/core/route.dart';
-import 'package:toolbox/data/res/font_style.dart';
+import '/data/provider/snippet.dart';
-import 'package:toolbox/generated/l10n.dart';
+import '/data/res/font_style.dart';
-import 'package:toolbox/view/page/snippet/edit.dart';
+import 'edit.dart';
-import 'package:toolbox/view/widget/round_rect_card.dart';
+import '/view/widget/round_rect_card.dart';
 
 class SnippetListPage extends StatefulWidget {
   const SnippetListPage({Key? key}) : super(key: key);
@@ -20,7 +21,7 @@ class _SnippetListPageState extends State<SnippetListPage> {
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    _s = S.of(context);
+    _s = S.of(context)!;
   }
 
   @override

lib/view/page/ssh.dart

@@ -5,11 +5,11 @@ import 'package:dartssh2/dartssh2.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:provider/provider.dart';
 import 'package:xterm/xterm.dart' hide TerminalColors;
 
 import '../../data/model/ssh/terminal_color.dart';
-import '../../generated/l10n.dart';
 import '../../core/utils/misc.dart';
 import '../../core/utils/ui.dart';
 import '../../core/utils/server.dart';
@@ -58,7 +58,7 @@ class _SSHPageState extends State<SSHPage> {
     _isDark = isDarkMode(context);
     _media = MediaQuery.of(context);
     _menuTextStyle = TextStyle(color: contentColor.resolve(context));
-    _s = S.of(context);
+    _s = S.of(context)!;
   }
 
   @override

lib/view/widget/dropdown_menu.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 import '../../data/res/menu.dart';
-import '../../generated/l10n.dart';
 
 class DropdownBtnItem {
   final String text;

macos/Podfile.lock

@@ -26,9 +26,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
-  path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852
+  path_provider_foundation: c68054786f1b4f3343858c1e1d0caaded73f0be9
   share_plus: 76dd39142738f7a68dd57b05093b5e8193f220f7
-  url_launcher_macos: c04e4fa86382d4f94f6b38f14625708be3ae52e2
+  url_launcher_macos: 5335912b679c073563f29d89d33d10d459f95451
 
 PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7
 

macos/Runner.xcodeproj/project.pbxproj

@@ -26,7 +26,7 @@
 		33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
 		33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
 		33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
-		4C070605ECAE15AF72815802 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2CB2EC868EDACCBD0199581 /* Pods_Runner.framework */; };
+		CC3C9C24336DBCBB13B1DD4E /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 051B6E43AB66C836E65690B6 /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -53,6 +53,8 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		051B6E43AB66C836E65690B6 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		1B64E26251C2132C1FD3DE5F /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
 		335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
 		33CC10ED2044A3C60003C045 /* server_box.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = server_box.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -67,12 +69,10 @@
 		33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
 		33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
 		33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
+		3EBAA16736A04B8FA45DF33F /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
-		93BF56BCB6A779C1799D1A42 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
-		BC4454F0DC2BCE8F9B14AD95 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		E8FDB0F1B04D4A1C2983795D /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
-		E2CB2EC868EDACCBD0199581 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		EF544CC0E8F5001B58CA124F /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -80,7 +80,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4C070605ECAE15AF72815802 /* Pods_Runner.framework in Frameworks */,
+				CC3C9C24336DBCBB13B1DD4E /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -105,7 +105,7 @@
 				33CEB47122A05771004F2AC0 /* Flutter */,
 				33CC10EE2044A3C60003C045 /* Products */,
 				D73912EC22F37F3D000D13A0 /* Frameworks */,
-				3B06CFC5C95E07DA79CF798C /* Pods */,
+				51D4AEDD40A46AA3AF8AF7AE /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -152,12 +152,12 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
-		3B06CFC5C95E07DA79CF798C /* Pods */ = {
+		51D4AEDD40A46AA3AF8AF7AE /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				93BF56BCB6A779C1799D1A42 /* Pods-Runner.debug.xcconfig */,
+				1B64E26251C2132C1FD3DE5F /* Pods-Runner.debug.xcconfig */,
-				BC4454F0DC2BCE8F9B14AD95 /* Pods-Runner.release.xcconfig */,
+				E8FDB0F1B04D4A1C2983795D /* Pods-Runner.release.xcconfig */,
-				EF544CC0E8F5001B58CA124F /* Pods-Runner.profile.xcconfig */,
+				3EBAA16736A04B8FA45DF33F /* Pods-Runner.profile.xcconfig */,
 			);
 			name = Pods;
 			path = Pods;
@@ -166,7 +166,7 @@
 		D73912EC22F37F3D000D13A0 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				E2CB2EC868EDACCBD0199581 /* Pods_Runner.framework */,
+				051B6E43AB66C836E65690B6 /* Pods_Runner.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -178,13 +178,13 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				AE558C9DE21E3C54833AFCE4 /* [CP] Check Pods Manifest.lock */,
+				33DCC8E03FB9B8627035A7B7 /* [CP] Check Pods Manifest.lock */,
 				33CC10E92044A3C60003C045 /* Sources */,
 				33CC10EA2044A3C60003C045 /* Frameworks */,
 				33CC10EB2044A3C60003C045 /* Resources */,
 				33CC110E2044A8840003C045 /* Bundle Framework */,
 				3399D490228B24CF009A79C7 /* ShellScript */,
-				DFE8A6B34CDBFF27DB607EA9 /* [CP] Embed Pods Frameworks */,
+				DE29B08A1EBC54F140840A8F /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -292,7 +292,7 @@
 			shellPath = /bin/sh;
 			shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
 		};
-		AE558C9DE21E3C54833AFCE4 /* [CP] Check Pods Manifest.lock */ = {
+		33DCC8E03FB9B8627035A7B7 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -314,7 +314,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		DFE8A6B34CDBFF27DB607EA9 /* [CP] Embed Pods Frameworks */ = {
+		DE29B08A1EBC54F140840A8F /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (

pubspec.yaml

@@ -62,7 +62,6 @@ dev_dependencies:
   flutter_native_splash: ^2.1.6
   hive_generator: ^2.0.0
   build_runner: ^2.3.2
-  intl_utils: ^2.8.1
   flutter_test:
     sdk: flutter
 
@@ -77,7 +76,7 @@ dev_dependencies:
 # following page: https://dart.dev/tools/pub/pubspec
 # The following section is specific to Flutter.
 flutter:
-
+  generate: true
   # The following line ensures that the Material Icons font is
   # included with your application, so that you can use the icons in
   # the material Icons class.
@@ -184,5 +183,3 @@ flutter_native_splash:
   #  - 'ios/Runner/Info-Release.plist'
   # To enable support for Android 12, set the following parameter to true.  Defaults to false.
   #android12: true
-flutter_intl:
-  enabled: true

test/widget_test.dart

@@ -12,7 +12,7 @@ import 'package:toolbox/app.dart';
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.
-    await tester.pumpWidget(const MyApp());
+    await tester.pumpWidget(MyApp());
 
     // Verify that our counter starts at 0.
     expect(find.text('0'), findsOneWidget);