From e33d3bf8ce363d9031b3925e4658881a6ac7ac9a Mon Sep 17 00:00:00 2001 From: Gianluca Bettega Date: Fri, 8 Dec 2023 22:57:32 -0300 Subject: [PATCH] updated deprecations + pub --- CHANGELOG.md | 4 ++++ example/lib/main.dart | 3 +-- lib/src/month_picker_widgets/button_bar.dart | 7 +++++-- lib/src/month_picker_widgets/header/header_row.dart | 12 ++++++++---- .../header/header_selected_date.dart | 4 +++- lib/src/month_selector/month_button.dart | 4 +++- lib/src/year_selector/year_button.dart | 4 +++- pubspec.yaml | 10 +++++----- 8 files changed, 32 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1dcc447..722e68d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.3.0 - 2023-11-03 +- Removed deprecated `textScaleFactor` inside the package (the name of the parameter stays the same) +- Bumped dart to `3.0.0`,provider to `6.1.1`, intl to `0.18.1` and flutter_lints to `3.0.1` + ## 2.2.1 - 2023-11-03 - Added `textScaleFactor` property to allow controlling the scale of the texts in the widget [77](https://github.com/hmkrivoj/month_picker_dialog/pull/77). - Wrap portrait mode dialog in IntrinsicWidth to prevent oversized content [76](https://github.com/hmkrivoj/month_picker_dialog/pull/76). diff --git a/example/lib/main.dart b/example/lib/main.dart index 242188d..665af1e 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,4 +1,3 @@ -// import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:month_picker_dialog/month_picker_dialog.dart'; @@ -55,7 +54,7 @@ class _MyAppState extends State { borderRadius: BorderRadius.all( Radius.circular(20), ), - side: BorderSide(color: Colors.blue) + side: BorderSide(color: Colors.blue), ), ), ), diff --git a/lib/src/month_picker_widgets/button_bar.dart b/lib/src/month_picker_widgets/button_bar.dart index 5538426..cd89baf 100644 --- a/lib/src/month_picker_widgets/button_bar.dart +++ b/lib/src/month_picker_widgets/button_bar.dart @@ -12,6 +12,9 @@ class PickerButtonBar extends StatelessWidget { Widget build(BuildContext context) { final MaterialLocalizations localizations = MaterialLocalizations.of(context); + final TextScaler? scaler = controller.textScaleFactor != null + ? TextScaler.linear(controller.textScaleFactor!) + : null; return ButtonBar( children: [ TextButton( @@ -19,7 +22,7 @@ class PickerButtonBar extends StatelessWidget { child: controller.cancelWidget ?? Text( localizations.cancelButtonLabel, - textScaleFactor: controller.textScaleFactor, + textScaler: scaler, ), ), TextButton( @@ -27,7 +30,7 @@ class PickerButtonBar extends StatelessWidget { child: controller.confirmWidget ?? Text( localizations.okButtonLabel, - textScaleFactor: controller.textScaleFactor, + textScaler: scaler, ), ) ], diff --git a/lib/src/month_picker_widgets/header/header_row.dart b/lib/src/month_picker_widgets/header/header_row.dart index aba0e1c..f9a67fe 100644 --- a/lib/src/month_picker_widgets/header/header_row.dart +++ b/lib/src/month_picker_widgets/header/header_row.dart @@ -29,6 +29,10 @@ class HeaderRow extends StatelessWidget { final Color? arrowcolors = controller.headerTextColor ?? theme.primaryIconTheme.color; + final TextScaler? scaler = controller.textScaleFactor != null + ? TextScaler.linear(controller.textScaleFactor!) + : null; + final YearUpDownPageProvider yearProvider = Provider.of(context); final MonthUpDownPageProvider monthProvider = @@ -43,7 +47,7 @@ class HeaderRow extends StatelessWidget { DateFormat.y(localeString) .format(DateTime(monthProvider.pageLimit.upLimit)), style: headline5, - textScaleFactor: controller.textScaleFactor, + textScaler: scaler, ), ), HeaderArrows( @@ -61,18 +65,18 @@ class HeaderRow extends StatelessWidget { DateFormat.y(localeString) .format(DateTime(yearProvider.pageLimit.upLimit)), style: headline5, - textScaleFactor: controller.textScaleFactor, + textScaler: scaler, ), Text( '-', style: headline5, - textScaleFactor: controller.textScaleFactor, + textScaler: scaler, ), Text( DateFormat.y(localeString) .format(DateTime(yearProvider.pageLimit.downLimit)), style: headline5, - textScaleFactor: controller.textScaleFactor, + textScaler: scaler, ), ], ), diff --git a/lib/src/month_picker_widgets/header/header_selected_date.dart b/lib/src/month_picker_widgets/header/header_selected_date.dart index 5b85885..88b7936 100644 --- a/lib/src/month_picker_widgets/header/header_selected_date.dart +++ b/lib/src/month_picker_widgets/header/header_selected_date.dart @@ -21,7 +21,9 @@ class HeaderSelectedDate extends StatelessWidget { : DateFormat.yMMM(localeString) .format(controller.selectedDate) .toLowerCase(), - textScaleFactor: controller.textScaleFactor, + textScaler: controller.textScaleFactor != null + ? TextScaler.linear(controller.textScaleFactor!) + : null, style: controller.headerTextColor == null ? theme.primaryTextTheme.titleMedium : theme.primaryTextTheme.titleMedium! diff --git a/lib/src/month_selector/month_button.dart b/lib/src/month_selector/month_button.dart index 5e7808e..5b9f0ff 100644 --- a/lib/src/month_selector/month_button.dart +++ b/lib/src/month_selector/month_button.dart @@ -97,7 +97,9 @@ class MonthButton extends StatelessWidget { DateFormat.MMM(localeString).format(date))! : DateFormat.MMM(localeString).format(date).toLowerCase(), style: monthStyle.textStyle?.resolve({}), - textScaleFactor: controller.textScaleFactor, + textScaler: controller.textScaleFactor != null + ? TextScaler.linear(controller.textScaleFactor!) + : null, ), ), ); diff --git a/lib/src/year_selector/year_button.dart b/lib/src/year_selector/year_button.dart index cf48578..97ee923 100644 --- a/lib/src/year_selector/year_button.dart +++ b/lib/src/year_selector/year_button.dart @@ -92,7 +92,9 @@ class YearButton extends StatelessWidget { child: Text( DateFormat.y(localeString).format(DateTime(year)), style: yearStyle.textStyle?.resolve({}), - textScaleFactor: controller.textScaleFactor, + textScaler: controller.textScaleFactor != null + ? TextScaler.linear(controller.textScaleFactor!) + : null, ), ), ); diff --git a/pubspec.yaml b/pubspec.yaml index 5a273b3..951eba3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,20 +1,20 @@ name: month_picker_dialog description: Internationalized dialog for picking a single month from an infinite list of years. -version: 2.2.1 +version: 2.3.0 homepage: https://github.com/hmkrivoj/month_picker_dialog environment: - sdk: '>=2.19.2 <4.0.0' + sdk: '>=3.0.0 <4.0.0' dependencies: flutter: sdk: flutter flutter_localizations: sdk: flutter - provider: ^6.0.5 - intl: ^0.18.0 + provider: ^6.1.1 + intl: ^0.18.1 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: 2.0.1 + flutter_lints: ^3.0.1 flutter: