Skip to content

Commit f219175

Browse files
committed
升级 Flutter 3.10.1
1 parent 0c99a5a commit f219175

File tree

15 files changed

+87
-110
lines changed

15 files changed

+87
-110
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
> 当前Flutter 版本
3030
3131
```
32-
Flutter 3.7.12 • channel stable • https://github.com/flutter/flutter.git
33-
Framework • revision 4d9e56e694 (7 days ago) • 2023-04-17 21:47:46 -0400
34-
Engine • revision 1a65d409c7
35-
Tools • Dart 2.19.6 • DevTools 2.20.1
32+
Flutter 3.10.1 • channel stable • https://github.com/flutter/flutter.git
33+
Framework • revision d3d8effc68 (3 days ago) • 2023-05-16 17:59:05 -0700
34+
Engine • revision b4fb11214d
35+
Tools • Dart 3.0.1 • DevTools 2.23.1
3636
```
3737

3838
---

android/app/build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,16 @@ android {
4444
defaultConfig {
4545
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4646
applicationId "com.toly1994.flutter_unit"
47-
minSdkVersion 16
47+
minSdkVersion 19
4848
targetSdkVersion 30
4949
versionCode flutterVersionCode.toInteger()
5050
versionName flutterVersionName
5151
multiDexEnabled true
5252
archivesBaseName = "FlutterUnit.apk"
53+
ndk {
54+
abiFilters 'arm64-v8a'
55+
// abiFilters 'armeabi', 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a'
56+
}
5357
}
5458

5559
buildTypes {

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ subprojects {
2424
project.evaluationDependsOn(':app')
2525
}
2626

27-
task clean(type: Delete) {
27+
tasks.register("clean", Delete) {
2828
delete rootProject.buildDir
2929
}

lib/app/utils/color_utils.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ class ColorUtils {
3838
print(e);
3939
}
4040
switch (code.length) {
41-
case 1 + 6://6位
41+
case 7://6位
4242
result = Color(value + 0xFF000000);
4343
break;
44-
case 1 + 8://8位
44+
case 9://8位
4545
result = Color(value);
4646
break;
4747
default:

macos/Flutter/GeneratedPluginRegistrant.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import FlutterMacOS
66
import Foundation
77

8-
import package_info_plus_macos
8+
import package_info_plus
99
import path_provider_macos
1010
import screen_retriever
1111
import share_plus

packages/app_update/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414
flutter_bloc: ^8.0.1 # 状态管理
1515
shared_preferences: ^2.0.13 # xml 固化
1616
r_upgrade: ^0.3.8+2 # 应用升级
17-
package_info_plus: ^1.3.0 # 应用包信息
17+
package_info_plus: ^4.0.1
1818
utils:
1919
path: ../utils
2020
app_config:

packages/components/lib/flutter_ui/no_div_expansion_tile.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class _NoBorderExpansionTileState extends State<NoBorderExpansionTile> with Sing
107107
_iconColor = _controller.drive(_iconColorTween.chain(_easeInTween));
108108
_backgroundColor = _controller.drive(_backgroundColorTween.chain(_easeOutTween));
109109

110-
_isExpanded = PageStorage.of(context)?.readState(context) ?? widget.initiallyExpanded;
110+
_isExpanded = PageStorage.of(context).readState(context) ?? widget.initiallyExpanded;
111111
if (_isExpanded) {
112112
_controller.value = 1.0;
113113
}
@@ -135,7 +135,7 @@ class _NoBorderExpansionTileState extends State<NoBorderExpansionTile> with Sing
135135
});
136136
});
137137
}
138-
PageStorage.of(context)?.writeState(context, _isExpanded);
138+
PageStorage.of(context).writeState(context, _isExpanded);
139139
});
140140
widget.onExpansionChanged?.call(_isExpanded);
141141
}
@@ -179,11 +179,11 @@ class _NoBorderExpansionTileState extends State<NoBorderExpansionTile> with Sing
179179
_borderColorTween
180180
.end = theme.dividerColor;
181181
_headerColorTween
182-
..begin = theme.textTheme.subtitle1!.color
183-
..end = theme.accentColor;
182+
..begin = theme.textTheme.bodyMedium?.color
183+
..end = theme.primaryColor;
184184
_iconColorTween
185185
..begin = theme.unselectedWidgetColor
186-
..end = theme.accentColor;
186+
..end = theme.primaryColor;
187187
_backgroundColorTween
188188
.end = widget.backgroundColor;
189189
super.didChangeDependencies();

packages/widget_repository/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies:
1212
flutter:
1313
sdk: flutter
1414
equatable: ^2.0.5
15-
intl: ^0.17.0
15+
intl: ^0.18.0
1616
utils:
1717
path: ../utils
1818
storage:

packages/widgets/lib/ProxyWidget/SliderTheme/node2_diy.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ class _DIYSliderThemeState extends State<DIYSliderTheme> {
3838
valueIndicatorColor: Colors.deepPurpleAccent,
3939
thumbShape: _CustomThumbShape(),
4040
valueIndicatorShape: _CustomValueIndicatorShape(),
41-
valueIndicatorTextStyle: theme.accentTextTheme.bodyText2!
42-
.copyWith(color: theme.colorScheme.onSurface),
41+
valueIndicatorTextStyle: theme.primaryTextTheme.bodyMedium?.copyWith(color: theme.colorScheme.onSurface),
4342
),
4443
child: Slider(
4544
min: 0.0,

packages/widgets/lib/SingleChildRenderObjectWidget/AnimatedSize/node1_base.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ class _CustomAnimatedSizeState extends State<CustomAnimatedSize>
4747
height: 100,
4848
alignment: Alignment.center,
4949
child: AnimatedSize(
50-
vsync: this,
5150
duration: const Duration(seconds: 1),
5251
curve: Curves.fastOutSlowIn,
5352
alignment: const Alignment(0, 0),

0 commit comments

Comments
 (0)