wip: Use reflect_ui to replace influxui

lijy91 · Aug 17, 2024 · 770ec49 · 770ec49
1 parent 7652370
commit 770ec49
Show file tree

Hide file tree

Showing 78 changed files with 917 additions and 343 deletions.
diff --git a/apps/biyi_app/lib/app/available_ocr_engines/page.dart b/apps/biyi_app/lib/app/available_ocr_engines/page.dart
@@ -2,12 +2,13 @@ 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/list_section.dart';
+import 'package:biyi_app/widgets/list_tile.dart';
 import 'package:biyi_app/widgets/widgets.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:go_router/go_router.dart';
-import 'package:harmonic/noprefix/harmonic.dart';
-import 'package:influxui/influxui.dart' show Button, ButtonVariant;
+import 'package:reflect_ui/reflect_ui.dart';
 
 class AvailableOcrEnginesPage extends StatefulWidget {
   const AvailableOcrEnginesPage({
@@ -50,7 +51,6 @@ class _AvailableOcrEnginesPageState extends State<AvailableOcrEnginesPage> {
 
   Widget _buildBody(BuildContext context) {
     return ListView(
-      padding: const EdgeInsets.symmetric(vertical: 8),
       children: [
         if (_proOcrEngineList.isNotEmpty)
           ListSection(
@@ -113,9 +113,9 @@ class _AvailableOcrEnginesPageState extends State<AvailableOcrEnginesPage> {
         ),
         actions: [
           Button(
-            label: LocaleKeys.ok.tr(),
-            variant: ButtonVariant.subtle,
+            variant: ButtonVariant.filled,
             onPressed: _handleClickOk,
+            child: Text(LocaleKeys.ok.tr()),
           ),
         ],
       ),

diff --git a/apps/biyi_app/lib/app/available_translation_engines/page.dart b/apps/biyi_app/lib/app/available_translation_engines/page.dart
@@ -2,12 +2,14 @@ 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/list_section.dart';
+import 'package:biyi_app/widgets/list_tile.dart';
 import 'package:biyi_app/widgets/widgets.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
+import 'package:flutter/widgets.dart';
 import 'package:go_router/go_router.dart';
-import 'package:harmonic/noprefix/harmonic.dart';
-import 'package:influxui/influxui.dart' show Button, ButtonVariant;
+import 'package:reflect_ui/reflect_ui.dart';
 
 class AvailableTranslationEnginesPage extends StatefulWidget {
   const AvailableTranslationEnginesPage({
@@ -53,7 +55,6 @@ class _AvailableTranslationEnginesPageState
 
   Widget _buildBody(BuildContext context) {
     return ListView(
-      padding: const EdgeInsets.symmetric(vertical: 8),
       children: [
         if (_proEngineList.isNotEmpty)
           ListSection(
@@ -117,9 +118,9 @@ class _AvailableTranslationEnginesPageState
         ),
         actions: [
           Button(
-            label: LocaleKeys.ok.tr(),
-            variant: ButtonVariant.subtle,
+            variant: ButtonVariant.filled,
             onPressed: _handleClickOk,
+            child: Text(LocaleKeys.ok.tr()),
           ),
         ],
       ),

diff --git a/apps/biyi_app/lib/app/home/desktop_popup.dart b/apps/biyi_app/lib/app/home/desktop_popup.dart
@@ -22,9 +22,9 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:hotkey_manager/hotkey_manager.dart';
-import 'package:influxui/influxui.dart';
 import 'package:protocol_handler/protocol_handler.dart';
 import 'package:provider/provider.dart';
+import 'package:reflect_ui/reflect_ui.dart';
 import 'package:screen_capturer/screen_capturer.dart';
 import 'package:screen_retriever/screen_retriever.dart';
 import 'package:screen_text_extractor/screen_text_extractor.dart';

diff --git a/apps/biyi_app/lib/app/home/limited_functionality_banner.dart b/apps/biyi_app/lib/app/home/limited_functionality_banner.dart
@@ -4,7 +4,8 @@ import 'package:bot_toast/bot_toast.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/gestures.dart';
-import 'package:influxui/influxui.dart';
+import 'package:influxui/influxui.dart' show Alert, AlertType, ExtendedColors;
+import 'package:reflect_ui/reflect_ui.dart' hide Alert;
 import 'package:screen_capturer/screen_capturer.dart';
 import 'package:screen_text_extractor/screen_text_extractor.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -25,10 +26,11 @@ class AllowAccessListItem extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final textStyle = Theme.of(context).textTheme.bodyMedium?.copyWith(
-          color: ExtendedColors.yellow.shade600,
-          height: 24 / 14,
-        );
+    final ThemeData themeData = Theme.of(context);
+    final textStyle = themeData.textTheme.bodyMedium?.copyWith(
+      color: ExtendedColors.yellow.shade600,
+      height: 24 / 14,
+    );
     return GappedRow(
       gap: 4,
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -170,18 +172,16 @@ class LimitedFunctionalityBanner extends StatelessWidget {
       },
       actions: [
         Button(
-          label: LocaleKeys.app_home_limited_banner_btn_check_again.tr(),
-          size: ButtonSize.small,
           color: ExtendedColors.yellow,
           onPressed: onTappedRecheckIsAllowedAllAccess,
+          child: Text(LocaleKeys.app_home_limited_banner_btn_check_again.tr()),
         ),
         Expanded(child: Container()),
         Tooltip(
           message: LocaleKeys.app_home_limited_banner_tip_help.tr(),
           child: IconButton(
             FluentIcons.question_circle_20_regular,
-            variant: IconButtonVariant.light,
-            size: ButtonSize.small,
+            variant: IconButtonVariant.filled,
             color: ExtendedColors.yellow,
             onPressed: () async {
               Uri url = Uri.parse('${sharedEnv.webUrl}/docs');

diff --git a/apps/biyi_app/lib/app/home/new_version_found_banner.dart b/apps/biyi_app/lib/app/home/new_version_found_banner.dart
@@ -1,9 +1,10 @@
 import 'package:biyi_app/generated/locale_keys.g.dart';
 import 'package:biyi_app/services/api_client.dart';
+import 'package:biyi_app/utils/extended_colors.dart';
 import 'package:biyi_app/utils/utils.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/gestures.dart';
-import 'package:influxui/influxui.dart';
+import 'package:reflect_ui/reflect_ui.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class NewVersionFoundBanner extends StatelessWidget {

diff --git a/apps/biyi_app/lib/app/home/page.dart b/apps/biyi_app/lib/app/home/page.dart
@@ -2,9 +2,10 @@ import 'package:biyi_app/app/home/desktop_popup.dart';
 import 'package:biyi_app/app/home/tab_homepage.dart';
 import 'package:biyi_app/app/home/tab_settings.dart';
 import 'package:biyi_app/app/home/tab_vocabulary.dart';
+import 'package:biyi_app/utils/extended_colors.dart';
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/cupertino.dart';
-import 'package:influxui/influxui.dart';
+import 'package:reflect_ui/reflect_ui.dart';
 import 'package:uni_platform/uni_platform.dart';
 
 const _kHomeTabHomepage = 0;

diff --git a/apps/biyi_app/lib/app/home/tab_homepage.dart b/apps/biyi_app/lib/app/home/tab_homepage.dart
@@ -1,7 +1,7 @@
 import 'package:biyi_app/app/router_config.dart';
 import 'package:biyi_app/widgets/customized_app_bar/customized_app_bar.dart';
 import 'package:go_router/go_router.dart';
-import 'package:influxui/influxui.dart';
+import 'package:reflect_ui/reflect_ui.dart';
 
 class TabHomepageScene extends StatefulWidget {
   const TabHomepageScene({super.key});
@@ -16,10 +16,10 @@ class _TabHomepageSceneState extends State<TabHomepageScene> {
       mainAxisSize: MainAxisSize.max,
       children: [
         Button(
-          label: 'settings/general',
           onPressed: () {
             context.go(PageId.settingsGeneral);
           },
+          child: const Text('settings/general'),
         ),
       ],
     );

diff --git a/apps/biyi_app/lib/app/home/tab_settings.dart b/apps/biyi_app/lib/app/home/tab_settings.dart
@@ -1,5 +1,5 @@
 import 'package:biyi_app/app/settings/page.dart';
-import 'package:influxui/influxui.dart';
+import 'package:reflect_ui/reflect_ui.dart';
 
 class TabSettingsScene extends StatelessWidget {
   const TabSettingsScene({super.key});

diff --git a/apps/biyi_app/lib/app/home/tab_vocabulary.dart b/apps/biyi_app/lib/app/home/tab_vocabulary.dart
@@ -1,5 +1,5 @@
 import 'package:biyi_app/widgets/customized_app_bar/customized_app_bar.dart';
-import 'package:influxui/influxui.dart';
+import 'package:reflect_ui/reflect_ui.dart';
 
 class TabVocabularyScene extends StatelessWidget {
   const TabVocabularyScene({super.key});

diff --git a/apps/biyi_app/lib/app/home/toolbar_item_always_on_top.dart b/apps/biyi_app/lib/app/home/toolbar_item_always_on_top.dart
@@ -1,5 +1,5 @@
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
-import 'package:influxui/influxui.dart';
+import 'package:reflect_ui/reflect_ui.dart';
 import 'package:window_manager/window_manager.dart';
 
 class ToolbarItemAlwaysOnTop extends StatefulWidget {
@@ -34,9 +34,9 @@ class _ToolbarItemAlwaysOnTopState extends State<ToolbarItemAlwaysOnTop> {
       ),
       child: IconButton(
         _isAlwaysOnTop ? FluentIcons.pin_20_filled : FluentIcons.pin_20_regular,
-        variant: IconButtonVariant.transparent,
+        variant: IconButtonVariant.filled,
         padding: EdgeInsets.zero,
-        size: IconButtonSize.small,
+        // size: IconButtonSize.small,
         color: _isAlwaysOnTop
             ? Theme.of(context).primaryColor
             : Theme.of(context).iconTheme.color,

diff --git a/apps/biyi_app/lib/app/home/toolbar_item_settings.dart b/apps/biyi_app/lib/app/home/toolbar_item_settings.dart
@@ -1,7 +1,8 @@
 import 'package:biyi_app/app/router_config.dart';
+import 'package:biyi_app/utils/extended_colors.dart';
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:go_router/go_router.dart';
-import 'package:influxui/influxui.dart';
+import 'package:reflect_ui/reflect_ui.dart';
 import 'package:uni_platform/uni_platform.dart';
 import 'package:window_manager/window_manager.dart';
 
@@ -31,11 +32,11 @@ class _ToolbarItemSettingsState extends State<ToolbarItemSettings> {
     Brightness brightness = Theme.of(context).brightness;
     return IconButton(
       FluentIcons.settings_20_regular,
-      variant: IconButtonVariant.transparent,
+      variant: IconButtonVariant.filled,
       color: brightness == Brightness.light
           ? ExtendedColors.black
           : ExtendedColors.gray,
-      size: IconButtonSize.small,
+      // size: IconButtonSize.small,
       onPressed: _handleClick,
     );
   }

diff --git a/apps/biyi_app/lib/app/home/translation_input_view.dart b/apps/biyi_app/lib/app/home/translation_input_view.dart
@@ -2,11 +2,12 @@ import 'dart:ui';
 
 import 'package:biyi_app/generated/locale_keys.g.dart';
 import 'package:biyi_app/models/settings_base.dart';
+import 'package:biyi_app/utils/extended_colors.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
-import 'package:influxui/influxui.dart';
+import 'package:reflect_ui/reflect_ui.dart';
 import 'package:screen_capturer/screen_capturer.dart';
 
 class TranslationInputView extends StatelessWidget {
@@ -46,6 +47,7 @@ class TranslationInputView extends StatelessWidget {
   final bool isAddedToVocabulary = true;
 
   Widget _buildToolbarItems(BuildContext context) {
+    final ThemeData themeData = Theme.of(context);
     return Row(
       children: [
         Tooltip(
@@ -56,23 +58,23 @@ class TranslationInputView extends StatelessWidget {
           ),
           child: IconButton(
             FluentIcons.target_20_regular,
-            variant: IconButtonVariant.subtle,
+            variant: IconButtonVariant.filled,
             iconBuilder: (context, icon) {
               return Stack(
                 alignment: Alignment.center,
                 children: [
                   Icon(
                     icon,
                     color: translationMode == TranslationMode.auto
-                        ? Theme.of(context).primaryColor
-                        : Theme.of(context).iconTheme.color,
+                        ? themeData.primaryColor
+                        : themeData.iconTheme.color,
                   ),
                   if (translationMode == TranslationMode.auto)
                     Positioned(
                       bottom: 0,
                       child: Container(
                         decoration: BoxDecoration(
-                          color: Theme.of(context).primaryColor,
+                          color: themeData.primaryColor,
                           borderRadius: BorderRadius.circular(2),
                         ),
                         padding: const EdgeInsets.only(
@@ -94,7 +96,7 @@ class TranslationInputView extends StatelessWidget {
                 ],
               );
             },
-            size: IconButtonSize.small,
+            // size: IconButtonSize.small,
             onPressed: () {
               TranslationMode newTranslationMode =
                   translationMode == TranslationMode.auto
@@ -107,9 +109,7 @@ class TranslationInputView extends StatelessWidget {
         const SizedBox(
           width: 8,
           height: 20,
-          child: Divider(
-            direction: Axis.vertical,
-          ),
+          child: VerticalDivider(),
         ),
         Tooltip(
           message:
@@ -119,11 +119,11 @@ class TranslationInputView extends StatelessWidget {
             iconBuilder: (context, icon) {
               return Icon(
                 icon,
-                color: Theme.of(context).iconTheme.color,
+                color: themeData.iconTheme.color,
               );
             },
-            variant: IconButtonVariant.subtle,
-            size: IconButtonSize.small,
+            variant: IconButtonVariant.filled,
+            // size: IconButtonSize.small,
             onPressed: onClickExtractTextFromScreenCapture,
           ),
         ),
@@ -135,11 +135,11 @@ class TranslationInputView extends StatelessWidget {
             iconBuilder: (context, icon) {
               return Icon(
                 icon,
-                color: Theme.of(context).iconTheme.color,
+                color: themeData.iconTheme.color,
               );
             },
-            variant: IconButtonVariant.subtle,
-            size: ButtonSize.small,
+            variant: IconButtonVariant.filled,
+            // size: ButtonSize.small,
             onPressed: onClickExtractTextFromClipboard,
           ),
         ),
@@ -163,19 +163,17 @@ class TranslationInputView extends StatelessWidget {
           constraints: const BoxConstraints(minWidth: 56),
           child: Button(
             variant: ButtonVariant.outlined,
-            label: LocaleKeys.app_home_btn_clear.tr(),
-            size: ButtonSize.small,
             onPressed: onButtonTappedClear,
+            child: Text(LocaleKeys.app_home_btn_clear.tr()),
           ),
         ),
         const SizedBox(width: 10),
         ConstrainedBox(
           constraints: const BoxConstraints(minWidth: 56),
           child: Button(
             variant: ButtonVariant.filled,
-            label: LocaleKeys.app_home_btn_trans.tr(),
-            size: ButtonSize.small,
             onPressed: onButtonTappedTrans,
+            child: Text(LocaleKeys.app_home_btn_trans.tr()),
           ),
         ),
       ],

diff --git a/apps/biyi_app/lib/app/home/translation_results_view.dart b/apps/biyi_app/lib/app/home/translation_results_view.dart
@@ -4,7 +4,7 @@ import 'package:biyi_app/models/models.dart';
 import 'package:biyi_app/models/settings_base.dart';
 import 'package:biyi_app/utils/language_util.dart';
 import 'package:biyi_app/widgets/widgets.dart';
-import 'package:influxui/influxui.dart';
+import 'package:reflect_ui/reflect_ui.dart';
 import 'package:sticky_headers/sticky_headers.dart';
 
 class TranslationResultsView extends StatelessWidget {
@@ -32,8 +32,9 @@ class TranslationResultsView extends StatelessWidget {
   final bool doubleClickCopyResult;
 
   Widget _buildNoMatchingTranslationTarget(BuildContext context) {
+    ThemeData themeData = Theme.of(context);
     return Container(
-      color: Theme.of(context).scaffoldBackgroundColor,
+      color: themeData.scaffoldBackgroundColor,
       padding: const EdgeInsets.only(
         left: 12,
         right: 12,