wip: Migrate apiClient to biyi_api_client package

apps/biyi_app/lib/app/available_ocr_engines/page.dart

@@ -1,5 +1,5 @@
-import 'package:biyi_advanced_features/biyi_advanced_features.dart';
 import 'package:biyi_app/generated/locale_keys.g.dart';
+import 'package:biyi_app/services/api_client.dart';
 import 'package:biyi_app/states/settings.dart';
 import 'package:biyi_app/widgets/customized_app_bar/customized_app_bar.dart';
 import 'package:biyi_app/widgets/widgets.dart';

apps/biyi_app/lib/app/available_translation_engines/page.dart

@@ -1,5 +1,5 @@
-import 'package:biyi_advanced_features/biyi_advanced_features.dart';
 import 'package:biyi_app/generated/locale_keys.g.dart';
+import 'package:biyi_app/services/api_client.dart';
 import 'package:biyi_app/states/settings.dart';
 import 'package:biyi_app/widgets/customized_app_bar/customized_app_bar.dart';
 import 'package:biyi_app/widgets/widgets.dart';

apps/biyi_app/lib/app/home/desktop_popup.dart

@@ -5,7 +5,6 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:biyi_advanced_features/biyi_advanced_features.dart';
 import 'package:biyi_app/app/home/limited_functionality_banner.dart';
 import 'package:biyi_app/app/home/new_version_found_banner.dart';
 import 'package:biyi_app/app/home/toolbar_item_always_on_top.dart';
@@ -15,6 +14,7 @@ import 'package:biyi_app/app/home/translation_results_view.dart';
 import 'package:biyi_app/app/home/translation_target_select_view.dart';
 import 'package:biyi_app/generated/locale_keys.g.dart';
 import 'package:biyi_app/models/models.dart';
+import 'package:biyi_app/services/api_client.dart';
 import 'package:biyi_app/services/services.dart';
 import 'package:biyi_app/states/settings.dart';
 import 'package:biyi_app/utils/utils.dart';
