diff --git a/lib/home.dart b/lib/home.dart index c462ec4..65bd963 100644 --- a/lib/home.dart +++ b/lib/home.dart @@ -645,37 +645,6 @@ class _HomePageState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - GlassCard( - color: Colors.green, - child: Padding( - padding: const EdgeInsets.all(8.0), - child: Row( - children: [ - Text("My Stats", - style: - TextStyle(color: Colors.blueGrey)), - SizedBox( - width: 50, - ), - Padding( - padding: const EdgeInsets.all(8.0), - child: Text( - "Kills : ${myStatsForSelectedGame['kills']}"), - ), - Padding( - padding: const EdgeInsets.all(8.0), - child: Text( - "Deaths : ${myStatsForSelectedGame['deaths']}"), - ), - Padding( - padding: const EdgeInsets.all(8.0), - child: Text( - "Assist : ${myStatsForSelectedGame['assists']}"), - ), - ], - ), - ), - ), Row( children: [ ActionButton, @@ -697,8 +666,41 @@ class _HomePageState extends State { }).toList(); }, ), + ], - ) + ), + GlassCard( + color: Colors.green, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + children: [ + Text("My Stats", + style: + TextStyle(color: Colors.blueGrey)), + SizedBox( + width: 50, + ), + Padding( + padding: const EdgeInsets.all(8.0), + child: Text( + "Kills : ${(myStatsForSelectedGame['kills'] ?? "0")}"), + ), + Padding( + padding: const EdgeInsets.all(8.0), + child: Text( + "Deaths : ${(myStatsForSelectedGame['deaths'] ?? "0")}"), + ), + Padding( + padding: const EdgeInsets.all(8.0), + child: Text( + "Assist : ${(myStatsForSelectedGame['assists'] ?? "0")}"), + ), + ], + ), + ), + ), + ], ), ), @@ -707,48 +709,8 @@ class _HomePageState extends State { child: Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ - SingleChildScrollView( - scrollDirection: Axis.vertical, - child: Column( - children: [ - Padding( - padding: const EdgeInsets.fromLTRB( - 0, 20, 0, 0), - child: Text( - "Leaderboard", - style: TextStyle(fontSize: 20), - ), - ), - DataTable( - dataTextStyle: - TextStyle(color: Colors.white), - headingTextStyle: - TextStyle(color: Colors.white), - dividerThickness: 0, - columns: [ - DataColumn( - label: - Expanded(child: Text("Place"))), - DataColumn( - label: Expanded( - child: Text("Username"))), - DataColumn( - label: - Expanded(child: Text("Kills"))), - DataColumn( - label: Expanded( - child: Text("Deaths"))), - DataColumn( - label: Expanded(child: Text("XP"))), - ], - rows: leaderboardList, - ), - ], - ), - ), - SizedBox( - width: 50, - ), + + Padding( padding: const EdgeInsets.all(20.0), child: GlassCard( @@ -783,7 +745,49 @@ class _HomePageState extends State { ], ), )), - ) + ), + SizedBox( + width: 50, + ), + SingleChildScrollView( + scrollDirection: Axis.vertical, + child: Column( + children: [ + Padding( + padding: const EdgeInsets.fromLTRB( + 0, 20, 0, 0), + child: Text( + "Leaderboard", + style: TextStyle(fontSize: 20), + ), + ), + DataTable( + dataTextStyle: + TextStyle(color: Colors.white), + headingTextStyle: + TextStyle(color: Colors.white), + dividerThickness: 0, + columns: [ + DataColumn( + label: + Expanded(child: Text("Place"))), + DataColumn( + label: Expanded( + child: Text("Username"))), + DataColumn( + label: + Expanded(child: Text("Kills"))), + DataColumn( + label: Expanded( + child: Text("Deaths"))), + DataColumn( + label: Expanded(child: Text("XP"))), + ], + rows: leaderboardList, + ), + ], + ), + ), ], )) ],