From 3ced6e1fecc12b545ab23cf08ae2db4454b424b2 Mon Sep 17 00:00:00 2001 From: Trent Palmer Date: Sun, 1 Sep 2019 19:14:42 -0700 Subject: [PATCH] add washingtonpark.dart --- web/attractions.dart | 8 +++++++ web/northweststreets.dart | 14 +++++------ web/prebuildcards.dart | 50 +++++++++++++++++++++++++++++++++++++++ web/washingtonpark.dart | 39 ++++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+), 7 deletions(-) create mode 100644 web/washingtonpark.dart diff --git a/web/attractions.dart b/web/attractions.dart index bca2079..3e5cf98 100644 --- a/web/attractions.dart +++ b/web/attractions.dart @@ -1,6 +1,8 @@ import 'package:flutter_web/material.dart'; import 'defaults.dart'; import 'prebuildcards.dart'; +import 'card_templates.dart'; +import 'washingtonpark.dart'; class Attractions extends StatefulWidget { @override @@ -29,6 +31,12 @@ class _AttractionsState extends State { mountHood(), mountSaintHelens(), oregonCoast(), + InkWell( + onTap: () async { + await Navigator.push(context, MaterialPageRoute(builder: (context) => WashingtonPark())); + }, + child: cardOne('Visit the Zoo, Rose Garden, Hoyt Arboretum, Pittock Mansion, and Japanese Garden at WashingtonPark.'), + ), ], ), ), diff --git a/web/northweststreets.dart b/web/northweststreets.dart index 464f0b7..a0585c7 100644 --- a/web/northweststreets.dart +++ b/web/northweststreets.dart @@ -2,6 +2,7 @@ import 'package:flutter_web/material.dart'; import 'defaults.dart'; import 'card_templates.dart'; import 'prebuildcards.dart'; +import 'washingtonpark.dart'; class NorthWestStreets extends StatefulWidget { @override @@ -32,13 +33,6 @@ class _NorthWestStreetsState extends State { child: Column( children: [ macleayParkPittockMansion(), - convenienceCardOne( - 'https://en.wikipedia.org/wiki/Washington_Park_(Portland,_Oregon)', - 'washington-park', - 'This area of town is convenient for the Zoo, Rose Garden, and Japanese Garden', - 'https://www.google.com/maps/@45.515833,-122.7075,15z', - 'washington-park-map' - ), convenienceCardOne( 'https://en.wikipedia.org/wiki/Providence_Park', 'providence-park', @@ -48,6 +42,12 @@ class _NorthWestStreetsState extends State { ), cardTwo('NW 23rd, Burnside to Thurman','https://www.google.com/maps/@45.5295226,-122.6984339,16z','23rd'), cardTwo('NW 21st, Burnside to Raleigh','https://www.google.com/maps/@45.5291143,-122.6945136,16z','21st'), + InkWell( + onTap: () async { + await Navigator.push(context, MaterialPageRoute(builder: (context) => WashingtonPark())); + }, + child: cardOne('Visit the Zoo, Rose Garden, Hoyt Arboretum, Pittock Mansion, and Japanese Garden at WashingtonPark.'), + ), ], ), ), diff --git a/web/prebuildcards.dart b/web/prebuildcards.dart index a4f309e..a02666e 100644 --- a/web/prebuildcards.dart +++ b/web/prebuildcards.dart @@ -290,3 +290,53 @@ Card willametteFallsViewPoint() { 'willamette-falls-map' ); } + +Card oregonZoo() { + return convenienceCardOne( + 'https://en.wikipedia.org/wiki/Oregon_Zoo', + 'oregon-zoo', + 'Visit Oregon Zoo in Washington Park', + 'https://www.google.com/maps/@45.5098414,-122.7167163,18z', + 'oregon-zoo-map' + ); +} + +Card roseGarden() { + return convenienceCardOne( + 'https://en.wikipedia.org/wiki/International_Rose_Test_Garden', + 'rose-garden', + 'Visit International Rose Test Garden in Washington Park', + 'https://www.google.com/maps/@45.5191,-122.7054,18z', + 'rose-garden-map' + ); +} + +Card peninsulaPark() { + return convenienceCardOne( + 'https://www.pdxmonthly.com/articles/2018/5/22/the-hidden-history-of-north-portland-s-flower-powered-peninsula-park', + 'peninsula-park', + 'Visit the Rose Garden in Peninsula Park', + 'https://www.google.com/maps/@45.5680077,-122.6736269,17z', + 'peninsula-park-map' + ); +} + +Card hoytArboretum() { + return convenienceCardOne( + 'https://en.wikipedia.org/wiki/Hoyt_Arboretum', + 'hoyt-arboretum', + 'Visit Hoyt Arboretum in Washington Park', + 'https://www.google.com/maps/@45.51679,-122.716,17z', + 'hoyt-arboretum-map' + ); +} + +Card pittockMansion() { + return convenienceCardOne( + 'https://en.wikipedia.org/wiki/Pittock_Mansion', + 'pittock-mansion', + 'Visit Pittock Mansion near Washington Park', + 'https://www.google.com/maps/@45.525,-122.716389,17z', + 'pittock-mansion-map' + ); +} diff --git a/web/washingtonpark.dart b/web/washingtonpark.dart new file mode 100644 index 0000000..ec3b794 --- /dev/null +++ b/web/washingtonpark.dart @@ -0,0 +1,39 @@ +import 'package:flutter_web/material.dart'; +import 'defaults.dart'; +import 'prebuildcards.dart'; + +class WashingtonPark extends StatefulWidget { + @override + _WashingtonParkState createState() => _WashingtonParkState(); +} + +class _WashingtonParkState extends State { + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + title: Text('washingtonpark'), + centerTitle: true, + backgroundColor: navy, + actions: [ + IconButton( + icon: Icon(Icons.home), + onPressed: () { + Navigator.of(context).popUntil((route) => route.isFirst); + }, + ), + ], + ), + backgroundColor: peacockBlue, + body: Column( + children: [ + oregonZoo(), + japaneseGarden(), + roseGarden(), + hoytArboretum(), + pittockMansion(), + ], + ), + ); + } +}