diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e4d7ef9..5b61408a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: - uses: subosito/flutter-action@v2 with: channel: "stable" - flutter-version: 3.19.0 + flutter-version: 3.22.3 # Get flutter dependencies. - run: flutter pub get diff --git a/lib/presentation/bottom_navigator/bottom_navigator_screen.dart b/lib/presentation/bottom_navigator/bottom_navigator_screen.dart index eec9ec32..8319850d 100644 --- a/lib/presentation/bottom_navigator/bottom_navigator_screen.dart +++ b/lib/presentation/bottom_navigator/bottom_navigator_screen.dart @@ -63,6 +63,7 @@ class BottomNavigatorScreen extends StatelessWidget { body: child, bottomNavigationBar: BottomNavigationBar( key: UniqueKey(), + backgroundColor: Colors.white, currentIndex: tabRouter.activeIndex, onTap: (index) { tabRouter.setActiveIndex(index); diff --git a/lib/presentation/leaves_and_rebate/components/monthly_rebates.dart b/lib/presentation/leaves_and_rebate/components/monthly_rebates.dart index 61243d28..8a4e29c8 100644 --- a/lib/presentation/leaves_and_rebate/components/monthly_rebates.dart +++ b/lib/presentation/leaves_and_rebate/components/monthly_rebates.dart @@ -98,9 +98,15 @@ class _MonthlyRebatesState extends State { onTap: () async { DateTime? newDateTime = await showMonthPicker( context: context, - headerColor: AppTheme.primary, - selectedMonthBackgroundColor: AppTheme.primary, - unselectedMonthTextColor: AppTheme.primary, + monthPickerDialogSettings: + const MonthPickerDialogSettings( + headerSettings: PickerHeaderSettings( + headerBackgroundColor: AppTheme.primary), + buttonsSettings: PickerButtonsSettings( + selectedMonthBackgroundColor: AppTheme.primary, + unselectedMonthsTextColor: AppTheme.primary, + ), + ), confirmWidget: const Text( 'OK', style: TextStyle(color: AppTheme.primary), diff --git a/pubspec.lock b/pubspec.lock index c62c632c..04754837 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -245,18 +245,18 @@ packages: dependency: transitive description: name: device_frame - sha256: afe76182aec178d171953d9b4a50a43c57c7cf3c77d8b09a48bf30c8fa04dd9d + sha256: d031a06f5d6f4750009672db98a5aa1536aa4a231713852469ce394779a23d75 url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" device_preview: dependency: "direct main" description: name: device_preview - sha256: "2f097bf31b929e15e6756dbe0ec1bcb63952ab9ed51c25dc5a2c722d2b21fdaf" + sha256: a694acdd3894b4c7d600f4ee413afc4ff917f76026b97ab06575fe886429ef19 url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" dio: dependency: "direct main" description: @@ -665,10 +665,10 @@ packages: dependency: "direct main" description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf url: "https://pub.dev" source: hosted - version: "0.18.1" + version: "0.19.0" io: dependency: transitive description: @@ -689,42 +689,42 @@ packages: dependency: "direct main" description: name: json_annotation - sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1" url: "https://pub.dev" source: hosted - version: "4.8.1" + version: "4.9.0" json_serializable: dependency: "direct dev" description: name: json_serializable - sha256: aa1f5a8912615733e0fdc7a02af03308933c93235bdc8d50d0b0c8a8ccb0b969 + sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b url: "https://pub.dev" source: hosted - version: "6.7.1" + version: "6.8.0" leak_tracker: dependency: transitive description: name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "10.0.4" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.3" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.1" lints: dependency: transitive description: @@ -761,10 +761,10 @@ packages: dependency: transitive description: name: meta - sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.12.0" mime: dependency: transitive description: @@ -785,10 +785,10 @@ packages: dependency: "direct main" description: name: month_picker_dialog - sha256: "480a19aac8db72bd89e3a34a651ea2e9e2551424e7a22ec52a79f7ffa927c622" + sha256: f15643f5b0ae517d0e4090ad3fddcfcbf8cb936d72f936f1d5c9de9a356f073e url: "https://pub.dev" source: hosted - version: "2.11.0" + version: "5.0.0" nested: dependency: transitive description: @@ -937,10 +937,10 @@ packages: dependency: transitive description: name: provider - sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096" + sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c url: "https://pub.dev" source: hosted - version: "6.1.1" + version: "6.1.2" pub_semver: dependency: transitive description: @@ -1001,10 +1001,10 @@ packages: dependency: transitive description: name: shared_preferences - sha256: "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02" + sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180 url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.2.3" shared_preferences_android: dependency: transitive description: @@ -1150,10 +1150,10 @@ packages: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" timing: dependency: transitive description: @@ -1294,10 +1294,10 @@ packages: dependency: transitive description: name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" url: "https://pub.dev" source: hosted - version: "13.0.0" + version: "14.2.1" watcher: dependency: transitive description: @@ -1355,5 +1355,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.3.0-279.1.beta <4.0.0" - flutter: ">=3.16.6" + dart: ">=3.4.0 <4.0.0" + flutter: ">=3.22.0" diff --git a/pubspec.yaml b/pubspec.yaml index dcf59aa1..543413cc 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -25,16 +25,16 @@ dependencies: get: ^4.6.5 package_info_plus: ^5.0.1 get_it: ^7.6.0 - intl: ^0.18.0 + intl: ^0.19.0 path_provider: ^2.0.15 bloc: ^8.1.2 fluttertoast: ^8.2.2 fswitch_nullsafety: ^2.0.2 flutter_svg: ^2.0.7 google_fonts: ^6.1.0 - month_picker_dialog: ^2.0.2 + month_picker_dialog: ^5.0.0 hive: ^2.2.3 - device_preview: ^1.1.0 + device_preview: ^1.2.0 retrofit: ^4.0.1 dio: ^5.3.2 json_annotation: ^4.8.1