diff --git a/lib/screens/sport.dart b/lib/screens/sport.dart index cc28258..01ec00b 100644 --- a/lib/screens/sport.dart +++ b/lib/screens/sport.dart @@ -68,13 +68,7 @@ class Sport extends StatelessWidget { ), ] ), - body: ListView( - physics: const NeverScrollableScrollPhysics(), - children: [ - HorizontalGameCards(gameCard: gameCard, sportID: sport_ID,), - VerticalNewsFeed(newsFeed: feed, sportFilter: _curSport.name), - ], - ), + body: bodyBuilder(), drawer: Drawer( child: ListView( children: [ @@ -115,6 +109,18 @@ class Sport extends StatelessWidget { ); } + Widget bodyBuilder() { + return Column( + children: [ + HorizontalGameCards(gameCard: gameCard, sportID: sport_ID,), + Expanded( + child: VerticalNewsFeed(newsFeed: feed, sportFilter: _curSport.name), + ), + + ], + ); + } + DropdownButtonHideUnderline buildDropdownButton(Item selectedSport, StateSetter setState) { return DropdownButtonHideUnderline( child: DropdownButton( diff --git a/lib/screens/sport_schedule.dart b/lib/screens/sport_schedule.dart index 8e43875..2e3fe92 100644 --- a/lib/screens/sport_schedule.dart +++ b/lib/screens/sport_schedule.dart @@ -201,62 +201,5 @@ class GameCard extends StatelessWidget { ], ), ); -// return Column( -// verticalDirection: VerticalDirection.up, -// children: [ -// Container( -// color: Colors.white, -// child: ListTile( -// leading: SizedBox( -// width: widthIn(ctx)/logoWidth, -// child: _homeAwayImageOrder( -// gameCard.location_indicator, -// gameCard.image, -// true, ctx)), -// title: FittedBox( -// fit: BoxFit.contain, -// child: Wrap( -// children: [ -// if (gameCard.status == null) // no game yet -// Text( -// '${_months[gameCard.date.month]} ${gameCard.date.day}' -// ) -// else -// _pastGameScore( -// gameCard.location_indicator, -// gameCard.status, -// gameCard.team_score, -// gameCard.opponent_score,), -// ], -// ) -// ), -// subtitle: FittedBox( -// fit: BoxFit.contain, -// child: Wrap( -// children: [ -// if (gameCard.status != null) // no game yet -// Text( -// '${_months[gameCard.date.month]} ${gameCard.date.day}', textAlign: TextAlign.center, -// ) -// else -// Text('${gameCard.date.hour}:${gameCard.date.minute} PM'), -// ], -// ) -// ), -// trailing: SizedBox( -// width: widthIn(ctx)/logoWidth, -// child: _homeAwayImageOrder( -// gameCard.location_indicator, -// gameCard.image, -// false, ctx)), -// onTap: () { -// print(gameCard.idSport); -// -// Navigator.pushNamed(ctx, '/Details', arguments: gameCard); -// }, -// ), -// ), -// ], -// ); } }