Release 1.3.3 (#36)

* fixes #20 (#25)

The white was caused by small margin that is default to the card widget.

* fixes #23 (#26)

* Updated Asset (#28)

* Dev 1.3.3 issue 22  (#30)

* Added Manifest Entry
* Updated packages added icons
* Packages updated for dart 2 compatability
* Placeholder notifcation icons added

* fixes #29 (#31)

reduced padding

* fixes #27 again (#32)

* Updated image and removed redundant code

* Added padding around text

* Removed repeated code

* Increased Padding

* fixes #21 and other improvemnts for small devices (#33)

* fixes #34 (#35)

android/app/build.gradle

@@ -26,8 +26,8 @@ android {
         applicationId "com.danielmilnes.cyberdiscovery"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 8
-        versionName "1.3.2"
+        versionCode 9
+        versionName "1.3.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 

android/app/src/main/AndroidManifest.xml

@@ -32,5 +32,12 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@mipmap/ic_notification" />
+        <meta-data android:name="com.google.firebase.messaging.default_notification_color"
+            android:resource="@color/primary" />
+
     </application>
 </manifest>

lib/main.dart

@@ -24,6 +24,7 @@ Future<void> main() async {
         databaseURL: 'https://cyber-discovery.firebaseio.com',
       )
   );
+
   runApp(new CyberDiscoveryApp(app));
 } 
 
@@ -39,13 +40,17 @@ class _CyberDiscoveryAppState extends State<CyberDiscoveryApp> {
   final FirebaseApp _app;
   _CyberDiscoveryAppState(this._app);
 
-  static FirebaseAnalytics analytics = new FirebaseAnalytics();
-  final FirebaseMessaging firebaseMessaging = new FirebaseMessaging();
+  static FirebaseAnalytics _analytics = new FirebaseAnalytics();
+  final FirebaseMessaging _firebaseMessaging = new FirebaseMessaging();
 
   @override
   void initState() {
     super.initState();
-    firebaseMessaging.requestNotificationPermissions();
+    _firebaseMessaging.requestNotificationPermissions();
+    _firebaseMessaging.configure();
+    _firebaseMessaging.getToken().then((String token){
+      print(token);
+    });
   }
 
   @override
@@ -62,7 +67,7 @@ class _CyberDiscoveryAppState extends State<CyberDiscoveryApp> {
         accentColor: new Color.fromRGBO(62, 174, 211, 1.0),
         fontFamily: "Dosis",
       ),
-      home: new HomePage(db, analytics),
+      home: new HomePage(db, _analytics),
     );
   }
 }

lib/pages/community_page.dart

@@ -33,33 +33,12 @@ class ComunityPage extends StatelessWidget {
     return comunityData;
   }
 
-
   @override
-  Widget build(BuildContext context) {
-    /*List<Widget> comunitys = [
-      new Text("Comunity", style: Theme.of(context).textTheme.headline.apply(color: Colors.white)),
-      new Text("Over the course of Cyber Discovery a large community has formed.  Originating from the discord server several community projects were undertaken showing the strength of the community, this app is one of them.  Some others and other pillars of the community are listed below.", style: Theme.of(context).textTheme.body1.apply(color: Colors.white)),
-      new Divider(),
-      new Comunity(
-        "Discord",
-        "Come and Lurk",
-        "https://discord.gg/Kf8n5rT",
-        "assets/images/discord_qr.png"
-      ),
-      new Comunity(
-        "The App",
-        "Leave a 5 star review xxx",
-        "https://play.google.com/store/apps/details?id=com.danielmilnes.cyberdiscovery",
-        "assets/images/playstore_qr.png"
-      ),
-      new Comunity(
-        "Challenge Master", "A shit webiste I made", "https://challenge-master.firebaseapp.com/", "assets/images/discord_qr.png")
-    ];*/
-
+  Widget build(BuildContext context) {   
     return new Padding(
       padding: new EdgeInsets.all(5.0),
       child: new FutureBuilder(
-        future: getComunityData(_db, context),
+        future: getComunityData(_db, context).timeout(new Duration(seconds: 3)),
         builder: (BuildContext context, AsyncSnapshot<List<ComunityData>> snapshot) {
           if (snapshot.hasError) {
             return new ErrorMessage("Welp Something Went Wrong", "Check your connection to the internet");
@@ -82,9 +61,6 @@ class ComunityPage extends StatelessWidget {
           }
         }
       )
-
-
-
     );
   }
 }

lib/pages/event_page.dart

@@ -36,7 +36,7 @@ class EventPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return new FutureBuilder(
-      future: getEventData(_db, context),
+      future: getEventData(_db, context).timeout(new Duration(seconds: 3)),
       builder: (BuildContext context, AsyncSnapshot<List<EventData>> snapshot) {
         if (snapshot.hasError) {
           return new ErrorMessage("Welp Something Went Wrong", "Check your connection to the internet");

lib/pages/schedule_page.dart

@@ -17,14 +17,18 @@ class SchedulePage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return new FutureBuilder<DataSnapshot>(
-      future: getTabData(),
+      future: getTabData().timeout(new Duration(seconds: 3)),
       builder: (BuildContext context, AsyncSnapshot<DataSnapshot> snapshot){
         switch(snapshot.connectionState) {
           case ConnectionState.waiting:
             return new Center(
               child: new CircularProgressIndicator(),
             );
           case ConnectionState.done:
+            if (snapshot.hasError) {
+              return new ErrorMessage("Welp Something Went Wrong", "Check your connection to the internet");
+            }
+
             //Load Tabs
             var data = snapshot.data.value;
             int i = 0;
@@ -36,6 +40,7 @@ class SchedulePage extends StatelessWidget {
               tabPages.add(new ScheduleTab(_db, data[i.toString()]));
             }
 
+            //Create Widgets
             if (tabs.length > 0) {
               return new DefaultTabController(
                 length: i+1,

lib/pages/soundboard_page.dart

@@ -3,7 +3,7 @@ import 'dart:async';
 
 import 'package:firebase_database/firebase_database.dart';
 import 'package:firebase_analytics/firebase_analytics.dart';
-import 'package:audioplayer/audioplayer.dart';
+import 'package:audioplayers/audioplayers.dart';
 
 import 'package:cyber_discovery/widgets/sound_tab.dart';
 import 'package:cyber_discovery/widgets/error_message.dart';
@@ -22,14 +22,18 @@ class SoundBoardPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return new FutureBuilder(
-      future: getTabData(),
+      future: getTabData().timeout(new Duration(seconds: 3)),
       builder: (BuildContext context, AsyncSnapshot<DataSnapshot> snapshot) {
         switch (snapshot.connectionState) {
           case ConnectionState.waiting:
             return new Center(
               child: new CircularProgressIndicator(),
             );
           case ConnectionState.done:
+            if (snapshot.hasError) {
+              return new ErrorMessage("Welp Something Went Wrong", "Check your connection to the internet");
+            }
+
             //Load Tabs
             int i = 0;
             List<Widget> tabs = [];
@@ -39,6 +43,7 @@ class SoundBoardPage extends StatelessWidget {
               tabPages.add(new SoundTab(_db, _analytics, audioPlayer, snapshot.data.value[i.toString()]));
             }
 
+            //Creates Widgets
             return new DefaultTabController(
               length: i+1,
               child: new Scaffold(

lib/widgets/community.dart

@@ -27,19 +27,19 @@ class Comunity extends StatelessWidget {
                   crossAxisAlignment: CrossAxisAlignment.center,
                   children: <Widget>[
                     new Padding(
-                      padding: new EdgeInsets.symmetric(vertical: 10.0),
+                      padding: new EdgeInsets.symmetric(vertical: 5.0),
                       child: new Text(_data.title, style: Theme.of(context).textTheme.headline, textAlign: TextAlign.center,),
                     ),
                     new Padding(
-                      padding: new EdgeInsets.only(bottom: 5.0),
+                      padding: new EdgeInsets.only(bottom: 2.0),
                       child: new Text(_data.subtitle, style: Theme.of(context).textTheme.subhead, textAlign: TextAlign.center,),
                     ),
                     new Flexible(
                       child: new Container(),
                       fit: FlexFit.tight,
                     ),
                     new Padding(
-                      padding: new EdgeInsets.symmetric(vertical: 5.0),
+                      padding: new EdgeInsets.symmetric(vertical: 3.0),
                       child: new RaisedButton(
                         color: Theme.of(context).primaryColor,
                         textColor: Colors.white,

lib/widgets/contributors.dart

@@ -1,70 +1,42 @@
 import 'package:flutter/material.dart';
 
-import 'package:url_launcher/url_launcher.dart';
+import 'package:cyber_discovery/widgets/link.dart';
 
 class Contributors extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return new Padding(
       padding: new EdgeInsets.symmetric(vertical: 10.0),
       child: new Card(
-        child: new Padding(
-          padding: new EdgeInsets.all(5.0),
-          child: new Column(
-            children: <Widget>[
-              new Image.asset("assets/images/contributors.png"),
-              new Text("Contributors", style: Theme.of(context).textTheme.headline),
-              new Padding(
-                padding: new EdgeInsets.symmetric(vertical: 5.0),
-                child: new Text("This app is the result of some amazing people from the community! Why not give them a follow and show your appreciation?"),
-              ),
-              new GestureDetector(
-                child: new Padding(
-                  padding: new EdgeInsets.symmetric(vertical: 5.0),
-                  child: new Text("@BenTechy66 - Building the IOS version without paying a cent", style: new TextStyle(color: Colors.lightBlue)),
-                ),
-                onTap: (){
-                  launch("https://twitter.com/BenTechy66");
-                },
-              ),
-              new GestureDetector(
-                child: new Padding(
-                  padding: new EdgeInsets.symmetric(vertical: 5.0),
-                  child: new Text("@thebeanogamer - Financial support and marketing", style: new TextStyle(color: Colors.lightBlue)),
-                ),
-                onTap: (){
-                  launch("https://twitter.com/thebeanogamer");
-                },
-              ),
-              new GestureDetector(
-                child: new Padding(
-                  padding: new EdgeInsets.symmetric(vertical: 5.0),
-                  child: new Text("@dwouca - Curing my dislexia and the website", style: new TextStyle(color: Colors.lightBlue)),
-                ),
-                onTap: (){
-                  launch("https://twitter.com/dwouca");
-                },
-              ),
-              new GestureDetector(
-                child: new Padding(
-                  padding: new EdgeInsets.symmetric(vertical: 5.0),
-                  child: new Text("@OwlNamedSeymour - Everything else", style: new TextStyle(color: Colors.lightBlue)),
-                ),
-                onTap: (){
-                  launch("https://twitter.com/OwlNamedSeymour");
-                },
-              ),
-              new GestureDetector(
-                child: new Padding(
-                  padding: new EdgeInsets.symmetric(vertical: 5.0),
-                  child: new Text("@BritMonk3y - Graphic Design", style: new TextStyle(color: Colors.lightBlue)),
-                ),
-                onTap: (){
-                  launch("https://twitter.com/BritMonk3y");
-                },
-              ),
-            ],
-          ),
+        margin: new EdgeInsets.all(0.0),
+        child: new Column(
+          children: <Widget>[
+            new Column(
+              children: <Widget>[
+                new Image.asset("assets/images/contributors.png"),
+                new Padding(
+                  padding: new EdgeInsets.all(15.0),
+                  child: new Column(
+                    children: <Widget>[
+                      new Text("Contributors", style: Theme.of(context).textTheme.headline),
+                      new Padding(
+                        padding: new EdgeInsets.symmetric(vertical: 5.0),
+                        child: new Text(
+                          "This app is the result of some amazing people from the community! Why not give them a follow and show your appreciation?",
+                          textAlign: TextAlign.center,
+                        ),
+                      ),
+                      new Link("@BenTechy66 - Building the IOS version without paying a cent", "https://twitter.com/BenTechy66"),
+                      new Link("@thebeanogamer - Financial support and marketing", "https://twitter.com/thebeanogamer"),
+                      new Link("@dwouca - Curing my dislexia and the website", "https://twitter.com/dwouca"),
+                      new Link("@OwlNamedSeymour - Everything else", "https://twitter.com/OwlNamedSeymour"),
+                      new Link("@BritMonk3y - Graphic Design", "https://twitter.com/BritMonk3y"),
+                    ],
+                  ),
+                )
+              ],
+            ),
+          ],
         ),
       )
     );

lib/widgets/countdown.dart

@@ -59,7 +59,7 @@ class _CountdownState extends State<Countdown> with TickerProviderStateMixin {
         builder: (BuildContext context, Widget child) {
           var times = durationToHumanTime(event);
           return new Padding(
-            padding: new EdgeInsets.symmetric(horizontal: 20.0),
+            padding: new EdgeInsets.symmetric(horizontal: 25.0),
             child: new Row(
               mainAxisAlignment: MainAxisAlignment.spaceAround,
               crossAxisAlignment: CrossAxisAlignment.end,
@@ -105,7 +105,7 @@ class _CountdownState extends State<Countdown> with TickerProviderStateMixin {
                 new Flexible(
                   fit: FlexFit.loose,
                   child: new Text(
-                    "minutes",
+                    "mins",
                     style: Theme.of(context).textTheme.body1,
                   ),
                 ),
@@ -120,7 +120,7 @@ class _CountdownState extends State<Countdown> with TickerProviderStateMixin {
                 new Flexible(
                   fit: FlexFit.loose,
                   child: new Text(
-                    "seconds",
+                    "secs",
                     style: Theme.of(context).textTheme.body1,
                   ),
                 ),

lib/widgets/drawer_header.dart

@@ -12,7 +12,7 @@ class DrawerHead extends StatelessWidget {
           new Text("Cyber Discovery App", style: Theme.of(context).textTheme.headline.apply(color: Colors.white)),
           new Padding(
             padding: new EdgeInsets.only(top: 5.0),
-            child: new Text("The UNOFFICAL Cyber Discovery App", style: Theme.of(context).textTheme.caption.apply(color: Colors.white))
+            child: new Text("The UNOFFICIAL Cyber Discovery App", style: Theme.of(context).textTheme.caption.apply(color: Colors.white))
           ),
           new Divider()
         ],

lib/widgets/event_card.dart

@@ -14,7 +14,7 @@ class EventCard extends StatelessWidget {
     return new Padding(
       padding: new EdgeInsets.symmetric(vertical: 15.0, horizontal: 5.0),
         child: new Card(
-        color: Colors.white,
+        margin: new EdgeInsets.all(0.0),
         child: new Column(
           children: <Widget>[
             new Container(

lib/widgets/link.dart

@@ -0,0 +1,22 @@
+import 'package:flutter/material.dart';
+
+import 'package:url_launcher/url_launcher.dart';
+
+class Link extends StatelessWidget {
+  final String _displayText;
+  final String _linkUrl;
+  Link(this._displayText, this._linkUrl);
+
+  @override
+  Widget build(BuildContext context) {
+    return new GestureDetector(
+      child: new Padding(
+        padding: new EdgeInsets.symmetric(vertical: 5.0),
+        child: new Text(_displayText, style: new TextStyle(color: Colors.lightBlue)),
+      ),
+      onTap: (){
+        launch(_linkUrl);
+      },
+    );
+  }
+}

lib/widgets/sound_tab.dart

@@ -3,7 +3,7 @@ import 'dart:async';
 
 import 'package:firebase_database/firebase_database.dart';
 import 'package:firebase_analytics/firebase_analytics.dart';
-import 'package:audioplayer/audioplayer.dart';
+import 'package:audioplayers/audioplayers.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 
 import 'package:cyber_discovery/sound.dart';