WIP: ladnmark card adjustments
This commit is contained in:
parent
4baf045c8c
commit
d186a51a87
@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:anyway/modules/landmark_card.dart';
|
import 'package:anyway/modules/landmark_card.dart';
|
||||||
import 'package:anyway/structs/landmark.dart';
|
import 'package:anyway/structs/landmark.dart';
|
||||||
import 'package:anyway/structs/trip.dart';
|
import 'package:anyway/structs/trip.dart';
|
||||||
import 'package:anyway/main.dart';
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -25,30 +24,7 @@ List<Widget> landmarksList(Trip trip) {
|
|||||||
|
|
||||||
for (Landmark landmark in trip.landmarks) {
|
for (Landmark landmark in trip.landmarks) {
|
||||||
children.add(
|
children.add(
|
||||||
Dismissible(
|
LandmarkCard(landmark, trip),
|
||||||
key: ValueKey<int>(landmark.hashCode),
|
|
||||||
child: LandmarkCard(landmark),
|
|
||||||
dismissThresholds: {DismissDirection.endToStart: 0.95, DismissDirection.startToEnd: 0.95},
|
|
||||||
onDismissed: (direction) {
|
|
||||||
log('Removing ${landmark.name}');
|
|
||||||
trip.removeLandmark(landmark);
|
|
||||||
|
|
||||||
rootScaffoldMessengerKey.currentState!.showSnackBar(
|
|
||||||
SnackBar(content: Text("We won't show ${landmark.name} again"))
|
|
||||||
);
|
|
||||||
},
|
|
||||||
|
|
||||||
background: Container(color: Colors.red),
|
|
||||||
secondaryBackground: Container(
|
|
||||||
color: Colors.red,
|
|
||||||
child: Icon(
|
|
||||||
Icons.delete,
|
|
||||||
color: Colors.white,
|
|
||||||
),
|
|
||||||
padding: EdgeInsets.all(15),
|
|
||||||
alignment: Alignment.centerRight,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
|
|
||||||
if (landmark.next != null) {
|
if (landmark.next != null) {
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
import 'package:anyway/main.dart';
|
||||||
|
import 'package:anyway/structs/trip.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:cached_network_image/cached_network_image.dart';
|
import 'package:cached_network_image/cached_network_image.dart';
|
||||||
import 'package:url_launcher/url_launcher.dart';
|
import 'package:url_launcher/url_launcher.dart';
|
||||||
@ -6,8 +8,12 @@ import 'package:anyway/structs/landmark.dart';
|
|||||||
|
|
||||||
class LandmarkCard extends StatefulWidget {
|
class LandmarkCard extends StatefulWidget {
|
||||||
final Landmark landmark;
|
final Landmark landmark;
|
||||||
|
final Trip parentTrip;
|
||||||
|
|
||||||
LandmarkCard(this.landmark);
|
LandmarkCard(
|
||||||
|
this.landmark,
|
||||||
|
this.parentTrip,
|
||||||
|
);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
_LandmarkCardState createState() => _LandmarkCardState();
|
_LandmarkCardState createState() => _LandmarkCardState();
|
||||||
@ -18,21 +24,28 @@ class _LandmarkCardState extends State<LandmarkCard> {
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Container(
|
return Container(
|
||||||
height: 160,
|
|
||||||
child: Card(
|
child: Card(
|
||||||
shape: RoundedRectangleBorder(
|
shape: RoundedRectangleBorder(
|
||||||
borderRadius: BorderRadius.circular(15.0),
|
borderRadius: BorderRadius.circular(15.0),
|
||||||
),
|
),
|
||||||
elevation: 5,
|
elevation: 5,
|
||||||
clipBehavior: Clip.antiAliasWithSaveLayer,
|
clipBehavior: Clip.antiAliasWithSaveLayer,
|
||||||
child: Row(
|
// if the image is available, display it on the left side of the card, otherwise only display the text
|
||||||
|
child: widget.landmark.imageURL != null ? splitLayout() : textLayout(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget splitLayout() {
|
||||||
|
// If an image is available, display it on the left side of the card
|
||||||
|
return Row(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
Container( // the image on the left
|
Container(
|
||||||
// inherit the height of the parent container
|
// the image on the left
|
||||||
height: double.infinity,
|
|
||||||
// force a fixed width
|
|
||||||
width: 160,
|
width: 160,
|
||||||
|
height: 160,
|
||||||
|
|
||||||
child: CachedNetworkImage(
|
child: CachedNetworkImage(
|
||||||
imageUrl: widget.landmark.imageURL ?? '',
|
imageUrl: widget.landmark.imageURL ?? '',
|
||||||
placeholder: (context, url) => Center(child: CircularProgressIndicator()),
|
placeholder: (context, url) => Center(child: CircularProgressIndicator()),
|
||||||
@ -41,7 +54,14 @@ class _LandmarkCardState extends State<LandmarkCard> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
Flexible(
|
Flexible(
|
||||||
child: Padding(
|
child: textLayout(),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget textLayout() {
|
||||||
|
return Padding(
|
||||||
padding: EdgeInsets.all(10),
|
padding: EdgeInsets.all(10),
|
||||||
child: Column(
|
child: Column(
|
||||||
children: [
|
children: [
|
||||||
@ -109,16 +129,46 @@ class _LandmarkCardState extends State<LandmarkCard> {
|
|||||||
// icon: Icon(Icons.book),
|
// icon: Icon(Icons.book),
|
||||||
// label: Text('Wikipedia'),
|
// label: Text('Wikipedia'),
|
||||||
// ),
|
// ),
|
||||||
|
PopupMenuButton(
|
||||||
|
icon: Icon(Icons.settings),
|
||||||
|
style: TextButtonTheme.of(context).style,
|
||||||
|
itemBuilder: (context) => [
|
||||||
|
PopupMenuItem(
|
||||||
|
child: ListTile(
|
||||||
|
leading: Icon(Icons.delete),
|
||||||
|
title: Text('Delete'),
|
||||||
|
onTap: () async {
|
||||||
|
setState(() {
|
||||||
|
widget.parentTrip.removeLandmark(widget.landmark);
|
||||||
|
});
|
||||||
|
rootScaffoldMessengerKey.currentState!.showSnackBar(
|
||||||
|
SnackBar(content: Text("We won't show ${widget.landmark.name} again"))
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
PopupMenuItem(
|
||||||
|
child: ListTile(
|
||||||
|
leading: Icon(Icons.star),
|
||||||
|
title: Text('Favorite'),
|
||||||
|
onTap: () async {
|
||||||
|
// delete the landmark
|
||||||
|
// await deleteLandmark(widget.landmark);
|
||||||
|
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user