upgraded pub packages

2024-02-24 23:19:37 +01:00
parent ae1f3f9389
commit 25bec328fa
34 changed files with 291 additions and 194 deletions
--- a/refilc_mobile_ui/lib/pages/grades/average_selector.dart
+++ b/refilc_mobile_ui/lib/pages/grades/average_selector.dart
@@ -60,26 +60,36 @@ class AverageSelectorState extends State<AverageSelector> {
        // }
      },
      value: widget.value,
-      iconSize: 14,
-      iconEnabledColor: AppColors.of(context).text,
-      iconDisabledColor: AppColors.of(context).text,
+      iconStyleData: IconStyleData(
+        iconSize: 14,
+        iconEnabledColor: AppColors.of(context).text,
+        iconDisabledColor: AppColors.of(context).text,
+      ),
      underline: const SizedBox(),
-      itemHeight: 40,
-      itemPadding: const EdgeInsets.only(left: 14, right: 14),
-      dropdownWidth: 200,
-      dropdownPadding: null,
-      buttonDecoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(8),
+      menuItemStyleData: const MenuItemStyleData(
+        height: 40,
+        padding: EdgeInsets.only(left: 14, right: 14),
      ),
-      dropdownDecoration: BoxDecoration(
-        borderRadius: BorderRadius.circular(14),
+      buttonStyleData: ButtonStyleData(
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(8),
+        ),
+      ),
+      dropdownStyleData: DropdownStyleData(
+        width: 200,
+        padding: null,
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(14),
+        ),
+        elevation: 8,
+        scrollbarTheme: ScrollbarThemeData(
+          radius: const Radius.circular(40),
+          thickness: MaterialStateProperty.all<double>(6.0),
+          trackVisibility: MaterialStateProperty.all<bool>(true),
+          thumbVisibility: MaterialStateProperty.all<bool>(true),
+        ),
+        offset: const Offset(-10, -10),
      ),
