cleaned up code; added all the tests to the main page

Author: konstantinPopovskikh

lib/main.dart

@@ -1,4 +1,6 @@
+import 'package:fetchingapp/screen/home_page.dart';
 import 'package:fetchingapp/screen/login_page.dart';
+import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
 import 'package:firebase_core/firebase_core.dart';
 
@@ -14,11 +16,21 @@ class MyApp extends StatelessWidget {
   // This widget is the root of your application.
   @override
   Widget build(BuildContext context) {
+    User? firebaseUser = FirebaseAuth.instance.currentUser;
+
+    Widget firstScreen;
+
+    if (firebaseUser != null) {
+      firstScreen = HomePage(firebaseUser);
+    } else {
+      firstScreen = const LoginPage();
+    }
+
     return MaterialApp(
       theme: ThemeData(
         primarySwatch: Colors.blue,
       ),
-      home: const LoginPage(),
+      home: firstScreen,
     );
   }
 }

lib/provider/api.dart

@@ -1,5 +1,4 @@
 import 'dart:convert';
-import 'dart:ffi';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:fetchingapp/provider/database.dart';
 import 'package:http/http.dart' as http;
@@ -20,7 +19,6 @@ class ApiProvider {
       if (value.isNotEmpty) {
         print('READING FROM DB, NUMBER OF ENTRIES: ${value.length}');
         callFirestore();
-        print('called firestore');
 
         return value;
       } else {
@@ -46,7 +44,7 @@ class ApiProvider {
   }
 
   Future _getFromDB() async {
-    return readCache().then((value) {
+    return readJsonCache().then((value) {
       if (value.isNotEmpty) {
         print('reading from db');
         return value;
@@ -67,7 +65,6 @@ class ApiProvider {
         // cache data
         if (!kIsWeb) {
           await cleanDB();
-          print('db cleaned');
           await addBatchOfEntries(entries: jsonDecoded);
         }
         return json.decode(body);

lib/provider/database.dart

@@ -7,15 +7,21 @@ import 'package:sqflite/sqflite.dart';
 Future<Database> cacheDatabase() async {
   return openDatabase(join(await getDatabasesPath(), 'cache_database.db'),
       onCreate: (db, version) {
-    return db.execute(Queries().createCacheTable);
+    return db.execute(Queries().createCacheTable + Queries().jsonCache);
   }, version: 1);
 }
 
 //read data
 Future<List<Map>> readCache() async {
   final db = await cacheDatabase();
   var cache = db.query('cache');
-  print('db entries: $cache');
+
+  return cache;
+}
+
+Future<List<Map>> readJsonCache() async {
+  final db = await cacheDatabase();
+  var cache = db.query('jsoncache');
 
   return cache;
 }
@@ -38,7 +44,7 @@ Future addBatchOfEntries({required List<dynamic> entries}) async {
     final entry =
         DataModel(name: item['name'], body: item['body'], email: item['email']);
 
-    batch.insert('cache', entry.toMap(),
+    batch.insert('jsoncache', entry.toMap(),
         conflictAlgorithm: ConflictAlgorithm.replace);
   }
   await batch.commit(noResult: true);
@@ -51,5 +57,7 @@ Future cleanDB() async {
   }
   final db = await cacheDatabase();
   db.execute(Queries().dropCacheTable);
+  db.execute(Queries().dropJsonTable);
   db.execute(Queries().createCacheTable);
+  db.execute(Queries().jsonCache);
 }

lib/provider/sql_queries.dart

@@ -1,17 +1,26 @@
 class Queries {
   // String createCacheTable = '''
-  //   CREATE TABLE IF NOT EXISTS cache (
-  //     id INTEGER PRIMARY KEY,
-  //     name TEXT,
-  //     email TEXT,
-  //     body TEXT
-  //     );
-  //     ''';
+
   String createCacheTable = '''
     CREATE TABLE IF NOT EXISTS cache (
       id INTEGER PRIMARY KEY,
       name TEXT
       );
       ''';
+
+  String jsonCache = '''
+    CREATE TABLE IF NOT EXISTS jsoncache (
+      id INTEGER PRIMARY KEY,
+      name TEXT,
+      email TEXT,
+      body TEXT
+      );
+      ''';
+
   String dropCacheTable = 'DROP TABLE cache';
+  String dropJsonTable = 'DROP TABLE jsoncache';
+}
+
+void main() {
+  print(Queries().createCacheTable + Queries().jsonCache);
 }

lib/screen/firestore_page_future.dart lib/screen/firestore_future.dartlib/screen/firestore_page_future.dart renamed to lib/screen/firestore_future.dart

@@ -1,6 +1,5 @@
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:fetchingapp/provider/api.dart';
-import 'package:fetchingapp/provider/database.dart';
 import 'package:flutter/material.dart';
 
 class FutureFireStore extends StatefulWidget {
@@ -46,7 +45,7 @@ class _FutureFireStoreState extends State<FutureFireStore> {
                           final entry = (snapshot.data as dynamic)[index];
                           return ListTile(
                             title: Text(entry['name'].toString()),
-                            leading: Icon(Icons.data_usage),
+                            leading: const Icon(Icons.data_usage),
                           );
                         });
                   }

lib/screen/firestore_page_stream.dart lib/screen/firestore_stream.dartlib/screen/firestore_page_stream.dart renamed to lib/screen/firestore_stream.dart

@@ -57,7 +57,6 @@ class _StreamFireStoreState extends State<StreamFireStore> {
                     // print(value);
                   });
 
-                  print('db: $db');
                   // readCache();
 
                   // print(data);

lib/screen/home_page.dart

@@ -1,7 +1,8 @@
 import 'package:fetchingapp/provider/database.dart';
 import 'package:fetchingapp/provider/google_authentication.dart';
-import 'package:fetchingapp/screen/firestore_page_stream.dart';
-import 'package:fetchingapp/screen/firestore_page_future.dart';
+import 'package:fetchingapp/screen/firestore_stream.dart';
+import 'package:fetchingapp/screen/firestore_future.dart';
+import 'package:fetchingapp/screen/json_caching.dart';
 import 'package:fetchingapp/screen/login_page.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
@@ -15,63 +16,88 @@ class HomePage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
+        automaticallyImplyLeading: false,
         title: const Text('Home Page'),
       ),
       body: Center(
           child: Column(
         mainAxisAlignment: MainAxisAlignment.center,
         crossAxisAlignment: CrossAxisAlignment.center,
         children: [
-          Container(
-            color: Colors.red,
-          ),
           const Text(
             'Try getting Firebase data with and without Cache.',
             style: TextStyle(fontSize: 20),
             textAlign: TextAlign.center,
           ),
           const SizedBox(height: 50),
-          ElevatedButton(
-            child: const Text(
-              'Show Firebase Data',
-              style: TextStyle(fontSize: 20),
-            ),
-            onPressed: () {
-              Navigator.push(
-                context,
-                MaterialPageRoute(
-                    builder: (context) => const FutureFireStore()),
-              );
-            },
-          ),
+          testSectionButton(
+              context: context,
+              name: 'Future Firestore',
+              widget: const FutureFireStore()),
           const SizedBox(height: 10),
-          ElevatedButton(
-            child: const Text(
-              'Clean DB',
-              style: TextStyle(fontSize: 20),
-            ),
-            onPressed: () {
-              cleanDB();
-            },
-          ),
+          testSectionButton(
+              context: context,
+              name: 'Stream Firestore',
+              widget: const StreamFireStore()),
+          const SizedBox(height: 10),
+          cleanDBbutton(),
+          const SizedBox(height: 10),
+          testSectionButton(
+              context: context,
+              name: 'Old Json Caching Example',
+              widget: const JsonPage()),
           const SizedBox(height: 50),
-          Card(
-            child: ListTile(
-              leading: const Icon(Icons.person),
-              title: Text(user.displayName.toString()),
-              subtitle: Text(user.email.toString()),
-              trailing: IconButton(
-                  onPressed: () {
-                    FirebaseService().signOutFromGoogle();
-                    Navigator.push(context,
-                        MaterialPageRoute(builder: (_) => const LoginPage()));
-                  },
-                  icon: const Icon(Icons.logout)),
-            ),
-            elevation: 8,
-          ),
+          userProfileCard(context: context, user: user)
         ],
       )),
     );
   }
 }
+
+Widget testSectionButton(
+    {required BuildContext context,
+    required String name,
+    required Widget widget}) {
+  return ElevatedButton(
+    child: Text(
+      name,
+      style: const TextStyle(fontSize: 20),
+    ),
+    onPressed: () {
+      Navigator.push(
+        context,
+        MaterialPageRoute(builder: (context) => widget),
+      );
+    },
+  );
+}
+
+Widget cleanDBbutton() {
+  return ElevatedButton(
+    child: const Text(
+      'Clean DB',
+      style: TextStyle(fontSize: 20),
+    ),
+    onPressed: () {
+      cleanDB();
+    },
+  );
+}
+
+Widget userProfileCard({required BuildContext context, required User user}) {
+  return Card(
+    child: ListTile(
+      leading: const Icon(Icons.person),
+      title: Text(user.displayName.toString()),
+      subtitle: Text(user.email.toString()),
+      trailing: IconButton(
+          onPressed: () {
+            FirebaseService().signOutFromGoogle();
+            Navigator.push(
+                context, MaterialPageRoute(builder: (_) => const LoginPage()));
+          },
+          icon: const Icon(Icons.logout)),
+    ),
+    elevation: 8,
+  );
+}

lib/screen/data_page.dart lib/screen/json_caching.dartlib/screen/data_page.dart renamed to lib/screen/json_caching.dart

@@ -10,45 +10,46 @@ class LoginPage extends StatefulWidget {
 }
 
 class _LoginPageState extends State<LoginPage> {
-  void click() async {
-    await FirebaseService().signInwithGoogle().then((user) {
-      Navigator.push(
-          context, MaterialPageRoute(builder: (_) => HomePage(user)));
-    });
-  }
-
-  Widget googleLoginButton() {
-    return OutlinedButton(
-        style: OutlinedButton.styleFrom(
-            shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(45))),
-        onPressed: click,
-        child: Padding(
-          padding: const EdgeInsets.fromLTRB(0, 10, 0, 10),
-          child: Row(
-            mainAxisSize: MainAxisSize.min,
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: const [
-              Image(image: AssetImage('images/google_logo.png'), height: 35),
-              Padding(
-                  padding: EdgeInsets.only(left: 10),
-                  child: Text('Sign in with Google',
-                      style: TextStyle(color: Colors.grey, fontSize: 25)))
-            ],
-          ),
-        ));
-  }
-
   @override
   Widget build(BuildContext context) {
     // FirebaseService().signOutFromGoogle();
     return Scaffold(
       appBar: AppBar(
+        automaticallyImplyLeading: false,
         title: const Text('Login Screen'),
       ),
       body: Center(
-        child: googleLoginButton(),
+        child: googleLoginButton(context: context),
       ),
     );
   }
 }
+
+Widget googleLoginButton({required BuildContext context}) {
+  void click() async {
+    await FirebaseService().signInwithGoogle().then((user) {
+      Navigator.push(
+          context, MaterialPageRoute(builder: (_) => HomePage(user)));
+    });
+  }
+
+  return OutlinedButton(
+      style: OutlinedButton.styleFrom(
+          shape:
+              RoundedRectangleBorder(borderRadius: BorderRadius.circular(45))),
+      onPressed: click,
+      child: Padding(
+        padding: const EdgeInsets.fromLTRB(0, 10, 0, 10),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: const [
+            Image(image: AssetImage('images/google_logo.png'), height: 35),
+            Padding(
+                padding: EdgeInsets.only(left: 10),
+                child: Text('Sign in with Google',
+                    style: TextStyle(color: Colors.grey, fontSize: 25)))
+          ],
+        ),
+      ));
+}