fix & opt

fix: android in-app upgrade fmt: proj struct opt: fetch primaryColor
2023-02-01 12:52:40 +08:00
parent 068089d207
commit 4d741ac82a
30 changed files with 523 additions and 448 deletions
--- a/lib/view/page/server/detail.dart
+++ b/lib/view/page/server/detail.dart
@@ -29,7 +29,6 @@ class _ServerDetailPageState extends State<ServerDetailPage>
    with SingleTickerProviderStateMixin {
  late MediaQueryData _media;
  late S _s;
-  late Color pColor;
  bool _showDistLogo = true;

  @override
@@ -38,7 +37,6 @@ class _ServerDetailPageState extends State<ServerDetailPage>
    _media = MediaQuery.of(context);
    _s = S.of(context);
    _showDistLogo = locator<SettingStore>().showDistLogo.fetch()!;
-    pColor = primaryColor;
  }

  @override
@@ -175,12 +173,14 @@ class _ServerDetailPageState extends State<ServerDetailPage>
  Widget _buildProgress(double percent) {
    if (percent > 100) percent = 100;
    final percentWithinOne = percent / 100;
-    return LinearProgressIndicator(
-      value: percentWithinOne,
-      minHeight: 7,
-      backgroundColor: progressColor.resolve(context),
-      color: pColor,
-    );
+    return PrimaryColor(builder: (context, primaryColor) {
+      return LinearProgressIndicator(
+        value: percentWithinOne,
+        minHeight: 7,
+        backgroundColor: progressColor.resolve(context),
+        color: primaryColor,
+      );
+    });
  }

  Widget _buildUpTimeAndSys(ServerStatus ss) {
--- a/lib/view/page/server/edit.dart
+++ b/lib/view/page/server/edit.dart
@@ -1,19 +1,20 @@
 import 'package:after_layout/after_layout.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:toolbox/core/route.dart';
-import 'package:toolbox/core/utils.dart';
-import 'package:toolbox/data/model/server/private_key_info.dart';
-import 'package:toolbox/data/model/server/server_private_info.dart';
-import 'package:toolbox/data/provider/private_key.dart';
-import 'package:toolbox/data/provider/server.dart';
-import 'package:toolbox/data/res/color.dart';
-import 'package:toolbox/data/res/font_style.dart';
-import 'package:toolbox/data/store/private_key.dart';
-import 'package:toolbox/generated/l10n.dart';
-import 'package:toolbox/locator.dart';
-import 'package:toolbox/view/page/private_key/edit.dart';
-import 'package:toolbox/view/widget/input_decoration.dart';
+
+import '../../../core/route.dart';
+import '../../../core/utils/ui.dart';
+import '../../../data/model/server/private_key_info.dart';
+import '../../../data/model/server/server_private_info.dart';
+import '../../../data/provider/private_key.dart';
+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';

 class ServerEditPage extends StatefulWidget {
  const ServerEditPage({Key? key, this.spi}) : super(key: key);
@@ -104,8 +105,11 @@ class _ServerEditPageState extends State<ServerEditPage> with AfterLayoutMixin {
              keyboardType: TextInputType.text,
              focusNode: _nameFocus,
              onSubmitted: (_) => _focusScope.requestFocus(_ipFocus),
-              decoration: buildDecoration(_s.name,
-                  icon: Icons.info, hint: _s.exampleName),
+              decoration: buildDecoration(
+                _s.name,
+                icon: Icons.info,
+                hint: _s.exampleName,
+              ),
            ),
            TextField(
              controller: _ipController,
@@ -114,16 +118,22 @@ class _ServerEditPageState extends State<ServerEditPage> with AfterLayoutMixin {
              focusNode: _ipFocus,
              autocorrect: false,
              enableSuggestions: false,
-              decoration: buildDecoration(_s.host,
-                  icon: Icons.storage, hint: 'example.com'),
+              decoration: buildDecoration(
+                _s.host,
+                icon: Icons.storage,
+                hint: 'example.com',
+              ),
            ),
            TextField(
              controller: _portController,
              keyboardType: TextInputType.number,
              focusNode: _portFocus,
              onSubmitted: (_) => _focusScope.requestFocus(_usernameFocus),
-              decoration: buildDecoration(_s.port,
-                  icon: Icons.format_list_numbered, hint: '22'),
+              decoration: buildDecoration(
+                _s.port,
+                icon: Icons.format_list_numbered,
+                hint: '22',
+              ),
            ),
            TextField(
              controller: _usernameController,
@@ -131,16 +141,20 @@ class _ServerEditPageState extends State<ServerEditPage> with AfterLayoutMixin {
              focusNode: _usernameFocus,
              autocorrect: false,
              enableSuggestions: false,
-              decoration: buildDecoration(_s.user,
-                  icon: Icons.account_box, hint: 'root'),
+              decoration: buildDecoration(
+                _s.user,
+                icon: Icons.account_box,
+                hint: 'root',
+              ),
            ),
            const SizedBox(height: 7),
            Row(
              children: [
                Text(_s.keyAuth),
                Switch(
-                    value: usePublicKey,
-                    onChanged: (val) => setState(() => usePublicKey = val)),
+                  value: usePublicKey,
+                  onChanged: (val) => setState(() => usePublicKey = val),
+                ),
              ],
            ),
            !usePublicKey
@@ -148,8 +162,11 @@ class _ServerEditPageState extends State<ServerEditPage> with AfterLayoutMixin {
                    controller: _passwordController,
                    obscureText: true,
                    keyboardType: TextInputType.text,
-                    decoration: buildDecoration(_s.pwd,
-                        icon: Icons.password, hint: _s.pwd),
+                    decoration: buildDecoration(
+                      _s.pwd,
+                      icon: Icons.password,
+                      hint: _s.pwd,
+                    ),
                    onSubmitted: (_) => {},
                  )
                : const SizedBox(),
@@ -164,9 +181,10 @@ class _ServerEditPageState extends State<ServerEditPage> with AfterLayoutMixin {
                      final tiles = key.infos
                          .map(
                            (e) => ListTile(
-                                contentPadding: EdgeInsets.zero,
-                                title: Text(e.id, textAlign: TextAlign.start),
-                                trailing: _buildRadio(key.infos.indexOf(e), e)),
+                              contentPadding: EdgeInsets.zero,
+                              title: Text(e.id, textAlign: TextAlign.start),
+                              trailing: _buildRadio(key.infos.indexOf(e), e),
+                            ),
                          )
                          .toList();
                      tiles.add(
@@ -176,23 +194,25 @@ class _ServerEditPageState extends State<ServerEditPage> with AfterLayoutMixin {
                          trailing: IconButton(
                            icon: const Icon(Icons.add),
                            onPressed: () => AppRoute(
-                                    const PrivateKeyEditPage(),
-                                    'private key edit page')
-                                .go(context),
+                              const PrivateKeyEditPage(),
+                              'private key edit page',
+                            ).go(context),
                          ),
                        ),
                      );
-                      return ExpansionTile(
-                        textColor: primaryColor,
-                        iconColor: primaryColor,
-                        tilePadding: EdgeInsets.zero,
-                        childrenPadding: EdgeInsets.zero,
-                        title: Text(
-                          _s.choosePrivateKey,
-                          style: const TextStyle(fontSize: 14),
-                        ),
-                        children: tiles,
-                      );
+                      return PrimaryColor(builder: ((context, primaryColor) {
+                        return ExpansionTile(
+                          textColor: primaryColor,
+                          iconColor: primaryColor,
+                          tilePadding: EdgeInsets.zero,
+                          childrenPadding: EdgeInsets.zero,
+                          title: Text(
+                            _s.choosePrivateKey,
+                            style: const TextStyle(fontSize: 14),
+                          ),
+                          children: tiles,
+                        );
+                      }));
                    },
                  )
                : const SizedBox()
