Skip to content

Commit 9410d67

Browse files
committed
🐛 Remove provider related console warning from trend screen
Make some changes due to updgrade in firebase packages.
1 parent c6461dd commit 9410d67

File tree

7 files changed

+46
-32
lines changed

7 files changed

+46
-32
lines changed

lib/page/feed/composeTweet/composeTweet.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ class _ComposeRetweet
317317
Padding(
318318
padding: EdgeInsets.symmetric(horizontal: 16, vertical: 8),
319319
child:
320-
customImage(context, authState.user?.photoUrl, height: 40),
320+
customImage(context, authState.user?.photoURL, height: 40),
321321
),
322322
Expanded(
323323
child: _TextField(
@@ -481,7 +481,7 @@ class _ComposeTweet
481481
Row(
482482
crossAxisAlignment: CrossAxisAlignment.start,
483483
children: <Widget>[
484-
customImage(context, authState.user?.photoUrl, height: 40),
484+
customImage(context, authState.user?.photoURL, height: 40),
485485
SizedBox(
486486
width: 10,
487487
),

lib/page/message/chatScreenPage.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ class _ChatScreenPageState extends State<ChatScreenPage> {
211211
Future<bool> _onWillPop() async {
212212
// final chatState = Provider.of<ChatState>(context,listen: false);
213213
state.setIsChatScreenOpen = false;
214-
state.dispose();
214+
state.onChatScreenClosed();
215215
return true;
216216
}
217217

lib/page/settings/accountSettings/contentPrefrences/trends/trendsPage.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class TrendsPage extends StatelessWidget {
9090
@override
9191
Widget build(BuildContext context) {
9292
WidgetsBinding.instance.addPostFrameCallback((_) {
93-
final state = Provider.of<SearchState>(context);
93+
final state = Provider.of<SearchState>(context, listen: false);
9494
sortBy = state.selectedFilter;
9595
});
9696
return Scaffold(

lib/state/authState.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class AuthState extends AppState {
108108
final GoogleSignInAuthentication googleAuth =
109109
await googleUser.authentication;
110110

111-
final AuthCredential credential = GoogleAuthProvider.getCredential(
111+
final AuthCredential credential = GoogleAuthProvider.credential(
112112
accessToken: googleAuth.accessToken,
113113
idToken: googleAuth.idToken,
114114
);

lib/state/chats/chatState.dart

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ class ChatState extends AppState {
164164
}
165165
}
166166

167+
/// Send message to other user
167168
void onMessageSubmitted(ChatMessage message,
168169
{UserModel myUser, UserModel secondUser}) {
169170
print(chatUser.userId);
@@ -189,6 +190,8 @@ class ChatState extends AppState {
189190
}
190191
}
191192

193+
/// Channel name is like a room name
194+
/// which save messages of two user uniquely in database
192195
String getChannelName(String user1, String user2) {
193196
user1 = user1.substring(0, 5);
194197
user2 = user2.substring(0, 5);
@@ -199,6 +202,7 @@ class ChatState extends AppState {
199202
return _channelName;
200203
}
201204

205+
/// Method will trigger every time when you send/recieve from/to someone messgae.
202206
void _onMessageAdded(Event event) {
203207
if (_messageList == null) {
204208
_messageList = List<ChatMessage>();
@@ -262,20 +266,21 @@ class ChatState extends AppState {
262266
notifyListeners();
263267
}
264268

265-
/// [Warning] do not call super.dispose() from this method
266-
/// If this method called here it will dipose chat state data
267-
// super.dispose();
268-
void dispose() {
269-
var user = _chatUserList.firstWhere((x) => x.key == chatUser.userId);
270-
if (_messageList != null) {
271-
user.message = _messageList.first.message;
272-
user.createdAt = _messageList.first.createdAt; //;
273-
_messageList = null;
274-
notifyListeners();
269+
// update last message on chat user list screen when manin chat screen get closed.
270+
void onChatScreenClosed() {
271+
if (_chatUserList != null && _chatUserList.isNotEmpty) {
272+
var user = _chatUserList.firstWhere((x) => x.key == chatUser.userId);
273+
if (_messageList != null) {
274+
user.message = _messageList.first.message;
275+
user.createdAt = _messageList.first.createdAt; //;
276+
_messageList = null;
277+
notifyListeners();
278+
}
275279
}
276280
}
277281

278-
/// Push notification will be sent to other user whrn you send him a message on in chat.
282+
/// Push notification will be sent to other user when you send him a message in chat.
283+
/// To send push notification make sure you have FCM `serverToken`
279284
void sendAndRetrieveMessage(ChatMessage model) async {
280285
await firebaseMessaging.requestNotificationPermissions(
281286
const IosNotificationSettings(

pubspec.lock

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,21 @@ packages:
8484
name: cloud_firestore
8585
url: "https://pub.dartlang.org"
8686
source: hosted
87-
version: "0.14.3"
87+
version: "0.16.0"
8888
cloud_firestore_platform_interface:
8989
dependency: transitive
9090
description:
9191
name: cloud_firestore_platform_interface
9292
url: "https://pub.dartlang.org"
9393
source: hosted
94-
version: "2.2.0"
94+
version: "3.0.1"
9595
cloud_firestore_web:
9696
dependency: transitive
9797
description:
9898
name: cloud_firestore_web
9999
url: "https://pub.dartlang.org"
100100
source: hosted
101-
version: "0.2.1"
101+
version: "0.3.0+1"
102102
collection:
103103
dependency: transitive
104104
description:
@@ -168,7 +168,7 @@ packages:
168168
name: firebase_analytics
169169
url: "https://pub.dartlang.org"
170170
source: hosted
171-
version: "6.2.0"
171+
version: "7.0.1"
172172
firebase_analytics_platform_interface:
173173
dependency: transitive
174174
description:
@@ -189,49 +189,49 @@ packages:
189189
name: firebase_auth
190190
url: "https://pub.dartlang.org"
191191
source: hosted
192-
version: "0.18.3"
192+
version: "0.20.0+1"
193193
firebase_auth_platform_interface:
194194
dependency: transitive
195195
description:
196196
name: firebase_auth_platform_interface
197197
url: "https://pub.dartlang.org"
198198
source: hosted
199-
version: "2.1.3"
199+
version: "3.0.1"
200200
firebase_auth_web:
201201
dependency: transitive
202202
description:
203203
name: firebase_auth_web
204204
url: "https://pub.dartlang.org"
205205
source: hosted
206-
version: "0.3.2"
206+
version: "0.3.2+6"
207207
firebase_core:
208208
dependency: transitive
209209
description:
210210
name: firebase_core
211211
url: "https://pub.dartlang.org"
212212
source: hosted
213-
version: "0.5.2"
213+
version: "0.7.0"
214214
firebase_core_platform_interface:
215215
dependency: transitive
216216
description:
217217
name: firebase_core_platform_interface
218218
url: "https://pub.dartlang.org"
219219
source: hosted
220-
version: "2.0.0"
220+
version: "3.0.1"
221221
firebase_core_web:
222222
dependency: transitive
223223
description:
224224
name: firebase_core_web
225225
url: "https://pub.dartlang.org"
226226
source: hosted
227-
version: "0.2.1"
227+
version: "0.2.1+3"
228228
firebase_database:
229229
dependency: "direct main"
230230
description:
231231
name: firebase_database
232232
url: "https://pub.dartlang.org"
233233
source: hosted
234-
version: "4.3.0"
234+
version: "6.0.0"
235235
firebase_messaging:
236236
dependency: "direct main"
237237
description:
@@ -245,21 +245,28 @@ packages:
245245
name: firebase_remote_config
246246
url: "https://pub.dartlang.org"
247247
source: hosted
248-
version: "0.3.1+1"
248+
version: "0.6.0"
249249
firebase_storage:
250250
dependency: "direct main"
251251
description:
252252
name: firebase_storage
253253
url: "https://pub.dartlang.org"
254254
source: hosted
255-
version: "5.0.1"
255+
version: "7.0.0"
256256
firebase_storage_platform_interface:
257257
dependency: transitive
258258
description:
259259
name: firebase_storage_platform_interface
260260
url: "https://pub.dartlang.org"
261261
source: hosted
262-
version: "1.0.1"
262+
version: "1.0.4"
263+
firebase_storage_web:
264+
dependency: transitive
265+
description:
266+
name: firebase_storage_web
267+
url: "https://pub.dartlang.org"
268+
source: hosted
269+
version: "0.1.1+3"
263270
flutter:
264271
dependency: "direct main"
265272
description: flutter

pubspec.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dependencies:
2828
cached_network_image: ^2.2.0+1
2929
provider: ^4.3.2+2
3030
# flutter_native_splash: ^0.1.9
31-
firebase_auth: ^0.18.3
31+
firebase_auth: ^0.20.0+1
3232
firebase_database:
3333
firebase_analytics:
3434
cloud_firestore:
@@ -44,7 +44,9 @@ dependencies:
4444
url_launcher:
4545
share: ^0.6.3
4646
google_fonts: ^0.3.9
47-
firebase_remote_config: ^0.3.0+3
47+
firebase_remote_config: ^0.6.0
48+
# firebase_dynamic_links: ^0.7.0+1
49+
# simple_url_preview: ^1.1.0
4850

4951
# camera:
5052
# image: ^2.0.75

0 commit comments

Comments
 (0)