Merge pull request #116 from borisbonchev/fix_dependencies_error_on_s…

…table fix: updating deprecated ThemeData textStyles
MariaMelnik · May 30, 2024 · a5f09af · a5f09af
2 parents c69f1fb + 1edb1f0
commit a5f09af
Show file tree

Hide file tree

Showing 15 changed files with 221 additions and 119 deletions.
diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+# This is a generated file; do not edit or check into version control.
+export "FLUTTER_ROOT=/home/borisbonchev/snap/flutter/common/flutter"
+export "FLUTTER_APPLICATION_PATH=/home/borisbonchev/dev/flutter_date_pickers/example"
+export "COCOAPODS_PARALLEL_CODE_SIGN=true"
+export "FLUTTER_TARGET=lib/main.dart"
+export "FLUTTER_BUILD_DIR=build"
+export "FLUTTER_BUILD_NAME=1.0.0"
+export "FLUTTER_BUILD_NUMBER=1"
+export "DART_OBFUSCATION=false"
+export "TRACK_WIDGET_CREATION=true"
+export "TREE_SHAKE_ICONS=false"
+export "PACKAGE_CONFIG=.dart_tool/package_config.json"
diff --git a/example/lib/date_pickers_widgets/day_picker_page.dart b/example/lib/date_pickers_widgets/day_picker_page.dart
@@ -44,7 +44,7 @@ class _DayPickerPageState extends State<DayPickerPage> {
     dp.DatePickerRangeStyles styles = dp.DatePickerRangeStyles(
       selectedDateStyle: Theme.of(context)
           .textTheme
-          .bodyText1
+          .bodyLarge
           ?.copyWith(color: selectedDateStyleColor),
       selectedSingleDateDecoration: BoxDecoration(
         color: selectedSingleDateDecorationColor,
@@ -88,7 +88,7 @@ class _DayPickerPageState extends State<DayPickerPage> {
               children: <Widget>[
                 Text(
                   "Selected date styles",
-                  style: Theme.of(context).textTheme.subtitle1,
+                  style: Theme.of(context).textTheme.titleMedium,
                 ),
                 Padding(
                   padding: const EdgeInsets.symmetric(vertical: 12.0),

diff --git a/example/lib/date_pickers_widgets/days_picker_page.dart b/example/lib/date_pickers_widgets/days_picker_page.dart
@@ -52,7 +52,7 @@ class _DaysPickerPageState extends State<DaysPickerPage> {
     dp.DatePickerRangeStyles styles = dp.DatePickerRangeStyles(
         selectedDateStyle: Theme.of(context)
             .textTheme
-            .bodyText1
+            .bodyLarge
             ?.copyWith(color: selectedDateStyleColor),
         selectedSingleDateDecoration: BoxDecoration(
             color: selectedSingleDateDecorationColor, shape: BoxShape.circle));
@@ -86,7 +86,7 @@ class _DaysPickerPageState extends State<DaysPickerPage> {
               children: <Widget>[
                 Text(
                   "Selected date styles",
-                  style: Theme.of(context).textTheme.subtitle1,
+                  style: Theme.of(context).textTheme.titleMedium,
                 ),
                 Padding(
                   padding: const EdgeInsets.symmetric(vertical: 12.0),

diff --git a/example/lib/date_pickers_widgets/month_picker_page.dart b/example/lib/date_pickers_widgets/month_picker_page.dart
@@ -32,7 +32,7 @@ class _MonthPickerPageState extends State<MonthPickerPage> {
     dp.DatePickerStyles styles = dp.DatePickerStyles(
         selectedDateStyle: Theme.of(context)
             .textTheme
-            .bodyText1
+            .bodyLarge
             ?.copyWith(color: selectedDateStyleColor),
         selectedSingleDateDecoration: BoxDecoration(
             color: selectedSingleDateDecorationColor, shape: BoxShape.circle));
@@ -60,7 +60,7 @@ class _MonthPickerPageState extends State<MonthPickerPage> {
               children: <Widget>[
                 Text(
                   "Selected date styles",
-                  style: Theme.of(context).textTheme.subtitle1,
+                  style: Theme.of(context).textTheme.titleMedium,
                 ),
                 Padding(
                   padding: const EdgeInsets.symmetric(vertical: 12.0),

diff --git a/example/lib/date_pickers_widgets/months_picker_page.dart b/example/lib/date_pickers_widgets/months_picker_page.dart
@@ -32,7 +32,7 @@ class _MonthsPickerPageState extends State<MonthsPickerPage> {
     dp.DatePickerStyles styles = dp.DatePickerStyles(
         selectedDateStyle: Theme.of(context)
             .textTheme
-            .bodyText1
+            .bodyLarge
             ?.copyWith(color: selectedDateStyleColor),
         selectedSingleDateDecoration: BoxDecoration(
             color: selectedSingleDateDecorationColor, shape: BoxShape.circle));
@@ -60,7 +60,7 @@ class _MonthsPickerPageState extends State<MonthsPickerPage> {
               children: <Widget>[
                 Text(
                   "Selected date styles",
-                  style: Theme.of(context).textTheme.subtitle1,
+                  style: Theme.of(context).textTheme.titleMedium,
                 ),
                 Padding(
                   padding: const EdgeInsets.symmetric(vertical: 12.0),

diff --git a/example/lib/date_pickers_widgets/range_picker_page.dart b/example/lib/date_pickers_widgets/range_picker_page.dart
@@ -87,7 +87,7 @@ class _RangePickerPageState extends State<RangePickerPage> {
               children: <Widget>[
                 Text(
                   "Selected date styles",
-                  style: Theme.of(context).textTheme.subtitle1,
+                  style: Theme.of(context).textTheme.titleMedium,
                 ),
                 _stylesBlock(),
                 _selectedBlock()

diff --git a/example/lib/date_pickers_widgets/range_picker_styled.dart b/example/lib/date_pickers_widgets/range_picker_styled.dart
@@ -113,7 +113,7 @@ class _RangePickerPageStyledState extends State<RangePickerPageStyled> {
               children: <Widget>[
                 Text(
                   "Selected date styles",
-                  style: Theme.of(context).textTheme.subtitle1,
+                  style: Theme.of(context).textTheme.titleMedium,
                 ),
                 _selectedBlock()
               ],

diff --git a/example/lib/date_pickers_widgets/week_picker_page.dart b/example/lib/date_pickers_widgets/week_picker_page.dart
@@ -81,7 +81,7 @@ class _WeekPickerPageState extends State<WeekPickerPage> {
               children: <Widget>[
                 Text(
                   "Selected date styles",
-                  style: Theme.of(context).textTheme.subtitle1,
+                  style: Theme.of(context).textTheme.titleMedium,
                 ),
                 _stylesBlock(),
                 _selectedBlock()
@@ -222,7 +222,7 @@ class _WeekPickerPageState extends State<WeekPickerPage> {
         borderRadius: BorderRadius.all(Radius.circular(3.0)));
 
     TextStyle? whiteText =
-        Theme.of(context).textTheme.bodyText2?.copyWith(color: Colors.white);
+        Theme.of(context).textTheme.bodyMedium?.copyWith(color: Colors.white);
 
     return isEventDate
         ? EventDecoration(boxDecoration: roundedBorder, textStyle: whiteText)

diff --git a/example/lib/date_pickers_widgets/year_picker_page.dart b/example/lib/date_pickers_widgets/year_picker_page.dart
@@ -32,7 +32,7 @@ class _YearPickerPageState extends State<YearPickerPage> {
     dp.DatePickerStyles styles = dp.DatePickerStyles(
         selectedDateStyle: Theme.of(context)
             .textTheme
-            .bodyText1
+            .bodyLarge
             ?.copyWith(color: selectedDateStyleColor),
         selectedSingleDateDecoration: BoxDecoration(
             color: selectedSingleDateDecorationColor, shape: BoxShape.circle));
@@ -60,7 +60,7 @@ class _YearPickerPageState extends State<YearPickerPage> {
               children: <Widget>[
                 Text(
                   "Selected date styles",
-                  style: Theme.of(context).textTheme.subtitle1,
+                  style: Theme.of(context).textTheme.titleMedium,
                 ),
                 Padding(
                   padding: const EdgeInsets.symmetric(vertical: 12.0),

diff --git a/example/lib/date_pickers_widgets/years_picker_page.dart b/example/lib/date_pickers_widgets/years_picker_page.dart
@@ -32,7 +32,7 @@ class _YearsPickerPageState extends State<YearsPickerPage> {
     dp.DatePickerStyles styles = dp.DatePickerStyles(
         selectedDateStyle: Theme.of(context)
             .textTheme
-            .bodyText1
+            .bodyLarge
             ?.copyWith(color: selectedDateStyleColor),
         selectedSingleDateDecoration: BoxDecoration(
             color: selectedSingleDateDecorationColor, shape: BoxShape.circle));
@@ -60,7 +60,7 @@ class _YearsPickerPageState extends State<YearsPickerPage> {
               children: <Widget>[
                 Text(
                   "Selected date styles",
-                  style: Theme.of(context).textTheme.subtitle1,
+                  style: Theme.of(context).textTheme.titleMedium,
                 ),
                 Padding(
                   padding: const EdgeInsets.symmetric(vertical: 12.0),

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -92,7 +92,7 @@ class _MyHomePageState extends State<MyHomePage> with TickerProviderStateMixin {
         data: Theme.of(context).copyWith(
             canvasColor: Colors.blueGrey,
             textTheme: Theme.of(context).textTheme.copyWith(
-                caption: TextStyle(color: Colors.white.withOpacity(0.5)))),
+                bodySmall: TextStyle(color: Colors.white.withOpacity(0.5)))),
         child: BottomNavigationBar(
           type: BottomNavigationBarType.fixed,
           items: [