Skip to content

Commit 8e5628a

Browse files
w568ww568w
committed
update: dependencies and Flutter version to 3.16.9
1 parent 38899b6 commit 8e5628a

16 files changed

+330
-254
lines changed

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ dmg 硬盘映像，挂载拷贝即可。
5656

5757
```shell
5858
$ flutter --version
59-
Flutter 3.16.7 • channel stable • https://github.com/flutter/flutter.git
60-
Framework • revision ef1af02aea (4 天前) • 2024-01-11 15:19:26 -0600
61-
Engine • revision 4a585b7929
62-
Tools • Dart 3.2.4 • DevTools 2.28.5
59+
Flutter 3.16.9 • channel stable • https://github.com/flutter/flutter.git
60+
Framework • revision 41456452f2 (3 周前) • 2024-01-25 10:06:23 -0800
61+
Engine • revision f40e976bed
62+
Tools • Dart 3.2.6 • DevTools 2.28.5
6363
```
6464

6565
## 编译说明

‎README_EN.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ mount it.
6363

6464
```shell
6565
$ flutter --version
66-
Flutter 3.16.7 • channel stable • https://github.com/flutter/flutter.git
67-
Framework • revision ef1af02aea (4 days ago) • 2024-01-11 15:19:26 -0600
68-
Engine • revision 4a585b7929
69-
Tools • Dart 3.2.4 • DevTools 2.28.5
66+
Flutter 3.16.9 • channel stable • https://github.com/flutter/flutter.git
67+
Framework • revision 41456452f2 (3 weeks ago) • 2024-01-25 10:06:23 -0800
68+
Engine • revision f40e976bed
69+
Tools • Dart 3.2.6 • DevTools 2.28.5
7070
```
7171

7272
## Notes on compilation

‎android/app/build.gradle

