Merge pull request #15 from thamaraiselvam/daily_weekly_leaderboard

weekly and daily leaderboard added

Author: thamaraiselvam

lib/component/LeaderboardCard.dart

@@ -5,21 +5,31 @@ import 'package:numbers/widgets/dashedLine.dart';
 import 'package:numbers/widgets/leadershipBoardTable.dart';
 
 class LeaderboardCard extends StatefulWidget {
+  final String title;
+  final String type;
+  final int limit;
+
+  const LeaderboardCard({Key key, this.title, this.type, this.limit}): super(key: key);
+
+  @override
   _LeaderboardCardState createState() => _LeaderboardCardState();
 }
 
 class _LeaderboardCardState extends State<LeaderboardCard> {
-  String title= 'Leaderboard';
   List scores = [];
 
   @override
   void initState() {
     super.initState();
-    _getRecentScore();
+    _getScores();
+  }
+
+  void _getScores() {
+    this.getScore();
   }
 
-  void _getRecentScore() {
-    LeaderboardService().getData().then((score) {
+  void getScore(){
+    LeaderboardService().getData(limit: widget.limit, leaderboardType: widget.type).then((score) {
       setState(() {
         this.scores = score;
       });
@@ -42,7 +52,7 @@ class _LeaderboardCardState extends State<LeaderboardCard> {
                     Icons.show_chart,
                     color: primaryColor,
                   ),
-                  title: Text(title,
+                  title: Text(widget.title,
                       style: TextStyle(
                           color: primaryColor, fontWeight: FontWeight.bold)),
                 ),

lib/component/RecentScoreCard.dart

@@ -12,7 +12,7 @@ class RecentScoreBoard extends StatefulWidget {
 class _RecentScoreBoardState extends State<RecentScoreBoard> {
   List recentScore = [];
   Map scoreCardMeta = {};
-  String title = 'Recent Scores';
+  String title = 'Your Recent Scores';
 
   @override
   void initState() {

lib/screens/HomeScreen/HomeScreen.dart

@@ -65,7 +65,9 @@ class _HomeScreenState extends State<HomeScreen> {
                     ],
                   ),
                 ),
-                LeaderboardCard(),
+                LeaderboardCard(title: "Today's Leaders", type: 'daily', limit: 6,),
+                LeaderboardCard(title: "Leaders for Week", type: 'weekly', limit: 6,),
+                LeaderboardCard(title: "All-Time Leaders", type: 'overall', limit: 6,),
                 RecentScoreBoard(),
               ],
             ),

lib/screens/SplashScreen.dart

@@ -4,12 +4,12 @@ import 'package:flutter/material.dart';
 import 'package:numbers/utils/constants.dart';
 
 class SplashScreen extends StatefulWidget {
+
   const SplashScreen({Key key}) : super(key: key);
 
   @override
   _SplashScreenState createState() => _SplashScreenState();
 }
-
 class _SplashScreenState extends State<SplashScreen> {
 
   Timer _timer;
@@ -19,7 +19,7 @@ class _SplashScreenState extends State<SplashScreen> {
 
     loadData();
   }
-  
+
 
   Future<Timer> loadData() async {
     _timer = new Timer(Duration(seconds: 2), onDoneLoading);

lib/service/leaderboardService.dart

@@ -5,17 +5,21 @@ import 'package:numbers/utils/Common.dart';
 class LeaderboardService {
   final String collection = 'leaderboard';
   final String orderByKey = 'score';
+  final Map<String, int> leaderBoardTypes = {
+    'overall': 0,
+    'weekly': 7,
+    'daily': 1
+  };
 
   setData(Map gameState) async {
     Map newData = await this._formatSetData(gameState);
     Firestore.instance.collection(this.collection).document().setData(newData);
   }
 
   _formatSetData(Map gameState) async {
-
     String name = await SettingsStore().getKey('name');
 
-    if(name == null){
+    if (name == null) {
       name = Common.getRandomName();
     }
 
@@ -30,28 +34,79 @@ class LeaderboardService {
     };
   }
 
-  getData({int limit = 6}) async {
+  getData({int limit = 6, leaderboardType = 'overall'}) async {
     try {
-      var resultData = await Firestore.instance
-          .collection(this.collection)
-          .orderBy(this.orderByKey, descending: true)
-          .limit(limit)
-          .getDocuments();
+      int daysToSubtract = this.leaderBoardTypes[leaderboardType];
+      var resultData;
+
+      if (daysToSubtract != 0) {
+        String lastWeekTimeStamp = DateTime.now()
+            .subtract(Duration(days: daysToSubtract))
+            .millisecondsSinceEpoch
+            .toString();
+
+        resultData = await _getDataByTimeCondition(lastWeekTimeStamp);
 
-      return this._formatGetData(resultData);
+      } else {
+        resultData = await _getOverallData(limit);
+      }
+
+      return this._formatGetData(resultData, limit);
     } catch (error) {
-      print(error);
+      //print(error);
     }
   }
 
-  _formatGetData(resultData) {
-    List formattedData = [];
+  _getDataByTimeCondition(String daysToSubtract) async {
+    return await Firestore.instance
+        .collection(this.collection)
+        .where("time", isGreaterThanOrEqualTo: daysToSubtract)
+        .getDocuments();
+  }
+
+  _getOverallData(limit) async {
+    return await Firestore.instance
+        .collection(this.collection)
+        .orderBy(this.orderByKey, descending: true)
+        .limit(limit)
+        .getDocuments();
+  }
 
+  _formatGetData(collection, limit) {
+    List list = this._formList(collection);
+    _sortList(list);
+    list = _addRank(list);
+    return _splitList(list, 0, limit);
+  }
+
+  List _formList(collection) {
+    List list = [];
+    for (var document in collection.documents) {
+      list.add(document.data);
+    }
+
+    return list;
+  }
+
+  _sortList(List documents) {
+    documents.sort((m1, m2) {
+      return m2["score"].compareTo(m1["score"]);
+    });
+  }
+
+  List _addRank(List documents) {
     int counter = 0;
-    for (var document in resultData.documents) {
-      document.data['rank'] = ++counter;
-      formattedData.add(document.data);
+    for (var document in documents) {
+      document['rank'] = ++counter;
+    }
+
+    return documents;
+  }
+
+  List _splitList(List list, int start, int end) {
+    if (list.length < end) {
+      end = list.length;
     }
-    return formattedData;
+    return list.sublist(start, end);
   }
 }

pubspec.lock

@@ -21,14 +21,14 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   charcode:
     dependency: transitive
     description:
@@ -136,21 +136,21 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.1.7"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.2"
+    version: "1.6.4"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0+1"
   petitparser:
     dependency: transitive
     description:
@@ -164,7 +164,7 @@ packages:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.5"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -204,7 +204,7 @@ packages:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   term_glyph:
     dependency: transitive
     description: