Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Simplified the building of RichAttributionWidget #1661

Merged
merged 3 commits into from
Sep 25, 2023
Merged

Simplified the building of RichAttributionWidget #1661

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51fda54
Ensure the RichAttributionWidgetState doesn't fail if its removed fro…
bramp Sep 24, 2023
f1aec62
Simplifed building the RichAttributionWidget.
bramp Sep 25, 2023
7ba25e9
Don't stretch the container as far as possible.
bramp Sep 25, 2023
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
148 changes: 60 additions & 88 deletions lib/src/layer/attribution_layer/rich.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,6 @@ class RichAttributionWidget extends StatefulWidget {
class RichAttributionWidgetState extends State<RichAttributionWidget> {
StreamSubscription<MapEvent>? mapEventSubscription;

final persistentAttributionKey = GlobalKey();
Size? persistentAttributionSize;

late bool popupExpanded = widget.popupInitialDisplayDuration != Duration.zero;
bool persistentHovered = false;

Expand All @@ -173,22 +170,6 @@ class RichAttributionWidgetState extends State<RichAttributionWidget> {
},
);
}

WidgetsBinding.instance.addPostFrameCallback(
(_) => WidgetsBinding.instance.addPostFrameCallback(
(_) {
assert(
persistentAttributionKey.currentContext?.findRenderObject() != null,
'persistentAttributionKey is not in the widget tree',
);
final renderObject =
persistentAttributionKey.currentContext?.findRenderObject();
if (renderObject is RenderBox) {
setState(() => persistentAttributionSize = renderObject.size);
}
},
),
);
}

@override
Expand Down Expand Up @@ -255,88 +236,79 @@ class RichAttributionWidgetState extends State<RichAttributionWidget> {
),
];

return LayoutBuilder(
builder: (context, constraints) => Align(
return Align(
alignment: widget.alignment.real,
child: Stack(
alignment: widget.alignment.real,
child: Stack(
alignment: widget.alignment.real,
children: [
if (persistentAttributionSize != null)
Padding(
padding: const EdgeInsets.all(6),
child: widget.animationConfig.popupAnimationBuilder(
context: context,
isExpanded: popupExpanded,
config: widget,
child: Container(
decoration: BoxDecoration(
color: widget.popupBackgroundColor ??
Theme.of(context).colorScheme.background,
border: Border.all(width: 0, style: BorderStyle.none),
borderRadius: widget.popupBorderRadius ??
BorderRadius.only(
topLeft: const Radius.circular(10),
topRight: const Radius.circular(10),
bottomLeft: widget.alignment ==
AttributionAlignment.bottomLeft
children: [
Padding(
padding: const EdgeInsets.all(6),
child: widget.animationConfig.popupAnimationBuilder(
context: context,
isExpanded: popupExpanded,
config: widget,
child: Container(
width: double.infinity,
decoration: BoxDecoration(
color: widget.popupBackgroundColor ??
Theme.of(context).colorScheme.background,
border: Border.all(width: 0, style: BorderStyle.none),
borderRadius: widget.popupBorderRadius ??
BorderRadius.only(
topLeft: const Radius.circular(10),
topRight: const Radius.circular(10),
bottomLeft:
widget.alignment == AttributionAlignment.bottomLeft
? Radius.zero
: const Radius.circular(10),
bottomRight: widget.alignment ==
AttributionAlignment.bottomRight
bottomRight:
widget.alignment == AttributionAlignment.bottomRight
? Radius.zero
: const Radius.circular(10),
),
),
constraints: BoxConstraints(
minWidth: constraints.maxWidth < 420
? constraints.maxWidth
: persistentAttributionSize!.width,
),
child: Padding(
padding: const EdgeInsets.all(8),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
...widget.attributions
.whereType<TextSourceAttribution>(),
const TextSourceAttribution(
"Made with 'flutter_map'",
prependCopyright: false,
textStyle: TextStyle(fontStyle: FontStyle.italic),
),
SizedBox(height: (widget.permanentHeight - 24) + 32),
],
),
),
),
child: Padding(
padding: const EdgeInsets.all(8),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
...widget.attributions.whereType<TextSourceAttribution>(),
const TextSourceAttribution(
"Made with 'flutter_map'",
prependCopyright: false,
textStyle: TextStyle(fontStyle: FontStyle.italic),
),
SizedBox(height: (widget.permanentHeight - 24) + 32),
],
),
),
),
MouseRegion(
key: persistentAttributionKey,
onEnter: (_) => setState(() => persistentHovered = true),
onExit: (_) => setState(() => persistentHovered = false),
cursor: SystemMouseCursors.click,
child: AnimatedOpacity(
opacity: persistentHovered || popupExpanded ? 1 : 0.5,
curve: widget.animationConfig.buttonCurve,
duration: widget.animationConfig.buttonDuration,
child: Padding(
padding: const EdgeInsets.all(4),
child: FittedBox(
child: Row(
mainAxisSize: MainAxisSize.min,
children:
widget.alignment == AttributionAlignment.bottomLeft
? persistentAttributionItems.reversed.toList()
: persistentAttributionItems,
),
),
),
MouseRegion(
onEnter: (_) => setState(() => persistentHovered = true),
onExit: (_) => setState(() => persistentHovered = false),
cursor: SystemMouseCursors.click,
child: AnimatedOpacity(
opacity: persistentHovered || popupExpanded ? 1 : 0.5,
curve: widget.animationConfig.buttonCurve,
duration: widget.animationConfig.buttonDuration,
child: Padding(
padding: const EdgeInsets.all(4),
child: FittedBox(
child: Row(
mainAxisSize: MainAxisSize.min,
children:
widget.alignment == AttributionAlignment.bottomLeft
? persistentAttributionItems.reversed.toList()
: persistentAttributionItems,
),
),
),
),
],
),
),
],
),
);
}
Expand Down