Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Tooltip title made optional #3

Merged
merged 1 commit into from
Jun 24, 2019
Merged

Tooltip title made optional #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 16 additions & 13 deletions example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ class _MailPageState extends State<MailPage> {
children: <Widget>[
Showcase(
key: _one,
title: 'Menu',
description: 'Click here to see menu options',
description: 'Tap to see menu options',
child: Icon(
Icons.menu,
color: Colors.black45,
Expand All @@ -80,7 +79,7 @@ class _MailPageState extends State<MailPage> {
Showcase(
key: _two,
title: 'Profile',
description: 'Click here to go to your Profile',
description: 'Tap to see profile',
showcaseBackgroundColor : Colors.blueAccent,
textColor: Colors.white,
shapeBorder: CircleBorder(),
Expand Down Expand Up @@ -118,12 +117,14 @@ class _MailPageState extends State<MailPage> {
),
],
),

Padding(padding: EdgeInsets.only(top: 8)),

Container(
padding: const EdgeInsets.symmetric(vertical: 10),
padding: const EdgeInsets.symmetric(vertical: 8),
child: Showcase(
key: _three,
title: 'Mail',
description: 'Click here to check mail',
description: 'Tap to check mail',
child: Container(
padding: const EdgeInsets.only(left: 6, right: 16),
child: Row(
Expand All @@ -142,8 +143,8 @@ class _MailPageState extends State<MailPage> {
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
width: 40,
height: 40,
width: 45,
height: 45,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: Colors.blue[200],
Expand All @@ -164,8 +165,8 @@ class _MailPageState extends State<MailPage> {
child: Container(
margin: const EdgeInsets.all(10),
child: Container(
width: 40,
height: 40,
width: 45,
height: 45,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: Colors.blue[200],
Expand All @@ -176,6 +177,7 @@ class _MailPageState extends State<MailPage> {
),
),
),
Padding(padding: EdgeInsets.only(left: 8)),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Expand Down Expand Up @@ -314,7 +316,7 @@ class MailTile extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Container(
padding: const EdgeInsets.only(left: 6, right: 16, top: 8),
padding: const EdgeInsets.only(left: 6, right: 16, top: 8,bottom: 8),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Expand All @@ -324,8 +326,8 @@ class MailTile extends StatelessWidget {
children: <Widget>[
Container(
margin: const EdgeInsets.all(10),
width: 40,
height: 40,
width: 45,
height: 45,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: Colors.blue[200],
Expand All @@ -334,6 +336,7 @@ class MailTile extends StatelessWidget {
child: Text(mail.sender[0]),
),
),
Padding(padding: EdgeInsets.only(left: 8)),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Expand Down
4 changes: 2 additions & 2 deletions lib/showcase.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class Showcase extends StatefulWidget {
const Showcase({
@required this.key,
@required this.child,
@required this.title,
this.title,
@required this.description,
this.shapeBorder,
this.overlayColor,
Expand Down Expand Up @@ -157,7 +157,7 @@ class _ShowcaseState extends State<Showcase> with TickerProviderStateMixin {
height: MediaQuery.of(context).size.height,
child: CustomPaint(
painter: ShapePainter(
opacity: widget.overlayOpacity ?? 0.7,
opacity: widget.overlayOpacity ?? 0.75,
rect: position.getRect(),
shapeBorder: widget.shapeBorder,
color: widget.overlayColor ?? Colors.black),
Expand Down
25 changes: 17 additions & 8 deletions lib/tooltip_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class ToolTipWidget extends StatelessWidget {
}

double _getTooltipWidth() {
double titleLength = (title.length * 10.0);
double titleLength = title == null ? 0 : (title.length * 10.0);
double descriptionLength = (description.length * 7.0);
if (titleLength > descriptionLength) {
return titleLength + 10;
Expand Down Expand Up @@ -163,17 +163,26 @@ class ToolTipWidget extends StatelessWidget {
children: <Widget>[
Container(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: title != null ? CrossAxisAlignment.start : CrossAxisAlignment.center,
children: <Widget>[
Text(
title,
style: titleTextStyle ??
Theme.of(context).textTheme.title.merge(TextStyle(color: textColor)),
),
title != null
? Text(
title,
style: titleTextStyle ??
Theme.of(context)
.textTheme
.title
.merge(TextStyle(
color: textColor)),
)
: Container(),
Text(
description,
style: descTextStyle ??
Theme.of(context).textTheme.subtitle.merge(TextStyle(color: textColor)),
Theme.of(context)
.textTheme
.subtitle
.merge(TextStyle(color: textColor)),
),
],
),
Expand Down