Fixes after PR

flyerhq · May 16, 2023 · 2368933 · 2368933
1 parent 3347c67
commit 2368933
Show file tree

Hide file tree

Showing 7 changed files with 211 additions and 216 deletions.
diff --git a/example/.gitignore b/example/.gitignore
@@ -9,7 +9,6 @@
 .history
 .svn/
 migrate_working_dir/
-google-services.json
 
 # IntelliJ related
 *.iml

diff --git a/example/lib/chat.dart b/example/lib/chat.dart
@@ -28,33 +28,6 @@ class ChatPage extends StatefulWidget {
 class _ChatPageState extends State<ChatPage> {
   bool _isAttachmentUploading = false;
 
-  @override
-  Widget build(BuildContext context) => Scaffold(
-        appBar: AppBar(
-          systemOverlayStyle: SystemUiOverlayStyle.light,
-          title: const Text('Chat'),
-        ),
-        body: StreamBuilder<types.Room>(
-          initialData: widget.room,
-          stream: FirebaseChatCore.instance.room(widget.room.id),
-          builder: (context, snapshot) => StreamBuilder<List<types.Message>>(
-            initialData: const [],
-            stream: FirebaseChatCore.instance.messages(snapshot.data!),
-            builder: (context, snapshot) => Chat(
-              isAttachmentUploading: _isAttachmentUploading,
-              messages: snapshot.data ?? [],
-              onAttachmentPressed: _handleAtachmentPressed,
-              onMessageTap: _handleMessageTap,
-              onPreviewDataFetched: _handlePreviewDataFetched,
-              onSendPressed: _handleSendPressed,
-              user: types.User(
-                id: FirebaseChatCore.instance.firebaseUser?.uid ?? '',
-              ),
-            ),
-          ),
-        ),
-      );
-
   void _handleAtachmentPressed() {
     showModalBottomSheet<void>(
       context: context,
@@ -224,4 +197,31 @@ class _ChatPageState extends State<ChatPage> {
       _isAttachmentUploading = uploading;
     });
   }
+
+  @override
+  Widget build(BuildContext context) => Scaffold(
+        appBar: AppBar(
+          systemOverlayStyle: SystemUiOverlayStyle.light,
+          title: const Text('Chat'),
+        ),
+        body: StreamBuilder<types.Room>(
+          initialData: widget.room,
+          stream: FirebaseChatCore.instance.room(widget.room.id),
+          builder: (context, snapshot) => StreamBuilder<List<types.Message>>(
+            initialData: const [],
+            stream: FirebaseChatCore.instance.messages(snapshot.data!),
+            builder: (context, snapshot) => Chat(
+              isAttachmentUploading: _isAttachmentUploading,
+              messages: snapshot.data ?? [],
+              onAttachmentPressed: _handleAtachmentPressed,
+              onMessageTap: _handleMessageTap,
+              onPreviewDataFetched: _handlePreviewDataFetched,
+              onSendPressed: _handleSendPressed,
+              user: types.User(
+                id: FirebaseChatCore.instance.firebaseUser?.uid ?? '',
+              ),
+            ),
+          ),
+        ),
+      );
 }
diff --git a/example/lib/login.dart b/example/lib/login.dart
@@ -25,6 +25,45 @@ class _LoginPageState extends State<LoginPage> {
     _usernameController = TextEditingController(text: '');
   }
 
+  void _login() async {
+    FocusScope.of(context).unfocus();
+
+    setState(() {
+      _loggingIn = true;
+    });
+
+    try {
+      await FirebaseAuth.instance.signInWithEmailAndPassword(
+        email: _usernameController!.text,
+        password: _passwordController!.text,
+      );
+      if (!mounted) return;
+      Navigator.of(context).pop();
+    } catch (e) {
+      setState(() {
+        _loggingIn = false;
+      });
+
+      await showDialog(
+        context: context,
+        builder: (context) => AlertDialog(
+          actions: [
+            TextButton(
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+              child: const Text('OK'),
+            ),
+          ],
+          content: Text(
+            e.toString(),
+          ),
+          title: const Text('Error'),
+        ),
+      );
+    }
+  }
+
   @override
   void dispose() {
     _focusNode?.dispose();
@@ -116,43 +155,4 @@ class _LoginPageState extends State<LoginPage> {
           ),
         ),
       );
