Skip to content

Commit 6d2d436

Browse files
committed
make app compatible with flutter 3.10.5 and dart 3.0.5 version
1 parent 59e3020 commit 6d2d436

File tree

7 files changed

+29
-30
lines changed

7 files changed

+29
-30
lines changed

.github/workflows/dart.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
java-version: '12.x'
1818
- uses: subosito/flutter-action@v1
1919
with:
20-
flutter-version: '3.7.11'
20+
flutter-version: '3.10.5'
2121
- run: flutter pub get
2222
- run: flutter analyze
23-
- run: flutter format -n --set-exit-if-changed .
23+
- run: dart format --output=none --set-exit-if-changed .
2424
- run: flutter test
2525
- run: flutter build apk
2626

android/build.gradle

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

29-
task clean(type: Delete) {
29+
tasks.register("clean", Delete) {
3030
delete rootProject.buildDir
3131
}

lib/Pages/home_screen/widgets/rss_feed_home_page.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,8 +1121,7 @@ class _RSSFeedHomePageState extends State<RSSFeedHomePage>
11211121
mainAxisSize:
11221122
MainAxisSize
11231123
.min,
1124-
children: <
1125-
Widget>[
1124+
children: <Widget>[
11261125
TextFormField(
11271126
controller:
11281127
directoryController,

pubspec.yaml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ environment:
2323
dependencies:
2424
flutter:
2525
sdk: flutter
26-
26+
flutter_localizations:
27+
sdk: flutter
2728
# The following adds the Cupertino Icons font to your application.
2829
# Use with the CupertinoIcons class for iOS style icons.
2930
# flutter pub run build_runner watch --delete-conflicting-outputs
@@ -33,7 +34,7 @@ dependencies:
3334
chewie: ^1.2.2
3435
dio: ^4.0.0
3536
duration: ^3.0.6
36-
expansion_tile_card: ^2.0.0
37+
expansion_tile_card: ^3.0.0
3738
flutter_keyboard_visibility: ^5.0.3
3839
flutter_svg: ^0.22.0
3940
flutter_slidable: ^0.6.0
@@ -42,7 +43,6 @@ dependencies:
4243
file_picker: ^3.0.4
4344
focused_menu: ^1.0.5
4445
font_awesome_flutter: ^9.1.0
45-
google_fonts: ^2.1.0
4646
hidden_drawer_menu: ^3.0.0
4747
http: ^0.13.3
4848
json_annotation: ^4.1.0
@@ -59,7 +59,6 @@ dependencies:
5959
url_launcher: ^6.0.12
6060
optimize_battery: ^0.0.4
6161
smooth_page_indicator: ^1.0.0+2
62-
awesome_notifications: ^0.7.0-beta.1
6362
uri_to_file: ^0.2.0
6463
bottom_sheet: ^3.1.1
6564
contained_tab_bar_view: ^0.8.0
@@ -69,16 +68,19 @@ dependencies:
6968
bloc: ^8.1.2
7069
flutter_bloc: ^8.1.3
7170
equatable: ^2.0.5
71+
google_fonts: ^4.0.4
72+
awesome_notifications: ^0.7.4+1
7273

7374
dependency_overrides:
7475
meta: ^1.7.0
7576
analyzer: ^3.0.0
77+
intl: ^0.18.0
7678

7779
dev_dependencies:
7880
build_runner: ^2.1.1
79-
json_serializable: ^5.0.0
8081
flutter_test:
8182
sdk: flutter
83+
json_serializable: ^6.7.0
8284
bloc_test: ^9.1.3
8385
mocktail: ^0.3.0
8486

@@ -91,7 +93,7 @@ flutter:
9193
# included with your application, so that you can use the icons in
9294
# the material Icons class.
9395
uses-material-design: true
94-
96+
generate: true
9597
# To add assets to your application, add an assets section, like this:
9698
assets:
9799
- assets/images/

test/widget_test/about_screen_widget_test.dart

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,27 @@
11
import 'dart:io';
2-
import 'package:flood_mobile/Blocs/bloc_provider_list.dart';
32
import 'package:flood_mobile/Pages/about_screen/about_screen.dart';
4-
import 'package:flutter_bloc/flutter_bloc.dart';
5-
63
import 'package:flutter_test/flutter_test.dart';
74
import 'package:flutter/material.dart';
85

96
void main() {
10-
setUp(() {});
7+
setUp(() {
8+
TestWidgetsFlutterBinding.ensureInitialized();
9+
});
1110
setUpAll(() => HttpOverrides.global = null);
1211
Widget createWidgetUnderTest() {
13-
return MultiBlocProvider(
14-
providers: BlocProviders.multiBlocProviders,
15-
child: MaterialApp(
16-
home: Material(
17-
child: AboutScreen(themeIndex: 2),
18-
),
12+
return MaterialApp(
13+
home: Material(
14+
child: AboutScreen(themeIndex: 2),
1915
),
2016
);
2117
}
2218

2319
group("Check different widgets in about-screen", () {
2420
testWidgets("Check if widgets displayed correctly",
2521
(WidgetTester tester) async {
26-
await tester.pumpWidget(createWidgetUnderTest());
22+
await tester.runAsync(() async {
23+
await tester.pumpWidget(createWidgetUnderTest());
24+
});
2725
expect(find.byKey(Key('App icon asset image')), findsOneWidget);
2826
expect(find.byKey(Key('release badge key')), findsOneWidget);
2927
expect(find.byKey(Key('commit badge key')), findsOneWidget);

test/widget_test/rss_feed_homepage_widget_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ void main() {
122122
findsNothing);
123123
expect(find.byKey(Key("Feeds are fetched")), findsOneWidget);
124124
expect(find.byKey(Key("Feed displayed")), findsNWidgets(2));
125-
expect(find.text("test label"), findsNWidgets(4));
125+
expect(find.text("test label"), findsNWidgets(2));
126126
expect(find.text("0 matches"), findsNWidgets(2));
127127
expect(find.text("0 Minutes"), findsNWidgets(2));
128128
expect(find.text("test url"), findsNWidgets(2));

test/widget_test/settings_screen_widget_test.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -248,9 +248,9 @@ void main() {
248248
expect(find.byKey(Key('Download Speed Dropdown')), findsOneWidget);
249249
expect(find.byKey(Key('Upload Speed Dropdown')), findsOneWidget);
250250
expect(find.text('Download'), findsOneWidget);
251-
expect(find.text('1 kB/s'), findsNWidgets(2));
251+
expect(find.text('1 kB/s'), findsOneWidget);
252252
expect(find.text('Upload'), findsOneWidget);
253-
expect(find.text('Unlimited'), findsNWidgets(2));
253+
expect(find.text('Unlimited'), findsOneWidget);
254254
expect(find.widgetWithText(ElevatedButton, 'Set'), findsOneWidget);
255255
});
256256

@@ -289,8 +289,8 @@ void main() {
289289
expect(find.text('rTorrent'), findsOneWidget);
290290
await tester.tap(find.text('rTorrent'));
291291
await tester.pumpAndSettle();
292-
expect(find.text('qBittorrent'), findsNWidgets(2));
293-
expect(find.text('Transmission'), findsNWidgets(2));
292+
expect(find.text('qBittorrent'), findsOneWidget);
293+
expect(find.text('Transmission'), findsOneWidget);
294294
await tester.tap(find.text('rTorrent').last);
295295
await tester.pumpAndSettle();
296296
expect(find.text('Socket'), findsOneWidget);
@@ -309,7 +309,7 @@ void main() {
309309
// For client qBittorrent select
310310
await tester.tap(find.text('rTorrent'));
311311
await tester.pumpAndSettle();
312-
await tester.tap(find.text('qBittorrent').last);
312+
await tester.tap(find.text('qBittorrent'));
313313
await tester.pumpAndSettle();
314314
expect(find.text('Username'), findsNWidgets(3));
315315
expect(find.text('Client Username'), findsOneWidget);
@@ -319,9 +319,9 @@ void main() {
319319
expect(find.text('eg. http://localhost:8080'), findsOneWidget);
320320

321321
// For client Transmission select
322-
await tester.tap(find.text('rTorrent'), warnIfMissed: false);
322+
await tester.tap(find.text('qBittorrent'));
323323
await tester.pumpAndSettle();
324-
await tester.tap(find.text('Transmission').last);
324+
await tester.tap(find.text('Transmission'));
325325
await tester.pumpAndSettle();
326326
expect(find.text('Username'), findsNWidgets(3));
327327
expect(find.text('Client Username'), findsOneWidget);

0 commit comments

Comments
 (0)