added the statistics provider and screen. Little bit cleanup is left

Author: noobcoder17

lib/archive/water_effect_archive.dart

@@ -1,18 +1,17 @@
-import 'package:drinkable/screens/add_water_screen.dart';
-import 'package:drinkable/screens/data_entry_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:firebase_core/firebase_core.dart';
 
-// screens
-import './screens/test.dart';
 
 // providers
 import './providers/home_provider.dart';
 import './providers/auth_provider.dart';
+import './providers/statistics_provider.dart';
 
+// screens
 import './root.dart';
+import './screens/data_entry_screen.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -23,15 +22,10 @@ void main() async {
       DeviceOrientation.portraitUp
     ]
   );
-  // SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
-  //   statusBarColor: Colors.transparent,
-  //   statusBarIconBrightness: Brightness.dark,    
-  // ));
   runApp(MyApp());
 }
 
 class MyApp extends StatelessWidget {
-  // This widget is the root of your application.
   @override
   Widget build(BuildContext context) {
     return MultiProvider(
@@ -42,6 +36,10 @@ class MyApp extends StatelessWidget {
         ChangeNotifierProxyProvider<AuthProvider,HomeProvider>(
           create: (context) => HomeProvider(),
           update: (context, authProvider, homeProvider) => homeProvider..update(authProvider.user),
+        ),
+        ChangeNotifierProxyProvider<AuthProvider,StatisticsProvider>(
+          create: (context) => StatisticsProvider(),
+          update: (context, authProvider, statisticsProvider) => statisticsProvider..update(authProvider.user),
         )
       ],
       child: MaterialApp(
@@ -54,19 +52,11 @@ class MyApp extends StatelessWidget {
             builders: {
               TargetPlatform.android : CupertinoPageTransitionsBuilder()
             }
-          )
+          ),
         ),
-        //home: HomeScreen(),
-        //home: CustomDrawer(),
         home: Root(),
-        //home: TestScreen(),
-        //home: OnboardScreen(),
         routes: {
-          // '/' : (ctx)=>OnboardScreen(),
           DataEntryScreen.routeName : (ctx)=>DataEntryScreen(),
-          // AuthScreen.routeName : (ctx)=>AuthScreen(),
-          // CustomDrawer.routeName : (ctx)=>CustomDrawer(),
-          AddWaterScreen.routeName : (ctx)=>AddWaterScreen()
         },
       ),
     );

lib/main.dart

