dependencies upgrade

Author: ankesh-kumar

CHANGELOG.md

@@ -1,4 +1,6 @@
-## version 0.1.0 flutter Chat android and iOS 
-## version 0.1.1 add screen widgets 
-## version 0.1.2 example added
-## version 0.1.3 widget seprated
+## version 0.1.4 dependencies upgrade
+## version 0.1.3 widget seprated
+## version 0.1.2 example added
+## version 0.1.1 add screen widgets
+## version 0.1.0 flutter Chat android and iOS 
+ 

README.md

@@ -37,8 +37,7 @@ dependencies:<br/>[flutter_chat](https://pub.dev/packages/flutter_chat)
 # Support Development
 If you found this project helpful or you learned something from the source code and want to thank me, consider buying me a cup of ☕️
 
-[Be Sponsor](https://github.com/sponsors/ankesh-kumar)<br/>
-[![Sponsor](https://1.bp.blogspot.com/-td3V-ijA4Q8/Xr57GVxCyEI/AAAAAAAAORQ/3u78fEKyYkk6aGx8yO1SzeN4Wo9_mr46ACK4BGAsYHg/icons8-love-64.png)](https://github.com/sponsors/ankesh-kumar)
-
 [PayPal](https://paypal.me/ankeshkumar01)
 
+# Thanks for coffee:
+Eirik Bakken

example/flutter_chat.dart

@@ -22,4 +22,4 @@ class _WelcomeScreenState extends State<WelcomeScreen> {
  backgroundColor: Colors.white,
  body: ChatWidget.widgetWelcomeScreen(context));
  }
-}
+}

lib/chatDB.dart

@@ -10,25 +10,25 @@ class ChatDBFireStore {
  return dbUser;
  }
 
- static Future<void> checkUserExists(FirebaseUser logInUser) async {
- final QuerySnapshot result = await Firestore.instance
+ static Future<void> checkUserExists(User logInUser) async {
+ final QuerySnapshot result = await FirebaseFirestore.instance
  .collection(getDocName())
  .where('userId', isEqualTo: logInUser.uid)
- .getDocuments();
+ .get();
  final List<DocumentSnapshot> documents = result.documents;
  if (documents.length == 0) {
  // Update data to server if new user
  await saveNewUser(logInUser);
  }
  }
 
- static saveNewUser(FirebaseUser logInUser) {
- Firestore.instance
+ static saveNewUser(User logInUser) {
+ FirebaseFirestore.instance
  .collection(getDocName())
- .document(logInUser.uid)
- .setData({
+ .doc(logInUser.uid)
+ .set({
  'nickname': logInUser.displayName,
- 'photoUrl': logInUser.photoUrl,
+ 'photoUrl': logInUser.photoURL,
  'userId': logInUser.uid,
  'createdAt': DateTime.now().millisecondsSinceEpoch.toString(),
  'chattingWith': null,
@@ -40,7 +40,7 @@ class ChatDBFireStore {
  Firestore.instance.collection(ChatDBFireStore.getDocName()).snapshots();
  }
 
- static Future<void> makeUserOnline(FirebaseUser logInUser) async {
+ static Future<void> makeUserOnline(User logInUser) async {
  FirebaseDatabase.instance
  .reference()
  .child("/status/" + logInUser.uid)

lib/chatData.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 import 'package:firebase_auth/firebase_auth.dart';
+import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
@@ -88,6 +89,7 @@ class ChatData {
  }
 
  static Future<Null> handleSignOut(BuildContext context) async {
+ await Firebase.initializeApp();
  final GoogleSignIn googleSignIn = GoogleSignIn();
 
  await FirebaseAuth.instance.signOut();
@@ -96,23 +98,26 @@ class ChatData {
  }
 
  static Future<bool> authUsersGoogle() async {
+
+
+ await Firebase.initializeApp();
  final GoogleSignIn googleSignIn = GoogleSignIn();
  final FirebaseAuth firebaseAuth = FirebaseAuth.instance;
 
+
  GoogleSignInAccount googleUser = await googleSignIn.signIn();
  GoogleSignInAuthentication googleAuth = await googleUser.authentication;
 
- final AuthCredential credential = GoogleAuthProvider.getCredential(
+ final AuthCredential credential = GoogleAuthProvider.credential(
  accessToken: googleAuth.accessToken,
  idToken: googleAuth.idToken,
  );
 
- final FirebaseUser logInUser =
- (await firebaseAuth.signInWithCredential(credential)).user;
+ final UserCredential logInUser = await firebaseAuth.signInWithCredential(credential);
 
  if (logInUser != null) {
  // Check is already sign up
- await ChatDBFireStore.checkUserExists(logInUser);
+ await ChatDBFireStore.checkUserExists(firebaseAuth.currentUser);
  return true;
  } else {
  return false;
@@ -144,19 +149,20 @@ class ChatData {
  }
 
  static checkUserLogin(BuildContext context) async {
+ await Firebase.initializeApp();
  final GoogleSignIn googleSignIn = GoogleSignIn();
  final FirebaseAuth firebaseAuth = FirebaseAuth.instance;
 
  if (await isSignedIn() == true) {
  GoogleSignInAccount googleUser = await googleSignIn.signIn();
  GoogleSignInAuthentication googleAuth = await googleUser.authentication;
 
- final AuthCredential credential = GoogleAuthProvider.getCredential(
+ final AuthCredential credential = GoogleAuthProvider.credential(
  accessToken: googleAuth.accessToken,
  idToken: googleAuth.idToken,
  );
 
- final FirebaseUser logInUser =
+ final User logInUser =
  (await firebaseAuth.signInWithCredential(credential)).user;
 
  /**
@@ -184,7 +190,7 @@ class ChatData {
  static bool isLastMessageLeft(var listMessage, String id, int index) {
  if ((index > 0 &&
  listMessage != null &&
- listMessage[index - 1]['idFrom'] == id) ||
+ listMessage[index - 1].get('idFrom') == id) ||
  index == 0) {
  return true;
  } else {
@@ -195,7 +201,7 @@ class ChatData {
  static bool isLastMessageRight(var listMessage, String id, int index) {
  if ((index > 0 &&
  listMessage != null &&
- listMessage[index - 1]['idFrom'] != id) ||
+ listMessage[index - 1].get('idFrom') != id) ||
  index == 0) {
  return true;
  } else {

lib/chatWidget.dart

@@ -43,18 +43,18 @@ class ChatWidget {
 
  static Widget userListbuildItem(
  BuildContext context, String currentUserId, DocumentSnapshot document) {
- print('firebase ' + document['userId']);
+ print('firebase ' + document.get('userId'));
  print(currentUserId);
- if (document['userId'] == currentUserId) {
+ if (document.get('userId') == currentUserId) {
  return Container();
  } else {
  return Container(
  child: FlatButton(
  child: Row(
  children: <Widget>[
  Material(
- child: document['photoUrl'] != null
- ? widgetShowImages(document['photoUrl'], 50)
+ child: document.get('photoUrl') != null
+ ? widgetShowImages(document.get('photoUrl'), 50)
  : Icon(
  Icons.account_circle,
  size: 50.0,
@@ -69,7 +69,7 @@ class ChatWidget {
  children: <Widget>[
  Container(
  child: Text(
- 'Nickname: ${document['nickname']}',
+ 'Nickname: ${document.get('nickname')}',
  style: TextStyle(color: primaryColor),
  ),
  alignment: Alignment.centerLeft,
@@ -89,7 +89,7 @@ class ChatWidget {
  ),
  child: new DecoratedBox(
  decoration: new BoxDecoration(
- color: document['online'] == 'online'
+ color: document.get('online') == 'online'
  ? Colors.greenAccent
  : Colors.transparent),
  ),
@@ -103,8 +103,8 @@ class ChatWidget {
  builder: (context) => Chat(
  currentUserId: currentUserId,
  peerId: document.documentID,
- peerName: document['nickname'],
- peerAvatar: document['photoUrl'],
+ peerName: document.get('nickname'),
+ peerAvatar: document.get('photoUrl'),
  )));
  },
  color: viewBg,
@@ -193,13 +193,13 @@ class ChatWidget {
 
  static Widget widgetChatBuildItem(BuildContext context, var listMessage,
  String id, int index, DocumentSnapshot document, String peerAvatar) {
- if (document['idFrom'] == id) {
+ if (document.get('idFrom') == id) {
  return Row(
  children: <Widget>[
- document['type'] == 0
- ? chatText(document['content'], id, listMessage, index, true)
+ document.get('type') == 0
+ ? chatText(document.get('content'), id, listMessage, index, true)
  : chatImage(
- context, id, listMessage, document['content'], index, true)
+ context, id, listMessage, document.get('content'), index, true)
  ],
  mainAxisAlignment: MainAxisAlignment.end,
  );
@@ -218,10 +218,10 @@ class ChatWidget {
  clipBehavior: Clip.hardEdge,
  )
  : Container(width: 35.0),
- document['type'] == 0
+ document.get('type') == 0
  ? chatText(
- document['content'], id, listMessage, index, false)
- : chatImage(context, id, listMessage, document['content'],
+ document.get('content'), id, listMessage, index, false)
+ : chatImage(context, id, listMessage, document.get('content'),
  index, false)
  ],
  ),
@@ -232,7 +232,7 @@ class ChatWidget {
  child: Text(
  DateFormat('dd MMM kk:mm').format(
  DateTime.fromMillisecondsSinceEpoch(
- int.parse(document['timestamp']))),
+ int.parse(document.get('timestamp')))),
  style: TextStyle(
  color: greyColor,
  fontSize: 12.0,
@@ -257,9 +257,9 @@ class ChatWidget {
  child: CircularProgressIndicator(
  valueColor: AlwaysStoppedAnimation<Color>(themeColor)))
  : StreamBuilder(
- stream: Firestore.instance
+ stream: FirebaseFirestore.instance
  .collection('messages')
- .document(groupChatId)
+ .doc(groupChatId)
  .collection(groupChatId)
  .orderBy('timestamp', descending: true)
  .limit(20)

lib/screens/chat.dart

@@ -3,10 +3,10 @@ import 'dart:io';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_storage/firebase_storage.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_chat/chatWidget.dart';
 import 'package:flutter_native_image/flutter_native_image.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:image_picker/image_picker.dart';
+import '../chatWidget.dart';
 import '../constants.dart';
 
 
@@ -159,13 +159,13 @@ class _ChatScreenState extends State<_ChatScreen> {
  if (content.trim() != '') {
  textEditingController.clear();
 
- var documentReference = Firestore.instance
+ var documentReference = FirebaseFirestore.instance
  .collection('messages')
- .document(groupChatId)
+ .doc(groupChatId)
  .collection(groupChatId)
- .document(DateTime.now().millisecondsSinceEpoch.toString());
+ .doc(DateTime.now().millisecondsSinceEpoch.toString());
 
- Firestore.instance.runTransaction((transaction) async {
+ FirebaseFirestore.instance.runTransaction((transaction) async {
  await transaction.set(
  documentReference,
  {