Skip to content

Commit f85f3f3

Browse files
linpengtenglinpengteng
committed
chore: Upgrade Flutter SDK and third-party dependencies
1. support extend dart extension (eg. size.vp and size.fp) 2. open android (Android Studio Otter | 2025.2.1) 3. open ios (26.1.1 | 17B100) 4. flutter (v3.38.1)
1 parent c906ecf commit f85f3f3

36 files changed

Lines changed: 1234 additions & 1300 deletions

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636

3737
## Packages
3838

39-
- flutter_ringtone_player
4039
- flutter_inappwebview
4140
- web_socket_channel
4241
- permission_handler

‎android/app/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ plugins {
2020

2121
dependencies {
2222
// Import the Firebase BoM
23-
implementation(platform("com.google.firebase:firebase-bom:34.3.0"))
23+
implementation(platform("com.google.firebase:firebase-bom:34.6.0"))
2424

2525
// TODO: Add the dependencies for Firebase products you want to use
2626
// When using the BoM, don't specify versions in Firebase dependencies

‎android/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
// Add the dependency for the Google services Gradle plugin
3-
id("com.google.gms.google-services") version "4.4.3" apply false
3+
id("com.google.gms.google-services") version "4.4.4" apply false
44
}
55

66
allprojects {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip

‎android/settings.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pluginManagement {
1818

1919
plugins {
2020
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
21-
id("com.android.application") version "8.12.2" apply false
22-
id("org.jetbrains.kotlin.android") version "2.2.20" apply false
21+
id("com.android.application") version "8.13.1" apply false
22+
id("org.jetbrains.kotlin.android") version "2.2.21" apply false
2323
}
2424

2525
include(":app")

‎devtools_options.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
description: This file stores settings for Dart & Flutter DevTools.
2+
documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
3+
extensions:

‎ios/Podfile.lock‎

Lines changed: 33 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,36 +16,36 @@ PODS:
1616
- FlutterMacOS
1717
- connectivity_plus (0.0.1):
1818
- Flutter
19-
- Firebase/Auth (12.2.0):
19+
- Firebase/Auth (12.4.0):
2020
- Firebase/CoreOnly
21-
- FirebaseAuth (~> 12.2.0)
22-
- Firebase/CoreOnly (12.2.0):
23-
- FirebaseCore (~> 12.2.0)
24-
- firebase_auth (6.1.0):
25-
- Firebase/Auth (= 12.2.0)
21+
- FirebaseAuth (~> 12.4.0)
22+
- Firebase/CoreOnly (12.4.0):
23+
- FirebaseCore (~> 12.4.0)
24+
- firebase_auth (6.1.2):
25+
- Firebase/Auth (= 12.4.0)
2626
- firebase_core
2727
- Flutter
28-
- firebase_core (4.1.1):
29-
- Firebase/CoreOnly (= 12.2.0)
28+
- firebase_core (4.2.1):
29+
- Firebase/CoreOnly (= 12.4.0)
3030
- Flutter
31-
- FirebaseAppCheckInterop (12.2.0)
32-
- FirebaseAuth (12.2.0):
33-
- FirebaseAppCheckInterop (~> 12.2.0)
34-
- FirebaseAuthInterop (~> 12.2.0)
35-
- FirebaseCore (~> 12.2.0)
36-
- FirebaseCoreExtension (~> 12.2.0)
31+
- FirebaseAppCheckInterop (12.4.0)
32+
- FirebaseAuth (12.4.0):
33+
- FirebaseAppCheckInterop (~> 12.4.0)
34+
- FirebaseAuthInterop (~> 12.4.0)
35+
- FirebaseCore (~> 12.4.0)
36+
- FirebaseCoreExtension (~> 12.4.0)
3737
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
3838
- GoogleUtilities/Environment (~> 8.1)
3939
- GTMSessionFetcher/Core (< 6.0, >= 3.4)
4040
- RecaptchaInterop (~> 101.0)
41-
- FirebaseAuthInterop (12.2.0)
42-
- FirebaseCore (12.2.0):
43-
- FirebaseCoreInternal (~> 12.2.0)
41+
- FirebaseAuthInterop (12.4.0)
42+
- FirebaseCore (12.4.0):
43+
- FirebaseCoreInternal (~> 12.4.0)
4444
- GoogleUtilities/Environment (~> 8.1)
4545
- GoogleUtilities/Logger (~> 8.1)
46-
- FirebaseCoreExtension (12.2.0):
47-
- FirebaseCore (~> 12.2.0)
48-
- FirebaseCoreInternal (12.2.0):
46+
- FirebaseCoreExtension (12.4.0):
47+
- FirebaseCore (~> 12.4.0)
48+
- FirebaseCoreInternal (12.4.0):
4949
- "GoogleUtilities/NSData+zlib (~> 8.1)"
5050
- Flutter (1.0.0)
5151
- flutter_inappwebview_ios (0.0.1):
@@ -55,8 +55,6 @@ PODS:
5555
- flutter_inappwebview_ios/Core (0.0.1):
5656
- Flutter
5757
- OrderedSet (~> 6.0.3)
58-
- flutter_ringtone_player (0.0.1):
59-
- Flutter
6058
- fluttertoast (0.0.2):
6159
- Flutter
6260
- google_sign_in_ios (0.0.1):
@@ -130,7 +128,6 @@ DEPENDENCIES:
130128
- firebase_core (from `.symlinks/plugins/firebase_core/ios`)
131129
- Flutter (from `Flutter`)
132130
- flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`)
133-
- flutter_ringtone_player (from `.symlinks/plugins/flutter_ringtone_player/ios`)
134131
- fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
135132
- google_sign_in_ios (from `.symlinks/plugins/google_sign_in_ios/darwin`)
136133
- image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
@@ -175,8 +172,6 @@ EXTERNAL SOURCES:
175172
:path: Flutter
176173
flutter_inappwebview_ios:
177174
:path: ".symlinks/plugins/flutter_inappwebview_ios/ios"
178-
flutter_ringtone_player:
179-
:path: ".symlinks/plugins/flutter_ringtone_player/ios"
180175
fluttertoast:
181176
:path: ".symlinks/plugins/fluttertoast/ios"
182177
google_sign_in_ios:
@@ -202,34 +197,33 @@ SPEC CHECKSUMS:
202197
AppCheckCore: cc8fd0a3a230ddd401f326489c99990b013f0c4f
203198
audioplayers_darwin: 4f9ca89d92d3d21cec7ec580e78ca888e5fb68bd
204199
connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
205-
Firebase: 26f6f8d460603af3df970ad505b16b15f5e2e9a1
206-
firebase_auth: 069b05a861a7c2f7a73112dd616a49a40f35ae52
207-
firebase_core: dfc4bd142bee4bc53a5d482397ca322c2dd3165d
208-
FirebaseAppCheckInterop: a1b2598c64c5a8c42fd6f6a1c3d0938ae4324678
209-
FirebaseAuth: 059c11702bdb759bb49b6c7ec6ff67abf21f39c4
210-
FirebaseAuthInterop: 217702acd4cc6baa98ba9d6c054532e0de0b8a16
211-
FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd
212-
FirebaseCoreExtension: 73af080c22a2f7b44cefa391dc08f7e4ee162cb5
213-
FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b
200+
Firebase: f07b15ae5a6ec0f93713e30b923d9970d144af3e
201+
firebase_auth: 9225db04db5d8e3b46dc8940e04bc6aec6833e27
202+
firebase_core: f1aafb21c14f497e5498f7ffc4dc63cbb52b2594
203+
FirebaseAppCheckInterop: f734c802f21fe1da0837708f0f9a27218c8a4ed0
204+
FirebaseAuth: 4a2aed737c84114a9d9b33d11ae1b147d6b94889
205+
FirebaseAuthInterop: 858e6b754966e70740a4370dd1503dfffe6dbb49
206+
FirebaseCore: bb595f3114953664e3c1dc032f008a244147cfd3
207+
FirebaseCoreExtension: 7e1f7118ee970e001a8013719fb90950ee5e0018
208+
FirebaseCoreInternal: d7f5a043c2cd01a08103ab586587c1468047bca6
214209
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
215210
flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
216-
flutter_ringtone_player: a77c42464250845611eaa44c27e8714acc800138
217211
fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1
218-
google_sign_in_ios: 205742c688aea0e64db9da03c33121694a365109
212+
google_sign_in_ios: 00dfa94252eb10278b64828c81bcb7158a81a53a
219213
GoogleSignIn: c7f09cfbc85a1abf69187be091997c317cc33b77
220214
GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
221215
GTMAppAuth: 217a876b249c3c585a54fd6f73e6b58c4f5c4238
222216
GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
223-
image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
217+
image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326
224218
mobile_scanner: 9157936403f5a0644ca3779a38ff8404c5434a93
225219
OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
226-
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
220+
path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
227221
permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
228222
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
229223
RecaptchaInterop: 11e0b637842dfb48308d242afc3f448062325aba
230224
share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
231225
sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
232-
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
226+
url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
233227

234228
PODFILE CHECKSUM: e615128e67103d6c13341e7c9cf615f3bc73c500
235229

‎lib/assets/medias/pay.wav‎

190 KB
Binary file not shown.

‎lib/configure/fluttertoast.dart‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ class Toaster {
3535
child: Container(
3636
alignment: Alignment.topCenter,
3737
padding: EdgeInsets.only(
38-
top: 640.wmax * 10.sr,
39-
left: 640.wmax * 20.sr,
40-
right: 640.wmax * 15.sr,
41-
bottom: 640.wmax * 10.sr,
38+
top: 10.vp,
39+
left: 20.vp,
40+
right: 15.vp,
41+
bottom: 10.vp,
4242
),
4343
decoration: BoxDecoration(
44-
borderRadius: BorderRadius.circular(640.wmax * 32.sr),
44+
borderRadius: BorderRadius.circular(32.vp),
4545
color: Colors.redAccent,
4646
),
4747
child: Row(
@@ -52,14 +52,14 @@ class Toaster {
5252
behavior: HitTestBehavior.opaque,
5353
child: Container(
5454
alignment: Alignment.center,
55-
padding: EdgeInsets.only(left: 640.wmax * 10.sr),
55+
padding: EdgeInsets.only(left: 10.vp),
5656
child: IntrinsicWidth(
5757
child: Text(
5858
message!,
5959
style: TextStyle(
60-
fontSize: 640.wmax * 14.sr,
61-
fontWeight: FontWeight.w600,
6260
color: Colors.white,
61+
fontWeight: FontWeight.w600,
62+
fontSize: 14.fp,
6363
height: 1.3,
6464
),
6565
),
@@ -74,11 +74,11 @@ class Toaster {
7474
),
7575
),
7676
SizedBox(
77-
width: 640.wmax * 24.sr,
78-
height: 640.wmax * 24.sr,
77+
width: 24.vp,
78+
height: 24.vp,
7979
child: IconButton(
8080
color: Colors.white,
81-
iconSize: 640.wmax * 24.sr,
81+
iconSize: 24.vp,
8282
padding: const EdgeInsets.all(0),
8383
icon: const Icon(Icons.close),
8484
onPressed: () => fToast.removeCustomToast(),
@@ -90,9 +90,9 @@ class Toaster {
9090
toastDuration: duration ?? const Duration(seconds: 3),
9191
positionedToastBuilder: (context, child, gravity) {
9292
return Positioned(
93-
top: max(640.wmax * 48.sr, mediaPadding.top + 640.wmax * 6.sr),
94-
left: 640.wmax * 20.sr,
95-
right: 640.wmax * 20.sr,
93+
top: max(48.vp, mediaPadding.top + 6.vp),
94+
left: 20.vp,
95+
right: 20.vp,
9696
child: child,
9797
);
9898
},
@@ -127,13 +127,13 @@ class Toaster {
127127
child: Container(
128128
alignment: Alignment.topCenter,
129129
padding: EdgeInsets.only(
130-
top: 640.wmax * 10.sr,
131-
left: 640.wmax * 20.sr,
132-
right: 640.wmax * 15.sr,
133-
bottom: 640.wmax * 10.sr,
130+
top: 10.vp,
131+
left: 20.vp,
132+
right: 15.vp,
133+
bottom: 10.vp,
134134
),
135135
decoration: BoxDecoration(
136-
borderRadius: BorderRadius.circular(640.wmax * 32.sr),
136+
borderRadius: BorderRadius.circular(32.vp),
137137
color: Color(0xffffc107),
138138
),
139139
child: Row(
@@ -144,14 +144,14 @@ class Toaster {
144144
behavior: HitTestBehavior.opaque,
145145
child: Container(
146146
alignment: Alignment.center,
147-
padding: EdgeInsets.only(left: 640.wmax * 10.sr),
147+
padding: EdgeInsets.only(left: 10.vp),
148148
child: IntrinsicWidth(
149149
child: Text(
150150
message!,
151151
style: TextStyle(
152-
fontSize: 640.wmax * 14.sr,
153-
fontWeight: FontWeight.w600,
154152
color: Colors.white,
153+
fontWeight: FontWeight.w600,
154+
fontSize: 14.fp,
155155
height: 1.3,
156156
),
157157
),
@@ -166,11 +166,11 @@ class Toaster {
166166
),
167167
),
168168
SizedBox(
169-
width: 640.wmax * 24.sr,
170-
height: 640.wmax * 24.sr,
169+
width: 24.vp,
170+
height: 24.vp,
171171
child: IconButton(
172172
color: Colors.white,
173-
iconSize: 640.wmax * 24.sr,
173+
iconSize: 24.vp,
174174
padding: const EdgeInsets.all(0),
175175
icon: const Icon(Icons.error_outline),
176176
onPressed: () => fToast.removeCustomToast(),
@@ -182,9 +182,9 @@ class Toaster {
182182
toastDuration: duration ?? const Duration(seconds: 3),
183183
positionedToastBuilder: (context, child, gravity) {
184184
return Positioned(
185-
top: max(640.wmax * 48.sr, mediaPadding.top + 640.wmax * 6.sr),
186-
left: 640.wmax * 20.sr,
187-
right: 640.wmax * 20.sr,
185+
top: max(48.vp, mediaPadding.top + 6.vp),
186+
left: 20.vp,
187+
right: 20.vp,
188188
child: child,
189189
);
190190
},
@@ -219,13 +219,13 @@ class Toaster {
219219
child: Container(
220220
alignment: Alignment.topCenter,
221221
padding: EdgeInsets.only(
222-
top: 640.wmax * 10.sr,
223-
left: 640.wmax * 20.sr,
224-
right: 640.wmax * 15.sr,
225-
bottom: 640.wmax * 10.sr,
222+
top: 10.vp,
223+
left: 20.vp,
224+
right: 15.vp,
225+
bottom: 10.vp,
226226
),
227227
decoration: BoxDecoration(
228-
borderRadius: BorderRadius.circular(640.wmax * 32.sr),
228+
borderRadius: BorderRadius.circular(32.vp),
229229
color: const Color(0xff52c41b),
230230
),
231231
child: Row(
@@ -236,14 +236,14 @@ class Toaster {
236236
behavior: HitTestBehavior.opaque,
237237
child: Container(
238238
alignment: Alignment.center,
239-
padding: EdgeInsets.only(left: 640.wmax * 10.sr),
239+
padding: EdgeInsets.only(left: 10.vp),
240240
child: IntrinsicWidth(
241241
child: Text(
242242
message!,
243243
style: TextStyle(
244-
fontSize: 640.wmax * 14.sr,
245-
fontWeight: FontWeight.w600,
246244
color: Colors.white,
245+
fontWeight: FontWeight.w600,
246+
fontSize: 14.fp,
247247
height: 1.3,
248248
),
249249
),
@@ -258,11 +258,11 @@ class Toaster {
258258
),
259259
),
260260
SizedBox(
261-
width: 640.wmax * 24.sr,
262-
height: 640.wmax * 24.sr,
261+
width: 24.vp,
262+
height: 24.vp,
263263
child: IconButton(
264+
iconSize: 24.vp,
264265
color: Colors.white,
265-
iconSize: 640.wmax * 24.sr,
266266
padding: const EdgeInsets.all(0),
267267
icon: const Icon(Icons.check),
268268
onPressed: () => fToast.removeCustomToast(),
@@ -274,9 +274,9 @@ class Toaster {
274274
toastDuration: duration ?? const Duration(seconds: 3),
275275
positionedToastBuilder: (context, child, gravity) {
276276
return Positioned(
277-
top: max(640.wmax * 48.sr, mediaPadding.top + 640.wmax * 6.sr),
278-
left: 640.wmax * 20.sr,
279-
right: 640.wmax * 20.sr,
277+
top: max(48.vp, mediaPadding.top + 6.vp),
278+
left: 20.vp,
279+
right: 20.vp,
280280
child: child,
281281
);
282282
},

0 commit comments

Comments
 (0)