Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade flutter to version 3.27 #1113

Merged
merged 7 commits into from
Dec 22, 2024
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
2 changes: 1 addition & 1 deletion .github/composite/flutter-setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ runs:
steps:
- uses: subosito/flutter-action@v2
with:
flutter-version: '3.24.x'
flutter-version: '3.27.x'
channel: 'stable'
cache: true

Expand Down
4 changes: 2 additions & 2 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ PODS:
- firebase_core (3.8.1):
- Firebase/CoreOnly (= 11.4.0)
- Flutter
- firebase_crashlytics (4.1.5):
- firebase_crashlytics (4.2.0):
- Firebase/Crashlytics (= 11.4.0)
- firebase_core
- Flutter
Expand Down Expand Up @@ -299,7 +299,7 @@ SPEC CHECKSUMS:
Firebase: cf1b19f21410b029b6786a54e9764a0cacad3c99
firebase_analytics: 2815af29d49c1a994652abd37a5b001a88bc7b75
firebase_core: 418aed674e9a0b8b6088aec16cde82a811f6261f
firebase_crashlytics: 72a8b504422ba8bb435a7a0c0a9341320cbcbe29
firebase_crashlytics: 757e252772ed3dd37c07638f9fcd4dceb5f101c8
firebase_remote_config: 015a36be218a38943c2273d63b33bc983b3d7bb6
FirebaseABTesting: aef1719704fade00b200827e7973f352efc4caee
FirebaseAnalytics: 3feef9ae8733c567866342a1000691baaa7cad49
Expand Down
5 changes: 2 additions & 3 deletions lib/features/schedule/schedule_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ class _ScheduleViewState extends State<ScheduleView>
events: events,
backgroundColor: (date.month == DateTime.now().month)
? backgroundColor.withAlpha(128)
: Colors.grey.withOpacity(0.1),
: Colors.grey.withValues(alpha: .1),
),
);
}
Expand Down Expand Up @@ -387,7 +387,7 @@ class _ScheduleViewState extends State<ScheduleView>
padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 10),
decoration: BoxDecoration(
color: date.withoutTime == DateTime.now().withoutTime
? AppTheme.etsLightRed.withOpacity(indicatorColorOpacity)
? AppTheme.etsLightRed.withValues(alpha: indicatorColorOpacity)
: Colors.transparent,
borderRadius: BorderRadius.circular(6.0)),
child: Flex(
Expand Down Expand Up @@ -455,7 +455,6 @@ class _ScheduleViewState extends State<ScheduleView>
selectedDayPredicate: (day) {
return isSameDay(model.daySelected, day);
},
weekendDays: const [],
headerStyle: HeaderStyle(
titleTextFormatter: (date, locale) => DateFormat.MMMMEEEEd(locale).format(model.daySelected),
titleCentered: true, formatButtonVisible: false),
Expand Down
4 changes: 3 additions & 1 deletion lib/features/schedule/schedule_viewmodel.dart
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,9 @@ class ScheduleViewModel extends FutureViewModel<List<CourseActivity>> {
if (listOfSchedules.isEmpty ||
!listOfSchedules.any((element) =>
element.activityCode == ActivityCode.labGroupA ||
element.activityCode == ActivityCode.labGroupB)) return;
element.activityCode == ActivityCode.labGroupB)) {
return;
}

setBusy(true);
scheduleActivitiesByCourse.clear();
Expand Down
4 changes: 1 addition & 3 deletions lib/features/schedule/widgets/schedule_settings.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class ScheduleSettings extends StatefulWidget {
}

class _ScheduleSettingsState extends State<ScheduleSettings> {
final Color selectedColor = AppTheme.etsLightRed.withOpacity(0.5);
final Color selectedColor = AppTheme.etsLightRed.withValues(alpha: .5);

@override
Widget build(BuildContext context) => ViewModelBuilder.reactive(
Expand Down Expand Up @@ -268,8 +268,6 @@ class _ScheduleSettingsState extends State<ScheduleSettings> {
return AppIntl.of(context)!.schedule_settings_calendar_format_week;
case CalendarTimeFormat.day:
return AppIntl.of(context)!.schedule_settings_calendar_format_day;
default:
return AppIntl.of(context)!.schedule_settings_calendar_format_day;
}
}

Expand Down
Loading
Loading