Skip to content

Commit 4cb8882

Browse files
committed
update packages
1 parent a9a4791 commit 4cb8882

File tree

12 files changed

+62
-69
lines changed

12 files changed

+62
-69
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,7 @@
7272
* hot fixes
7373

7474
## 1.0.2
75-
* update packages and support multiple device open same account
75+
* update packages and support multiple device open same account
76+
77+
## 1.0.3
78+
* update packages

example/android/app/build.gradle

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ if (flutterVersionName == null) {
2424
apply plugin: 'com.android.application'
2525
apply plugin: 'kotlin-android'
2626
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
27-
def keystoreProperties = new Properties()
28-
def keystorePropertiesFile = rootProject.file('key.properties')
29-
if (keystorePropertiesFile.exists()) {
30-
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
31-
}
27+
//def keystoreProperties = new Properties()
28+
//def keystorePropertiesFile = rootProject.file('key.properties')
29+
//if (keystorePropertiesFile.exists()) {
30+
// keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
31+
//}
3232
android {
3333
compileSdkVersion 31
3434

@@ -54,29 +54,29 @@ android {
5454
versionCode flutterVersionCode.toInteger()
5555
versionName flutterVersionName
5656
}
57-
signingConfigs {
58-
release {
59-
keyAlias keystoreProperties['keyAlias']
60-
keyPassword keystoreProperties['keyPassword']
61-
storeFile file(keystoreProperties['storeFile'])
62-
storePassword keystoreProperties['storePassword']
63-
}
64-
debug {
65-
keyAlias keystoreProperties['keyAlias']
66-
keyPassword keystoreProperties['keyPassword']
67-
storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
68-
storePassword keystoreProperties['storePassword']
69-
}
70-
}
57+
// signingConfigs {
58+
// release {
59+
// keyAlias keystoreProperties['keyAlias']
60+
// keyPassword keystoreProperties['keyPassword']
61+
// storeFile file(keystoreProperties['storeFile'])
62+
// storePassword keystoreProperties['storePassword']
63+
// }
64+
// debug {
65+
// keyAlias keystoreProperties['keyAlias']
66+
// keyPassword keystoreProperties['keyPassword']
67+
// storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
68+
// storePassword keystoreProperties['storePassword']
69+
// }
70+
// }
7171

72-
buildTypes {
73-
debug {
74-
signingConfig signingConfigs.release
75-
}
76-
release {
77-
signingConfig signingConfigs.release
78-
}
79-
}
72+
// buildTypes {
73+
// debug {
74+
// signingConfig signingConfigs.release
75+
// }
76+
// release {
77+
// signingConfig signingConfigs.release
78+
// }
79+
// }
8080

8181
buildTypes {
8282
release {
@@ -91,7 +91,7 @@ flutter {
9191
source '../..'
9292
}
9393
apply plugin: 'com.google.gms.google-services'
94-
apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'
94+
9595
googleServices { disableVersionCheck = true }
9696
dependencies {
9797
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

example/android/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ buildscript {
1212
dependencies {
1313
classpath 'com.android.tools.build:gradle:4.1.3'
1414
classpath 'com.google.gms:google-services:4.3.5'
15-
classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:[0.12.10, 0.99.99]'
1615
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1716
}
1817
}

example/lib/main.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ void main() async {
2222
await VChatController.instance.init(
2323
baseUrl: Uri.parse(serverIp),
2424
appName: "test_v_chat",
25-
vChatNotificationType: VChatNotificationType.onesignal,
25+
vChatNotificationType: VChatNotificationType.firebase,
2626
widgetsBuilder: VChatCustomWidgets(),
2727
enableLogger: true,
2828
maxMediaUploadSize: 50 * 1000 * 1000,

example/pubspec.lock

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ packages:
3535
name: bloc
3636
url: "https://pub.dartlang.org"
3737
source: hosted
38-
version: "8.0.1"
38+
version: "8.0.2"
3939
boolean_selector:
4040
dependency: transitive
4141
description:
@@ -215,7 +215,7 @@ packages:
215215
name: flutter_bloc
216216
url: "https://pub.dartlang.org"
217217
source: hosted
218-
version: "8.0.0"
218+
version: "8.0.1"
219219
flutter_blurhash:
220220
dependency: transitive
221221
description:
@@ -490,13 +490,6 @@ packages:
490490
url: "https://pub.dartlang.org"
491491
source: hosted
492492
version: "1.0.0+1"
493-
onesignal_flutter:
494-
dependency: transitive
495-
description:
496-
name: onesignal_flutter
497-
url: "https://pub.dartlang.org"
498-
source: hosted
499-
version: "3.2.7"
500493
open_file:
501494
dependency: transitive
502495
description:

lib/src/modules/message/views/list_view_widgets/message_item_view.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class MessageItemView extends StatelessWidget {
6161
child: Column(
6262
mainAxisAlignment: MainAxisAlignment.center,
6363
children: [
64-
VChatAppService.instance.vcBuilder.infoLightMessage(
64+
VChatAppService.instance.vcBuilder.infoDarkMessage(
6565
Helpers.getMessageBody(
6666
message,
6767
VChatAppService.instance.getTrans(context),

lib/src/modules/rooms/cubit/room_cubit.dart

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,19 @@ class RoomCubit extends Cubit<RoomState> {
8484
}
8585

8686
Future<void> loadMore() async {
87-
final loadedRooms = await _provider.loadMore(loadMorePage);
88-
loadingStatus = LoadMoreStatus.loaded;
89-
if (loadedRooms.isEmpty) {
90-
loadingStatus = LoadMoreStatus.completed;
87+
try {
88+
final loadedRooms = await _provider.loadMore(loadMorePage);
89+
loadingStatus = LoadMoreStatus.loaded;
90+
if (loadedRooms.isEmpty) {
91+
loadingStatus = LoadMoreStatus.completed;
92+
}
93+
++loadMorePage;
94+
rooms.addAll(loadedRooms);
95+
emit(RoomLoaded(rooms));
96+
} catch (err) {
97+
CustomAlert.error(msg: "Failed to loadMore");
98+
loadMorePage = 1;
9199
}
92-
++loadMorePage;
93-
rooms.addAll(loadedRooms);
94-
emit(RoomLoaded(rooms));
95100
}
96101

97102
bool isRoomOpen(String roomId) => currentRoomId == roomId;

lib/src/services/notification_service.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,14 @@ class NotificationService {
2929
priority: Priority.max,
3030
);
3131
final iosNotificationDetails = const IOSNotificationDetails(
32-
presentBadge: true,
32+
presentBadge: false,
3333
presentSound: true,
3434
);
3535

3636
Future init(BuildContext context) async {
3737
this.context = context;
38-
if (VChatAppService.instance.vChatNotificationType != VChatNotificationType.none ) {
38+
if (VChatAppService.instance.vChatNotificationType !=
39+
VChatNotificationType.none) {
3940
await initNotification();
4041
}
4142
}

lib/src/services/socket_service.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import 'dart:convert';
44
import 'package:flutter/material.dart';
55
import 'package:socket_io_client/socket_io_client.dart';
66
import 'package:v_chat_sdk/src/modules/rooms/cubit/room_cubit.dart';
7-
import 'package:v_chat_sdk/src/utils/helpers/helpers.dart';
87

98
import '../enums/socket_state_type.dart';
109
import '../models/v_chat_room.dart';
@@ -86,9 +85,9 @@ class SocketService {
8685
});
8786

8887
_socket!.on("update_one_room", (_room) {
89-
Helpers.vlog(
90-
"update_one_room Event called ${DateTime.now().microsecondsSinceEpoch}",
91-
);
88+
// Helpers.vlog(
89+
// "update_one_room Event called ${DateTime.now().microsecondsSinceEpoch}",
90+
// );
9291
final room = VChatRoom.fromMap(_room);
9392
unawaited(LocalStorageService.instance.setRoomOrUpdate(room));
9493
RoomCubit.instance.updateOneRoomInRamAndSort(room);

lib/src/services/v_chat_app_service.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ class VChatAppService {
2020

2121
late VChatWidgetBuilder vcBuilder;
2222

23-
2423
String currentLocal = "en";
2524

2625
late String appName;
@@ -74,7 +73,9 @@ class VChatAppService {
7473
_lookupMessagesMap[locale] = lookupMessages;
7574
}
7675

77-
Future<VChatAppService> init({required VChatNotificationType vChatNotificationType}) async {
76+
Future<VChatAppService> init({
77+
required VChatNotificationType vChatNotificationType,
78+
}) async {
7879
const storage = FlutterSecureStorage();
7980

8081
await DBProvider.instance.database;

pubspec.lock

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ packages:
2828
name: bloc
2929
url: "https://pub.dartlang.org"
3030
source: hosted
31-
version: "8.0.1"
31+
version: "8.0.2"
3232
boolean_selector:
3333
dependency: transitive
3434
description:
@@ -201,7 +201,7 @@ packages:
201201
name: flutter_bloc
202202
url: "https://pub.dartlang.org"
203203
source: hosted
204-
version: "8.0.0"
204+
version: "8.0.1"
205205
flutter_blurhash:
206206
dependency: transitive
207207
description:
@@ -436,13 +436,6 @@ packages:
436436
url: "https://pub.dartlang.org"
437437
source: hosted
438438
version: "1.0.0+1"
439-
onesignal_flutter:
440-
dependency: "direct main"
441-
description:
442-
name: onesignal_flutter
443-
url: "https://pub.dartlang.org"
444-
source: hosted
445-
version: "3.2.7"
446439
open_file:
447440
dependency: "direct main"
448441
description:

pubspec.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: v_chat_sdk
22
description: official sdk for v chat this is a complete chat ecosystem use flutter for clint node js and socket io for server side flutter chat v chat sdk
3-
version: 1.0.2
3+
version: 1.0.3
44
homepage: https://github.com/hatemragab/v_chat_sdk
55

66
environment:
@@ -11,9 +11,9 @@ dependencies:
1111
flutter:
1212
sdk: flutter
1313
# state management
14-
bloc: ^8.0.1
14+
bloc: ^8.0.2
1515
# state management
16-
flutter_bloc: ^8.0.0
16+
flutter_bloc: ^8.0.1
1717

1818
# upload files
1919
http: ^0.13.4
@@ -77,7 +77,6 @@ dependencies:
7777
crypto: ^3.0.1
7878
# for save user app language
7979
shared_preferences: ^2.0.11
80-
onesignal_flutter: ^3.2.7
8180

8281

8382

0 commit comments

Comments
 (0)