diff --git a/ui/flutter/android/app/src/main/AndroidManifest.xml b/ui/flutter/android/app/src/main/AndroidManifest.xml index f3cc905b..9fcb0b2c 100644 --- a/ui/flutter/android/app/src/main/AndroidManifest.xml +++ b/ui/flutter/android/app/src/main/AndroidManifest.xml @@ -9,7 +9,7 @@ android:requestLegacyExternalStorage="true" android:name="${applicationName}" android:icon="@mipmap/ic_launcher" - android:label="gopeed"> + android:label="Gopeed"> start(StartConfig cfg); diff --git a/ui/flutter/lib/core/entry/libgopeed_boot_native.dart b/ui/flutter/lib/core/entry/libgopeed_boot_native.dart index a2a4da28..8780fc34 100644 --- a/ui/flutter/lib/core/entry/libgopeed_boot_native.dart +++ b/ui/flutter/lib/core/entry/libgopeed_boot_native.dart @@ -3,11 +3,10 @@ import 'dart:ffi'; import 'dart:io'; import 'dart:isolate'; -import 'package:flutter/foundation.dart'; -import 'package:gopeed/core/common/libgopeed_channel.dart'; -import 'package:gopeed/util/util.dart'; import 'package:path_provider/path_provider.dart'; +import '../../util/util.dart'; +import '../common/libgopeed_channel.dart'; import '../common/libgopeed_ffi.dart'; import '../common/libgopeed_interface.dart'; import '../common/start_config.dart'; diff --git a/ui/flutter/lib/core/libgopeed_boot.dart b/ui/flutter/lib/core/libgopeed_boot.dart index 9ef0405a..07397072 100644 --- a/ui/flutter/lib/core/libgopeed_boot.dart +++ b/ui/flutter/lib/core/libgopeed_boot.dart @@ -1,4 +1,4 @@ -import "./libgopeed_boot_stub.dart" +import "libgopeed_boot_stub.dart" if (dart.library.html) 'entry/libgopeed_boot_browser.dart' if (dart.library.io) 'entry/libgopeed_boot_native.dart'; diff --git a/ui/flutter/lib/pages/create/create_view.dart b/ui/flutter/lib/pages/create/create_view.dart index fab299ac..ca2ad181 100644 --- a/ui/flutter/lib/pages/create/create_view.dart +++ b/ui/flutter/lib/pages/create/create_view.dart @@ -1,13 +1,13 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:gopeed/api/api.dart'; -import 'package:gopeed/api/model/create_task.dart'; -import 'package:gopeed/api/model/options.dart'; -import 'package:gopeed/api/model/request.dart'; -import 'package:gopeed/api/model/resource.dart'; -import 'package:gopeed/pages/create/create_controller.dart'; -import 'package:gopeed/setting/setting.dart'; -import 'package:gopeed/widget/file_list_view.dart'; +import '../../api/api.dart'; +import '../../api/model/create_task.dart'; +import '../../api/model/options.dart'; +import '../../api/model/request.dart'; +import '../../api/model/resource.dart'; +import 'create_controller.dart'; +import '../../setting/setting.dart'; +import '../../widget/file_list_view.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:rounded_loading_button/rounded_loading_button.dart'; diff --git a/ui/flutter/lib/pages/setting/setting_view.dart b/ui/flutter/lib/pages/setting/setting_view.dart index 47d29f57..b7d49626 100644 --- a/ui/flutter/lib/pages/setting/setting_view.dart +++ b/ui/flutter/lib/pages/setting/setting_view.dart @@ -3,8 +3,8 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; -import 'package:gopeed/setting/setting.dart'; -import 'package:gopeed/widget/directory_selector.dart'; +import '../../setting/setting.dart'; +import '../../widget/directory_selector.dart'; import 'setting_controller.dart'; diff --git a/ui/flutter/lib/pages/task/task_controller.dart b/ui/flutter/lib/pages/task/task_controller.dart index 89ab65c1..53b19707 100644 --- a/ui/flutter/lib/pages/task/task_controller.dart +++ b/ui/flutter/lib/pages/task/task_controller.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'package:get/get.dart'; -import 'package:gopeed/api/model/task.dart'; -import 'package:gopeed/core/libgopeed_boot.dart'; +import '../../api/model/task.dart'; +import '../../core/libgopeed_boot.dart'; import '../../api/api.dart'; diff --git a/ui/flutter/lib/pages/task/task_view.dart b/ui/flutter/lib/pages/task/task_view.dart index c8baf225..db44271d 100644 --- a/ui/flutter/lib/pages/task/task_view.dart +++ b/ui/flutter/lib/pages/task/task_view.dart @@ -2,8 +2,8 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:gopeed/api/api.dart'; -import 'package:gopeed/api/model/task.dart'; +import '../../api/api.dart'; +import '../../api/model/task.dart'; import 'package:styled_widget/styled_widget.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/ui/flutter/lib/routes/router.dart b/ui/flutter/lib/routes/router.dart index 069dadce..749fd8fa 100644 --- a/ui/flutter/lib/routes/router.dart +++ b/ui/flutter/lib/routes/router.dart @@ -1,6 +1,6 @@ import 'package:get/get.dart'; -import 'package:gopeed/pages/create/create_controller.dart'; -import 'package:gopeed/pages/setting/setting_view.dart'; +import '../pages/create/create_controller.dart'; +import '../pages/setting/setting_view.dart'; import '../pages/create/create_view.dart'; import '../pages/home/home_controller.dart'; diff --git a/ui/flutter/lib/setting/setting.dart b/ui/flutter/lib/setting/setting.dart index 4e0b952f..7bea5471 100644 --- a/ui/flutter/lib/setting/setting.dart +++ b/ui/flutter/lib/setting/setting.dart @@ -1,6 +1,6 @@ import 'package:external_path/external_path.dart'; import 'package:flutter/material.dart'; -import 'package:gopeed/api/api.dart'; +import '../api/api.dart'; import 'package:path_provider/path_provider.dart'; import '../api/model/server_config.dart'; diff --git a/ui/flutter/lib/widget/file_list_view.dart b/ui/flutter/lib/widget/file_list_view.dart index da42fdbd..66e496d5 100644 --- a/ui/flutter/lib/widget/file_list_view.dart +++ b/ui/flutter/lib/widget/file_list_view.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:gopeed/util/util.dart'; +import '../util/util.dart'; import '../api/model/resource.dart'; diff --git a/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json index a2ec33f1..96d3fee1 100644 --- a/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,68 +1,68 @@ { - "images" : [ - { - "size" : "16x16", - "idiom" : "mac", - "filename" : "app_icon_16.png", - "scale" : "1x" + "info": { + "version": 1, + "author": "xcode" }, - { - "size" : "16x16", - "idiom" : "mac", - "filename" : "app_icon_32.png", - "scale" : "2x" - }, - { - "size" : "32x32", - "idiom" : "mac", - "filename" : "app_icon_32.png", - "scale" : "1x" - }, - { - "size" : "32x32", - "idiom" : "mac", - "filename" : "app_icon_64.png", - "scale" : "2x" - }, - { - "size" : "128x128", - "idiom" : "mac", - "filename" : "app_icon_128.png", - "scale" : "1x" - }, - { - "size" : "128x128", - "idiom" : "mac", - "filename" : "app_icon_256.png", - "scale" : "2x" - }, - { - "size" : "256x256", - "idiom" : "mac", - "filename" : "app_icon_256.png", - "scale" : "1x" - }, - { - "size" : "256x256", - "idiom" : "mac", - "filename" : "app_icon_512.png", - "scale" : "2x" - }, - { - "size" : "512x512", - "idiom" : "mac", - "filename" : "app_icon_512.png", - "scale" : "1x" - }, - { - "size" : "512x512", - "idiom" : "mac", - "filename" : "app_icon_1024.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} + "images": [ + { + "size": "16x16", + "idiom": "mac", + "filename": "app_icon_16.png", + "scale": "1x" + }, + { + "size": "16x16", + "idiom": "mac", + "filename": "app_icon_32.png", + "scale": "2x" + }, + { + "size": "32x32", + "idiom": "mac", + "filename": "app_icon_32.png", + "scale": "1x" + }, + { + "size": "32x32", + "idiom": "mac", + "filename": "app_icon_64.png", + "scale": "2x" + }, + { + "size": "128x128", + "idiom": "mac", + "filename": "app_icon_128.png", + "scale": "1x" + }, + { + "size": "128x128", + "idiom": "mac", + "filename": "app_icon_256.png", + "scale": "2x" + }, + { + "size": "256x256", + "idiom": "mac", + "filename": "app_icon_256.png", + "scale": "1x" + }, + { + "size": "256x256", + "idiom": "mac", + "filename": "app_icon_512.png", + "scale": "2x" + }, + { + "size": "512x512", + "idiom": "mac", + "filename": "app_icon_512.png", + "scale": "1x" + }, + { + "size": "512x512", + "idiom": "mac", + "filename": "app_icon_1024.png", + "scale": "2x" + } + ] +} \ No newline at end of file diff --git a/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png index 3c4935a7..d3d7c0f2 100644 Binary files a/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png index ed4cc164..ec35f21a 100644 Binary files a/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png index 483be613..b52991ed 100644 Binary files a/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png index bcbf36df..41ebdd2f 100644 Binary files a/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png index 9c0a6528..64189f51 100644 Binary files a/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png index e71a7261..4eaf48b4 100644 Binary files a/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png index 8a31fe2d..a4270524 100644 Binary files a/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/ui/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/ui/flutter/pubspec.lock b/ui/flutter/pubspec.lock index d8652c2a..869b271d 100644 --- a/ui/flutter/pubspec.lock +++ b/ui/flutter/pubspec.lock @@ -286,6 +286,15 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_launcher_icons: + dependency: "direct dev" + description: + path: "." + ref: "v0.11.0" + resolved-ref: "5d45f1fa6fcb28608ba77eb53937ac2cc077f2e3" + url: "https://github.com/fluttercommunity/flutter_launcher_icons.git" + source: git + version: "0.11.0" flutter_lints: dependency: "direct dev" description: @@ -352,6 +361,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "4.0.1" + image: + dependency: transitive + description: + name: image + url: "https://pub.flutter-io.cn" + source: hosted + version: "3.2.2" intl: dependency: transitive description: @@ -562,6 +578,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "0.1.1" + petitparser: + dependency: transitive + description: + name: petitparser + url: "https://pub.flutter-io.cn" + source: hosted + version: "5.1.0" platform: dependency: transitive description: @@ -882,6 +905,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "0.2.0+2" + xml: + dependency: transitive + description: + name: xml + url: "https://pub.flutter-io.cn" + source: hosted + version: "6.1.0" yaml: dependency: transitive description: diff --git a/ui/flutter/pubspec.yaml b/ui/flutter/pubspec.yaml index abd9cb77..d7e69e0a 100644 --- a/ui/flutter/pubspec.yaml +++ b/ui/flutter/pubspec.yaml @@ -63,6 +63,10 @@ dev_dependencies: ffigen: ^6.1.2 build_runner: ^2.2.1 json_serializable: ^6.3.2 + flutter_launcher_icons: + git: + url: https://github.com/fluttercommunity/flutter_launcher_icons.git + ref: v0.11.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec @@ -105,9 +109,23 @@ flutter: # For details regarding fonts from package dependencies, # see https://flutter.dev/custom-fonts/#from-packages +# flutter pub run flutter_launcher_icons:main +flutter_icons: + image_path_android: "assets/icon/icon_1024.png" + android: true # can specify file name here e.g. "ic_launcher" + web: + generate: true + image_path: "assets/icon/icon_1024.png" + windows: + generate: true + image_path: "assets/icon/icon_1024.png" + macos: + generate: true + image_path: "assets/icon/icon_macos_1024.png" + ffigen: name: LibgopeedBind - description: Bindings to gopeed core. + description: Bindings to gopeed library. output: 'lib/core/ffi/libgopeed_bind.dart' headers: entry-points: diff --git a/ui/flutter/web/favicon.png b/ui/flutter/web/favicon.png index 8aaa46ac..f8b854de 100644 Binary files a/ui/flutter/web/favicon.png and b/ui/flutter/web/favicon.png differ diff --git a/ui/flutter/web/icons/Icon-192.png b/ui/flutter/web/icons/Icon-192.png index b749bfef..b02a30c9 100644 Binary files a/ui/flutter/web/icons/Icon-192.png and b/ui/flutter/web/icons/Icon-192.png differ diff --git a/ui/flutter/web/icons/Icon-512.png b/ui/flutter/web/icons/Icon-512.png index 88cfd48d..13b0d092 100644 Binary files a/ui/flutter/web/icons/Icon-512.png and b/ui/flutter/web/icons/Icon-512.png differ diff --git a/ui/flutter/web/icons/Icon-maskable-192.png b/ui/flutter/web/icons/Icon-maskable-192.png index eb9b4d76..b02a30c9 100644 Binary files a/ui/flutter/web/icons/Icon-maskable-192.png and b/ui/flutter/web/icons/Icon-maskable-192.png differ diff --git a/ui/flutter/web/icons/Icon-maskable-512.png b/ui/flutter/web/icons/Icon-maskable-512.png index d69c5669..13b0d092 100644 Binary files a/ui/flutter/web/icons/Icon-maskable-512.png and b/ui/flutter/web/icons/Icon-maskable-512.png differ diff --git a/ui/flutter/web/manifest.json b/ui/flutter/web/manifest.json index 5306b3f3..778a6dfe 100644 --- a/ui/flutter/web/manifest.json +++ b/ui/flutter/web/manifest.json @@ -3,8 +3,8 @@ "short_name": "gopeed", "start_url": ".", "display": "standalone", - "background_color": "#0175C2", - "theme_color": "#0175C2", + "background_color": "#hexcode", + "theme_color": "#hexcode", "description": "A new Flutter project.", "orientation": "portrait-primary", "prefer_related_applications": false, @@ -32,4 +32,4 @@ "purpose": "maskable" } ] -} +} \ No newline at end of file diff --git a/ui/flutter/windows/runner/resources/app_icon.ico b/ui/flutter/windows/runner/resources/app_icon.ico index c04e20ca..1996c5d4 100644 Binary files a/ui/flutter/windows/runner/resources/app_icon.ico and b/ui/flutter/windows/runner/resources/app_icon.ico differ