--- a/lib/view/page/server/tab.dart
+++ b/lib/view/page/server/tab.dart
@@ -3,32 +3,32 @@ import 'package:circle_chart/circle_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:provider/provider.dart';
-import 'package:toolbox/core/route.dart';
-import 'package:toolbox/core/utils.dart';
-import 'package:toolbox/data/model/server/server.dart';
-import 'package:toolbox/data/model/server/server_private_info.dart';
-import 'package:toolbox/data/model/server/server_status.dart';
-import 'package:toolbox/data/provider/server.dart';
-import 'package:toolbox/data/provider/snippet.dart';
-import 'package:toolbox/data/res/color.dart';
-import 'package:toolbox/data/res/font_style.dart';
-import 'package:toolbox/data/res/url.dart';
-import 'package:toolbox/data/store/setting.dart';
-import 'package:toolbox/generated/l10n.dart';
-import 'package:toolbox/locator.dart';
-import 'package:toolbox/view/page/pkg.dart';
-import 'package:toolbox/view/page/docker.dart';
-import 'package:toolbox/view/page/server/detail.dart';
-import 'package:toolbox/view/page/server/edit.dart';
-import 'package:toolbox/view/page/sftp/view.dart';
-import 'package:toolbox/view/page/snippet/edit.dart';
-import 'package:toolbox/view/page/ssh.dart';
-import 'package:toolbox/view/widget/picker.dart';
-import 'package:toolbox/view/widget/round_rect_card.dart';