-
-  void _login() async {
-    FocusScope.of(context).unfocus();
-
-    setState(() {
-      _loggingIn = true;
-    });
-
-    try {
-      await FirebaseAuth.instance.signInWithEmailAndPassword(
-        email: _usernameController!.text,
-        password: _passwordController!.text,
-      );
-      if (!mounted) return;
-      Navigator.of(context).pop();
-    } catch (e) {
-      setState(() {
-        _loggingIn = false;
-      });
-
-      await showDialog(
-        context: context,
-        builder: (context) => AlertDialog(
-          actions: [
-            TextButton(
-              onPressed: () {
-                Navigator.of(context).pop();
-              },
-              child: const Text('OK'),
-            ),
-          ],
-          content: Text(
-            e.toString(),
-          ),
-          title: const Text('Error'),
-        ),
-      );
-    }
-  }
 }
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -1,11 +1,14 @@
 import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/material.dart';
 
+import 'firebase_options.dart';
 import 'rooms.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  await Firebase.initializeApp();
+  await Firebase.initializeApp(
+    options: DefaultFirebaseOptions.currentPlatform,
+  );
   runApp(const MyApp());
 }
 

diff --git a/example/lib/register.dart b/example/lib/register.dart
@@ -36,6 +36,57 @@ class _RegisterPageState extends State<RegisterPage> {
     );
   }
 
+  void _register() async {
+    FocusScope.of(context).unfocus();
+
+    setState(() {
+      _registering = true;
+    });
+
+    try {
+      final credential =
+          await FirebaseAuth.instance.createUserWithEmailAndPassword(
+        email: _usernameController!.text,
+        password: _passwordController!.text,
+      );
+      await FirebaseChatCore.instance.createUserInFirestore(
+        types.User(
+          firstName: _firstName,
+          id: credential.user!.uid,
+          imageUrl: 'https://i.pravatar.cc/300?u=$_email',
+          lastName: _lastName,
+        ),
+      );
+
+      if (!mounted) return;
+      Navigator.of(context)
+        ..pop()
+        ..pop();
+    } catch (e) {
+      setState(() {
+        _registering = false;
+      });
+
+      await showDialog(
+        context: context,
+        builder: (context) => AlertDialog(
+          actions: [
+            TextButton(
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+              child: const Text('OK'),
+            ),
+          ],
+          content: Text(
+            e.toString(),
+          ),
+          title: const Text('Error'),
+        ),
+      );
+    }
+  }
+
   @override
   void dispose() {
     _focusNode?.dispose();
@@ -116,55 +167,4 @@ class _RegisterPageState extends State<RegisterPage> {
           ),
         ),
       );
-
-  void _register() async {
-    FocusScope.of(context).unfocus();
-
-    setState(() {
-      _registering = true;
-    });
-
-    try {
-      final credential =
-          await FirebaseAuth.instance.createUserWithEmailAndPassword(
-        email: _usernameController!.text,
-        password: _passwordController!.text,
-      );
-      await FirebaseChatCore.instance.createUserInFirestore(
-        types.User(
-          firstName: _firstName,
-          id: credential.user!.uid,
-          imageUrl: 'https://i.pravatar.cc/300?u=$_email',
-          lastName: _lastName,
-        ),
-      );
-
-      if (!mounted) return;
-      Navigator.of(context)
-        ..pop()
-        ..pop();
-    } catch (e) {
-      setState(() {
-        _registering = false;
-      });
-
-      await showDialog(
-        context: context,
-        builder: (context) => AlertDialog(
-          actions: [
-            TextButton(
-              onPressed: () {
-                Navigator.of(context).pop();
-              },
-              child: const Text('OK'),
-            ),
-          ],
-          content: Text(
-            e.toString(),
-          ),
-          title: const Text('Error'),
-        ),
-      );
-    }
-  }
 }