Finished stats screen

Author: me-here

lib/screens/stats_screen.dart

@@ -10,17 +10,25 @@ import 'package:arena/views/stats_screen/goal_averages.dart';
 import 'package:arena/views/stats_screen/scorers.dart';
 
 class StatsScreen extends StatelessWidget {
-  Widget get _extraInfo {
+  Widget _extraInfo(comparison) {
     return Container(
       color: Colors.white,
       padding: EdgeInsets.symmetric(horizontal: 32, vertical: 8),
       child: Column(
         children: [
-          PreviousGamesView(),
+          PreviousGamesView(
+            homeTeamGames:
+                comparison != null ? comparison[0]['latest_games'] : [],
+            oppTeamGames:
+                comparison != null ? comparison[1]['latest_games'] : [],
+          ),
           Divider(thickness: 2.0),
           GoalAverages(),
           Divider(thickness: 2.0),
-          Scorers(),
+          Scorers(
+            homeGoalie: comparison[0]['goalie'],
+            oppGoalie: comparison[1]['goalie'],
+          ),
         ],
       ),
     );
@@ -36,8 +44,9 @@ class StatsScreen extends StatelessWidget {
           child: Column(
             children: [
               InformationListView(),
-              ComparisonView(comparison: result.data['compareTeams']),
-              _extraInfo,
+              if (result.data != null)
+                ComparisonView(comparison: result.data['compareTeams']),
+              if (result.data != null) _extraInfo(result?.data['compareTeams']),
               SizedBox(height: 16),
             ],
           ),

lib/views/stats_screen/comparison_view.dart

@@ -10,7 +10,9 @@ class ComparisonView extends StatelessWidget {
         Container(
           height: 50,
           width: 50,
-          child: Image.network(comparison[which]['logo']),
+          child: comparison != null
+              ? Image.network(comparison[which]['logo'])
+              : null,
         ),
         SizedBox(height: 8),
       ],
@@ -52,10 +54,12 @@ class ComparisonView extends StatelessWidget {
                     width: 'Position in League'.length * 8.0,
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: [
-                        Text('${comparison[0]['rank']}'),
-                        Text('${comparison[1]['rank']}')
-                      ],
+                      children: comparison != null
+                          ? [
+                              Text('${comparison[0]['rank']}'),
+                              Text('${comparison[1]['rank']}')
+                            ]
+                          : null,
                     ),
                   ),
                   Text(

lib/views/stats_screen/previous_games_view.dart

@@ -5,8 +5,13 @@ import 'package:arena/widgets/previous_game.dart';
 class PreviousGamesView extends StatelessWidget {
   const PreviousGamesView({
     Key key,
+    this.homeTeamGames,
+    this.oppTeamGames,
   }) : super(key: key);
 
+  final List<dynamic> homeTeamGames;
+  final List<dynamic> oppTeamGames;
+
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -21,24 +26,16 @@ class PreviousGamesView extends StatelessWidget {
             children: [
               Expanded(
                 child: Column(
-                  children: [
-                    PreviousGame(),
-                    PreviousGame(),
-                    PreviousGame(),
-                    PreviousGame(),
-                    PreviousGame(),
-                  ],
+                  children: homeTeamGames
+                      .map((game) => PreviousGame(game: game))
+                      .toList(),
                 ),
               ),
               Expanded(
                 child: Column(
-                  children: [
-                    PreviousGame(),
-                    PreviousGame(),
-                    PreviousGame(),
-                    PreviousGame(),
-                    PreviousGame(),
-                  ],
+                  children: oppTeamGames
+                      .map((game) => PreviousGame(game: game))
+                      .toList(),
                 ),
               ),
             ],

lib/views/stats_screen/scorers.dart

@@ -3,12 +3,16 @@ import 'package:flutter/material.dart';
 class Scorers extends StatelessWidget {
   const Scorers({
     Key key,
+    this.homeGoalie,
+    this.oppGoalie,
   }) : super(key: key);
 
+  final homeGoalie;
+  final oppGoalie;
+
   @override
   Widget build(BuildContext context) {
     return Container(
-      // height: 150,
       child: Column(
         children: [
           Text(
@@ -18,28 +22,32 @@ class Scorers extends StatelessWidget {
           Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
-              _playerInfo(),
-              _playerInfo(),
+              _playerInfo(true),
+              _playerInfo(false),
             ],
           )
         ],
       ),
     );
   }
 
-  Widget _playerInfo() {
+  Widget _playerInfo(bool isHomeTeam) {
     return Container(
       child: Column(
         mainAxisAlignment: MainAxisAlignment.spaceAround,
         children: [
-          Image.asset(
-            'assets/images/player_face.jpg',
-            width: 50,
+          Image.network(
+            isHomeTeam
+                ? '${homeGoalie['urlToImage']}'
+                : '${oppGoalie['urlToImage']}',
+            width: 100,
           ),
           SizedBox(height: 8),
-          Text('Player Name'),
+          Text(isHomeTeam
+              ? '${homeGoalie['player_name']}'
+              : '${oppGoalie['player_name']}'),
           SizedBox(height: 8),
-          Text('11'),
+          // Text('11'),
           SizedBox(height: 16),
         ],
       ),

lib/widgets/previous_game.dart

@@ -3,8 +3,11 @@ import 'package:flutter/material.dart';
 class PreviousGame extends StatelessWidget {
   const PreviousGame({
     Key key,
+    this.game,
   }) : super(key: key);
 
+  final game;
+
   Text get _flagText {
     return Text(
       'G',
@@ -30,9 +33,13 @@ class PreviousGame extends StatelessWidget {
   }
 
   Widget get _label {
-    return Text(
-      'vs Team Name 0:0',
-      style: TextStyle(color: Colors.grey),
+    return Expanded(
+      child: Text(
+        game != null
+            ? 'vs ${game['homeTeam']['name']} ${game['score']}'
+            : ' vs Team Name 0-0',
+        style: TextStyle(color: Colors.grey),
+      ),
     );
   }
 

server/index.ts

@@ -117,6 +117,7 @@ const resolvers = {
             const parsed = await response.json();
 
             // Filter to just the 2 teams requested
+            if(parsed.api.standings == null) return null;
             const teamsToCompare = parsed.api.standings[0].filter((element, index, array) => { 
                 return teamNames.includes(element.teamName);
             });