Skip to content

fix: 👕 update pubspec.yaml file and minimum SDK constraint #450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## [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)
- [BREAKING] Fixed [#434](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/issues/434) removed deprecated text style after Flutter 3.22 follow [migration guide](https://docs.flutter.dev/release/breaking-changes/3-19-deprecations#texttheme)
- Updated minimum support to dart sdk 2.18.0

## [2.1.1]
- Fixed [#425](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/issues/425) - Unhandled breaking change in v2.1.0
Expand Down
7 changes: 2 additions & 5 deletions example/lib/detailscreen.dart
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import 'package:example/helper.dart';
import 'package:flutter/material.dart';
import 'package:showcaseview/showcaseview.dart';

class Detail extends StatefulWidget {
const Detail({Key? key}) : super(key: key);

@override
_DetailState createState() => _DetailState();
State<Detail> createState() => _DetailState();
}

class _DetailState extends State<Detail> {
Expand All @@ -16,9 +15,7 @@ class _DetailState extends State<Detail> {
@override
void initState() {
super.initState();
//NOTE: remove ambiguate function if you are using
//flutter version greater than 3.x and direct use WidgetsBinding.instance
ambiguate(WidgetsBinding.instance)?.addPostFrameCallback(
WidgetsBinding.instance.addPostFrameCallback(
(_) => Future.delayed(const Duration(milliseconds: 200), () {
ShowCaseWidget.of(myContext!).startShowCase([_one]);
}),
Expand Down
3 changes: 0 additions & 3 deletions example/lib/helper.dart

This file was deleted.

7 changes: 2 additions & 5 deletions example/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'dart:developer';

import 'package:example/detailscreen.dart';
import 'package:example/helper.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:showcaseview/showcaseview.dart';
Expand Down Expand Up @@ -48,7 +47,7 @@ class MailPage extends StatefulWidget {
const MailPage({Key? key}) : super(key: key);

@override
_MailPageState createState() => _MailPageState();
State<MailPage> createState() => _MailPageState();
}

class _MailPageState extends State<MailPage> {
Expand All @@ -65,9 +64,7 @@ class _MailPageState extends State<MailPage> {
void initState() {
super.initState();
//Start showcase view after current widget frames are drawn.
//NOTE: remove ambiguate function if you are using
//flutter version greater than 3.x and direct use WidgetsBinding.instance
ambiguate(WidgetsBinding.instance)?.addPostFrameCallback(
WidgetsBinding.instance.addPostFrameCallback(
(_) => ShowCaseWidget.of(context)
.startShowCase([_one, _two, _three, _four, _five]),
);
Expand Down
4 changes: 2 additions & 2 deletions example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: An example application to demonstrate showcaseview package.
version: 1.0.0+1

environment:
sdk: ">=2.12.0 <3.0.0"
sdk: ">=2.18.0 <4.0.0"

publish_to: none

Expand All @@ -14,7 +14,7 @@ dependencies:
path: ../

dev_dependencies:
flutter_lints: ^1.0.4
flutter_lints: 2.0.2
flutter_test:
sdk: flutter

Expand Down
24 changes: 0 additions & 24 deletions lib/src/extension.dart

This file was deleted.

22 changes: 9 additions & 13 deletions lib/src/layout_overlays.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

import 'package:flutter/material.dart';

import 'extension.dart';
import 'showcase_widget.dart';

typedef OverlayBuilderCallback = Widget Function(
Expand Down Expand Up @@ -50,12 +49,12 @@ class AnchoredOverlay extends StatelessWidget {
final RenderObject? rootRenderObject;

const AnchoredOverlay({
Key? key,
super.key,
this.showOverlay = false,
this.overlayBuilder,
this.child,
this.rootRenderObject,
}) : super(key: key);
});

@override
Widget build(BuildContext context) {
Expand Down Expand Up @@ -120,11 +119,11 @@ class OverlayBuilder extends StatefulWidget {
final Widget? child;

const OverlayBuilder({
Key? key,
super.key,
this.showOverlay = false,
this.overlayBuilder,
this.child,
}) : super(key: key);
});

@override
State<OverlayBuilder> createState() => _OverlayBuilderState();
Expand All @@ -138,23 +137,20 @@ class _OverlayBuilderState extends State<OverlayBuilder> {
super.initState();

if (widget.showOverlay) {
ambiguate(WidgetsBinding.instance)
?.addPostFrameCallback((_) => showOverlay());
WidgetsBinding.instance.addPostFrameCallback((_) => showOverlay());
}
}

@override
void didUpdateWidget(OverlayBuilder oldWidget) {
super.didUpdateWidget(oldWidget);
ambiguate(WidgetsBinding.instance)
?.addPostFrameCallback((_) => syncWidgetAndOverlay());
WidgetsBinding.instance.addPostFrameCallback((_) => syncWidgetAndOverlay());
}

@override
void reassemble() {
super.reassemble();
ambiguate(WidgetsBinding.instance)
?.addPostFrameCallback((_) => syncWidgetAndOverlay());
WidgetsBinding.instance.addPostFrameCallback((_) => syncWidgetAndOverlay());
}

@override
Expand Down Expand Up @@ -208,8 +204,8 @@ class _OverlayBuilderState extends State<OverlayBuilder> {
}

void buildOverlay() async {
ambiguate(WidgetsBinding.instance)
?.addPostFrameCallback((_) => _overlayEntry?.markNeedsBuild());
WidgetsBinding.instance
.addPostFrameCallback((_) => _overlayEntry?.markNeedsBuild());
}

@override
Expand Down
9 changes: 3 additions & 6 deletions lib/src/measure_size.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,17 @@
import 'package:flutter/material.dart';
import 'package:flutter/scheduler.dart';

import 'extension.dart';

typedef OnWidgetSizeChange = void Function(Size? size);

class MeasureSize extends StatefulWidget {
final Widget? child;
final OnWidgetSizeChange onSizeChange;

const MeasureSize({
Key? key,
super.key,
required this.onSizeChange,
required this.child,
}) : super(key: key);
});

@override
State<MeasureSize> createState() => _MeasureSizeState();
Expand All @@ -44,8 +42,7 @@ class MeasureSize extends StatefulWidget {
class _MeasureSizeState extends State<MeasureSize> {
@override
Widget build(BuildContext context) {
ambiguate(SchedulerBinding.instance)
?.addPostFrameCallback(postFrameCallback);
SchedulerBinding.instance.addPostFrameCallback(postFrameCallback);
return Container(
key: widgetKey,
child: widget.child,
Expand Down
10 changes: 4 additions & 6 deletions lib/src/showcase.dart
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';

import 'enum.dart';
import 'extension.dart';
import 'get_position.dart';
import 'layout_overlays.dart';
import 'shape_clipper.dart';
Expand Down Expand Up @@ -428,7 +427,7 @@ class _ShowcaseState extends State<Showcase> {
}

void _scrollIntoView() {
ambiguate(WidgetsBinding.instance)?.addPostFrameCallback((timeStamp) async {
WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
setState(() => _isScrollRunning = true);
await Scrollable.ensureVisible(
widget.key.currentContext!,
Expand Down Expand Up @@ -464,14 +463,14 @@ class _ShowcaseState extends State<Showcase> {
}

void initRootWidget() {
ambiguate(WidgetsBinding.instance)?.addPostFrameCallback((_) {
WidgetsBinding.instance.addPostFrameCallback((_) {
rootWidgetSize = showCaseWidgetState.rootWidgetSize;
rootRenderObject = showCaseWidgetState.rootRenderObject;
});
}

void recalculateRootWidgetSize() {
ambiguate(WidgetsBinding.instance)?.addPostFrameCallback((_) {
WidgetsBinding.instance.addPostFrameCallback((_) {
if (!mounted) return;
final rootWidget =
context.findRootAncestorStateOfType<State<WidgetsApp>>();
Expand Down Expand Up @@ -649,7 +648,6 @@ class _TargetWidget extends StatelessWidget {
final bool disableDefaultChildGestures;

const _TargetWidget({
Key? key,
required this.offset,
required this.size,
required this.shapeBorder,
Expand All @@ -658,7 +656,7 @@ class _TargetWidget extends StatelessWidget {
this.onDoubleTap,
this.onLongPress,
this.disableDefaultChildGestures = false,
}) : super(key: key);
});

@override
Widget build(BuildContext context) {
Expand Down
7 changes: 3 additions & 4 deletions lib/src/showcase_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import 'package:flutter/material.dart';

import '../showcaseview.dart';
import 'extension.dart';

class ShowCaseWidget extends StatefulWidget {
final Builder builder;
Expand Down Expand Up @@ -157,7 +156,7 @@ class ShowCaseWidgetState extends State<ShowCaseWidget> {
}

void initRootWidget() {
ambiguate(WidgetsBinding.instance)?.addPostFrameCallback((_) {
WidgetsBinding.instance.addPostFrameCallback((_) {
final rootWidget = context.findAncestorStateOfType<State<WidgetsApp>>();
rootRenderObject = rootWidget?.context.findRenderObject() as RenderBox?;
rootWidgetSize = rootWidget == null
Expand Down Expand Up @@ -269,8 +268,8 @@ class _InheritedShowCaseView extends InheritedWidget {

const _InheritedShowCaseView({
required this.activeWidgetIds,
required Widget child,
}) : super(child: child);
required super.child,
});

@override
bool updateShouldNotify(_InheritedShowCaseView oldWidget) =>
Expand Down
14 changes: 5 additions & 9 deletions lib/src/tooltip_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,10 @@
*/

import 'dart:math';
import 'dart:ui';

import 'package:flutter/material.dart';

import 'enum.dart';
import 'extension.dart';
import 'get_position.dart';
import 'measure_size.dart';
import 'widget/tooltip_slide_transition.dart';
Expand Down Expand Up @@ -67,7 +65,7 @@ class ToolTipWidget extends StatefulWidget {
final double toolTipSlideEndDistance;

const ToolTipWidget({
Key? key,
super.key,
required this.position,
required this.offset,
required this.screenSize,
Expand Down Expand Up @@ -99,7 +97,7 @@ class ToolTipWidget extends StatefulWidget {
this.titleTextDirection,
this.descriptionTextDirection,
this.toolTipSlideEndDistance = 7,
}) : super(key: key);
});

@override
State<ToolTipWidget> createState() => _ToolTipWidgetState();
Expand Down Expand Up @@ -131,11 +129,9 @@ class _ToolTipWidgetState extends State<ToolTipWidget>
// ignore: deprecated_member_use
final EdgeInsets viewInsets = EdgeInsets.fromWindowPadding(
// ignore: deprecated_member_use
ambiguate(WidgetsBinding.instance)?.window.viewInsets ??
// ignore: deprecated_member_use
WindowPadding.zero,
WidgetsBinding.instance.window.viewInsets,
// ignore: deprecated_member_use
ambiguate(WidgetsBinding.instance)?.window.devicePixelRatio ?? 1,
WidgetsBinding.instance.window.devicePixelRatio,
);
final double actualVisibleScreenHeight =
widget.screenSize.height - viewInsets.bottom;
Expand Down Expand Up @@ -259,7 +255,7 @@ class _ToolTipWidgetState extends State<ToolTipWidget>
@override
void initState() {
super.initState();
ambiguate(WidgetsBinding.instance)?.addPostFrameCallback((_) {
WidgetsBinding.instance.addPostFrameCallback((_) {
if (widget.container != null &&
_customContainerKey.currentContext != null &&
_customContainerKey.currentContext?.size != null) {
Expand Down
6 changes: 3 additions & 3 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: showcaseview
description: A Flutter package to Showcase/Highlight widgets step by step.
version: 3.0.0
homepage: https://github.com/simformsolutions/flutter_showcaseview
issue_tracker: https://github.com/simformsolutions/flutter_showcaseview/issues
repository: https://github.com/simformsolutions/flutter_showcaseview

environment:
sdk: '>=2.12.0 <4.0.0'
sdk: '>=2.18.0 <4.0.0'

dependencies:
flutter:
Expand All @@ -14,6 +14,6 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: 1.0.4
flutter_lints: 2.0.2

flutter:
Loading