diff --git a/lib/data/model/app/menu_item.dart b/lib/data/model/app/menu_item.dart new file mode 100644 index 00000000..1a0d75b8 --- /dev/null +++ b/lib/data/model/app/menu_item.dart @@ -0,0 +1,35 @@ +import 'package:flutter/material.dart'; + +class MenuItem { + final String text; + final IconData icon; + + const MenuItem({ + required this.text, + required this.icon, + }); +} + +class MenuItems { + static const List firstItems = [sftp, snippet, apt]; + static const List secondItems = [edit]; + + static const sftp = MenuItem(text: 'SFTP', icon: Icons.file_present); + static const snippet = MenuItem(text: 'Snippet', icon: Icons.label); + static const apt = MenuItem(text: 'Apt', icon: Icons.system_security_update); + static const edit = MenuItem(text: 'Edit', icon: Icons.settings); + + static Widget buildItem(MenuItem item) { + return Row( + children: [ + Icon(item.icon), + const SizedBox( + width: 10, + ), + Text( + item.text, + ), + ], + ); + } +} \ No newline at end of file diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index e7c8a8b8..4747778b 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,9 +2,9 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 93; + static const int build = 94; static const String engine = "Flutter 2.10.0 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision 5f105a6ca7 (7 days ago) • 2022-02-01 14:15:42 -0800\nEngine • revision 776efd2034\nTools • Dart 2.16.0 • DevTools 2.9.2\n"; - static const String buildAt = "2022-02-08 20:57:54.707031"; - static const int modifications = 9; + static const String buildAt = "2022-02-08 21:12:52.441728"; + static const int modifications = 0; } diff --git a/lib/data/res/tab.dart b/lib/data/res/tab.dart index fa7dc7fc..01b9a8ee 100644 --- a/lib/data/res/tab.dart +++ b/lib/data/res/tab.dart @@ -3,7 +3,7 @@ import 'package:toolbox/data/model/app/navigation_item.dart'; final List tabs = ['Servers', 'En/Decode', 'Ping']; final List tabItems = [ - NavigationItem(Icons.computer, 'Server'), - NavigationItem(Icons.code, 'Convert'), - NavigationItem(Icons.network_check, 'Ping'), - ]; + NavigationItem(Icons.computer, 'Server'), + NavigationItem(Icons.code, 'Convert'), + NavigationItem(Icons.network_check, 'Ping'), +]; diff --git a/lib/view/page/server/tab.dart b/lib/view/page/server/tab.dart index 5e598423..8d697e4f 100644 --- a/lib/view/page/server/tab.dart +++ b/lib/view/page/server/tab.dart @@ -8,6 +8,7 @@ import 'package:provider/provider.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart'; import 'package:toolbox/core/route.dart'; import 'package:toolbox/core/utils.dart'; +import 'package:toolbox/data/model/app/menu_item.dart'; import 'package:toolbox/data/model/server/server.dart'; import 'package:toolbox/data/model/server/server_connection_state.dart'; import 'package:toolbox/data/model/server/server_private_info.dart'; @@ -385,37 +386,3 @@ class _ServerPageState extends State _serverProvider.startAutoRefresh(); } } - -class MenuItem { - final String text; - final IconData icon; - - const MenuItem({ - required this.text, - required this.icon, - }); -} - -class MenuItems { - static const List firstItems = [sftp, snippet, apt]; - static const List secondItems = [edit]; - - static const sftp = MenuItem(text: 'SFTP', icon: Icons.file_present); - static const snippet = MenuItem(text: 'Snippet', icon: Icons.label); - static const apt = MenuItem(text: 'Apt', icon: Icons.system_security_update); - static const edit = MenuItem(text: 'Edit', icon: Icons.settings); - - static Widget buildItem(MenuItem item) { - return Row( - children: [ - Icon(item.icon), - const SizedBox( - width: 10, - ), - Text( - item.text, - ), - ], - ); - } -} diff --git a/pubspec.lock b/pubspec.lock index 7875b243..f559d284 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -335,6 +335,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" meta: dependency: transitive description: @@ -521,7 +528,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" + version: "0.4.8" typed_data: dependency: transitive description: diff --git a/screenshots/convert.jpg b/screenshots/convert.jpg index 0d50b73f..79beb1e3 100644 Binary files a/screenshots/convert.jpg and b/screenshots/convert.jpg differ diff --git a/screenshots/drawer.jpg b/screenshots/drawer.jpg index ff7e3f83..d4372867 100644 Binary files a/screenshots/drawer.jpg and b/screenshots/drawer.jpg differ diff --git a/screenshots/ping.jpg b/screenshots/ping.jpg index 635e169c..f189fe22 100644 Binary files a/screenshots/ping.jpg and b/screenshots/ping.jpg differ diff --git a/screenshots/server.jpg b/screenshots/server.jpg index 9818fe5a..c2fb4c3d 100644 Binary files a/screenshots/server.jpg and b/screenshots/server.jpg differ