-      dropdownElevation: 8,
-      scrollbarRadius: const Radius.circular(40),
-      scrollbarThickness: 6,
-      scrollbarAlwaysShow: true,
-      offset: const Offset(-10, -10),
-      buttonSplashColor: Colors.transparent,
      customButton: SizedBox(
        height: 30,
        child: Row(
--- a/refilc_mobile_ui/lib/pages/grades/graph.dart
+++ b/refilc_mobile_ui/lib/pages/grades/graph.dart
@@ -7,7 +7,7 @@ import 'package:refilc_kreta_api/models/grade.dart';
 import 'package:flutter/material.dart';
 import 'package:fl_chart/fl_chart.dart';
 import 'package:intl/intl.dart';
-import 'package:i18n_extension/i18n_widget.dart';
+import 'package:i18n_extension/i18n_extension.dart';
 import 'package:provider/provider.dart';
 import 'graph.i18n.dart';

--- a/refilc_mobile_ui/lib/pages/home/home_page.dart
+++ b/refilc_mobile_ui/lib/pages/home/home_page.dart
@@ -4,7 +4,7 @@ import 'dart:math';
 import 'package:refilc/api/providers/live_card_provider.dart';
 import 'package:refilc/ui/date_widget.dart';
 import 'package:refilc/utils/format.dart';
-import 'package:i18n_extension/i18n_widget.dart';
+import 'package:i18n_extension/i18n_extension.dart';
 import 'package:intl/intl.dart';
 import 'package:refilc_plus/providers/premium_provider.dart';
 import 'package:animated_list_plus/animated_list_plus.dart';
@@ -33,7 +33,6 @@ import 'package:provider/provider.dart';
 import 'home_page.i18n.dart';
 import 'package:refilc/ui/filter/widgets.dart';
 import 'package:refilc/ui/filter/sort.dart';
-import 'package:i18n_extension/i18n_extension.dart';
 // import 'package:dropdown_button2/dropdown_button2.dart';

 class HomePage extends StatefulWidget {
--- a/refilc_mobile_ui/lib/pages/home/live_card/live_card.dart
+++ b/refilc_mobile_ui/lib/pages/home/live_card/live_card.dart
@@ -10,7 +10,7 @@ import 'package:refilc/utils/format.dart';
 import 'package:refilc/api/providers/live_card_provider.dart';
 import 'package:refilc_mobile_ui/pages/home/live_card/live_card_widget.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
-import 'package:i18n_extension/i18n_widget.dart';
+import 'package:i18n_extension/i18n_extension.dart';
 import 'package:intl/intl.dart';
 import 'package:maps_launcher/maps_launcher.dart';
 import 'package:provider/provider.dart';
--- a/refilc_mobile_ui/lib/pages/messages/send_message/send_message.dart
+++ b/refilc_mobile_ui/lib/pages/messages/send_message/send_message.dart
@@ -79,27 +79,37 @@ class SendMessageSheetState extends State<SendMessageSheet> {
                      .removeWhere((e) => e.kretaId == kretaId);
                });
              },
-              iconSize: 14,
-              iconEnabledColor: AppColors.of(context).text,
-              iconDisabledColor: AppColors.of(context).text,
+              iconStyleData: IconStyleData(
+                iconSize: 14,
+                iconEnabledColor: AppColors.of(context).text,
+                iconDisabledColor: AppColors.of(context).text,
+              ),
              underline: const SizedBox(),
-              itemHeight: 40,
-              itemPadding: const EdgeInsets.only(left: 14, right: 14),
-              buttonWidth: 50,
-              dropdownWidth: 300,
-              dropdownPadding: null,
-              buttonDecoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(8),
+              menuItemStyleData: const MenuItemStyleData(
+                height: 40,
+                padding: EdgeInsets.only(left: 14, right: 14),
              ),
-              dropdownDecoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(14),
+              buttonStyleData: ButtonStyleData(
+                width: 50,
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(8),
+                ),
+              ),
+              dropdownStyleData: DropdownStyleData(
+                width: 300,
+                padding: null,
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(14),
+                ),
+                elevation: 8,
+                scrollbarTheme: ScrollbarThemeData(
+                  radius: const Radius.circular(40),
+                  thickness: MaterialStateProperty.all<double>(6.0),
+                  trackVisibility: MaterialStateProperty.all<bool>(true),
+                  thumbVisibility: MaterialStateProperty.all<bool>(true),
+                ),
+                offset: const Offset(-10, -10),
              ),
-              dropdownElevation: 8,
-              scrollbarRadius: const Radius.circular(40),
-              scrollbarThickness: 6,
-              scrollbarAlwaysShow: true,
-              offset: const Offset(-10, -10),
-              buttonSplashColor: Colors.transparent,
              customButton: Container(
                width: double.infinity,
                decoration: BoxDecoration(
--- a/refilc_mobile_ui/lib/pages/timetable/fs_timetable.dart
+++ b/refilc_mobile_ui/lib/pages/timetable/fs_timetable.dart
@@ -13,7 +13,7 @@ import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:refilc/utils/format.dart';
 import 'dart:math' as math;
 import 'package:intl/intl.dart';
-import 'package:i18n_extension/i18n_widget.dart';
+import 'package:i18n_extension/i18n_extension.dart';
 import 'package:provider/provider.dart';

 class FSTimetable extends StatefulWidget {
--- a/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart
+++ b/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart
@@ -1,5 +1,6 @@
 import 'dart:math';
 import 'package:animations/animations.dart';
+import 'package:i18n_extension/i18n_extension.dart';
 import 'package:refilc/api/providers/update_provider.dart';
 import 'package:refilc/models/settings.dart';
 // TODO: gulag calendar sync
@@ -29,7 +30,6 @@ import 'package:flutter/services.dart';
 import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:provider/provider.dart';
 import 'package:intl/intl.dart';
-import 'package:i18n_extension/i18n_widget.dart';
 import 'timetable_page.i18n.dart';

 // todo: "fix" overflow (priority: -1)