+4-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ gradle.taskGraph.whenReady {
3939
}
4040
}
4141
android {
42-
compileSdkVersion 33
42+
compileSdkVersion 34
4343

4444
ndkVersion "25.1.8937393"
4545

@@ -50,8 +50,9 @@ android {
5050

5151
defaultConfig {
5252
applicationId "io.github.danxi_dev.dan_xi"
53+
namespace "io.github.danxi_dev.dan_xi"
5354
minSdkVersion 21
54-
targetSdkVersion 33
55+
targetSdkVersion 34
5556
versionCode flutterVersionCode.toInteger()
5657
versionName flutterVersionName
5758
}
@@ -83,5 +84,5 @@ flutter {
8384

8485
dependencies {
8586
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
86-
implementation 'com.google.android.material:material:1.8.0'
87+
implementation 'com.google.android.material:material:1.11.0'
8788
}

‎android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.8.0'
2+
ext.kotlin_version = '1.9.22'
33
repositories {
44
google()
55
mavenCentral()

‎android/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip

‎lib/common/pubspec.yaml.g.dart

+16-15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/main.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import 'dart:async';
1919
import 'dart:ui';
2020

21-
import 'package:bitsdojo_window_v3/bitsdojo_window_v3.dart';
21+
import 'package:bitsdojo_window/bitsdojo_window.dart';
2222
import 'package:dan_xi/feature/feature_map.dart';
2323
import 'package:dan_xi/generated/l10n.dart';
2424
import 'package:dan_xi/page/danke/course_group_detail.dart';

‎lib/page/subpage_settings.dart

+16-6
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,16 @@ class SettingsSubpageState extends PlatformSubpageState<SettingsSubpage> {
8888
LicenseItem("asn1lib", LICENSE_BSD, "https://github.com/wstrange/asn1lib"),
8989
LicenseItem("cached_network_image", LICENSE_MIT,
9090
"https://github.com/Baseflow/flutter_cached_network_image"),
91-
LicenseItem(
92-
"system_tray", LICENSE_MIT, "https://github.com/antler119/system_tray"),
91+
LicenseItem("tray_manager", LICENSE_MIT,
92+
"https://github.com/leanflutter/tray_manager"),
9393
LicenseItem(
9494
"win32", LICENSE_BSD_3_0_CLAUSE, "https://github.com/timsneath/win32"),
9595
LicenseItem("collection", LICENSE_BSD_3_0_CLAUSE,
9696
"https://github.com/dart-lang/collection"),
9797
LicenseItem(
9898
"meta", LICENSE_BSD_3_0_CLAUSE, "https://github.com/dart-lang/sdk"),
99-
LicenseItem("bitsdojo_window", LICENSE_MIT,
100-
"https://github.com/bitsdojo/bitsdojo_window"),
99+
LicenseItem("bitsdojo_window_v3", LICENSE_MIT,
100+
"https://github.com/DartGit-dev/bitsdojo_window"),
101101
LicenseItem("flutter_layout_grid", LICENSE_MIT,
102102
"https://github.com/madewithfelt/flutter_layout_grid"),
103103
LicenseItem(
@@ -225,8 +225,18 @@ class SettingsSubpageState extends PlatformSubpageState<SettingsSubpage> {
225225
"https://github.com/berkanaslan/material-color-generator"),
226226
LicenseItem("flutter_swiper_view", LICENSE_MIT,
227227
"https://github.com/feicien/flutter_swiper_view"),
228-
LicenseItem(
229-
"mutex", LICENSE_BSD_3_0_CLAUSE, "https://github.com/hoylen/dart-mutex")
228+
LicenseItem("mutex", LICENSE_BSD_3_0_CLAUSE,
229+
"https://github.com/hoylen/dart-mutex"),
230+
LicenseItem("receive_intent", LICENSE_GPL_3_0,
231+
"https://github.com/w568w/receive_intent"),
232+
LicenseItem("flutter_secure_storage", LICENSE_BSD_3_0_CLAUSE,
233+
"https://github.com/mogol/flutter_secure_storage"),
234+
LicenseItem("encrypt_shared_preferences", LICENSE_APACHE_2_0,
235+
"https://github.com/xaldarof/encrypted-shared-preferences"),
236+
LicenseItem("device_identity", LICENSE_MIT,
237+
"https://devgit.starschina.com/flutter_open_srouce/device_identity"),
238+
LicenseItem("tutorial_coach_mark", LICENSE_MIT,
239+
"https://github.com/RafaelBarbosatec/tutorial_coach_mark")
230240
];
231241

232242
String? _clearCacheSubtitle;

‎lib/util/browser_util.dart

+17-16
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,19 @@ import 'package:url_launcher/url_launcher.dart';
3131
import 'package:url_launcher/url_launcher_string.dart';
3232

3333
class BrowserUtil {
34-
static InAppBrowserClassOptions getOptions(BuildContext context) =>
35-
InAppBrowserClassOptions(
36-
crossPlatform: InAppBrowserOptions(
37-
toolbarTopBackgroundColor: Theme.of(context).cardTheme.color),
38-
android: AndroidInAppBrowserOptions(hideTitleBar: true),
39-
ios: IOSInAppBrowserOptions(hideToolbarBottom: true),
40-
inAppWebViewGroupOptions: InAppWebViewGroupOptions(
41-
crossPlatform: InAppWebViewOptions(
42-
javaScriptEnabled: true,
43-
useOnDownloadStart: true,
44-
incognito: true),
45-
ios: IOSInAppWebViewOptions(sharedCookiesEnabled: true)));
34+
static InAppBrowserClassSettings getOptions(BuildContext context) =>
35+
InAppBrowserClassSettings(
36+
browserSettings: InAppBrowserSettings(
37+
toolbarTopBackgroundColor: Theme.of(context).cardTheme.color,
38+
hideTitleBar: true,
39+
hideToolbarBottom: true,
40+
),
41+
webViewSettings: InAppWebViewSettings(
42+
sharedCookiesEnabled: true,
43+
javaScriptEnabled: true,
44+
useOnDownloadStart: true,
45+
incognito: true,
46+
));
4647

4748
/// Open a URL in the browser.
4849
///
@@ -67,7 +68,7 @@ class BrowserUtil {
6768
}
6869

6970
if (cookieJar != null) {
70-
Uri uri = Uri.parse(url);
71+
WebUri uri = WebUri(url);
7172
CookieManager.instance().deleteCookies(url: uri);
7273
if (uri.host.startsWith(Constant.UIS_HOST)) {
7374
cookieJar.hostCookies.forEach((host, value) {
@@ -107,8 +108,8 @@ class BrowserUtil {
107108
}
108109
}
109110
CustomInAppBrowser().openUrlRequest(
110-
urlRequest: URLRequest(url: Uri.parse(url)),
111-
options: getOptions(context!));
111+
urlRequest: URLRequest(url: WebUri(url)),
112+
settings: getOptions(context!));
112113
}
113114
}
114115

@@ -178,7 +179,7 @@ class CustomInAppBrowser extends InAppBrowser {
178179
.startsWith("https://uis.fudan.edu.cn/authserver/login") ==
179180
true) {
180181
Future.delayed(const Duration(milliseconds: 1000)).then((_) =>
181-
webViewController.evaluateJavascript(
182+
webViewController?.evaluateJavascript(
182183
source: uisLoginJavaScript(StateProvider.personInfo.value!)));
183184
}
184185
}

‎linux/flutter/generated_plugin_registrant.cc

+36-26
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,48 @@
66

77
#include "generated_plugin_registrant.h"
88

9-
#include <bitsdojo_window_linux_v3/bitsdojo_window_plugin.h>
9+
#include <bitsdojo_window_linux/bitsdojo_window_plugin.h>
1010
#include <desktop_window/desktop_window_plugin.h>
1111
#include <file_selector_linux/file_selector_plugin.h>
1212
#include <flutter_js/flutter_js_plugin.h>
1313
#include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
1414
#include <platform_device_id_linux/platform_device_id_linux_plugin.h>
15-
#include <system_tray/system_tray_plugin.h>
15+
#include <tray_manager/tray_manager_plugin.h>
1616
#include <url_launcher_linux/url_launcher_plugin.h>
1717

1818
void fl_register_plugins(FlPluginRegistry* registry) {
19-
g_autoptr(FlPluginRegistrar) bitsdojo_window_linux_v3_registrar =
20-
fl_plugin_registry_get_registrar_for_plugin(registry, "BitsdojoWindowPlugin");
21-
bitsdojo_window_plugin_register_with_registrar(bitsdojo_window_linux_v3_registrar);
22-
g_autoptr(FlPluginRegistrar) desktop_window_registrar =
23-
fl_plugin_registry_get_registrar_for_plugin(registry, "DesktopWindowPlugin");
24-
desktop_window_plugin_register_with_registrar(desktop_window_registrar);
25-
g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
26-
fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
27-
file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
28-
g_autoptr(FlPluginRegistrar) flutter_js_registrar =
29-
fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterJsPlugin");
30-
flutter_js_plugin_register_with_registrar(flutter_js_registrar);
31-
g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar =
32-
fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin");
33-
flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar);
34-
g_autoptr(FlPluginRegistrar) platform_device_id_linux_registrar =
35-
fl_plugin_registry_get_registrar_for_plugin(registry, "PlatformDeviceIdLinuxPlugin");
36-
platform_device_id_linux_plugin_register_with_registrar(platform_device_id_linux_registrar);
37-
g_autoptr(FlPluginRegistrar) system_tray_registrar =
38-
fl_plugin_registry_get_registrar_for_plugin(registry, "SystemTrayPlugin");
39-
system_tray_plugin_register_with_registrar(system_tray_registrar);
40-
g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
41-
fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
42-
url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
19+
g_autoptr(FlPluginRegistrar)
20+
bitsdojo_window_linux_registrar =
21+
fl_plugin_registry_get_registrar_for_plugin(registry, "BitsdojoWindowPlugin");
22+
bitsdojo_window_plugin_register_with_registrar(bitsdojo_window_linux_registrar);
23+
g_autoptr(FlPluginRegistrar)
24+
desktop_window_registrar =
25+
fl_plugin_registry_get_registrar_for_plugin(registry, "DesktopWindowPlugin");
26+
desktop_window_plugin_register_with_registrar(desktop_window_registrar);
27+
g_autoptr(FlPluginRegistrar)
28+
file_selector_linux_registrar =
29+
fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
30+
file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
31+
g_autoptr(FlPluginRegistrar)
32+
flutter_js_registrar =
33+
fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterJsPlugin");
34+
flutter_js_plugin_register_with_registrar(flutter_js_registrar);
35+
g_autoptr(FlPluginRegistrar)
36+
flutter_secure_storage_linux_registrar =
37+
fl_plugin_registry_get_registrar_for_plugin(registry,
38+
"FlutterSecureStorageLinuxPlugin");
39+
flutter_secure_storage_linux_plugin_register_with_registrar(
40+
flutter_secure_storage_linux_registrar);
41+
g_autoptr(FlPluginRegistrar)
42+
platform_device_id_linux_registrar =
43+
fl_plugin_registry_get_registrar_for_plugin(registry, "PlatformDeviceIdLinuxPlugin");
44+
platform_device_id_linux_plugin_register_with_registrar(platform_device_id_linux_registrar);
45+
g_autoptr(FlPluginRegistrar)
46+
tray_manager_registrar =
47+
fl_plugin_registry_get_registrar_for_plugin(registry, "TrayManagerPlugin");
48+
tray_manager_plugin_register_with_registrar(tray_manager_registrar);
49+
g_autoptr(FlPluginRegistrar)
50+
url_launcher_linux_registrar =
51+
fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
52+
url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
4353
}

‎linux/flutter/generated_plugins.cmake

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
#
44

55
list(APPEND FLUTTER_PLUGIN_LIST
6-
bitsdojo_window_linux_v3
7-
desktop_window
8-
file_selector_linux
9-
flutter_js
10-
flutter_secure_storage_linux
11-
platform_device_id_linux
12-
system_tray
13-
url_launcher_linux
14-
)
6+
bitsdojo_window_linux
7+
desktop_window
8+
file_selector_linux
9+
flutter_js
10+
flutter_secure_storage_linux
11+
platform_device_id_linux
12+
tray_manager
13+
url_launcher_linux
14+
)
1515

1616
list(APPEND FLUTTER_FFI_PLUGIN_LIST
1717
)

0 commit comments

Comments
 (0)