Refactor + finish stats screen UI

Author: me-here

assets/images/player_face.jpg

@@ -1,9 +1,10 @@
-import 'package:arena/screens/stats_screen.dart';
 import 'package:flutter/material.dart';
+
 import 'screens/home_screen.dart';
+import 'package:arena/screens/stats_screen.dart';
 
-import 'widgets/styled_app_bar.dart';
-import 'widgets/styled_bottom_navigation_bar.dart';
+import 'widgets/global/styled_app_bar.dart';
+import 'widgets/global/styled_bottom_navigation_bar.dart';
 
 void main() {
   runApp(

lib/main.dart

@@ -1,11 +1,8 @@
 import 'package:flutter/material.dart';
 
-import 'package:arena/views/partidos_view/partidos.dart';
-import 'package:arena/views/horizontal_list_views/teams_list_view.dart';
-import 'package:arena/views/noticias_view/noticias.dart';
-
-import 'package:arena/widgets/styled_bottom_navigation_bar.dart';
-import 'package:arena/widgets/styled_app_bar.dart';
+import 'package:arena/views/home_screen/noticias_view/noticias.dart';
+import 'package:arena/views/home_screen/partidos_view/partidos.dart';
+import 'package:arena/views/home_screen/teams_list_view.dart';
 
 class HomeScreen extends StatelessWidget {
   @override

lib/screens/home_screen.dart

@@ -1,28 +1,24 @@
-import 'package:arena/views/horizontal_list_views/information_list_view.dart';
+import 'package:arena/views/stats_screen/information_list_view.dart';
 import 'package:flutter/material.dart';
 
-import '../views/horizontal_list_views/information_list_view.dart';
-import '../views/comparison_view/comparison_view.dart';
-import '../views/previous_games_view.dart';
+import '../views/stats_screen/information_list_view.dart';
+import '../views/stats_screen/comparison_view.dart';
+import '../views/stats_screen/previous_games_view.dart';
+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 get _extraInfo {
     return Container(
       color: Colors.white,
       padding: EdgeInsets.symmetric(horizontal: 32, vertical: 8),
       child: Column(
         children: [
           PreviousGamesView(),
-          Divider(
-            thickness: 2.0,
-          ),
-          Container(
-            height: 100,
-          ),
-          Divider(
-            thickness: 2.0,
-          ),
-          Container(height: 150),
+          Divider(thickness: 2.0),
+          GoalAverages(),
+          Divider(thickness: 2.0),
+          Scorers(),
         ],
       ),
     );
@@ -36,7 +32,8 @@ class StatsScreen extends StatelessWidget {
         children: [
           InformationListView(),
           ComparisonView(),
-          extraInfo,
+          _extraInfo,
+          SizedBox(height: 16),
         ],
       ),
     );

lib/screens/stats_screen.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import '../../widgets/styled_card.dart';
+import 'package:arena/widgets/styled_card.dart';
 import './noticia.dart';
 
 class Noticias extends StatelessWidget {

lib/views/noticias_view/noticia.dart renamed to lib/views/home_screen/noticias_view/noticia.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:arena/widgets/styled_card.dart';
 import './partido.dart';
-import '../../widgets/styled_card.dart';
 
 class Partidos extends StatelessWidget {
   @override

lib/views/noticias_view/noticias.dart renamed to lib/views/home_screen/noticias_view/noticias.dart

@@ -0,0 +1,57 @@
+import 'package:flutter/material.dart';
+import 'package:charts_flutter/flutter.dart' as charts;
+
+class GoalAverages extends StatelessWidget {
+  final List<charts.Series> seriesList = [
+    charts.Series<int, int>(
+      id: 'Goal avg',
+      domainFn: (datum, index) {
+        return datum;
+      },
+      measureFn: (datum, index) {
+        return datum;
+      },
+      data: [1, 2],
+    ),
+  ];
+  final bool animate = true;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      height: 100,
+      width: double.infinity,
+      child: Column(
+        children: [
+          Text(
+            'promedio de goles'.toUpperCase(),
+            style: TextStyle(color: Colors.grey),
+          ),
+          Expanded(
+              child: Row(
+            children: [
+              Expanded(
+                child: Container(
+                  child: charts.PieChart(
+                    seriesList,
+                    animate: true,
+                    defaultRenderer: charts.ArcRendererConfig(arcWidth: 6),
+                  ),
+                ),
+              ),
+              Expanded(
+                child: Container(
+                  child: charts.PieChart(
+                    seriesList,
+                    animate: true,
+                    defaultRenderer: charts.ArcRendererConfig(arcWidth: 6),
+                  ),
+                ),
+              ),
+            ],
+          )),
+        ],
+      ),
+    );
+  }
+}

lib/views/partidos_view/partido.dart renamed to lib/views/home_screen/partidos_view/partido.dart

@@ -0,0 +1,48 @@
+import 'package:flutter/material.dart';
+
+class Scorers extends StatelessWidget {
+  const Scorers({
+    Key key,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      // height: 150,
+      child: Column(
+        children: [
+          Text(
+            'Goleadores'.toUpperCase(),
+            style: TextStyle(color: Colors.grey),
+          ),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              _playerInfo(),
+              _playerInfo(),
+            ],
+          )
+        ],
+      ),
+    );
+  }
+
+  Widget _playerInfo() {
+    return Container(
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.spaceAround,
+        children: [
+          Image.asset(
+            'assets/images/player_face.jpg',
+            width: 50,
+          ),
+          SizedBox(height: 8),
+          Text('Player Name'),
+          SizedBox(height: 8),
+          Text('11'),
+          SizedBox(height: 16),
+        ],
+      ),
+    );
+  }
+}

lib/views/partidos_view/partidos.dart renamed to lib/views/home_screen/partidos_view/partidos.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'circle_button.dart';
+import '../circle_button.dart';
 
 class StyledAppBar extends StatelessWidget implements PreferredSizeWidget {
   StyledAppBar({Key key}) : super(key: key);

lib/views/horizontal_list_views/teams_list_view.dart renamed to lib/views/home_screen/teams_list_view.dart

@@ -29,6 +29,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.3"
+  charts_common:
+    dependency: transitive
+    description:
+      name: charts_common
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.9.0"
+  charts_flutter:
+    dependency: "direct main"
+    description:
+      name: charts_flutter
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.9.0"
   clock:
     dependency: transitive
     description:
@@ -67,6 +81,20 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  intl:
+    dependency: transitive
+    description:
+      name: intl
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.16.1"
+  logging:
+    dependency: transitive
+    description:
+      name: logging
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.11.4"
   matcher:
     dependency: transitive
     description:

lib/views/comparison_view/comparison_view.dart renamed to lib/views/stats_screen/comparison_view.dart

@@ -28,6 +28,7 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^0.1.3
+  charts_flutter: ^0.9.0
 
 dev_dependencies:
   flutter_test:
@@ -47,6 +48,7 @@ flutter:
   # To add assets to your application, add an assets section, like this:
   assets:
     - assets/images/arena_icon.png
+    - assets/images/player_face.jpg
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware.