Skip to content

Commit cbbaf29

Browse files
duytq94duytq94
committed
update version packages
change some syntax
1 parent e350662 commit cbbaf29

File tree

12 files changed

+201
-221
lines changed

12 files changed

+201
-221
lines changed

‎.idea/libraries/Dart_Packages.xml

Lines changed: 80 additions & 72 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/Flutter_Plugins.xml

Lines changed: 10 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ dependencies {
6161
testImplementation 'junit:junit:4.12'
6262
androidTestImplementation 'com.android.support.test:runner:1.0.2'
6363
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
64-
compile 'com.google.firebase:firebase-core:16.0.4'
64+
compile 'com.google.firebase:firebase-core:16.0.7'
6565
}
6666

6767
apply plugin: 'com.google.gms.google-services'

‎android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.2.1'
9-
classpath 'com.google.gms:google-services:4.0.0'
8+
classpath 'com.android.tools.build:gradle:3.3.2'
9+
classpath 'com.google.gms:google-services:4.2.0'
1010
}
1111
}
1212

‎android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
org.gradle.jvmargs=-Xmx1536M
1+
org.gradle.jvmargs=-Xmx1536M

‎android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

‎lib/chat.dart

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -189,32 +189,32 @@ class ChatScreenState extends State<ChatScreen> {
189189
? Container(
190190
child: Material(
191191
child: CachedNetworkImage(
192-
placeholder: Container(
193-
child: CircularProgressIndicator(
194-
valueColor: AlwaysStoppedAnimation<Color>(themeColor),
195-
),
196-
width: 200.0,
197-
height: 200.0,
198-
padding: EdgeInsets.all(70.0),
199-
decoration: BoxDecoration(
200-
color: greyColor2,
201-
borderRadius: BorderRadius.all(
202-
Radius.circular(8.0),
192+
placeholder: (context, url) => Container(
193+
child: CircularProgressIndicator(
194+
valueColor: AlwaysStoppedAnimation<Color>(themeColor),
195+
),
196+
width: 200.0,
197+
height: 200.0,
198+
padding: EdgeInsets.all(70.0),
199+
decoration: BoxDecoration(
200+
color: greyColor2,
201+
borderRadius: BorderRadius.all(
202+
Radius.circular(8.0),
203+
),
204+
),
205+
),
206+
errorWidget: (context, url, error) => Material(
207+
child: Image.asset(
208+
'images/img_not_available.jpeg',
209+
width: 200.0,
210+
height: 200.0,
211+
fit: BoxFit.cover,
212+
),
213+
borderRadius: BorderRadius.all(
214+
Radius.circular(8.0),
215+
),
216+
clipBehavior: Clip.hardEdge,
203217
),
204-
),
205-
),
206-
errorWidget: Material(
207-
child: Image.asset(
208-
'images/img_not_available.jpeg',
209-
width: 200.0,
210-
height: 200.0,
211-
fit: BoxFit.cover,
212-
),
213-
borderRadius: BorderRadius.all(
214-
Radius.circular(8.0),
215-
),
216-
clipBehavior: Clip.hardEdge,
217-
),
218218
imageUrl: document['content'],
219219
width: 200.0,
220220
height: 200.0,
@@ -248,15 +248,15 @@ class ChatScreenState extends State<ChatScreen> {
248248
isLastMessageLeft(index)
249249
? Material(
250250
child: CachedNetworkImage(
251-
placeholder: Container(
252-
child: CircularProgressIndicator(
253-
strokeWidth: 1.0,
254-
valueColor: AlwaysStoppedAnimation<Color>(themeColor),
255-
),
256-
width: 35.0,
257-
height: 35.0,
258-
padding: EdgeInsets.all(10.0),
259-
),
251+
placeholder: (context, url) => Container(
252+
child: CircularProgressIndicator(
253+
strokeWidth: 1.0,
254+
valueColor: AlwaysStoppedAnimation<Color>(themeColor),
255+
),
256+
width: 35.0,
257+
height: 35.0,
258+
padding: EdgeInsets.all(10.0),
259+
),
260260
imageUrl: peerAvatar,
261261
width: 35.0,
262262
height: 35.0,
@@ -283,32 +283,32 @@ class ChatScreenState extends State<ChatScreen> {
283283
? Container(
284284
child: Material(
285285
child: CachedNetworkImage(
286-
placeholder: Container(
287-
child: CircularProgressIndicator(
288-
valueColor: AlwaysStoppedAnimation<Color>(themeColor),
289-
),
290-
width: 200.0,
291-
height: 200.0,
292-
padding: EdgeInsets.all(70.0),
293-
decoration: BoxDecoration(
294-
color: greyColor2,
295-
borderRadius: BorderRadius.all(
296-
Radius.circular(8.0),
286+
placeholder: (context, url) => Container(
287+
child: CircularProgressIndicator(
288+
valueColor: AlwaysStoppedAnimation<Color>(themeColor),
289+
),
290+
width: 200.0,
291+
height: 200.0,
292+
padding: EdgeInsets.all(70.0),
293+
decoration: BoxDecoration(
294+
color: greyColor2,
295+
borderRadius: BorderRadius.all(
296+
Radius.circular(8.0),
297+
),
298+
),
299+
),
300+
errorWidget: (context, url, error) => Material(
301+
child: Image.asset(
302+
'images/img_not_available.jpeg',
303+
width: 200.0,
304+
height: 200.0,
305+
fit: BoxFit.cover,
306+
),
307+
borderRadius: BorderRadius.all(
308+
Radius.circular(8.0),
309+
),
310+
clipBehavior: Clip.hardEdge,
297311
),
298-
),
299-
),
300-
errorWidget: Material(
301-
child: Image.asset(
302-
'images/img_not_available.jpeg',
303-
width: 200.0,
304-
height: 200.0,
305-
fit: BoxFit.cover,
306-
),
307-
borderRadius: BorderRadius.all(
308-
Radius.circular(8.0),
309-
),
310-
clipBehavior: Clip.hardEdge,
311-
),
312312
imageUrl: document['content'],
313313
width: 200.0,
314314
height: 200.0,

‎lib/login.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,14 @@ class LoginScreenState extends State<LoginScreen> {
7676

7777
GoogleSignInAccount googleUser = await googleSignIn.signIn();
7878
GoogleSignInAuthentication googleAuth = await googleUser.authentication;
79-
FirebaseUser firebaseUser = await firebaseAuth.signInWithGoogle(
79+
80+
final AuthCredential credential = GoogleAuthProvider.getCredential(
8081
accessToken: googleAuth.accessToken,
8182
idToken: googleAuth.idToken,
8283
);
84+
85+
FirebaseUser firebaseUser = await firebaseAuth.signInWithCredential(credential);
86+
8387
if (firebaseUser != null) {
8488
// Check is already sign up
8589
final QuerySnapshot result =

‎lib/main.dart

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,15 @@ class MainScreenState extends State<MainScreen> {
132132
children: <Widget>[
133133
Material(
134134
child: CachedNetworkImage(
135-
placeholder: Container(
136-
child: CircularProgressIndicator(
137-
strokeWidth: 1.0,
138-
valueColor: AlwaysStoppedAnimation<Color>(themeColor),
139-
),
140-
width: 50.0,
141-
height: 50.0,
142-
padding: EdgeInsets.all(15.0),
143-
),
135+
placeholder: (context, url) => Container(
136+
child: CircularProgressIndicator(
137+
strokeWidth: 1.0,
138+
valueColor: AlwaysStoppedAnimation<Color>(themeColor),
139+
),
140+
width: 50.0,
141+
height: 50.0,
142+
padding: EdgeInsets.all(15.0),
143+
),
144144
imageUrl: document['photoUrl'],
145145
width: 50.0,
146146
height: 50.0,

‎lib/settings.dart

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,15 @@ class SettingsScreenState extends State<SettingsScreen> {
171171
? (photoUrl != ''
172172
? Material(
173173
child: CachedNetworkImage(
174-
placeholder: Container(
175-
child: CircularProgressIndicator(
176-
strokeWidth: 2.0,
177-
valueColor: AlwaysStoppedAnimation<Color>(themeColor),
178-
),
179-
width: 90.0,
180-
height: 90.0,
181-
padding: EdgeInsets.all(20.0),
182-
),
174+
placeholder: (context, url) => Container(
175+
child: CircularProgressIndicator(
176+
strokeWidth: 2.0,
177+
valueColor: AlwaysStoppedAnimation<Color>(themeColor),
178+
),
179+
width: 90.0,
180+
height: 90.0,
181+
padding: EdgeInsets.all(20.0),
182+
),
183183
imageUrl: photoUrl,
184184
width: 90.0,
185185
height: 90.0,

‎pubspec.lock

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ packages:
2121
name: cached_network_image
2222
url: "https://pub.dartlang.org"
2323
source: hosted
24-
version: "0.4.2"
24+
version: "0.7.0"
2525
charcode:
2626
dependency: transitive
2727
description:
@@ -35,7 +35,7 @@ packages:
3535
name: cloud_firestore
3636
url: "https://pub.dartlang.org"
3737
source: hosted
38-
version: "0.7.4"
38+
version: "0.8.2+3"
3939
collection:
4040
dependency: transitive
4141
description:
@@ -70,7 +70,7 @@ packages:
7070
name: firebase_auth
7171
url: "https://pub.dartlang.org"
7272
source: hosted
73-
version: "0.5.20"
73+
version: "0.7.0"
7474
firebase_core:
7575
dependency: transitive
7676
description:
@@ -84,7 +84,7 @@ packages:
8484
name: firebase_storage
8585
url: "https://pub.dartlang.org"
8686
source: hosted
87-
version: "1.1.0+1"
87+
version: "1.0.4"
8888
flutter:
8989
dependency: "direct main"
9090
description: flutter
@@ -96,7 +96,7 @@ packages:
9696
name: flutter_cache_manager
9797
url: "https://pub.dartlang.org"
9898
source: hosted
99-
version: "0.1.2"
99+
version: "0.3.2"
100100
flutter_test:
101101
dependency: "direct dev"
102102
description: flutter
@@ -115,7 +115,7 @@ packages:
115115
name: google_sign_in
116116
url: "https://pub.dartlang.org"
117117
source: hosted
118-
version: "3.3.0+1"
118+
version: "3.2.4"
119119
http:
120120
dependency: transitive
121121
description:
@@ -171,7 +171,7 @@ packages:
171171
name: path_provider
172172
url: "https://pub.dartlang.org"
173173
source: hosted
174-
version: "0.4.1"
174+
version: "0.5.0+1"
175175
pedantic:
176176
dependency: transitive
177177
description:
@@ -205,6 +205,13 @@ packages:
205205
url: "https://pub.dartlang.org"
206206
source: hosted
207207
version: "1.5.4"
208+
sqflite:
209+
dependency: transitive
210+
description:
211+
name: sqflite
212+
url: "https://pub.dartlang.org"
213+
source: hosted
214+
version: "1.1.3"
208215
stack_trace:
209216
dependency: transitive
210217
description:
@@ -232,7 +239,7 @@ packages:
232239
name: synchronized
233240
url: "https://pub.dartlang.org"
234241
source: hosted
235-
version: "1.5.3+2"
242+
version: "2.1.0"
236243
term_glyph:
237244
dependency: transitive
238245
description:
@@ -260,7 +267,7 @@ packages:
260267
name: uuid
261268
url: "https://pub.dartlang.org"
262269
source: hosted
263-
version: "1.0.3"
270+
version: "2.0.0"
264271
vector_math:
265272
dependency: transitive
266273
description:
@@ -270,4 +277,4 @@ packages:
270277
version: "2.0.8"
271278
sdks:
272279
dart: ">=2.1.0 <3.0.0"
273-
flutter: ">=0.2.4 <2.0.0"
280+
flutter: ">=1.2.1 <2.0.0"

0 commit comments

Comments
 (0)