Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/FlutterBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
channel: stable
flutter-version: '3.35.5'
flutter-version: '3.41.0'
- name: Decode keystore
run: |
echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 --decode > android/release.jks
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
channel: stable
flutter-version: '3.35.5'
flutter-version: '3.41.0'

- run: flutter pub get
- run: flutter build windows
Expand All @@ -75,7 +75,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
channel: stable
flutter-version: '3.35.5'
flutter-version: '3.41.0'

- run: flutter pub get
- run: flutter build macos
Expand All @@ -95,7 +95,7 @@ jobs:
- uses: actions/checkout@v4
- uses: subosito/flutter-action@v2
with:
flutter-version: '3.35.5'
flutter-version: '3.41.0'
- run: flutter pub get
- run: flutter build web --release --base-href /arabic_learning/

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/FlutterBuildTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
channel: stable
flutter-version: '3.35.5'
flutter-version: '3.41.0'

- run: flutter pub get
- run: flutter build windows
Expand All @@ -32,7 +32,7 @@ jobs:
- uses: actions/checkout@v4
- uses: subosito/flutter-action@v2
with:
flutter-version: '3.35.5'
flutter-version: '3.41.0'
- run: flutter pub get
- run: flutter build web --release
- uses: actions/upload-artifact@v4
Expand Down
10 changes: 5 additions & 5 deletions lib/funcs/noification.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Future<FlutterLocalNotificationsPlugin?> initNotificationsBackground() async {

// 通知接口
FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
await flutterLocalNotificationsPlugin.initialize(initializationSettings);
await flutterLocalNotificationsPlugin.initialize(settings: initializationSettings);

// 通知渠道
const AndroidNotificationChannel channel = AndroidNotificationChannel(
Expand Down Expand Up @@ -66,10 +66,10 @@ Future<bool> sendNotification() async {

final Random rnd = Random();
await localNotificationPlugin.show(
rnd.nextInt(9999),
'学习提醒',
StaticsVar.learningMessage[rnd.nextInt(StaticsVar.learningMessage.length)],
notificationDetails,
id: rnd.nextInt(9999),
title: '学习提醒',
body: StaticsVar.learningMessage[rnd.nextInt(StaticsVar.learningMessage.length)],
notificationDetails: notificationDetails,
);
return Future.value(true);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/funcs/ui.dart
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@ class WordCardQuestion extends StatelessWidget {
SizedBox(height: mediaQuery.size.height * 0.01),
WordCard(word: word),
Expanded(child: SizedBox()),
if(bottomWidget != null) bottomWidget!,
?bottomWidget,
SizedBox(height: mediaQuery.size.height * 0.05),
],
),
Expand Down
Loading