@@ -4,9 +4,10 @@ class WeeklyData {
   int month;
   int week;
   Map<String,dynamic> amounts;
+  int dailyTarget;
 
   WeeklyData({
-    this.id,this.year,this.month,this.week,this.amounts
+    this.id,this.year,this.month,this.week,this.amounts,this.dailyTarget
   });
 
   factory WeeklyData.fromDoc(Map<String,dynamic> doc){
@@ -21,17 +22,33 @@ class WeeklyData {
       year: doc['year'],
       month: doc['month'],
       week: doc['week'],
-      amounts: rawAmounts
+      amounts: rawAmounts,
+      dailyTarget: doc['daily_target']
     );
   }
 
 
-  Map<String,dynamic> createNewWeek(String id,int year,int month,int week){
+  Map<String,dynamic> createNewWeek(String id,int year,int month,int week,int target){
     return {
       'id' : id,
       'year' : year,
       'month' : month,
       'week' : week,
+      'daily_target' : target
     };
   }
+
+  double totalThisWeek(){
+    double total = 0;
+    amounts.forEach((key, value) {
+      total+=value;
+    });
+    return total;
+  }
+
+  int percentThisWeek(){
+    double total = totalThisWeek();
+    double max = (dailyTarget*DateTime.now().weekday).toDouble();
+    return ((total/max)*100).toInt();
+  }
 }

lib/models/weekly_data.dart

@@ -9,7 +9,6 @@ class AuthProvider extends ChangeNotifier {
   FirebaseFirestore _firestore = FirebaseFirestore.instance;
   GoogleSignIn _googleSignIn = GoogleSignIn();
   FirebaseAuth _firebaseAuth = FirebaseAuth.instance;
-  AppUser _appUser;
 
   GoogleSignInAccount get googleAcount {
     return _googleSignIn.currentUser;

lib/providers/auth_provider.dart

@@ -84,7 +84,7 @@ class HomeProvider extends ChangeNotifier {
         _appUser = AppUser.fromDoc(userSnapshot.data());
         DocumentSnapshot snapshot = await _currentWeek.get();
         if(!snapshot.exists){
-          Map<String,dynamic> newWeek = WeeklyData().createNewWeek(docId,_today.year,_today.month,week);
+          Map<String,dynamic> newWeek = WeeklyData().createNewWeek(docId,_today.year,_today.month,week,_appUser.dailyTarget);
           await _currentWeek.set(newWeek);
           _weeklyData = WeeklyData.fromDoc(newWeek);
         }else{
@@ -196,8 +196,12 @@ class HomeProvider extends ChangeNotifier {
 
   Future<void> updateUser(AppUser appUser)async{
     try{
-      print(appUser.toDoc());
-      await _userRef.update(appUser.toDoc());
+     await _firebaseFirestore.runTransaction((transaction)async{
+        transaction.update(_currentWeek,{
+          'daily_target' : appUser.dailyTarget
+        });
+        transaction.update(_userRef, appUser.toDoc());
+      });
       _appUser = appUser;
       notifyListeners();
     }catch(e){

lib/providers/home_provider.dart

@@ -0,0 +1,38 @@
+import 'package:flutter/foundation.dart';
+import '../models/weekly_data.dart';
+import 'package:firebase_auth/firebase_auth.dart';
+import 'package:cloud_firestore/cloud_firestore.dart';
+
+class StatisticsProvider extends ChangeNotifier {
+  FirebaseFirestore _firebaseFirestore = FirebaseFirestore.instance;
+  String _uid;
+  CollectionReference _weeksRef;
+
+  List<WeeklyData> _weeklyData = [];
+
+  List<WeeklyData> get weeklyData => [..._weeklyData];
+
+  void update(User user){
+    if(user!=null){
+      _uid = user.uid;
+      _weeksRef = _firebaseFirestore.collection('users').doc(_uid).collection('weeks');
+    }else{
+      _uid = null;
+      _weeksRef = null;
+      _weeklyData.clear();
+    }
+  }
+
+  Future<void> init() async {
+    try {
+      _weeklyData.clear();
+      QuerySnapshot snapshot = await _weeksRef.orderBy('id').limit(4).get();
+      List<QueryDocumentSnapshot> docsSnap = snapshot.docs;
+      docsSnap.forEach((docSnap) { 
+        _weeklyData.add(new WeeklyData.fromDoc(docSnap.data()));
+      });
+    }catch(e){
+      print(e);
+    }
+  }
+}

lib/providers/statistics_provider.dart

@@ -1,69 +1,20 @@
-import 'package:drinkable/providers/auth_provider.dart';
-import 'package:drinkable/screens/auth_screen.dart';
-import 'package:drinkable/screens/onboard_screen.dart';
-import 'package:drinkable/widgets/custom_drawer.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 
-class Root extends StatefulWidget {
-  @override
-  _RootState createState() => _RootState();
-}
-
-class _RootState extends State<Root> {
-  bool _loading = false;
-  bool _firstTime;
-
-
-  @override
-  void initState() {
-    super.initState();
-    isFirstTime();
-  }
+// providers
+import './providers/auth_provider.dart';
 
-  void toggleLoading(){
-    setState(() {
-      _loading = !_loading;
-    });
-  }
+// screens
+import './screens/auth_screen.dart';
 
-  void isFirstTime() async {
-    toggleLoading();
-    try{
-      SharedPreferences _preferences = await SharedPreferences.getInstance();
-      bool firstTime = _preferences.getBool('first_time');
-      if(firstTime==null){
-        _firstTime = true;
-      }else{
-        _firstTime = false;
-      }
-    }catch(e){
-      print('First time ${true}');
-    }
-    toggleLoading();
-  }
-
-  Future<void> setFirstTime() async {
-    toggleLoading();
-    try{
-      SharedPreferences _preferences = await SharedPreferences.getInstance();
-      bool success = await _preferences.setBool('first_time', false);
-      if(success){
-        _firstTime = false;
-      }
-    }catch(e){
-      print(e);
-    }
-    toggleLoading();
-  }
+// widgets
+import './widgets/custom_drawer.dart';
 
+class Root extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    return _loading ? Scaffold(body: Center(child: CircularProgressIndicator(),),) :
-    _firstTime ? OnboardScreen(this.setFirstTime) : 
-    Consumer<AuthProvider>(
+    return Consumer<AuthProvider>(
       builder: (context, authProvider, child) {
         User user = authProvider.user;
         if(user==null){