Fix connectivity issue & empty list placeholder (#29)

* Increase connect timeout for slow responses * Add placeholder for no selected favorites
acmauth · May 8, 2020 · 1e1848c · 1e1848c
1 parent 9ebe0df
commit 1e1848c
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 23 deletions.
diff --git a/lib/DataFetcher.dart b/lib/DataFetcher.dart
@@ -23,7 +23,7 @@ class DataFetcher {
 
   static Dio dio = new Dio(new BaseOptions(
     baseUrl: "http://snf-872013.vm.okeanos.grnet.gr:3000/",
-    connectTimeout: 5000,
+    connectTimeout: 10000,
     receiveTimeout: 3000,
   ));
 

diff --git a/lib/pages/user_profile/UserProfile.dart b/lib/pages/user_profile/UserProfile.dart
@@ -31,6 +31,8 @@ class UserProfile extends AbstractPage {
 }
 
 class _UserProfileState extends PageState<UserProfile> {
+  List<Container> _none = [Container(child: Text("None."))];
+
   @override
   Widget body(GlobalKey<ScaffoldState> scfKey) {
     return Column(
@@ -98,37 +100,44 @@ class _UserProfileState extends PageState<UserProfile> {
   }
 
   Container _buildFavSubjects() {
+    var subjects = widget.userData.favSubjects.isEmpty
+        ? _none
+        : widget.userData.favSubjects
+            .map((String subj) => Container(
+                  child: StyledText(subj),
+                  padding: EdgeInsets.all(5),
+                  margin: EdgeInsets.all(5),
+                  decoration: BoxDecoration(
+                    border: Border.all(color: Colors.blue),
+                    borderRadius: BorderRadius.all(Radius.circular(5)),
+                  ),
+                ))
+            .toList();
+
     return ItemContainer(
       title: "Favorite Subjects",
       color: Colors.lightBlue.withOpacity(0.1),
-      items: widget.userData.favSubjects
-          .map((String subj) => Container(
-                child: StyledText(subj),
-                padding: EdgeInsets.all(5),
-                margin: EdgeInsets.all(5),
-                decoration: BoxDecoration(
-                  border: Border.all(color: Colors.blue),
-                  borderRadius: BorderRadius.all(Radius.circular(5)),
-                ),
-              ))
-          .toList(),
+      items: subjects,
     );
   }
 
   Container _buildFavTeachers() {
+    var teachers = widget.userData.favTeachers.isEmpty
+        ? _none
+        : widget.userData.favTeachers
+            .map((String subj) => Container(
+                  child: StyledText(subj),
+                  padding: EdgeInsets.all(5),
+                  margin: EdgeInsets.all(5),
+                  decoration: BoxDecoration(
+                    border: Border.all(color: Colors.grey),
+                    borderRadius: BorderRadius.all(Radius.circular(5)),
+                  ),
+                ))
+            .toList();
     return ItemContainer(
       title: "Favorite Teachers",
-      items: widget.userData.favTeachers
-          .map((String subj) => Container(
-                child: StyledText(subj),
-                padding: EdgeInsets.all(5),
-                margin: EdgeInsets.all(5),
-                decoration: BoxDecoration(
-                  border: Border.all(color: Colors.grey),
-                  borderRadius: BorderRadius.all(Radius.circular(5)),
-                ),
-              ))
-          .toList(),
+      items: teachers,
     );
   }