added profile page and updation of data and water add modal

Author: noobcoder17

assets/icons/01.png

@@ -1,3 +1,4 @@
+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';
@@ -22,10 +23,10 @@ void main() async {
       DeviceOrientation.portraitUp
     ]
   );
-  SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
-    statusBarColor: Colors.transparent,
-    statusBarIconBrightness: Brightness.dark,    
-  ));
+  // SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
+  //   statusBarColor: Colors.transparent,
+  //   statusBarIconBrightness: Brightness.dark,    
+  // ));
   runApp(MyApp());
 }
 
@@ -49,6 +50,11 @@ class MyApp extends StatelessWidget {
         theme: ThemeData(
           primarySwatch: Colors.blue,
           visualDensity: VisualDensity.adaptivePlatformDensity,
+          pageTransitionsTheme: PageTransitionsTheme(
+            builders: {
+              TargetPlatform.android : CupertinoPageTransitionsBuilder()
+            }
+          )
         ),
         //home: HomeScreen(),
         //home: CustomDrawer(),
@@ -59,7 +65,8 @@ class MyApp extends StatelessWidget {
           // '/' : (ctx)=>OnboardScreen(),
           DataEntryScreen.routeName : (ctx)=>DataEntryScreen(),
           // AuthScreen.routeName : (ctx)=>AuthScreen(),
-          // CustomDrawer.routeName : (ctx)=>CustomDrawer()
+          // CustomDrawer.routeName : (ctx)=>CustomDrawer(),
+          AddWaterScreen.routeName : (ctx)=>AddWaterScreen()
         },
       ),
     );

assets/icons/02.png

@@ -27,7 +27,16 @@ class AppUser {
   factory AppUser.fromDoc(Map<String,dynamic> doc){
     return AppUser(
       uid: doc['uid'],
+      googleId: doc['google_id'],
+      email: doc['email'],
       name: doc['name'],
+      gender: doc['gender'],
+      birthday: (doc['birthday'] as Timestamp).toDate(),
+      weight: doc['weight'],
+      wakeUpTime: TimeOfDay(
+        hour: doc['wake_up_time']['hour'],
+        minute: doc['wake_up_time']['minute']
+      ),
       dailyTarget: doc['daily_target']
     );
   }

assets/icons/025-sun.png

@@ -22,12 +22,8 @@ class HomeProvider extends ChangeNotifier {
   DocumentReference _userRef;
   DocumentReference _currentWeek;
   Location _location = Location();
-  Map<String,dynamic> weather;
-
-  // HomeProvider(){
-  //   _weekColRef = _firebaseFirestore.collection('users').doc(_uid).collection('week');
-  //   _userRef = _firebaseFirestore.collection('users').doc(_uid);
-  // }
+  Map<String,dynamic> _weather;
+  LocationData _locationData;
 
   void update(User user){
     print('Updating user in home provider');
@@ -36,6 +32,7 @@ class HomeProvider extends ChangeNotifier {
       _weekColRef = _firebaseFirestore.collection('users').doc(_uid).collection('weeks');
       _userRef = _firebaseFirestore.collection('users').doc(_uid);
     }else{
+      _isInited = false;
       _uid = null;
       _appUser = null;
       _weekColRef = null;
@@ -44,6 +41,10 @@ class HomeProvider extends ChangeNotifier {
     notifyListeners();
   }
 
+  Map<String,dynamic> get weather {
+    return _weather;
+  }
+
   String get dailyTarget {
     int target = _appUser.dailyTarget;
     if(target<1000){
@@ -71,6 +72,8 @@ class HomeProvider extends ChangeNotifier {
     return consumed/target;
   }
 
+  AppUser get appUser => _appUser;
+
   Future<void> init()async{
     if(_isInited==false){
       try {
@@ -88,17 +91,21 @@ class HomeProvider extends ChangeNotifier {
           _weeklyData = WeeklyData.fromDoc(snapshot.data());
         }
         _isInited = true;
+        bool canGetLocation = await getLocationService();
+        print(canGetLocation);
+        if(canGetLocation){
+          _locationData = await _location.getLocation();
+          print(_locationData.latitude);
+          print(_locationData.longitude);
+          http.Response response = await http.get(
+            'https://api.openweathermap.org/data/2.5/weather?lat=${_locationData.latitude}&lon=${_locationData.longitude}&appid=5c079888a15f3da50f160e44ce22723e&units=metric'
+          );
+          if(response.statusCode==200){
+            final weatherInfo = jsonDecode(response.body);
+            _weather = weatherInfo['weather'][0];
+          }
+        }
         notifyListeners();
-        // LocationData _locationData = await _location.getLocation();
-        // print(_locationData.latitude);
-        // print(_locationData.longitude);
-        // http.Response response = await http.get(
-        //   'https://api.openweathermap.org/data/2.5/weather?lat=${_locationData.latitude}&lon=${_locationData.longitude}&appid=5c079888a15f3da50f160e44ce22723e&units=metric'
-        // );
-        // if(response.statusCode==200){
-        //   final weatherInfo = jsonDecode(response.body);
-        //   print(weatherInfo['main']);
-        // }
       }catch(e){
         print(e);
       }
@@ -107,49 +114,64 @@ class HomeProvider extends ChangeNotifier {
     }
   }
 
-  Future<void> addWater(int amount) async {
+  Future<void> addWater(int amount,DateTime time) async {
     try{
-      int weekday = DateTime.now().weekday;
+      int weekday = time.weekday;
+      int week = getWeek(time);
+      String weekId = '${time.year}_$week';
       _firebaseFirestore.runTransaction((transaction)async{
-        DocumentReference yearDocRef = _firebaseFirestore.collection('users').doc(_uid).collection('years').doc('${_today.year}');
-        DocumentReference monthDocRef = _firebaseFirestore.collection('users').doc(_uid).collection('months').doc('${_today.year}_${_today.month}');
+        DocumentReference weekDocRef = _firebaseFirestore.collection('users').doc(_uid).collection('weeks').doc(weekId);
+        DocumentReference yearDocRef = _firebaseFirestore.collection('users').doc(_uid).collection('years').doc('${time.year}');
+        DocumentReference monthDocRef = _firebaseFirestore.collection('users').doc(_uid).collection('months').doc('${time.year}_${time.month}');
         DocumentSnapshot yearDocSnap = await transaction.get(yearDocRef);
         DocumentSnapshot monthDocSnap = await transaction.get(monthDocRef);
+        DocumentSnapshot weekDocSnap = await transaction.get(weekDocRef);
 
         if(!yearDocSnap.exists){
           transaction.set(yearDocRef, {
-            'year' : _today.year
+            'year' : time.year
           },SetOptions(merge: true));
         }
 
         if(!monthDocSnap.exists){
           transaction.set(monthDocRef, {
-            'year' : _today.year,
-            'month' : _today.month
+            'year' : time.year,
+            'month' : time.month
+          },SetOptions(merge: true));
+        }
+
+        if(!weekDocSnap.exists){
+          transaction.set(weekDocRef, {
+            'year' : time.year,
+            'month' : time.month,
+            'week' : week,
+            'id' : weekId
           },SetOptions(merge: true));
         }
 
         transaction.update(yearDocRef, {
-          'amounts.${_today.month}' : FieldValue.increment(amount)
+          'amounts.${time.month}' : FieldValue.increment(amount)
         });
 
         transaction.update(monthDocRef, {
-          'amounts.${_today.day}' : FieldValue.increment(amount)
+          'amounts.${time.day}' : FieldValue.increment(amount)
         });
-        transaction.update(_currentWeek, {
+        transaction.update(weekDocRef, {
           'amounts.$weekday' : FieldValue.increment(amount)
         });
 
       });
-      _weeklyData.amounts[weekday.toString()] += amount;
-      notifyListeners();
+      if(_weeklyData.id==weekId){
+        _weeklyData.amounts[weekday.toString()] += amount;
+        notifyListeners();
+      }
     }catch(e){
       print(e);
     }
 
   }
 
-  Future<void> getLocation()async{
+  Future<bool> getLocationService()async{
     bool isServiceEnabled = await _location.serviceEnabled();
     print(isServiceEnabled);
 
@@ -158,19 +180,29 @@ class HomeProvider extends ChangeNotifier {
       if (_enabled) {
         print('Service is enabled now');
       }else{
-        return;
+        return false;
       }
     }
-    print('Service is already enables');
 
     PermissionStatus permissionGranted = await _location.hasPermission();
     if (permissionGranted == PermissionStatus.denied) {
       PermissionStatus _isGranted = await _location.requestPermission();
       if (_isGranted != PermissionStatus.granted) {
-        return;
+        return false;
       }
     }
-    print('Ok');
+    return true;
   }
+
+  Future<void> updateUser(AppUser appUser)async{
+    try{
+      print(appUser.toDoc());
+      await _userRef.update(appUser.toDoc());
+      _appUser = appUser;
+      notifyListeners();
+    }catch(e){
+      print(e);
+    }
+  } 
 }
 

assets/icons/03.png

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:google_sign_in/google_sign_in.dart';
 import 'package:provider/provider.dart';
 import 'package:google_fonts/google_fonts.dart';
+import 'package:flutter/services.dart';
 
 class AuthScreen extends StatefulWidget {
   static const routeName = 'auth-screen';
@@ -15,6 +16,15 @@ class AuthScreen extends StatefulWidget {
 class _AuthScreenState extends State<AuthScreen> {
   bool _loading = false;
 
+  @override
+  void initState() {
+    super.initState();
+    SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
+      statusBarColor: Colors.transparent,
+      statusBarIconBrightness: Brightness.dark,    
+    ));
+  }
+
   void toggleLoading(){
     setState(() {
       _loading = !_loading;

assets/icons/04.png

@@ -4,6 +4,7 @@ import 'package:provider/provider.dart';
 import 'package:google_sign_in/google_sign_in.dart';
 import 'package:intl/intl.dart';
 import '../utils/time_converter.dart';
+import '../widgets/custom_form_field.dart';
 
 class DataEntryScreen extends StatelessWidget {
   static const routeName = 'data-entry-screen';
@@ -102,21 +103,22 @@ class _DataEntryFormState extends State<DataEntryForm> {
     if(!_formKey.currentState.validate()){
       return;
     }
-    // toggleLoading();
-    // try{
-    //   await Provider.of<AuthProvider>(context,listen: false).signUp(
-    //     _gender,
-    //     _birthday,
-    //     _weight,
-    //     _wakeUpTime,
-    //     _water
-    //   );
-    //   Navigator.of(context).pop();
-    //   return;
-    // }catch(e){
-    //   print(e);
-    // }
-    // toggleLoading();
+    _formKey.currentState.save();
+    toggleLoading();
+    try{
+      await Provider.of<AuthProvider>(context,listen: false).signUp(
+        _gender,
+        _birthday,
+        _weight,
+        _wakeUpTime,
+        _water
+      );
+      Navigator.of(context).pop();
+      return;
+    }catch(e){
+      print(e);
+    }
+    toggleLoading();
   }
 
   void setWater({double weight}){
@@ -368,48 +370,7 @@ class _DataEntryFormState extends State<DataEntryForm> {
   }
 }
 
-class CustomFormField extends StatelessWidget {
-  final String label;
-  final Widget child;
-  CustomFormField({this.child,this.label});
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      //color: Colors.yellow,
-      height: 60,
-      child: Stack(
-        children: [
-          Container(
-            width: double.infinity,
-            height: double.infinity,
-            margin: EdgeInsets.only(top: 6),
-            padding: EdgeInsets.symmetric(horizontal: 12),
-            decoration: BoxDecoration(
-              border: Border.all(color: Colors.black.withOpacity(0.3),width: 1.1),
-              borderRadius: BorderRadius.circular(4)
-            ),
-            alignment: Alignment.centerLeft,
-            child: child
-          ),
-          Positioned(
-            left: 14,
-            child: Container(
-              color: Colors.white,
-              padding: EdgeInsets.symmetric(horizontal: 3),
-              child: Text(
-                label,
-                style: TextStyle(
-                  fontSize: 12,
-                  fontWeight: FontWeight.w500
-                ),
-              )
-            ),
-          )
-        ],
-      ),
-    );
-  }
-}
+
 
 // RaisedButton(
 //           child: Text('Lest go'),