Skip to content

Commit 60daec6

Browse files
hatemragabhatemragab
committed
some fixes
1 parent 4cb8882 commit 60daec6

17 files changed

+111
-208
lines changed

‎README.md

Lines changed: 1 addition & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -132,149 +132,4 @@ Don't forget to see the example attached to github here <a href="https://github.
132132

133133

134134
## Check Our Full documention
135-
<a href="https://hatemragab.github.io/VChatSdk-Documentation/"> VCHAT DOCS</a> <br />
136-
137-
138-
139-
=======
140-
# V_Chat_SDK Micro service
141-
142-
## Check Our Full documention
143-
<a href="https://hatemragab.github.io/VChatSdk-Documentation/"> VCHAT Documention</a> <br />
144-
<a href="https://pub.dev/packages/v_chat_sdk"> v_chat_sdk on pub.dev</a> <br />
145-
146-
147-
## Android Test
148-
149-
<a href="https://play.google.com/store/apps/details?id=com.vchatsdk.app"> <img src="https://user-images.githubusercontent.com/37384769/145644981-17ec8f75-be19-4cea-9322-52f1b31a15da.png" width ="300" /></a> <br />
150-
151-
## Android Drive APK
152-
153-
<a href="https://drive.google.com/file/d/1BpEY2wrzzPqbgT-la0-xHc6VbwFVJ5rz/view?usp=sharing"> Drive APK </a> <br />
154-
155-
## IOS Test Flight
156-
157-
<a href="https://testflight.apple.com/join/Bb2LLcKx"> <img src="https://user-images.githubusercontent.com/37384769/145644883-e914dd94-c797-4944-bb6d-fb4ec629c016.png" width ="300" /> </a> <br />
158-
159-
160-
161-
**Quick Review**
162-
![carbon](https://user-images.githubusercontent.com/37384769/137525753-03155709-c903-4b4d-89bf-ee40e0525d63.png)
163-
164-
### Android <br />
165-
166-
<p float="left">
167-
<img src="https://user-images.githubusercontent.com/37384769/138588123-8919321f-132e-4913-9e81-6c0d6a915d8f.jpeg" width ="200" />
168-
<img src="https://user-images.githubusercontent.com/37384769/138588161-836214c0-0d54-480a-8030-3679430656b5.jpeg" width ="200" />
169-
<img src="https://user-images.githubusercontent.com/37384769/138588227-31de6adc-fb1e-49b5-baa0-5fe554d3e841.jpeg" width ="200" />
170-
<img src="https://user-images.githubusercontent.com/37384769/138588252-5e7cfd5c-3955-48ca-b8d2-78352abb9d87.jpeg" width ="200" />
171-
</p>
172-
173-
174-
175-
### IOS <br />
176-
<p float="left">
177-
<img src="https://user-images.githubusercontent.com/37384769/145550341-b155ce1b-ab0d-4cbe-b82f-cddf89e37638.PNG" width ="200" />
178-
<img src="https://user-images.githubusercontent.com/37384769/145550352-e3185015-073e-4980-b3a3-37c669ca444e.PNG" width ="200" />
179-
180-
181-
<img src="https://user-images.githubusercontent.com/37384769/145550367-52eda5d9-9d8f-4bc8-89a7-4373e1ab2d7f.PNG" width ="200" />
182-
<img src="https://user-images.githubusercontent.com/37384769/145550323-73d75d9a-dabf-4301-be56-072c2603f359.PNG" width ="200" />
183-
</p>
184-
185-
186-
187-
Don't forget to see the example attached to github here <a href="https://github.com/hatemragab/v_chat_sdk/tree/master/example">V_CHAT_SDK Example</a> <br />
188-
189-
190-
191-
---
192-
# Featurs
193-
<table>
194-
<tr>
195-
<th>Name</th>
196-
<th>Android</th>
197-
<th>Ios</th>
198-
</tr>
199-
200-
<tr>
201-
<td>online/offline</td>
202-
<td>👍</td>
203-
<td>👍</td>
204-
</tr>
205-
206-
<tr>
207-
<td>textMessage/typing...</td>
208-
<td>👍</td>
209-
<td>👍</td>
210-
</tr>
211-
212-
213-
<tr>
214-
<td>voiceRecord/recording...</td>
215-
<td>👍</td>
216-
<td>👍</td>
217-
</tr>
218-
219-
220-
<tr>
221-
<td>saned video/file/images</td>
222-
<td>👍</td>
223-
<td>👍</td>
224-
</tr>
225-
226-
<tr>
227-
<td>cache all media</td>
228-
<td>👍</td>
229-
<td>👍</td>
230-
</tr>
231-
232-
<tr>
233-
<td>message notification</td>
234-
<td>👍</td>
235-
<td>👍</td>
236-
</tr>
237-
238-
239-
<tr>
240-
<td>mute/un mute notification</td>
241-
<td>👍</td>
242-
<td>👍</td>
243-
</tr>
244-
245-
<tr>
246-
<td>block/un block users</td>
247-
<td>👍</td>
248-
<td>👍</td>
249-
</tr>
250-
251-
<tr>
252-
<td>message status/read/unread</td>
253-
<td>👍</td>
254-
<td>👍</td>
255-
</tr>
256-
</tr>
257-
<tr>
258-
<td>un read message count</td>
259-
<td>👍</td>
260-
<td>👍</td>
261-
</tr>
262-
<tr>
263-
<td>smooth performance</td>
264-
<td>👍</td>
265-
<td>👍</td>
266-
267-
</tr>
268-
<tr>
269-
<td>Group Chat with administration system</td>
270-
<td>👍</td>
271-
<td>👍</td>
272-
</tr>
273-
</table>
274-
275-
276-
## Check Our Full documention
277-
<a href="https://hatemragab.github.io/VChatSdk-Documentation/"> VCHAT DOCS</a> <br />
278-
279-
280-
135+
<a href="https://hatemragab.github.io/VChatSdk-Documentation/"> VCHAT DOCS</a> <br />

‎example/lib/app_terms.dart

Lines changed: 34 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,34 +21,56 @@ class _AppTermsState extends State<AppTerms> {
2121
padding: const EdgeInsets.all(8.0),
2222
child: Column(
2323
children: [
24-
SizedBox(height: 5,),
24+
SizedBox(
25+
height: 5,
26+
),
2527
"* By entering and participating in the v chat 's you agree to the following terms and conditions of participation. "
2628
.text,
27-
SizedBox(height: 5,),
29+
SizedBox(
30+
height: 5,
31+
),
2832
"* These terms and conditions are contractually binding upon you and you agree to each of them. "
2933
.text,
30-
SizedBox(height: 5,),
34+
SizedBox(
35+
height: 5,
36+
),
3137
"* You enter and participate in the Chat Room and gain access to the materials contained thereon at your own risk."
3238
.text,
33-
SizedBox(height: 5,),
39+
SizedBox(
40+
height: 5,
41+
),
3442
"* We do not monitor or screen communications on the Chat Room and we are not responsible for any material that any Chat Room participant posts and we do not assume the responsibility to do so. "
3543
.text,
36-
SizedBox(height: 5,),
44+
SizedBox(
45+
height: 5,
46+
),
3747
"* We do not make any representations or warranties as to the truth or accuracy of any statement made or materials posted on or through the Chat Room. You agree and acknowledge that you assume the risk of any actions you take in reliance upon the information that may be contained in the Chat Room. "
3848
.text,
39-
SizedBox(height: 5,),
49+
SizedBox(
50+
height: 5,
51+
),
4052
"* We do not endorse or lend any credence for any statements that are made by any participant in the Chat Room. "
4153
.text,
42-
SizedBox(height: 5,),
54+
SizedBox(
55+
height: 5,
56+
),
4357
"* Any opinions or views expressed by Chat Room participants are their own. We do not endorse or support or otherwise give any credence or reason for reliance on any such statements or opinions. "
4458
.text,
45-
SizedBox(height: 5,),
59+
SizedBox(
60+
height: 5,
61+
),
4662
"* You are fully responsible for your own statements and materials that you post in the Chat Room and any consequences, whether or not foreseen, to any party who may rely upon these statements. "
4763
.text,
48-
SizedBox(height: 5,),
49-
"* From time to time, we, along with our authorised service providers, select Content in Third Party Platforms that we would like to use in V CHAT Media.".text,
50-
SizedBox(height: 5,),
51-
"* confirm that the Content is your original creation and not copied from third parties".text,
64+
SizedBox(
65+
height: 5,
66+
),
67+
"* From time to time, we, along with our authorised service providers, select Content in Third Party Platforms that we would like to use in V CHAT Media."
68+
.text,
69+
SizedBox(
70+
height: 5,
71+
),
72+
"* confirm that the Content is your original creation and not copied from third parties"
73+
.text,
5274
],
5375
),
5476
),

‎example/lib/main.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import './screens/splash_screen.dart';
88
import 'controllers/app_controller.dart';
99
import 'controllers/home_controller.dart';
1010
import 'generated/l10n.dart';
11-
import 'utils/v_chat_custom_widgets.dart';
11+
import 'utils/v_chat_utils/v_chat_custom_widgets.dart';
1212

1313
const isUseRealServer = true;
1414

@@ -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.firebase,
25+
vChatNotificationType: VChatNotificationType.none,
2626
widgetsBuilder: VChatCustomWidgets(),
2727
enableLogger: true,
2828
maxMediaUploadSize: 50 * 1000 * 1000,

‎example/lib/screens/group_chat_info/group_chat_info.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,9 @@ class _GroupChatInfoState extends State<GroupChatInfo> {
154154
),
155155
InkWell(
156156
onTap: () {
157-
updateGroupTitle();
157+
if (isMeAdmin) {
158+
updateGroupTitle();
159+
}
158160
},
159161
child: Row(
160162
mainAxisAlignment: MainAxisAlignment.center,

‎example/lib/screens/home.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import 'package:example/generated/l10n.dart';
33
import 'package:example/screens/choose_group_members/choose_group_members_screen.dart';
44
import 'package:example/screens/setting_screen.dart';
55
import 'package:example/screens/user_item.dart';
6-
76
import 'package:example/screens/users_search.dart';
87
import 'package:provider/provider.dart';
98
import 'package:flutter/material.dart';

‎example/lib/utils/v_chat_custom_widgets.dart

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎example/lib/utils/v_chat_utils/custom_chat_dark_theme.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import 'package:flutter/material.dart';
2+
3+
final customChatDarkTheme = ThemeData.dark().copyWith();

‎example/lib/utils/v_chat_utils/custom_chat_light_theme.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import 'package:flutter/material.dart';
2+
3+
final customChatLightTheme = ThemeData(
4+
brightness: Brightness.light,
5+
);

‎example/lib/utils/v_chat_utils/v_chat_custom_widgets.dart

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import 'package:flutter/material.dart';
2+
import 'package:v_chat_sdk/v_chat_sdk.dart';
3+
4+
/// override the widgets that you want to update it
5+
class VChatCustomWidgets extends VChatWidgetBuilder {
6+
@override
7+
Color sendButtonColor(BuildContext context, {required bool isDark}) {
8+
if (isDark) {
9+
return Colors.red;
10+
} else {
11+
return Colors.blue;
12+
}
13+
}
14+
15+
// @override
16+
// Widget senderTextMessageWidget(BuildContext context, String text) {
17+
// return Container(
18+
// child: Text(text),
19+
// color: Colors.grey,
20+
// padding: EdgeInsets.all(20),
21+
// );
22+
// }
23+
//
24+
//
25+
// @override
26+
// Widget receiverTextMessageWidget(BuildContext context, String text) {
27+
// final isDark = Theme.of(context).brightness == Brightness.dark;
28+
// return Container(
29+
// child: Text(text),
30+
// color:isDark?Colors.red: Colors.grey,
31+
// padding: EdgeInsets.all(20),
32+
// );
33+
// }
34+
}

‎example/pubspec.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,14 +250,14 @@ packages:
250250
name: flutter_local_notifications
251251
url: "https://pub.dartlang.org"
252252
source: hosted
253-
version: "9.1.5"
253+
version: "9.2.0"
254254
flutter_local_notifications_linux:
255255
dependency: transitive
256256
description:
257257
name: flutter_local_notifications_linux
258258
url: "https://pub.dartlang.org"
259259
source: hosted
260-
version: "0.4.0"
260+
version: "0.4.1+1"
261261
flutter_local_notifications_platform_interface:
262262
dependency: transitive
263263
description:
@@ -886,7 +886,7 @@ packages:
886886
path: ".."
887887
relative: true
888888
source: path
889-
version: "1.0.2"
889+
version: "1.0.3"
890890
vector_math:
891891
dependency: transitive
892892
description:

‎lib/src/enums/v_chat_notification_type.dart

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
enum VChatNotificationType {
2-
none,
3-
firebase,
4-
onesignal
5-
}
1+
enum VChatNotificationType { none, firebase, onesignal }

‎lib/src/modules/message/providers/message_socket.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ class MessageSocket {
2727

2828
void connectMessageSocket() {
2929
_socket = _getSocket();
30-
_socket.onConnect((data) {
31-
_socket.on("all_messages", (data) {
30+
_socket.onConnect((data) {
31+
_socket.on("all_messages", (data) {
3232
final msgList = jsonDecode(data as String) as List;
3333
final x = msgList.map((e) => VChatMessage.fromMap(e)).toList();
3434
unawaited(

‎lib/src/modules/rooms/room_page.dart

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,8 @@ class VChatRoomsScreen extends StatelessWidget {
5353
@override
5454
Widget build(BuildContext context) {
5555
RoomCubit.instance.setListViewListener();
56-
return Container(
57-
color: Theme.of(context).scaffoldBackgroundColor,
58-
child: Column(
56+
return Scaffold(
57+
body: Column(
5958
mainAxisAlignment: MainAxisAlignment.center,
6059
children: [
6160
const ConnectionChecker(),
@@ -91,19 +90,17 @@ class VChatRoomsScreen extends StatelessWidget {
9190
key: const PageStorageKey<String>('RoomsTabView'),
9291
padding: const EdgeInsets.all(8.0),
9392
itemBuilder: (context, index) {
94-
return Material(
95-
child: SizedBox(
96-
height: 70,
97-
child: RoomItem(rooms[index]),
98-
),
93+
return SizedBox(
94+
height: 70,
95+
child: RoomItem(rooms[index]),
9996
);
10097
},
10198
itemCount: rooms.length,
10299
),
103100
),
104101
);
105102
}
106-
throw UnimplementedError();
103+
throw const SizedBox();
107104
},
108105
),
109106
],

0 commit comments

Comments
 (0)