Cleaned/Beautified all pages and changed the multitasking color in

main.dart

Author: Cyan101

app/lib/helpers/helpers.dart

@@ -1,12 +1,9 @@
-import 'package:http/http.dart' as http;
-import 'package:flutter/material.dart';
-import 'package:cached_network_image/cached_network_image.dart'; // WARNING: Cached Images package can be bugged
 import 'dart:async';
 import 'dart:convert';
 
-class Globals {
-  static var httpCache = {};
-}
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:flutter/material.dart';
+import 'package:http/http.dart' as http;
 
 const baseUrl = 'https://app.splatoon2.nintendo.net';
 
@@ -27,11 +24,18 @@ Future<Map> fetchData(toFetch) async {
   }
 }
 
-timeLeft(endTime) {
-  var currentTime = DateTime.now().millisecondsSinceEpoch;
-  endTime = endTime * 1000;
-  var remainingMin = (endTime - currentTime) / 1000 / 60;
-  return minToHours(remainingMin);
+imageRowBuild(image1, image2) {
+  return <Widget>[
+    new Flexible(
+        child: new CachedNetworkImage(
+            placeholder: new Center(child: CircularProgressIndicator()),
+            imageUrl: baseUrl + image1)),
+    new Padding(padding: new EdgeInsets.all(2.0)),
+    new Flexible(
+        child: new CachedNetworkImage(
+            placeholder: new Center(child: CircularProgressIndicator()),
+            imageUrl: baseUrl + image2))
+  ];
 }
 
 minToHours(timeMin) {
@@ -59,46 +63,6 @@ salmonRunOutCheck(timeStart, timeEnd) {
   }
 }
 
-
-weaponCardBuild(weaponArray) {
-  var cardList = <Widget>[];
-  for (var i = 0; i < 4; i++) {
-    cardList.add(new Expanded(
-      child: new Card(
-          color: Colors.blueGrey,
-          child: new CachedNetworkImage(
-              placeholder: new Center(child: CircularProgressIndicator()),
-              imageUrl: baseUrl + weaponArray[i]['thumbnail'])),
-    ));
-  }
-  return new Row(
-      mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: cardList);
-}
-
-imageRowBuild(image1, image2) {
-  return <Widget>[
-    new Flexible(
-        child: new CachedNetworkImage(
-            placeholder: new Center(child: CircularProgressIndicator()),
-            imageUrl: baseUrl + image1)),
-    new Padding(padding: new EdgeInsets.all(2.0)),
-    new Flexible(
-        child: new CachedNetworkImage(
-            placeholder: new Center(child: CircularProgressIndicator()),
-            imageUrl: baseUrl + image2))
-  ];
-}
-
-//starCreator(amount) {
-//  var starList = <Widget>[];
-//  for (var i = 0; i < amount; i++) {
-//    starList.add(
-//      new Icon(Icons.star)
-//    );
-//  }
-//  return starList;
-//}
-
 storeItemCreator(storeData) {
   var times = storeData.length;
   var listOfCards = <Widget>[];
@@ -144,4 +108,41 @@ storeItemCreator(storeData) {
   }
 
   return listOfCards;
+}
+
+
+timeLeft(endTime) {
+  var currentTime = DateTime.now().millisecondsSinceEpoch;
+  endTime = endTime * 1000;
+  var remainingMin = (endTime - currentTime) / 1000 / 60;
+  return minToHours(remainingMin);
+}
+
+weaponCardBuild(weaponArray) {
+  var cardList = <Widget>[];
+  for (var i = 0; i < 4; i++) {
+    cardList.add(new Expanded(
+      child: new Card(
+          color: Colors.blueGrey,
+          child: new CachedNetworkImage(
+              placeholder: new Center(child: CircularProgressIndicator()),
+              imageUrl: baseUrl + weaponArray[i]['thumbnail'])),
+    ));
+  }
+  return new Row(
+      mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: cardList);
+}
+
+//starCreator(amount) {
+//  var starList = <Widget>[];
+//  for (var i = 0; i < amount; i++) {
+//    starList.add(
+//      new Icon(Icons.star)
+//    );
+//  }
+//  return starList;
+//}
+
+class Globals {
+  static var httpCache = {};
 }

app/lib/main.dart

@@ -18,7 +18,9 @@ class AppMenu extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return new MaterialApp(
+      theme: ThemeData(primarySwatch: Colors.blue),
       title: 'Splat2ink',
+      color: Color.fromRGBO(29, 85, 211, 1.0),
       home: new DefaultTabController(
         length: 3,
         child: new Scaffold(

app/lib/pages/game_modes.dart

@@ -109,7 +109,9 @@ class GameModes extends StatelessWidget {
             } else if (snapshot.hasError) {
               return new Text("${snapshot.error}");
             }
-            return new Padding(padding: EdgeInsets.only(top: 15.0),child: new Center(child: CircularProgressIndicator()));
+            return new Padding(
+                padding: EdgeInsets.only(top: 15.0),
+                child: new Center(child: CircularProgressIndicator()));
           },
         ),
       ],

app/lib/pages/salmon_run.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import '../helpers/helpers.dart';
 import 'package:cached_network_image/cached_network_image.dart'; // WARNING: Cached Images package can be bugged
 
-
 //class SalmonRun extends StatefulWidget {
 //  @override
 //  createState() => new SalmonRunState();
@@ -92,7 +91,9 @@ class SalmonRun extends StatelessWidget {
             }
 
             // By default, show a loading spinner
-            return new Padding(padding: EdgeInsets.only(top: 15.0),child: new Center(child: CircularProgressIndicator()));
+            return new Padding(
+                padding: EdgeInsets.only(top: 15.0),
+                child: new Center(child: CircularProgressIndicator()));
           },
         ),
       ],

app/lib/pages/store.dart

@@ -1,6 +1,11 @@
 import 'package:flutter/material.dart';
 import '../helpers/helpers.dart';
-import 'package:cached_network_image/cached_network_image.dart'; // WARNING: Cached Images package can be bugged
+
+//class Store extends StatefulWidget {
+//  @override
+//  createState() => new StoreState();
+//}
+//class StoreState extends State<Store> {
 
 class Store extends StatelessWidget {
   @override
@@ -12,10 +17,7 @@ class Store extends StatelessWidget {
           builder: (context, snapshot) {
             if (snapshot.hasData) {
               var data = snapshot.data['store'];
-              return new Column(
-                children: storeItemCreator(data)
-              );
-
+              return new Column(children: storeItemCreator(data));
             } else if (snapshot.hasError) {
               return new Text("${snapshot.error}");
             }