+import '../../../core/route.dart';
+import '../../../core/utils/ui.dart';
+import '../../../data/model/server/server.dart';
+import '../../../data/model/server/server_private_info.dart';
+import '../../../data/model/server/server_status.dart';
+import '../../../data/provider/server.dart';
+import '../../../data/provider/snippet.dart';
+import '../../../data/res/color.dart';
+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';
+import '../../widget/round_rect_card.dart';
 import '../../widget/url_text.dart';
+import '../docker.dart';
+import '../pkg.dart';
+import '../sftp/view.dart';
+import '../snippet/edit.dart';
+import '../ssh.dart';
+import 'detail.dart';
+import 'edit.dart';

 class ServerPage extends StatefulWidget {
  const ServerPage({Key? key}) : super(key: key);
@@ -41,7 +41,6 @@ class _ServerPageState extends State<ServerPage>
    with AutomaticKeepAliveClientMixin, AfterLayoutMixin {
  late MediaQueryData _media;
  late ThemeData _theme;
-  late Color _primaryColor;
  late ServerProvider _serverProvider;
  late SettingStore _settingStore;
  late S _s;
@@ -58,7 +57,6 @@ class _ServerPageState extends State<ServerPage>
    super.didChangeDependencies();
    _media = MediaQuery.of(context);
    _theme = Theme.of(context);
-    _primaryColor = primaryColor;
    _s = S.of(context);
  }

@@ -94,9 +92,10 @@ class _ServerPageState extends State<ServerPage>
    return Scaffold(
      body: child,
      floatingActionButton: FloatingActionButton(
-        onPressed: () =>
-            AppRoute(const ServerEditPage(), 'Add server info page')
-                .go(context),
+        onPressed: () => AppRoute(
+          const ServerEditPage(),
+          'Add server info page',
+        ).go(context),
        tooltip: _s.addAServer,
        heroTag: 'server page fab',
        child: const Icon(Icons.add),
@@ -353,12 +352,16 @@ class _ServerPageState extends State<ServerPage>
      child: Stack(
        children: [
          Center(
-            child: CircleChart(
-              progressColor: _primaryColor,
-              progressNumber: percent,
-              maxNumber: 100,
-              width: 53,
-              height: 53,
+            child: PrimaryColor(
+              builder: (context, primaryColor) {
+                return CircleChart(
+                  progressColor: primaryColor,
+                  progressNumber: percent,
+                  maxNumber: 100,
+                  width: 53,
+                  height: 53,
+                );
+              },
            ),
          ),
          Positioned.fill(
@@ -404,8 +407,10 @@ class _ServerPageState extends State<ServerPage>
    showRoundDialog(
      context,
      _s.choose,
-      buildPicker(provider.snippets.map((e) => Text(e.name)).toList(),
-          (idx) => snippet = provider.snippets[idx]),
+      buildPicker(
+        provider.snippets.map((e) => Text(e.name)).toList(),
+        (idx) => snippet = provider.snippets[idx],
+      ),
      [
        TextButton(
          onPressed: () async {
@@ -418,8 +423,9 @@ class _ServerPageState extends State<ServerPage>
              Text(result ?? _s.error, style: textSize13),
              [
                TextButton(
-                    onPressed: () => Navigator.of(context).pop(),
-                    child: Text(_s.ok))
+                  onPressed: () => Navigator.of(context).pop(),
+                  child: Text(_s.ok),
+                )
              ],
            );
          },