Skip to content

Commit bd7b8f1

Browse files
committed
chore: Migrate to flutter 3.47.0
- Run `dart fix --apply --code=migrate_design_widgets` - Use `AppLocalizations.localizationsDelegates` To be merged, `google_fonts` package needs to support it. See flutter/flutter#191067
1 parent 6857080 commit bd7b8f1

67 files changed

Lines changed: 233 additions & 285 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎android/app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ if (keystorePropertiesFile.exists()) {
3030
android {
3131
namespace = "fr.vareversat.chabo"
3232

33-
ndkVersion = "28.2.13676358"
34-
compileSdkVersion 36
33+
ndkVersion = flutter.ndkVersion
34+
compileSdkVersion flutter.compileSdkVersion
3535

3636
lintOptions {
3737
disable 'InvalidPackage'
@@ -48,7 +48,7 @@ android {
4848
multiDexEnabled true // https://pub.dev/packages/flutter_local_notifications/
4949
applicationId "fr.vareversat.chabo"
5050
minSdkVersion flutter.minSdkVersion
51-
targetSdkVersion 36
51+
targetSdkVersion flutter.targetSdkVersion
5252
versionCode flutterVersionCode.toInteger()
5353
versionName flutterVersionName
5454
}

‎lib/app_theme.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:flutter/material.dart';
1+
import 'package:material_ui/material_ui.dart';
22
import 'package:google_fonts/google_fonts.dart';
33

44
class MaterialTheme {

‎lib/bloc/notification/notification_bloc.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'package:chabo_app/models/abstract_forecast.dart';
88
import 'package:chabo_app/models/enums/day.dart';
99
import 'package:chabo_app/service/notification_service.dart';
1010
import 'package:chabo_app/service/storage_service.dart';
11-
import 'package:flutter/material.dart';
11+
import 'package:material_ui/material_ui.dart';
1212
import 'package:flutter/services.dart';
1313
import 'package:flutter_bloc/flutter_bloc.dart';
1414

‎lib/bloc/status/status_bloc.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'package:chabo_app/extensions/string_extension.dart';
55
import 'package:chabo_app/l10n/app_localizations.dart';
66
import 'package:chabo_app/models/abstract_forecast.dart';
77
import 'package:equatable/equatable.dart';
8-
import 'package:flutter/material.dart';
8+
import 'package:material_ui/material_ui.dart';
99
import 'package:flutter_bloc/flutter_bloc.dart';
1010
import 'package:intl/intl.dart';
1111

‎lib/bloc/theme/theme_bloc.dart‎

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'package:chabo_app/const.dart';
55
import 'package:chabo_app/models/enums/theme_state_status.dart';
66
import 'package:chabo_app/service/storage_service.dart';
77
import 'package:equatable/equatable.dart';
8-
import 'package:flutter/material.dart';
8+
import 'package:material_ui/material_ui.dart';
99
import 'package:flutter/scheduler.dart';
1010
import 'package:flutter_bloc/flutter_bloc.dart';
1111

@@ -89,9 +89,8 @@ class ThemeBloc extends Bloc<ThemeEvent, ThemeState> {
8989
themeData: _getCorrectThemeForSystem(),
9090
imagePath: _getCorrectImageData(ThemeStateStatus.system).path,
9191
imageCredits: _getCorrectImageData(ThemeStateStatus.system).credits,
92-
imageCreditsLink: _getCorrectImageData(
93-
ThemeStateStatus.system,
94-
).creditsLink,
92+
imageCreditsLink: _getCorrectImageData(ThemeStateStatus.system)
93+
.creditsLink,
9594
),
9695
);
9796
} else {
@@ -102,9 +101,8 @@ class ThemeBloc extends Bloc<ThemeEvent, ThemeState> {
102101
themeData: theme.light(),
103102
imagePath: _getCorrectImageData(ThemeStateStatus.light).path,
104103
imageCredits: _getCorrectImageData(ThemeStateStatus.light).credits,
105-
imageCreditsLink: _getCorrectImageData(
106-
ThemeStateStatus.light,
107-
).creditsLink,
104+
imageCreditsLink: _getCorrectImageData(ThemeStateStatus.light)
105+
.creditsLink,
108106
),
109107
);
110108
} else if (savedStatus == ThemeStateStatus.dark) {
@@ -114,9 +112,8 @@ class ThemeBloc extends Bloc<ThemeEvent, ThemeState> {
114112
themeData: theme.dark(),
115113
imagePath: _getCorrectImageData(ThemeStateStatus.dark).path,
116114
imageCredits: _getCorrectImageData(ThemeStateStatus.dark).credits,
117-
imageCreditsLink: _getCorrectImageData(
118-
ThemeStateStatus.dark,
119-
).creditsLink,
115+
imageCreditsLink: _getCorrectImageData(ThemeStateStatus.dark)
116+
.creditsLink,
120117
),
121118
);
122119
} else if (savedStatus == ThemeStateStatus.system) {
@@ -126,9 +123,8 @@ class ThemeBloc extends Bloc<ThemeEvent, ThemeState> {
126123
themeData: _getCorrectThemeForSystem(),
127124
imagePath: _getCorrectImageData(ThemeStateStatus.system).path,
128125
imageCredits: _getCorrectImageData(ThemeStateStatus.system).credits,
129-
imageCreditsLink: _getCorrectImageData(
130-
ThemeStateStatus.system,
131-
).creditsLink,
126+
imageCreditsLink: _getCorrectImageData(ThemeStateStatus.system)
127+
.creditsLink,
132128
),
133129
);
134130
}
@@ -147,9 +143,8 @@ class ThemeBloc extends Bloc<ThemeEvent, ThemeState> {
147143
themeData: theme.light(),
148144
imagePath: _getCorrectImageData(ThemeStateStatus.light).path,
149145
imageCredits: _getCorrectImageData(ThemeStateStatus.light).credits,
150-
imageCreditsLink: _getCorrectImageData(
151-
ThemeStateStatus.light,
152-
).creditsLink,
146+
imageCreditsLink: _getCorrectImageData(ThemeStateStatus.light)
147+
.creditsLink,
153148
),
154149
);
155150
} else if (event.status == ThemeStateStatus.dark) {
@@ -159,9 +154,8 @@ class ThemeBloc extends Bloc<ThemeEvent, ThemeState> {
159154
themeData: theme.dark(),
160155
imagePath: _getCorrectImageData(ThemeStateStatus.dark).path,
161156
imageCredits: _getCorrectImageData(ThemeStateStatus.dark).credits,
162-
imageCreditsLink: _getCorrectImageData(
163-
ThemeStateStatus.dark,
164-
).creditsLink,
157+
imageCreditsLink: _getCorrectImageData(ThemeStateStatus.dark)
158+
.creditsLink,
165159
),
166160
);
167161
} else if (event.status == ThemeStateStatus.system) {
@@ -171,9 +165,8 @@ class ThemeBloc extends Bloc<ThemeEvent, ThemeState> {
171165
themeData: _getCorrectThemeForSystem(),
172166
imagePath: _getCorrectImageData(ThemeStateStatus.system).path,
173167
imageCredits: _getCorrectImageData(ThemeStateStatus.system).credits,
174-
imageCreditsLink: _getCorrectImageData(
175-
ThemeStateStatus.system,
176-
).creditsLink,
168+
imageCreditsLink: _getCorrectImageData(ThemeStateStatus.system)
169+
.creditsLink,
177170
),
178171
);
179172
}