@@ -904,7 +904,6 @@ class _DesktopPopupPageState extends State<DesktopPopupPage>
   Widget build(BuildContext context) {
     WidgetsBinding.instance.addPostFrameCallback((_) => _windowResize());
     return Scaffold(
-      backgroundColor: Theme.of(context).colorScheme.surface,
       appBar: _buildAppBar(context),
       body: _buildBody(context),
     );

apps/biyi_app/lib/app/home/new_version_found_banner.dart

@@ -1,5 +1,5 @@
-import 'package:biyi_advanced_features/biyi_advanced_features.dart';
 import 'package:biyi_app/generated/locale_keys.g.dart';
+import 'package:biyi_app/services/api_client.dart';
 import 'package:biyi_app/utils/utils.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/gestures.dart';

apps/biyi_app/lib/app/settings/general/page.dart

@@ -1,7 +1,7 @@
-import 'package:biyi_advanced_features/models/models.dart';
 import 'package:biyi_app/app/router_config.dart';
 import 'package:biyi_app/generated/locale_keys.g.dart';
 import 'package:biyi_app/models/translation_target.dart';
+import 'package:biyi_app/services/api_client.dart';
 import 'package:biyi_app/states/settings.dart';
 import 'package:biyi_app/widgets/customized_app_bar/customized_app_bar.dart';
 import 'package:biyi_app/widgets/widgets.dart';

apps/biyi_app/lib/app/settings/layout.dart

@@ -115,7 +115,7 @@ class _SettingsLayoutState extends State<SettingsLayout> with WindowListener {
   Widget _buildSidebar(BuildContext context) {
     return Container(
       decoration: BoxDecoration(
-        color: Theme.of(context).scaffoldBackgroundColor,
+        color: Theme.of(context).colorScheme.surfaceContainerLow,
         border: Border(
           right: BorderSide(
             color: Theme.of(context).dividerColor,

apps/biyi_app/lib/app/settings/ocr_engines/new/page.dart

@@ -1,6 +1,6 @@
-import 'package:biyi_advanced_features/biyi_advanced_features.dart';
 import 'package:biyi_app/app/router_config.dart';
 import 'package:biyi_app/generated/locale_keys.g.dart';
+import 'package:biyi_app/services/api_client.dart';
 import 'package:biyi_app/services/ocr_client/ocr_client.dart';
 import 'package:biyi_app/states/settings.dart';
 import 'package:biyi_app/widgets/customized_app_bar/customized_app_bar.dart';

apps/biyi_app/lib/app/settings/ocr_engines/page.dart

@@ -1,6 +1,6 @@
-import 'package:biyi_advanced_features/models/models.dart';
 import 'package:biyi_app/app/router_config.dart';
 import 'package:biyi_app/generated/locale_keys.g.dart';
+import 'package:biyi_app/services/api_client.dart';
 import 'package:biyi_app/states/settings.dart';
 import 'package:biyi_app/widgets/customized_app_bar/customized_app_bar.dart';
 import 'package:biyi_app/widgets/widgets.dart';

apps/biyi_app/lib/app/settings/translation_engines/new/page.dart

@@ -1,6 +1,6 @@
-import 'package:biyi_advanced_features/biyi_advanced_features.dart';
 import 'package:biyi_app/app/router_config.dart';
 import 'package:biyi_app/generated/locale_keys.g.dart';
+import 'package:biyi_app/services/api_client.dart';
 import 'package:biyi_app/services/translate_client/translate_client.dart';
 import 'package:biyi_app/states/settings.dart';
 import 'package:biyi_app/widgets/customized_app_bar/customized_app_bar.dart';

apps/biyi_app/lib/app/settings/translation_engines/page.dart

@@ -1,6 +1,6 @@
-import 'package:biyi_advanced_features/models/models.dart';
 import 'package:biyi_app/app/router_config.dart';
 import 'package:biyi_app/generated/locale_keys.g.dart';
+import 'package:biyi_app/services/api_client.dart';
 import 'package:biyi_app/states/settings.dart';
 import 'package:biyi_app/widgets/customized_app_bar/customized_app_bar.dart';
 import 'package:biyi_app/widgets/widgets.dart';

apps/biyi_app/lib/models/ext_ocr_engine_config.dart

@@ -1,6 +1,8 @@
-import 'package:biyi_advanced_features/biyi_advanced_features.dart';
+import 'package:biyi_app/services/api_client.dart' show OcrEngineConfig;
 import 'package:easy_localization/easy_localization.dart';
 
+export 'package:biyi_app/services/api_client.dart' show OcrEngineConfig;
+
 extension ExtOcrEngineConfig on OcrEngineConfig {
   String get typeName {
     String key = 'ocr_engine.$type';

apps/biyi_app/lib/models/ext_translation_engine_config.dart

@@ -1,6 +1,8 @@
-import 'package:biyi_advanced_features/biyi_advanced_features.dart';
+import 'package:biyi_app/services/api_client.dart' show TranslationEngineConfig;
 import 'package:easy_localization/easy_localization.dart';
 
+export 'package:biyi_app/services/api_client.dart' show TranslationEngineConfig;
+
 extension ExtTranslationEngineConfig on TranslationEngineConfig {
   String get typeName {
     String key = 'engine.$type';

apps/biyi_app/lib/models/settings_base.dart

@@ -1,5 +1,4 @@
-import 'package:biyi_advanced_features/models/ocr_engine_config.dart';
-import 'package:biyi_advanced_features/models/translation_engine_config.dart';
+import 'package:biyi_api_client/biyi_api_client.dart';
 import 'package:biyi_app/models/translation_target.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart' show ThemeMode;

apps/biyi_app/lib/services/api_client.dart

@@ -0,0 +1,4 @@
+import 'package:biyi_api_client/biyi_api_client.dart';
+export 'package:biyi_api_client/biyi_api_client.dart' hide ApiClient;
+
+ApiClient apiClient = ApiClient();

apps/biyi_app/lib/services/local_db/configuration.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 
-import 'package:biyi_advanced_features/biyi_advanced_features.dart';
+import 'package:biyi_advanced_features/models/user_preference.dart';
+import 'package:biyi_app/services/api_client.dart';
 import 'package:biyi_app/services/local_db/local_db.dart';
 import 'package:biyi_app/utils/language_util.dart';
 import 'package:flutter/services.dart';

apps/biyi_app/lib/services/local_db/local_db.dart

@@ -1,59 +1,31 @@
 import 'dart:io';
 
-import 'package:biyi_advanced_features/biyi_advanced_features.dart';
 import 'package:biyi_app/services/local_db/configuration.dart';
 import 'package:biyi_app/services/local_db/init_data_if_need.dart';
-import 'package:biyi_app/services/local_db/local_db_listener.dart';
 import 'package:biyi_app/services/local_db/modifiers/engines_modifier.dart';
 import 'package:biyi_app/services/local_db/modifiers/ocr_engines_modifier.dart';
 import 'package:biyi_app/services/local_db/modifiers/preferences_modifier.dart';
 import 'package:biyi_app/services/local_db/modifiers/translation_targets_modifier.dart';
 import 'package:biyi_app/utils/utils.dart';
-import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
 import 'package:path/path.dart' as path;
 import 'package:uni_platform/uni_platform.dart';
 
 export 'configuration.dart';
-export 'local_db_listener.dart';
 export 'modifiers/engines_modifier.dart';
 export 'modifiers/ocr_engines_modifier.dart';
 export 'modifiers/preferences_modifier.dart';
 export 'modifiers/translation_targets_modifier.dart';
 
 @Deprecated('Use Settings instead.')
 class LocalDb {
-  User user = User(id: -1);
   Configuration configuration = Configuration();
 
   EnginesModifier? _enginesModifier;
   OcrEnginesModifier? _ocrEnginesModifier;
   PreferencesModifier? _preferencesModifier;
   TranslationTargetsModifier? _translationTargetsModifier;
 
-  final ObserverList<LocalDbListener> _listeners =
-      ObserverList<LocalDbListener>();
-
-  List<LocalDbListener> get listeners {
-    final List<LocalDbListener> localListeners =
-        List<LocalDbListener>.from(_listeners);
-    return localListeners;
-  }
-
-  bool get hasListeners {
-    return _listeners.isNotEmpty;
-  }
-
-  @Deprecated('No longer used.')
-  void addListener(LocalDbListener listener) {
-    _listeners.add(listener);
-  }
-
-  @Deprecated('No longer used.')
-  void removeListener(LocalDbListener listener) {
-    _listeners.remove(listener);
-  }
-
   @Deprecated('No longer used.')
   EnginesModifier get engines {
     return engine(null);

apps/biyi_app/lib/services/local_db/migrate_old_settings.dart

@@ -1,6 +1,5 @@
-// ignore_for_file: deprecated_member_use_from_same_package, deprecated_member_use
+// ignore_for_file: deprecated_member_use_from_same_package
 
-import 'package:biyi_advanced_features/biyi_advanced_features.dart';
 import 'package:biyi_app/models/settings_base.dart';
 import 'package:biyi_app/services/local_db/local_db.dart';
 
@@ -14,7 +13,7 @@ Future<SettingsBase> migrateOldSettings(SettingsBase settings) async {
   settings.defaultDetectLanguageEngineId = c.defaultEngineId;
   settings.translationTargets = localDb.translationTargets.list();
   settings.doubleClickCopyResult = c.doubleClickCopyResult;
-  settings.inputSubmitMode = c.inputSetting == kInputSettingSubmitWithEnter
+  settings.inputSubmitMode = c.inputSetting == 'submit-with-enter'
       ? InputSubmitMode.enter
       : InputSubmitMode.metaEnter;
   settings.themeMode = c.themeMode;

apps/biyi_app/lib/services/local_db/modifiers/engines_modifier.dart

@@ -1,4 +1,4 @@
-import 'package:biyi_advanced_features/biyi_advanced_features.dart';
+import 'package:biyi_app/services/api_client.dart';
 import 'package:flutter/foundation.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:shortid/shortid.dart';

apps/biyi_app/lib/services/local_db/modifiers/ocr_engines_modifier.dart

@@ -1,4 +1,4 @@
-import 'package:biyi_advanced_features/biyi_advanced_features.dart';
+import 'package:biyi_app/services/api_client.dart';
 import 'package:flutter/foundation.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:shortid/shortid.dart';

apps/biyi_app/lib/services/local_db/modifiers/preferences_modifier.dart

@@ -1,4 +1,4 @@
-import 'package:biyi_advanced_features/biyi_advanced_features.dart';
+import 'package:biyi_advanced_features/models/user_preference.dart';
 import 'package:flutter/foundation.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 

apps/biyi_app/lib/services/ocr_client/ocr_client.dart

@@ -1,4 +1,5 @@
 import 'package:biyi_advanced_features/biyi_advanced_features.dart';
+import 'package:biyi_app/services/api_client.dart';
 import 'package:biyi_app/states/settings.dart';
 import 'package:ocr_engine_builtin/ocr_engine_builtin.dart';
 import 'package:ocr_engine_youdao/ocr_engine_youdao.dart';
@@ -20,7 +21,7 @@ OcrEngine? createOcrEngine(
 ) {
   OcrEngine? ocrEngine;
   if (Settings.instance.proOcrEngine(ocrEngineConfig.id).exists()) {
-    ocrEngine = ProOcrEngine(ocrEngineConfig);
+    ocrEngine = ProOcrEngine(ocrEngineConfig, apiClient: apiClient);
     if (ocrEngineConfig.id == kDefaultBuiltInOcrEngine.identifier) {
       ocrEngine = kDefaultBuiltInOcrEngine;
     }

apps/biyi_app/lib/services/services.dart

@@ -1,4 +1,4 @@
-export './local_db/local_db.dart';
-export './ocr_client/ocr_client.dart';
-export './shortcut_service/shortcut_service.dart';
-export './translate_client/translate_client.dart';
+export 'local_db/local_db.dart';
+export 'ocr_client/ocr_client.dart';
+export 'shortcut_service/shortcut_service.dart';
+export 'translate_client/translate_client.dart';

apps/biyi_app/lib/services/translate_client/translate_client.dart

@@ -1,4 +1,5 @@
 import 'package:biyi_advanced_features/biyi_advanced_features.dart';
+import 'package:biyi_app/services/api_client.dart';
 import 'package:biyi_app/states/settings.dart';
 import 'package:translation_engine_baidu/translation_engine_baidu.dart';
 import 'package:translation_engine_caiyun/translation_engine_caiyun.dart';
@@ -36,7 +37,7 @@ TranslationEngine? createTranslationEngine(
   TranslationEngineConfig engineConfig,
 ) {
   if (Settings.instance.proTranslationEngine(engineConfig.id).exists()) {
-    return ProTranslationEngine(engineConfig);
+    return ProTranslationEngine(engineConfig, apiClient: apiClient);
   } else {
     switch (engineConfig.type) {
       case kEngineTypeBaidu:

apps/biyi_app/lib/states/modifiers/ocr_engines_modifier.dart

@@ -1,4 +1,4 @@
-import 'package:biyi_advanced_features/models/ocr_engine_config.dart';
+import 'package:biyi_app/services/api_client.dart';
 import 'package:biyi_app/states/settings.dart';
 import 'package:collection/collection.dart';
 import 'package:shortid/shortid.dart';

apps/biyi_app/lib/states/modifiers/translation_engines_modifier.dart

@@ -1,4 +1,4 @@
-import 'package:biyi_advanced_features/biyi_advanced_features.dart';
+import 'package:biyi_app/services/api_client.dart';
 import 'package:biyi_app/states/settings.dart';
 import 'package:collection/collection.dart';
 import 'package:shortid/shortid.dart';

apps/biyi_app/lib/states/settings.dart

@@ -2,11 +2,9 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:biyi_advanced_features/models/ocr_engine_config.dart';
-import 'package:biyi_advanced_features/models/translation_engine_config.dart';
-import 'package:biyi_advanced_features/networking/api_client/api_client.dart';
 import 'package:biyi_app/models/settings_base.dart';
 import 'package:biyi_app/models/translation_target.dart';
+import 'package:biyi_app/services/api_client.dart';
 import 'package:biyi_app/services/local_db/migrate_old_settings.dart';
 import 'package:biyi_app/services/ocr_client/ocr_client.dart';
 import 'package:biyi_app/states/modifiers/ocr_engines_modifier.dart';
@@ -140,6 +138,7 @@ class Settings extends SettingsBase with ChangeNotifier {
           .firstWhere((e) => e.type == 'built_in' || e.type == 'tesseract')
           .id;
     }
+    await _writeToLocalFile();
   }
 
   Locale get locale => languageToLocale(displayLanguage ?? 'en');

apps/biyi_app/lib/widgets/customized_app_bar/customized_app_bar.dart

@@ -43,6 +43,7 @@ class CustomizedAppBar extends StatelessWidget implements PreferredSizeWidget {
         right: 16,
       ),
       decoration: BoxDecoration(
+        color: Theme.of(context).colorScheme.surfaceContainerLow,
         border: Border(
           bottom: BorderSide(
             color: Theme.of(context).dividerColor,

apps/biyi_app/lib/widgets/ocr_engine_name/ocr_engine_name.dart

@@ -1,4 +1,3 @@
-import 'package:biyi_advanced_features/biyi_advanced_features.dart';
 import 'package:biyi_app/models/ext_ocr_engine_config.dart';
 import 'package:influxui/influxui.dart';
 

apps/biyi_app/lib/widgets/translation_engine_name/translation_engine_name.dart

@@ -1,4 +1,3 @@
-import 'package:biyi_advanced_features/biyi_advanced_features.dart';
 import 'package:biyi_app/models/ext_translation_engine_config.dart';
 import 'package:influxui/influxui.dart';
 

apps/biyi_app/lib/widgets/translation_result_record_view/translation_engine_tag.dart

@@ -1,4 +1,3 @@
-import 'package:biyi_advanced_features/biyi_advanced_features.dart';
 import 'package:biyi_app/models/ext_translation_engine_config.dart';
 import 'package:biyi_app/models/translation_result_record.dart';
 import 'package:biyi_app/states/settings.dart';

apps/biyi_app/pubspec.lock

@@ -96,6 +96,13 @@ packages:
       relative: true
     source: path
     version: "0.1.0"
+  biyi_api_client:
+    dependency: "direct main"
+    description:
+      path: "../../packages/biyi_api_client"
+      relative: true
+    source: path
+    version: "0.1.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -527,9 +534,11 @@ packages:
   influxui:
     dependency: "direct main"
     description:
-      path: "../../../../leanflutter/influxui/packages/influxui"
-      relative: true
-    source: path
+      path: "packages/influxui"
+      ref: HEAD
+      resolved-ref: "30ea962d4d58e0a43dfed7dd02171cd57e2c5d0a"
+      url: "https://github.com/leanflutter/influxui.git"
+    source: git
     version: "0.0.1"
   intl:
     dependency: transitive
@@ -822,9 +831,11 @@ packages:
   preference_list:
     dependency: "direct main"
     description:
-      path: "../../../../leanflutter/influxui/packages/preference_list"
-      relative: true
-    source: path
+      path: "packages/preference_list"
+      ref: HEAD
+      resolved-ref: "30ea962d4d58e0a43dfed7dd02171cd57e2c5d0a"
+      url: "https://github.com/leanflutter/influxui.git"
+    source: git
     version: "0.0.2"
   protocol_handler:
     dependency: "direct main"

apps/biyi_app/pubspec.yaml

@@ -11,6 +11,8 @@ dependencies:
   audioplayers: ^5.2.1
   biyi_advanced_features:
     path: ../../packages/biyi_advanced_features
+  biyi_api_client:
+    path: ../../packages/biyi_api_client
   bot_toast: ^4.1.3
   collection: ^1.18.0
   easy_localization: ^3.0.3

packages/biyi_advanced_features/lib/biyi_advanced_features.dart

@@ -1,4 +1,4 @@
 library biyi_advanced_features;
 
-export './models/models.dart';
-export './networking/networking.dart';
+export 'src/pro_ocr_engine.dart';
+export 'src/pro_translation_engine.dart';