Skip to content

Commit 3ccb46f

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # lib/src/showcase.dart
2 parents 9addc09 + 772b28c commit 3ccb46f

25 files changed

Lines changed: 1783 additions & 568 deletions

‎CHANGELOG.md‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,35 @@
1+
## [4.0.0] (unreleased)
2+
- [BREAKING] Fixed [#457](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/issues/457) titleAlignment property does not work
3+
- Feature ✨: Added Action widget for tooltip
4+
- Feature [#475](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/issues/475) - Add
5+
feasibility to change margin of tooltip with `toolTipMargin`.
6+
- Feature [#478](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/issues/478) - Added
7+
feasibility to change auto scroll widget alignment `scrollAlignment`.
8+
9+
## [3.0.0]
10+
- [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)
11+
- Updated minimum support to dart sdk 2.18.0
12+
- Fixed [#449](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/issues/449) - Null check operator used on a null value
13+
- [BREAKING] Improvement [#400](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/issues/400) - remove Builder widget
14+
- Fixed [#435](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/issues/435) - Extra padding when add targetShapeBorder
15+
16+
## [2.1.1]
17+
- Fixed [#425](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/issues/425) - Unhandled breaking change in v2.1.0
18+
- Fixed [#428](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/issues/428) - _ShowcaseState.recalculateRootWidgetSize null value
19+
20+
## [2.1.0]
21+
- Feature [#420](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/pull/420) - Dart SDK Upgrade
22+
- Fixed [#419](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/pull/419) - Suppress Text Scale Factor Warning
23+
- Improvement [#413](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/pull/413) - Improved `Showcase` class
24+
- Fixed [#369](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/pull/369) - Fixed ToolTip Slide Transition
25+
- Fixed [#388](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/issues/388) - Can't scroll horizontal list with showcase
26+
- Fixed [#366](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/issues/366) - Null check operator used on a null value
27+
- Fixed [#389](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/issues/389) - Ignore extra `_nextIfAny` function operations
28+
- Fixed [#409](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/pull/409) - Fixed target hit area.
29+
- Improvement [#370](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/pull/370) - Improved `GetPosition` class.
30+
- Feature [#387](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/issues/387) - Provided barrier click disable functionality for a particular showcase.
31+
- Fixed [#383](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/issues/383) - Targeted widget focusing issue when we applying size constraint on root widget(MaterialApp).
32+
133
## [2.0.3]
234
- Feature [#148](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/issues/148) - Add feasibility to add `textDirection` of `title` and `description`.
335
- Feature [#272](https://github.com/SimformSolutionsPvtLtd/flutter_showcaseview/issues/272) - Add barrier click callback.

‎README.md‎

Lines changed: 142 additions & 95 deletions
Large diffs are not rendered by default.

‎analysis_options.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@ analyzer:
1414
linter:
1515
rules:
1616
public_member_api_docs: false
17-
avoid_returning_null: false
1817
avoid_print: true
1918
avoid_empty_else: true
2019
annotate_overrides: true
2120
cancel_subscriptions: true
2221
close_sinks: true
2322
avoid_positional_boolean_parameters: false
2423
use_super_parameters: true
25-
prefer_relative_imports: true
24+
prefer_relative_imports: true

‎example/android/app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
2626
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2727

2828
android {
29-
compileSdkVersion 31
29+
compileSdkVersion 34
3030

3131
sourceSets {
3232
main.java.srcDirs += 'src/main/kotlin'
@@ -38,8 +38,8 @@ android {
3838

3939
defaultConfig {
4040
applicationId "com.simform.example"
41-
minSdkVersion 16
42-
targetSdkVersion 31
41+
minSdkVersion flutter.minSdkVersion
42+
targetSdkVersion 33
4343
versionCode flutterVersionCode.toInteger()
4444
versionName flutterVersionName
4545
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

‎example/android/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
buildscript {
2-
ext.kotlin_version = '1.4.32'
2+
ext.kotlin_version = '1.7.10'
33
repositories {
44
google()
55
jcenter()
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.3'
9+
classpath 'com.android.tools.build:gradle:7.3.0'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}
@@ -26,6 +26,6 @@ subprojects {
2626
project.evaluationDependsOn(':app')
2727
}
2828

29-
task clean(type: Delete) {
29+
tasks.register("clean", Delete) {
3030
delete rootProject.buildDir
3131
}

‎example/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

‎example/lib/detailscreen.dart‎

Lines changed: 80 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import 'package:example/helper.dart';
21
import 'package:flutter/material.dart';
32
import 'package:showcaseview/showcaseview.dart';
43

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

87
@override
9-
_DetailState createState() => _DetailState();
8+
State<Detail> createState() => _DetailState();
109
}
1110

1211
class _DetailState extends State<Detail> {
@@ -16,9 +15,7 @@ class _DetailState extends State<Detail> {
1615
@override
1716
void initState() {
1817
super.initState();
19-
//NOTE: remove ambiguate function if you are using
20-
//flutter version greater than 3.x and direct use WidgetsBinding.instance
21-
ambiguate(WidgetsBinding.instance)?.addPostFrameCallback(
18+
WidgetsBinding.instance.addPostFrameCallback(
2219
(_) => Future.delayed(const Duration(milliseconds: 200), () {
2320
ShowCaseWidget.of(myContext!).startShowCase([_one]);
2421
}),
@@ -28,97 +25,93 @@ class _DetailState extends State<Detail> {
2825
@override
2926
Widget build(BuildContext context) {
3027
return ShowCaseWidget(
31-
builder: Builder(
32-
builder: (context) {
33-
myContext = context;
34-
return Scaffold(
35-
appBar: AppBar(
36-
backgroundColor: Colors.transparent,
37-
elevation: 0,
38-
leading: IconButton(
39-
icon: const Icon(
40-
Icons.arrow_back,
41-
color: Colors.black,
42-
),
43-
onPressed: () {
44-
Navigator.pop(context);
45-
},
28+
builder: (context) {
29+
myContext = context;
30+
return Scaffold(
31+
appBar: AppBar(
32+
backgroundColor: Colors.transparent,
33+
elevation: 0,
34+
leading: IconButton(
35+
icon: const Icon(
36+
Icons.arrow_back,
37+
color: Colors.black,
4638
),
39+
onPressed: () {
40+
Navigator.pop(context);
41+
},
4742
),
48-
body: Padding(
49-
padding: const EdgeInsets.all(16),
50-
child: ListView(
51-
children: <Widget>[
52-
Showcase(
53-
key: _one,
54-
title: 'Title',
55-
description: 'Desc',
56-
child: InkWell(
57-
onTap: () {},
58-
child: const Text(
59-
'Flutter Notification',
60-
style: TextStyle(
61-
fontSize: 25,
62-
fontWeight: FontWeight.w600,
63-
),
43+
),
44+
body: Padding(
45+
padding: const EdgeInsets.all(16),
46+
child: ListView(
47+
children: <Widget>[
48+
Showcase(
49+
key: _one,
50+
title: 'Title',
51+
description: 'Desc',
52+
child: InkWell(
53+
onTap: () {},
54+
child: const Text(
55+
'Flutter Notification',
56+
style: TextStyle(
57+
fontSize: 25,
58+
fontWeight: FontWeight.w600,
6459
),
6560
),
6661
),
67-
const SizedBox(
68-
height: 16,
69-
),
70-
const Text(
71-
'Hi, you have new Notification from flutter group, open '
72-
'slack and check it out',
73-
style: TextStyle(fontSize: 18, fontWeight: FontWeight.w500),
74-
),
75-
const SizedBox(
76-
height: 16,
77-
),
78-
RichText(
79-
text: const TextSpan(
80-
style: TextStyle(
81-
fontWeight: FontWeight.w400,
82-
color: Colors.black,
62+
),
63+
const SizedBox(
64+
height: 16,
65+
),
66+
const Text(
67+
'Hi, you have new Notification from flutter group, open '
68+
'slack and check it out',
69+
style: TextStyle(fontSize: 18, fontWeight: FontWeight.w500),
70+
),
71+
const SizedBox(
72+
height: 16,
73+
),
74+
RichText(
75+
text: const TextSpan(
76+
style: TextStyle(
77+
fontWeight: FontWeight.w400,
78+
color: Colors.black,
79+
),
80+
children: [
81+
TextSpan(text: 'Hi team,\n\n'),
82+
TextSpan(
83+
text: 'As some of you know, we’re moving to Slack for '
84+
'our internal team communications. Slack is a '
85+
'messaging app where we can talk, share files, '
86+
'and work together. It also connects with tools '
87+
'we already use, like [add your examples here], '
88+
'plus 900+ other apps.\n\n',
8389
),
84-
children: [
85-
TextSpan(text: 'Hi team,\n\n'),
86-
TextSpan(
87-
text:
88-
'As some of you know, we’re moving to Slack for '
89-
'our internal team communications. Slack is a '
90-
'messaging app where we can talk, share files, '
91-
'and work together. It also connects with tools '
92-
'we already use, like [add your examples here], '
93-
'plus 900+ other apps.\n\n',
94-
),
95-
TextSpan(
96-
text: 'Why are we moving to Slack?\n\n',
97-
style: TextStyle(
98-
fontWeight: FontWeight.w600,
99-
color: Colors.black,
100-
),
101-
),
102-
TextSpan(
103-
text:
104-
'We want to use the best communication tools to '
105-
'make our lives easier and be more productive. '
106-
'Having everything in one place will help us '
107-
'work together better and faster, rather than '
108-
'jumping around between emails, IMs, texts and '
109-
'a bunch of other programs. Everything you share '
110-
'in Slack is automatically indexed and archived, '
111-
'creating a searchable archive of all our work.',
90+
TextSpan(
91+
text: 'Why are we moving to Slack?\n\n',
92+
style: TextStyle(
93+
fontWeight: FontWeight.w600,
94+
color: Colors.black,
11295
),
113-
],
114-
),
96+
),
97+
TextSpan(
98+
text: 'We want to use the best communication tools to '
99+
'make our lives easier and be more productive. '
100+
'Having everything in one place will help us '
101+
'work together better and faster, rather than '
102+
'jumping around between emails, IMs, texts and '
103+
'a bunch of other programs. Everything you share '
104+
'in Slack is automatically indexed and archived, '
105+
'creating a searchable archive of all our work.',
106+
),
107+
],
115108
),
116-
],
117-
),
109+
),
110+
],
118111
),
119-
);
120-
},
121-
),
112+
),
113+
);
114+
},
122115
);
123116
}
124117
}

‎example/lib/helper.dart‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)