‎lib/chabo.dart‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ import 'package:chabo_app/models/enums/time_format.dart';
1111
import 'package:chabo_app/service/notification_service.dart';
1212
import 'package:chabo_app/service/storage_service.dart';
1313
import 'package:chabo_app/widgets/nav_bar.dart';
14-
import 'package:flutter/material.dart';
14+
import 'package:material_ui/material_ui.dart';
1515
import 'package:flutter/services.dart';
1616
import 'package:flutter_bloc/flutter_bloc.dart';
17-
import 'package:flutter_localizations/flutter_localizations.dart';
1817
import 'package:sentry_flutter/sentry_flutter.dart';
1918

2019
import 'screens/main_screen.dart';
@@ -106,12 +105,7 @@ class Chabo extends StatelessWidget {
106105
SentryNavigatorObserver(setRouteNameAsTransaction: true),
107106
],
108107
home: const MainScreen(),
109-
localizationsDelegates: const [
110-
AppLocalizations.delegate,
111-
GlobalMaterialLocalizations.delegate,
112-
GlobalWidgetsLocalizations.delegate,
113-
GlobalCupertinoLocalizations.delegate,
114-
],
108+
localizationsDelegates: AppLocalizations.localizationsDelegates,
115109
supportedLocales: const [
116110
Locale('en', ''),
117111
Locale('fr', ''),

‎lib/const.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:chabo_app/models/enums/day.dart';
22
import 'package:chabo_app/models/enums/time_format.dart';
33
import 'package:chabo_app/models/time_slot.dart';
44
import 'package:chabo_app/models/web_link_icon.dart';
5-
import 'package:flutter/material.dart';
5+
import 'package:material_ui/material_ui.dart';
66
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
77

88
class Const {

‎lib/dialogs/credits_dialog.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:chabo_app/custom_properties.dart';
22
import 'package:chabo_app/l10n/app_localizations.dart';
3-
import 'package:flutter/material.dart';
3+
import 'package:material_ui/material_ui.dart';
44
import 'package:url_launcher/url_launcher_string.dart';
55

66
class CreditsDialog extends StatelessWidget {

‎lib/dialogs/days_of_the_week_dialog.dart‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import 'package:chabo_app/custom_properties.dart';
44
import 'package:chabo_app/extensions/time_of_day_extension.dart';
55
import 'package:chabo_app/l10n/app_localizations.dart';
66
import 'package:chabo_app/models/enums/day.dart';
7-
import 'package:flutter/material.dart';
7+
import 'package:material_ui/material_ui.dart';
88
import 'package:flutter_bloc/flutter_bloc.dart';
99

1010
class DaysOfTheWeekDialog extends StatelessWidget {
@@ -34,9 +34,8 @@ class DaysOfTheWeekDialog extends StatelessWidget {
3434
borderRadius: BorderRadius.circular(12.0),
3535
onChanged: (Day? value) {
3636
if (value != null) {
37-
BlocProvider.of<NotificationBloc>(
38-
context,
39-
).add(DayNotificationValueEvent(day: value));
37+
BlocProvider.of<NotificationBloc>(context)
38+
.add(DayNotificationValueEvent(day: value));
4039
}
4140
},
4241
value: state.dayNotificationValue,

‎lib/dialogs/time_slot_dialog.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'package:chabo_app/extensions/time_of_day_extension.dart';
55
import 'package:chabo_app/l10n/app_localizations.dart';
66
import 'package:chabo_app/models/enums/time_format.dart';
77
import 'package:chabo_app/models/time_slot.dart';
8-
import 'package:flutter/material.dart';
8+
import 'package:material_ui/material_ui.dart';
99
import 'package:flutter_bloc/flutter_bloc.dart';
1010

1111
class TimeSlotDialog extends StatelessWidget {

0 commit comments

Comments
 (0)