wip

Author: ekalosak

firebase.json

@@ -31,10 +31,7 @@
     "ui": {
       "enabled": true
     },
-    "singleProjectMode": true,
-    "storage": {
-      "port": 9199
-    }
+    "singleProjectMode": true
   },
   "remoteconfig": {
     "template": "remoteconfig.template.json"

lib/screens/main/chat.dart

@@ -104,7 +104,7 @@ class _ChatScreenState extends State<ChatScreen> {
     return [
       // Message(Role.ast,
       //     "Then, hold the walkie-talkie button to speak. Let go when you're done speaking. You should feel your phone vibrate when the recording starts."),
-      Message(Role.ast, "Press the call button to get started."),
+      Message(Role.ast, "Press that button to get started."),
       Message(Role.ast, "Would you like to practice ${widget.languages[widget.profile.lang]['language']['name']}?"),
       Message(Role.ast, "Hello, ${widget.profile.name}."),
     ];
@@ -461,6 +461,7 @@ class _ChatScreenState extends State<ChatScreen> {
       loadingBar = LinearProgressIndicator(
         value: progressValue,
         minHeight: loadingHeight,
+        color: Theme.of(context).colorScheme.tertiary,
       );
     } else if (callStatus == CallStatus.ringing || serverStatus == ServerStatus.pending) {
       loadingBar = LinearProgressIndicator(minHeight: loadingHeight);
@@ -481,9 +482,9 @@ class _ChatScreenState extends State<ChatScreen> {
     return Column(children: [
       _progressBar(context),
       Row(children: [
-        Expanded(flex: 2, child: SizedBox()),
+        Expanded(flex: 7, child: SizedBox()),
         Expanded(
-          flex: 3,
+          flex: 2,
           child: ConnectionStatus(
             micStatus: micStatus,
             serverStatus: serverStatus,
@@ -557,7 +558,7 @@ class _ChatScreenState extends State<ChatScreen> {
       backgroundColor: {
         CallStatus.idle: Theme.of(context).colorScheme.tertiary,
         CallStatus.ringing: Theme.of(context).colorScheme.onSurface,
-        CallStatus.inCall: Theme.of(context).colorScheme.primary,
+        CallStatus.inCall: Theme.of(context).colorScheme.secondary,
         CallStatus.error: Theme.of(context).colorScheme.tertiary,
       }[callStatus],
       icon: Icon(

lib/screens/main/feed.dart

@@ -94,10 +94,12 @@ class _FeedScreenState extends State<FeedScreen> {
 
   @override
   void dispose() {
+    super.dispose();
     _globalFeedListener.cancel();
     _feedListener.cancel();
     _userFeed.clear();
-    super.dispose();
+    _globalFeed.clear();
+    _globalRead.clear();
   }
 
   void _addToUserFeed(Map<String, Item> userFeed, Map<String, bool> globalRead) {

lib/types.dart

@@ -14,33 +14,19 @@ class NullDataError implements Exception {
 }
 
 class Activity {
-  String id;
   String title;
   String type;
   String name;
-  String? language;
-  List<Map<String, dynamic>>? goals;
-  String? userPrompt;
-  int? level;
+  int level;
 
-  Activity(
-      {required this.id,
-      required this.title,
-      required this.type,
-      required this.name,
-      this.language,
-      this.userPrompt,
-      this.goals,
-      this.level});
+  Activity({required this.title, required this.type, required this.name, required this.level});
 
   factory Activity.fromDocumentSnapshot(DocumentSnapshot snapshot) {
     Map<String, dynamic>? data = snapshot.data() as Map<String, dynamic>?;
     if (data == null) {
       throw NullDataError("Activity.fromDocumentSnapshot: data is null: ${snapshot.id}");
     }
     print('Activity.data: $data');
-    // TODO parse goals, requires Goals class {title: string, criteria: list[{body: string, points: int > 0}]}
-    List<Map<String, dynamic>> goals = [];
     String? name;
     if (data['type'] == 'lesson') {
       name = snapshot['config']['topic'];
@@ -49,17 +35,11 @@ class Activity {
     } else {
       throw Exception("Activity.fromDocumentSnapshot: unknown activity type: ${snapshot.id}");
     }
-    String? userPrompt = data.containsKey('user_prompt') ? snapshot['user_prompt'] : null;
-    int? level = data.containsKey('level') ? snapshot['level'] : null;
     final Activity act = Activity(
-        id: snapshot.id,
-        language: snapshot['language'],
-        title: snapshot['title'],
+        title: snapshot['translations']['en-US']['title'],
         type: snapshot['type'],
         name: name!,
-        goals: goals,
-        userPrompt: userPrompt,
-        level: level);
+        level: snapshot['config']['level']);
     return act;
   }
 }

lib/widgets/status.dart

@@ -50,8 +50,9 @@ class ConnectionStatus extends StatelessWidget {
     // print('serverStatus: $serverStatus');
     // print('callStatus: $callStatus');
     return Row(
-      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-      children: [_micIcon(micStatus), _serverIcon(serverStatus), _callIcon(callStatus)],
+      // mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+      mainAxisAlignment: MainAxisAlignment.spaceAround,
+      children: [_micIcon(micStatus), _serverIcon(serverStatus)], //, _callIcon(callStatus)],
     );
   }
 }