feat(lesson): added numerical progression indicator

SethCohen · Mar 13, 2023 · 2c34d26 · 2c34d26
1 parent 8cd3f3c
commit 2c34d26
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 7 deletions.
diff --git a/src/lib/pages/lessons_page.dart b/src/lib/pages/lessons_page.dart
@@ -48,8 +48,18 @@ class _LessonsPageState extends State<LessonsPage> {
                             color: const Color(0XFF425366),
                             child: ListTile(
                                 title: Text(lessonTitle),
-                                trailing:
+                                trailing: Row(
+                                  mainAxisSize: MainAxisSize.min,
+                                  children: [
+                                    Text(
+                                      lessonProgress[index]
+                                              ['lessonCardsRemaining']
+                                          .toString(),
+                                      style: TextStyle(color: iconColour),
+                                    ),
                                     Icon(Icons.check_circle, color: iconColour),
+                                  ],
+                                ),
                                 onTap: () => Navigator.pushNamed(
                                       context,
                                       '/lesson',
@@ -94,6 +104,7 @@ class _LessonsPageState extends State<LessonsPage> {
         'id': lessonProgress.id,
         'complete': data['complete'],
         'inProgress': data['inProgress'],
+        'lessonCardsRemaining': data['lessonCardsRemaining'],
       };
     }).toList();
   }
@@ -107,12 +118,28 @@ class _LessonsPageState extends State<LessonsPage> {
 
     if (lessonDoesntExist) {
       FirebaseFirestore.instance
-          .collection("users")
-          .doc(user.uid)
-          .collection("progress")
+          .collection("lessons")
           .doc(lesson.id)
-          .set({"complete": false, "inProgress": false},
-              SetOptions(merge: true));
+          .collection('cards')
+          .get()
+          .then(
+        (value) {
+          final lessonCardsRemaining = value.size;
+          FirebaseFirestore.instance
+              .collection("users")
+              .doc(user.uid)
+              .collection("progress")
+              .doc(lesson.id)
+              .set(
+            {
+              "complete": false,
+              "inProgress": false,
+              "lessonCardsRemaining": lessonCardsRemaining
+            },
+            SetOptions(merge: true),
+          );
+        },
+      );
     }
   }
 

diff --git a/src/lib/widgets/lesson.dart b/src/lib/widgets/lesson.dart
@@ -21,7 +21,6 @@ class _LessonState extends State<Lesson> {
   Widget build(BuildContext context) {
     // TODO add actual expression signs, not just alphabet | add more cards
     // TODO optional: quiz minigame at end of lesson or loop
-    // TODO percentage|cards remaining lesson completed
 
     final arguments = (ModalRoute.of(context)?.settings.arguments ??
         <String, dynamic>{}) as Map;
@@ -111,6 +110,12 @@ class _LessonState extends State<Lesson> {
         Navigator.pop(context);
       } else {
         _currentCardIndex++;
+        FirebaseFirestore.instance
+            .collection('users')
+            .doc(_user.uid)
+            .collection('progress')
+            .doc(_lessonId)
+            .update({'lessonCardsRemaining': FieldValue.increment(-1)});
       }
     });
   }