From 731a516d12606714238092dd69ed4d9cb76f39d2 Mon Sep 17 00:00:00 2001 From: Chandra Abdul Fattah Date: Tue, 14 May 2024 08:58:05 +0700 Subject: [PATCH 1/6] Fix bug --- CHANGELOG.md | 3 +++ lib/src/tooltip_widget.dart | 16 ++++------------ pubspec.yaml | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51fd8dd6..7fe26767 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## [2.1.2] +- Fixed removed deprecated text style after Flutter 3.22 for headline6 to headlineMedium and subtitle2 to labelMedium + ## [2.1.1] - Fixed [#425](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/issues/425) - Unhandled breaking change in v2.1.0 - Fixed [#428](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/issues/428) - _ShowcaseState.recalculateRootWidgetSize null value diff --git a/lib/src/tooltip_widget.dart b/lib/src/tooltip_widget.dart index efbd6ad7..b39f4d6d 100644 --- a/lib/src/tooltip_widget.dart +++ b/lib/src/tooltip_widget.dart @@ -151,16 +151,12 @@ class _ToolTipWidgetState extends State final titleStyle = widget.titleTextStyle ?? Theme.of(context) .textTheme - // TODO: replace once support for 3.1.0 and above is provided. - // ignore: deprecated_member_use - .headline6! + .headlineMedium! .merge(TextStyle(color: widget.textColor)); final descriptionStyle = widget.descTextStyle ?? Theme.of(context) .textTheme - // TODO: replace once support for 3.1.0 and above is provided. - // ignore: deprecated_member_use - .subtitle2! + .labelMedium! .merge(TextStyle(color: widget.textColor)); final titleLength = widget.title == null ? 0 @@ -458,9 +454,7 @@ class _ToolTipWidgetState extends State style: widget.titleTextStyle ?? Theme.of(context) .textTheme - // TODO: replace once support for 3.1.0 and above is provided. - // ignore: deprecated_member_use - .headline6! + .headlineMedium! .merge( TextStyle( color: widget.textColor, @@ -479,9 +473,7 @@ class _ToolTipWidgetState extends State style: widget.descTextStyle ?? Theme.of(context) .textTheme - // TODO: replace once support for 3.1.0 and above is provided. - // ignore: deprecated_member_use - .subtitle2! + .labelMedium! .merge( TextStyle( color: widget.textColor, diff --git a/pubspec.yaml b/pubspec.yaml index b9bd7f07..9ed74726 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: showcaseview description: A Flutter package to Showcase/Highlight widgets step by step. -version: 2.1.1 +version: 2.1.2 homepage: https://github.com/simformsolutions/flutter_showcaseview issue_tracker: https://github.com/simformsolutions/flutter_showcaseview/issues From 67a1ab8e0084e29ed934f0e5607b5010af394bc2 Mon Sep 17 00:00:00 2001 From: Chandra Abdul Fattah Date: Tue, 14 May 2024 09:07:43 +0700 Subject: [PATCH 2/6] Replace with headlineSmall --- CHANGELOG.md | 2 +- example/android/app/build.gradle | 2 +- lib/src/tooltip_widget.dart | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fe26767..7dc0d20b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ ## [2.1.2] -- Fixed removed deprecated text style after Flutter 3.22 for headline6 to headlineMedium and subtitle2 to labelMedium +- Fixed removed deprecated text style after Flutter 3.22 for headline6 to headlineSmall and subtitle2 to labelMedium ## [2.1.1] - Fixed [#425](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/issues/425) - Unhandled breaking change in v2.1.0 diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 1b66a242..e66f244b 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -38,7 +38,7 @@ android { defaultConfig { applicationId "com.simform.example" - minSdkVersion 16 + minSdkVersion flutter.minSdkVersion targetSdkVersion 31 versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/lib/src/tooltip_widget.dart b/lib/src/tooltip_widget.dart index b39f4d6d..ec80fe8a 100644 --- a/lib/src/tooltip_widget.dart +++ b/lib/src/tooltip_widget.dart @@ -151,7 +151,7 @@ class _ToolTipWidgetState extends State final titleStyle = widget.titleTextStyle ?? Theme.of(context) .textTheme - .headlineMedium! + .headlineSmall! .merge(TextStyle(color: widget.textColor)); final descriptionStyle = widget.descTextStyle ?? Theme.of(context) @@ -454,7 +454,7 @@ class _ToolTipWidgetState extends State style: widget.titleTextStyle ?? Theme.of(context) .textTheme - .headlineMedium! + .headlineSmall! .merge( TextStyle( color: widget.textColor, From ae8d8a327cdede529d264d1df02892fdc6161688 Mon Sep 17 00:00:00 2001 From: Chandra Abdul Fattah Date: Wed, 15 May 2024 08:20:00 +0700 Subject: [PATCH 3/6] Replace Follow migration guide --- CHANGELOG.md | 2 +- lib/src/tooltip_widget.dart | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7dc0d20b..1648cdf2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ ## [2.1.2] -- Fixed removed deprecated text style after Flutter 3.22 for headline6 to headlineSmall and subtitle2 to labelMedium +- Fixed removed deprecated text style after Flutter 3.22 follow [migration guide](https://docs.flutter.dev/release/breaking-changes/3-19-deprecations#texttheme) ## [2.1.1] - Fixed [#425](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/issues/425) - Unhandled breaking change in v2.1.0 diff --git a/lib/src/tooltip_widget.dart b/lib/src/tooltip_widget.dart index ec80fe8a..78c758e0 100644 --- a/lib/src/tooltip_widget.dart +++ b/lib/src/tooltip_widget.dart @@ -151,12 +151,12 @@ class _ToolTipWidgetState extends State final titleStyle = widget.titleTextStyle ?? Theme.of(context) .textTheme - .headlineSmall! + .titleLarge! .merge(TextStyle(color: widget.textColor)); final descriptionStyle = widget.descTextStyle ?? Theme.of(context) .textTheme - .labelMedium! + .titleSmall! .merge(TextStyle(color: widget.textColor)); final titleLength = widget.title == null ? 0 @@ -454,7 +454,7 @@ class _ToolTipWidgetState extends State style: widget.titleTextStyle ?? Theme.of(context) .textTheme - .headlineSmall! + .titleLarge! .merge( TextStyle( color: widget.textColor, @@ -473,7 +473,7 @@ class _ToolTipWidgetState extends State style: widget.descTextStyle ?? Theme.of(context) .textTheme - .labelMedium! + .titleSmall! .merge( TextStyle( color: widget.textColor, From b13fef030022f89f07ae4beb9e84486e7c3caa7c Mon Sep 17 00:00:00 2001 From: Chandra Abdul Fattah Date: Fri, 31 May 2024 09:04:35 +0700 Subject: [PATCH 4/6] Update pubspec.yaml --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 9ed74726..9c8ff4a6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: showcaseview description: A Flutter package to Showcase/Highlight widgets step by step. -version: 2.1.2 +version: 3.0.0 homepage: https://github.com/simformsolutions/flutter_showcaseview issue_tracker: https://github.com/simformsolutions/flutter_showcaseview/issues From ebbc526cf595a2b0becdca583a311c2a77333f73 Mon Sep 17 00:00:00 2001 From: Chandra Abdul Fattah Date: Fri, 31 May 2024 09:04:55 +0700 Subject: [PATCH 5/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1648cdf2..cb9f6b8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## [2.1.2] +## [3.0.0] - Fixed removed deprecated text style after Flutter 3.22 follow [migration guide](https://docs.flutter.dev/release/breaking-changes/3-19-deprecations#texttheme) ## [2.1.1] From 3b06c4f45f71a3fc7c3de425763bc399cbe84254 Mon Sep 17 00:00:00 2001 From: Chandra Abdul Fattah Date: Fri, 31 May 2024 09:05:58 +0700 Subject: [PATCH 6/6] Update build.gradle --- example/android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index e66f244b..1b66a242 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -38,7 +38,7 @@ android { defaultConfig { applicationId "com.simform.example" - minSdkVersion flutter.minSdkVersion + minSdkVersion 16 targetSdkVersion 31 versionCode flutterVersionCode.toInteger() versionName flutterVersionName