Skip to content

Update deprecated flat button #19

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.

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
20 changes: 10 additions & 10 deletions module02-tourismandco/lesson16/lib/mocks/mock_location.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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() {
Expand Down
12 changes: 6 additions & 6 deletions module02-tourismandco/lesson16/lib/models/location.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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<LocationFact>? 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<String, dynamic> json) =>
Expand Down
26 changes: 16 additions & 10 deletions module02-tourismandco/lesson17/lib/location_detail.dart
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ class _LocationDetailState extends State<LocationDetail> {
@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),
Expand Down Expand Up @@ -66,7 +67,8 @@ class _LocationDetailState extends State<LocationDetail> {
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) {
Expand All @@ -75,10 +77,12 @@ class _LocationDetailState extends State<LocationDetail> {
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()),
)
]);
Expand All @@ -95,8 +99,8 @@ class _LocationDetailState extends State<LocationDetail> {

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));
}
Expand All @@ -123,10 +127,12 @@ class _LocationDetailState extends State<LocationDetail> {
}
}

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),
);
Expand Down