Merge pull request #110 from theTaoTeam/notesimage

fix(jar notes): fix fav note toggle so it works properly when there a…
theTaoTeam · Apr 30, 2019 · a8b323b · a8b323b
2 parents 3ab9971 + 19a934e
commit a8b323b
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 11 deletions.
diff --git a/fude_app/lib/pages/jars/jar_edit.dart b/fude_app/lib/pages/jars/jar_edit.dart
@@ -49,7 +49,6 @@ class _JarPageState extends State<EditJarPage> {
     } else {
       formKey.currentState.save();
       model.updateJar(_formData);
-      model.fetchAllUserJars(model.currUserEmail);
       Navigator.pop(context);
     }
   }
@@ -234,7 +233,6 @@ class _JarPageState extends State<EditJarPage> {
                                   color: Colors.red,
                                   onPressed: () {
                                     model.deleteJar();
-                                    model.fetchAllUserJars(model.currUserEmail);
                                     Navigator.pop(context);
                                   })
                             ],

diff --git a/fude_app/lib/pages/jars/jar_notes.dart b/fude_app/lib/pages/jars/jar_notes.dart
@@ -20,7 +20,6 @@ class JarNotes extends StatefulWidget {
 
 class _JarNotesState extends State<JarNotes> {
   bool isFavorite = false;
-  var stream; // state variable
 
   @override
   void initState() {
@@ -177,12 +176,40 @@ class _JarNotesState extends State<JarNotes> {
                           ),
                         ],
                       )
-                    : Center(
-                        child: Text(
-                          'ADD AN IDEA TO GET STARTED',
-                          style: Theme.of(context).textTheme.subtitle,
-                          textAlign: TextAlign.center,
-                        ),
+                    : Column(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        children: <Widget>[
+                          SizedBox(height: height * .3,),
+                          Center(
+                            child: Text(
+                              isFavorite
+                                  ? 'NO FAVORITES'
+                                  : 'ADD AN IDEA TO GET STARTED',
+                              style: Theme.of(context).textTheme.subtitle,
+                              textAlign: TextAlign.center,
+                            ),
+                          ),
+                          Expanded(
+                            child: Align(
+                              alignment: Alignment.bottomRight,
+                              child: Container(
+                                padding: EdgeInsets.fromLTRB(
+                                    0, 0, width * 0.04, width * 0.05),
+                                child: IconButton(
+                                  splashColor: Colors.transparent,
+                                  highlightColor: Colors.transparent,
+                                  icon: isFavorite
+                                      ? Icon(Icons.favorite)
+                                      : Icon(Icons.favorite_border),
+                                  iconSize: 38,
+                                  color: Theme.of(context).iconTheme.color,
+                                  onPressed: () => toggleFavoriteFilter(),
+                                ),
+                              ),
+                            ),
+                          ),
+                        ],
                       );
               }
             }),

diff --git a/fude_app/lib/scoped-models/jar.dart b/fude_app/lib/scoped-models/jar.dart
@@ -97,6 +97,9 @@ mixin JarModel on Model {
             imageLocation == null ? _selJar['image'] : imageLocation.toString(),
         'isFav': _selJar['isFav']
       });
+      final user = await _auth.currentUser();
+      fetchAllUserJars(user.email);
+      notifyListeners();
     } catch (e) {
       print(e);
     }
@@ -109,6 +112,8 @@ mixin JarModel on Model {
           .document(_selJar.documentID)
           .delete()
           .catchError((err) => print(err));
+      final user = await _auth.currentUser();
+      fetchAllUserJars(user.email);
       notifyListeners();
     } catch (e) {
       print(e);
@@ -194,7 +199,6 @@ mixin JarModel on Model {
     } catch (e) {
       print(e);
     }
-    // print('location: $location -------');
     //returns the download url
     return location;
   }

diff --git a/fude_app/lib/widgets/forms/add_user_to_jar.dart b/fude_app/lib/widgets/forms/add_user_to_jar.dart
@@ -92,7 +92,7 @@ class AddUserToJarForm extends StatelessWidget {
                   ? Container(
                       padding: EdgeInsets.only(left: width * 0.04),
                       child: Text(
-                        "This user doesn't have an account yet. Please have them create one before adding!",
+                        "This user doesn't have an account yet. Please have them create one before sharing!",
                         overflow: TextOverflow.clip,
                         style: TextStyle(
                             color: Colors.red,