Code refactor

Best Score added

Author: thamaraiselvam

lib/component/ScoreCard.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:numbers/provider/ScoreStore.dart';
+import 'package:numbers/store/RecentScoreStore.dart';
 import 'package:numbers/utils/constants.dart';
 import 'package:numbers/widgets/dashedLine.dart';
 import 'package:numbers/widgets/recentScore.dart';
@@ -22,7 +22,7 @@ class _ScoreBoardState extends State<ScoreBoard> {
   }
 
   void _getRecentScore() {
-    ScoreStore().getRecentScore().then((score) {
+    RecentScoreStore().getRecentScore().then((score) {
       setState(() {
         this.recentScore = score;
       });
@@ -32,6 +32,7 @@ class _ScoreBoardState extends State<ScoreBoard> {
   @override
   Widget build(BuildContext context) {
     return Container(
+      color: secondaryBGColor,
       padding: const EdgeInsets.only(top: 5, left: 10, right: 10, bottom: 5),
       child: Column(
         children: <Widget>[

lib/provider/BlockDataStream.dart

@@ -7,5 +7,9 @@ class BlockDataStream {
 
   final _controller = StreamController<Map<String, int>>();
 
+  void dispose(){
+    _controller.close();
+  }
+
   Stream<Map<String, int>> get stream => _controller.stream;
 }

lib/screens/GameScreen/GameScreen.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
-import 'package:numbers/provider/ScoreStore.dart';
+import 'package:numbers/store/BestScore.dart';
+import 'package:numbers/store/RecentScoreStore.dart';
 import 'package:numbers/schema/BlockSchema.dart';
 import 'package:numbers/screens/GameScreen/summaryModel.dart';
 import 'package:numbers/widgets/bgGradient.dart';
@@ -68,12 +69,17 @@ class _GameScreenState extends State<GameScreen> {
           this.isTimeUp = true;
           this.gameTimerObject.cancel();
           showSummary(context, gameHistory);
-          ScoreStore().updateRecentScore(gameHistory['success']);
+          updateScores();
         }
       });
     });
   }
 
+  void updateScores(){
+    RecentScoreStore().updateRecentScore(gameHistory['success']);
+    BestScoreStore().updateScore(gameHistory['success']);
+  }
+
   void fillBlocksData() {
     if (this.isTimeUp) {
       return;

lib/screens/HomeScreen/HomeScreen.dart

@@ -14,6 +14,7 @@ class HomeScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     return SafeArea(
       child: Scaffold(
+        backgroundColor: secondaryBGColor,
         body: SingleChildScrollView(
           child: Container(
             color: primaryColorLowOpacity,
@@ -42,11 +43,10 @@ class HomeScreen extends StatelessWidget {
                     ],
                   ),
                 ),
-                SizedBox(
-                  height: 10,
-                ),
+                // SizedBox(
+                //   height: 10,
+                // ),
                 ScoreBoard('Recent Scores'),
-                // ScoreBoard('recent_score '),
               ],
             ),
           ),

lib/store/BestScore.dart

@@ -0,0 +1,24 @@
+import 'package:shared_preferences/shared_preferences.dart';
+
+class BestScoreStore {
+  SharedPreferences prefs;
+  final String key = 'bestScore';
+  init() async {
+    if (this.prefs == null) {
+      this.prefs = await SharedPreferences.getInstance();
+    }
+  }
+
+  updateScore(int currentBest) async {
+    int bestScore = await getBestScore();
+
+    bestScore = bestScore > currentBest ? bestScore : currentBest;
+
+    return await this.prefs.setInt(this.key, bestScore);
+  }
+
+  Future getBestScore() async {
+    await this.init();
+    return this.prefs.getInt(this.key) == null ? 0 : this.prefs.getInt(this.key);
+  }
+}

lib/provider/ScoreStore.dart lib/store/RecentScoreStore.dartlib/provider/ScoreStore.dart renamed to lib/store/RecentScoreStore.dart

@@ -2,7 +2,7 @@ import 'dart:convert';
 import 'package:numbers/service/RecentScoreService.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
-class ScoreStore {
+class RecentScoreStore {
   SharedPreferences prefs;
 
   final String scoreKey = 'recentScore';

lib/utils/constants.dart

@@ -3,5 +3,6 @@ import 'package:flutter/material.dart';
 const Color primaryColor = Color.fromRGBO(40, 20, 130, 1);
 const Color primaryColorLowOpacity = Color.fromRGBO(40, 20, 130, 0.6);
 const Color secondaryColor = Color.fromRGBO(206, 127, 216, 1);
+const Color secondaryBGColor = Color.fromRGBO(136, 112, 201, 1);
 const Color greyFontColor = Color.fromRGBO(117, 112, 112, 1);
 const Color blackLowOpacity = Color.fromRGBO(17, 38, 33, 0.5);