Merge pull request #104 from theTaoTeam/bug

fix(jar_edit, home_page_jar): allow for time to pass while pulling se…
theTaoTeam · Apr 30, 2019 · e39ded9 · e39ded9
2 parents 83f4eb6 + 6d64e3a
commit e39ded9
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 20 deletions.
diff --git a/fude_app/lib/pages/home/home.dart b/fude_app/lib/pages/home/home.dart
@@ -1,12 +1,10 @@
-import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
-import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:page_transition/page_transition.dart';
+import 'dart:async';
 
 import 'package:fude/scoped-models/main.dart';
 import 'package:fude/pages/jars/jar.dart';
 import 'package:fude/pages/home/home_page_jar.dart';
-import 'package:fude/widgets/page_transformer/page_transformer.dart';
 
 class HomePage extends StatefulWidget {
   final MainModel model;
@@ -97,7 +95,7 @@ class _HomePageState extends State<HomePage> {
                         reverse: false,
                         pageSnapping: true,
                         controller: PageController(
-                          keepPage: false,
+                            keepPage: false,
                             viewportFraction: 0.88,
                             initialPage: 0),
                         itemCount: widget.model.usersJars.length,
@@ -109,14 +107,16 @@ class _HomePageState extends State<HomePage> {
                                   onTap: () {
                                     widget.model.getJarBySelectedId(widget
                                         .model.usersJars[index].documentID);
-                                    Navigator.push(
-                                      context,
-                                      PageTransition(
-                                        curve: Curves.linear,
-                                        type: PageTransitionType.downToUp,
-                                        child: JarPage(model: widget.model),
-                                      ),
-                                    );
+                                    Timer(Duration(milliseconds: 500), () {
+                                      Navigator.push(
+                                        context,
+                                        PageTransition(
+                                          curve: Curves.linear,
+                                          type: PageTransitionType.downToUp,
+                                          child: JarPage(model: widget.model),
+                                        ),
+                                      );
+                                    });
                                   },
                                   child: HomePageJar(
                                       model: widget.model,

diff --git a/fude_app/lib/pages/home/home_page_jar.dart b/fude_app/lib/pages/home/home_page_jar.dart
@@ -76,7 +76,7 @@ class HomePageJar extends StatelessWidget {
                         color: Theme.of(context).textTheme.subhead.color,
                         onPressed: () {
                           print('jar pressed, ${jar['id']}');
-                          model.getJarBySelectedId(jar['id']);
+                          model.getJarBySelectedId(jar.documentID);
                           Navigator.push(
                             context,
                             PageTransition(

diff --git a/fude_app/lib/pages/jars/jar.dart b/fude_app/lib/pages/jars/jar.dart
@@ -9,8 +9,6 @@ import 'dart:ui';
 import 'package:fude/scoped-models/main.dart';
 import 'package:fude/pages/jars/jar_notes.dart';
 import 'package:fude/pages/jars/category_card.dart';
-import 'package:fude/pages/home/home.dart';
-import 'package:fude/widgets/page_transformer/page_transformer.dart';
 import 'package:fude/helpers/randomNoteModal.dart';
 
 class JarPage extends StatefulWidget {

diff --git a/fude_app/lib/pages/jars/jar_edit.dart b/fude_app/lib/pages/jars/jar_edit.dart
@@ -26,6 +26,7 @@ class _JarPageState extends State<EditJarPage> {
   List<dynamic> currentCategories = [];
   bool userHasBeenAdded = false;
   bool needToInviteThisUser = false;
+  bool loadingJarData = true;
   final Map<String, dynamic> _formData = {
     'title': '',
     'categoriesToAdd': [],
@@ -36,7 +37,8 @@ class _JarPageState extends State<EditJarPage> {
 
   @override
   void initState() {
-    currentCategories = widget.model.selectedJar.data['categories'].toList();
+    _waitinForJarData();
+
     super.initState();
   }
 
@@ -131,6 +133,16 @@ class _JarPageState extends State<EditJarPage> {
     }
   }
 
+  void _waitinForJarData() {
+    Timer(Duration(seconds: 1), () {
+      setState(() {
+        currentCategories =
+            widget.model.selectedJar.data['categories'].toList();
+        loadingJarData = false;
+      });
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     final double height = MediaQuery.of(context).size.height;
@@ -159,7 +171,7 @@ class _JarPageState extends State<EditJarPage> {
           decoration: BoxDecoration(
             color: Theme.of(context).primaryColor,
           ),
-          child: ListView(
+          child: !loadingJarData ? ListView(
             shrinkWrap: true,
             children: <Widget>[
               Column(
@@ -228,7 +240,7 @@ class _JarPageState extends State<EditJarPage> {
                 ],
               ),
             ],
-          ),
+          ) : Center(child: CircularProgressIndicator(),),
         ),
       );
     });

diff --git a/fude_app/lib/scoped-models/jar.dart b/fude_app/lib/scoped-models/jar.dart
@@ -126,6 +126,8 @@ mixin JarModel on Model {
   }
 
   void getJarBySelectedId(String jarId) async {
+    _isLoading = true;
+    notifyListeners();
     try {
       await _firestore.collection('jars').getDocuments().then((val) {
         val.documents.forEach((jar) {
@@ -134,7 +136,7 @@ mixin JarModel on Model {
           }
         });
       });
-
+      _isLoading = false;
       notifyListeners();
     } catch (e) {
       print(e);
@@ -231,7 +233,6 @@ mixin JarModel on Model {
   }
 
   addUserToJar(String email) async {
-    FirebaseUser currUser = await FirebaseAuth.instance.currentUser();
     FirebaseUser user;
     String returnMsg = 'user does not exist';
     _isLoading = true;