diff --git a/lib/core/route.dart b/lib/core/route.dart index 7821d242..68cee13f 100644 --- a/lib/core/route.dart +++ b/lib/core/route.dart @@ -4,7 +4,6 @@ import 'package:flutter/material.dart'; import 'package:server_box/data/model/server/private_key_info.dart'; import 'package:server_box/data/model/server/server_private_info.dart'; import 'package:server_box/data/res/build_data.dart'; -import 'package:server_box/data/res/provider.dart'; import 'package:server_box/data/res/store.dart'; import 'package:server_box/view/page/backup.dart'; import 'package:server_box/view/page/container.dart'; @@ -157,11 +156,7 @@ class AppRoutes { return AppRoutes( DebugPage( key: key, - args: DebugPageArgs( - notifier: Pros.debug.widgets, - onClear: Pros.debug.clear, - title: 'Logs(${BuildData.build})', - ), + args: const DebugPageArgs(title: 'Logs(${BuildData.build})'), ), 'debug', ); diff --git a/lib/data/res/provider.dart b/lib/data/res/provider.dart index 3943a547..e4ecb611 100644 --- a/lib/data/res/provider.dart +++ b/lib/data/res/provider.dart @@ -1,4 +1,3 @@ -import 'package:fl_lib/fl_lib.dart'; import 'package:server_box/data/provider/app.dart'; import 'package:server_box/data/provider/private_key.dart'; import 'package:server_box/data/provider/server.dart'; @@ -7,7 +6,6 @@ import 'package:server_box/data/provider/snippet.dart'; abstract final class Pros { static final app = AppProvider(); - static final debug = DebugProvider(maxLines: 177); static final key = PrivateKeyProvider(); static final server = ServerProvider(); static final sftp = SftpProvider(); diff --git a/lib/main.dart b/lib/main.dart index ac4ba923..15367d70 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -110,7 +110,7 @@ Future _initData() async { void _setupDebug() { Logger.root.level = Level.ALL; Logger.root.onRecord.listen((record) { - Pros.debug.addLog(record); + DebugProvider.addLog(record); print(record); if (record.error != null) print(record.error); if (record.stackTrace != null) print(record.stackTrace); diff --git a/lib/view/page/server/detail/view.dart b/lib/view/page/server/detail/view.dart index 9f64b50f..bb0f3ede 100644 --- a/lib/view/page/server/detail/view.dart +++ b/lib/view/page/server/detail/view.dart @@ -243,15 +243,19 @@ class _ServerDetailPageState extends State } Widget _buildCpuModelItem(MapEntry e) { + final name = e.key + .replaceFirst('Intel(R)', '') + .replaceFirst('AMD', '') + .replaceFirst('with Radeon Graphics', ''); final child = Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ SizedBox( width: _media.size.width * .7, child: Text( - e.key, + name, style: UIs.text13, - overflow: TextOverflow.fade, + overflow: TextOverflow.ellipsis, maxLines: 1, ), ), diff --git a/lib/view/page/ssh/page.dart b/lib/view/page/ssh/page.dart index d21ba857..3b89af6f 100644 --- a/lib/view/page/ssh/page.dart +++ b/lib/view/page/ssh/page.dart @@ -145,8 +145,7 @@ class SSHPageState extends State _terminal, key: _termKey, controller: _terminalController, - keyboardType: - letterCache ? TextInputType.text : TextInputType.visiblePassword, + keyboardType: TextInputType.text, enableSuggestions: letterCache, textStyle: _terminalStyle, theme: _terminalTheme, diff --git a/lib/view/page/ssh/tab.dart b/lib/view/page/ssh/tab.dart index cb467a03..20f7ddb6 100644 --- a/lib/view/page/ssh/tab.dart +++ b/lib/view/page/ssh/tab.dart @@ -268,7 +268,7 @@ final class _TabBar extends StatelessWidget implements PreferredSizeWidget { textWidthBasis: TextWidthBasis.parent, ); child = AnimatedContainer( - width: selected ? 90 : 50, + width: selected ? 90 : 57, duration: Durations.medium3, padding: selected ? const EdgeInsets.symmetric(horizontal: 7) : null, curve: Curves.fastEaseInToSlowEaseOut, @@ -290,10 +290,7 @@ final class _TabBar extends StatelessWidget implements PreferredSizeWidget { SizedBox(width: 50, child: text), ], ), - false => Align( - alignment: Alignment.centerRight, - child: text, - ), + false => Center(child: text), }, ); } diff --git a/pubspec.lock b/pubspec.lock index bc6da8a2..9cc0cad7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -385,8 +385,8 @@ packages: dependency: "direct main" description: path: "." - ref: "v1.0.96" - resolved-ref: "585ac0566cae83a54c035dc3346a80356e68e528" + ref: "v1.0.99" + resolved-ref: d2b9bb5093528cc014e8ddc0bcb70bf7fec16e99 url: "https://github.com/lppcg/fl_lib" source: git version: "0.0.1" diff --git a/pubspec.yaml b/pubspec.yaml index 246b1e21..fa1487f7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -62,7 +62,7 @@ dependencies: fl_lib: git: url: https://github.com/lppcg/fl_lib - ref: v1.0.96 + ref: v1.0.99 dependency_overrides: # dartssh2: