bug fixes

premacck · Apr 26, 2018 · 2ad9e50 · 2ad9e50
1 parent ca9583c
commit 2ad9e50
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 13 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -26,8 +26,16 @@ android {
         disable 'InvalidPackage'
     }
 
+    signingConfigs {
+        releaseConfig {
+            keyAlias 'QuizAppKey'
+            keyPassword 'QuizApp@420'
+            storeFile file('D:/AndroidStudio/KeyStores/QuizApp-Flutter.jks')
+            storePassword 'QuizApp@420'
+        }
+    }
+
     defaultConfig {
-        // TO DO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.prembros.flutter.quizapp"
         minSdkVersion 16
         targetSdkVersion 27
@@ -38,9 +46,8 @@ android {
 
     buildTypes {
         release {
-            // TO DO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+//            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.releaseConfig
         }
     }
 }

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
          FlutterApplication and put your custom class here. -->
     <application
         android:name="io.flutter.app.FlutterApplication"
-        android:label="quiz_app"
+        android:label="QuizApp"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"

diff --git a/lib/pages/landing_page.dart b/lib/pages/landing_page.dart
@@ -6,7 +6,7 @@ class LandingPage extends StatelessWidget {
 
   @override Widget build(BuildContext context) {
     return new Material(
-      color: Colors.blueGrey,
+      color: Colors.blue,
       child: new InkWell(
         onTap: () => Navigator.of(context).push(new MaterialPageRoute(builder: (context) => new QuizPage())),
         child: new Column(

diff --git a/lib/pages/quiz_page.dart b/lib/pages/quiz_page.dart
@@ -52,7 +52,7 @@ class QuizPageState extends State<QuizPage> {
             if (_quiz.length == _questionNumber) {
               Navigator.of(context).pushAndRemoveUntil(
                 new MaterialPageRoute(builder: (context) => new ScorePage(_quiz.score, _quiz.length)),
-                (Route route) => route = null
+                    (Route route) => false,
               );
               return;
             }

diff --git a/lib/pages/score_page.dart b/lib/pages/score_page.dart
@@ -40,13 +40,15 @@ class ScorePage extends StatelessWidget {
             )
           ),
           new IconButton(
-            icon: new Icon(Icons.keyboard_arrow_right),
+            icon: new Icon(Icons.replay),
             color: Colors.white,
             iconSize: 100.0,
-            onPressed: () => Navigator.of(context).pushAndRemoveUntil(
-              new MaterialPageRoute(builder: (context) {new LandingPage();}),
-              (Route route) => route = null,
-            ),
+            onPressed: () {
+              Navigator.of(context).pushAndRemoveUntil(
+                new MaterialPageRoute(builder: (context) => new LandingPage()),
+                    (Route route) => false,
+              );
+            },
           ),
         ],
       ),

diff --git a/lib/ui/result_overlay.dart b/lib/ui/result_overlay.dart
@@ -26,10 +26,15 @@ class ResultOverlayState extends State<ResultOverlay> with SingleTickerProviderS
     super.initState();
   }
 
+  @override void dispose() {
+    _iconAnimationController.dispose();
+    super.dispose();
+  }
+
   @override Widget build(BuildContext context) => new Material(
       color: Colors.black87,
       child: new InkWell(
-        onTap: widget._onTap,
+        onTap: () => widget._onTap(),
         child: new Column(
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: <Widget>[