Merge pull request #17 from Koenigseder/develop

Version 1.1.2
Koenigseder · Jan 25, 2023 · 0b5d3f3 · 0b5d3f3
2 parents bf0839e + 46c839c
commit 0b5d3f3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/lib/screens/home.dart b/lib/screens/home.dart
@@ -318,7 +318,7 @@ class _HomePageState extends State<HomePage> {
             stream: _firestoreService.readUser(),
             builder: (context, snapshot) {
               if (snapshot.hasError) {
-                return const Text("Something went wrong!");
+                return const Text("Something went wrong! Try resetting the app... 😥");
               }
               if (!snapshot.hasData) {
                 return Container();
@@ -364,7 +364,7 @@ class _HomePageState extends State<HomePage> {
                         key: Key("${Random().nextDouble()}"),
                         builder: (context, snapshot) {
                           Widget child = Container();
-                          if (!snapshot.hasData) return child;
+                          if (snapshot.connectionState == ConnectionState.waiting) return child;
                           if ((snapshot.data ?? []).isNotEmpty) {
                             child = ScrollConfiguration(
                               behavior: NoGlowBehaviour(),
@@ -423,15 +423,16 @@ class _HomePageState extends State<HomePage> {
                                       ),
                                     ),
                                     Text(
-                                      "So far there are no tasks",
+                                      "So far there are no lists",
                                       style: TextStyle(
                                         fontWeight: FontWeight.bold,
                                         fontSize: 20.0,
                                         height: 2.0,
                                       ),
                                     ),
                                     Text(
-                                      "Start by creating one in the right bottom corner",
+                                      "Start by creating or joining one in the right bottom corner",
+                                      textAlign: TextAlign.center,
                                     )
                                   ],
                                 ),

diff --git a/lib/screens/settings.dart b/lib/screens/settings.dart
@@ -72,7 +72,7 @@ class _SettingsPageState extends State<SettingsPage> {
             stream: _firestoreService.readUser(),
             builder: (context, snapshot) {
               if (snapshot.hasError) {
-                return const Text("Something went wrong!");
+                return const Text("Something went wrong! Try resetting the app... 😥");
               }
               if (!snapshot.hasData) {
                 return Container();

diff --git a/lib/services/firestore_service.dart b/lib/services/firestore_service.dart
@@ -24,12 +24,7 @@ class FirestoreService {
 
     final firestoreUser = FirestoreUser(
       name: name,
-      tasks: [
-        {
-          "role": "ADMIN",
-          "task_id": "DUMMY", // Needed to display right dialogs
-        }
-      ],
+      tasks: [],
     );
 
     final json = firestoreUser.toJson();

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.1.1+14
+version: 1.1.2+15
 
 environment:
   sdk: ">=2.17.6 <3.0.0"