From fa80553c2f886ac9bdbe0be9c727461f0e7f43b4 Mon Sep 17 00:00:00 2001 From: Tomasz Date: Mon, 7 Aug 2023 20:41:06 +0200 Subject: [PATCH 1/2] update api fields --- .../lib/components/location_tile.dart | 4 ++-- .../lesson16/lib/mocks/mock_location.dart | 20 +++++++++---------- .../lesson16/lib/models/location.dart | 12 +++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/module02-tourismandco/lesson16/lib/components/location_tile.dart b/module02-tourismandco/lesson16/lib/components/location_tile.dart index 7120b66..9be6906 100755 --- a/module02-tourismandco/lesson16/lib/components/location_tile.dart +++ b/module02-tourismandco/lesson16/lib/components/location_tile.dart @@ -13,8 +13,8 @@ class LocationTile extends StatelessWidget { @override Widget build(BuildContext context) { final title = location.name.toUpperCase(); - final subTitle = location.userItinerarySummary.toUpperCase(); - final caption = location.tourPackageName.toUpperCase(); + final subTitle = location.user_itinerary_summary.toUpperCase(); + final caption = location.tour_package_name.toUpperCase(); return Container( padding: EdgeInsets.all(0.0), height: LocationTileHeight, diff --git a/module02-tourismandco/lesson16/lib/mocks/mock_location.dart b/module02-tourismandco/lesson16/lib/mocks/mock_location.dart index 0b808cb..62f6008 100755 --- a/module02-tourismandco/lesson16/lib/mocks/mock_location.dart +++ b/module02-tourismandco/lesson16/lib/mocks/mock_location.dart @@ -18,8 +18,8 @@ mixin MockLocation implements Location { text: 'Kyoto airport, with several terminals, is located 16 kilometres south of the city and is also known as Kyoto. Kyoto can also be reached by transport links from other regional airports.') ], - tourPackageName: '', - userItinerarySummary: ''), + tour_package_name: '', + user_itinerary_summary: ''), Location( id: 2, name: 'Mount Fuji', @@ -35,8 +35,8 @@ mixin MockLocation implements Location { text: 'There are three cities that surround Mount Fuji: Gotemba, Fujiyoshida and Fujinomiya.') ], - tourPackageName: '', - userItinerarySummary: ''), + tour_package_name: '', + user_itinerary_summary: ''), Location( id: 3, name: 'Kiyomizu-dera', @@ -51,8 +51,8 @@ mixin MockLocation implements Location { title: 'Architectural Style', text: 'Japanese Buddhist architecture') ], - tourPackageName: '', - userItinerarySummary: ''), + tour_package_name: '', + user_itinerary_summary: ''), Location( id: 4, name: 'Kinkaku-ji', @@ -68,8 +68,8 @@ mixin MockLocation implements Location { text: 'The Golden Pavilion is set in a magnificent Japanese strolling garden.') ], - tourPackageName: '', - userItinerarySummary: ''), + tour_package_name: '', + user_itinerary_summary: ''), Location( id: 5, name: 'Odaiba', @@ -85,8 +85,8 @@ mixin MockLocation implements Location { text: 'The pedestrian path begins a short walk from Shibaura-futo Station along the Yurikamome on the "Tokyo side" of the bridge, while Odaiba Kaihinkoen Station is the nearest station on the "Odaiba side."') ], - tourPackageName: '', - userItinerarySummary: ''), + tour_package_name: '', + user_itinerary_summary: ''), ]; static Location fetchAny() { diff --git a/module02-tourismandco/lesson16/lib/models/location.dart b/module02-tourismandco/lesson16/lib/models/location.dart index 38d16f8..28ee694 100755 --- a/module02-tourismandco/lesson16/lib/models/location.dart +++ b/module02-tourismandco/lesson16/lib/models/location.dart @@ -11,24 +11,24 @@ class Location { final int id; final String name; final String url; - final String userItinerarySummary; - final String tourPackageName; + final String user_itinerary_summary; + final String tour_package_name; final List? facts; Location( {required this.id, required this.name, required this.url, - required this.userItinerarySummary, - required this.tourPackageName, + required this.user_itinerary_summary, + required this.tour_package_name, required this.facts}); Location.blank() : id = 0, name = '', url = '', - userItinerarySummary = '', - tourPackageName = '', + user_itinerary_summary = '', + tour_package_name = '', facts = []; factory Location.fromJson(Map json) => From a5a840343e05a92dcb66b037ea398eadab4b0355 Mon Sep 17 00:00:00 2001 From: Tomasz Date: Mon, 7 Aug 2023 21:02:10 +0200 Subject: [PATCH 2/2] update deprecated flat button --- .../lesson17/lib/location_detail.dart | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/module02-tourismandco/lesson17/lib/location_detail.dart b/module02-tourismandco/lesson17/lib/location_detail.dart index e4fb10e..9eaecfa 100755 --- a/module02-tourismandco/lesson17/lib/location_detail.dart +++ b/module02-tourismandco/lesson17/lib/location_detail.dart @@ -32,7 +32,8 @@ class _LocationDetailState extends State { @override Widget build(BuildContext context) { return Scaffold( - appBar: AppBar(title: Text(location.name, style: Styles.navBarTitle)), + appBar: AppBar( + title: Text(location.name, style: Styles.navBarTitle)), body: Stack(children: [ _renderBody(context, location), _renderFooter(context, location), @@ -66,7 +67,8 @@ class _LocationDetailState extends State { padding: EdgeInsets.symmetric( vertical: BodyVerticalPadding, horizontal: Styles.horizontalPaddingDefault), - child: LocationTile(location: this.location, darkTheme: false)); + child: + LocationTile(location: this.location, darkTheme: false)); } Widget _renderFooter(BuildContext context, Location location) { @@ -75,10 +77,12 @@ class _LocationDetailState extends State { crossAxisAlignment: CrossAxisAlignment.stretch, children: [ Container( - decoration: BoxDecoration(color: Colors.white.withOpacity(0.5)), + decoration: + BoxDecoration(color: Colors.white.withOpacity(0.5)), height: FooterHeight, child: Container( - padding: EdgeInsets.symmetric(vertical: 20.0, horizontal: 30.0), + padding: EdgeInsets.symmetric( + vertical: 20.0, horizontal: 30.0), child: _renderBookButton()), ) ]); @@ -95,8 +99,8 @@ class _LocationDetailState extends State { Widget _sectionTitle(String text) { return Container( - padding: EdgeInsets.fromLTRB(Styles.horizontalPaddingDefault, 25.0, - Styles.horizontalPaddingDefault, 0.0), + padding: EdgeInsets.fromLTRB(Styles.horizontalPaddingDefault, + 25.0, Styles.horizontalPaddingDefault, 0.0), child: Text(text.toUpperCase(), textAlign: TextAlign.left, style: Styles.headerLarge)); } @@ -123,10 +127,12 @@ class _LocationDetailState extends State { } } - Widget _renderBookButton() { - return FlatButton( - color: Styles.accentColor, - textColor: Styles.textColorBright, + WWidget _renderBookButton() { + return TextButton( + style: TextButton.styleFrom( + foregroundColor: Styles.accentColor, + backgroundColor: Styles.textColorBright, + ), onPressed: _handleBookPress, child: Text('Book'.toUpperCase(), style: Styles.textCTAButton), );