some fixes

hatemragab · Jan 4, 2022 · 60daec6 · 60daec6
1 parent 4cb8882
commit 60daec6
Show file tree

Hide file tree

Showing 17 changed files with 111 additions and 208 deletions.
diff --git a/README.md b/README.md
@@ -132,149 +132,4 @@ Don't forget to see the example attached to github here <a href="https://github.
 
 
 ## Check Our Full documention 
-<a href="https://hatemragab.github.io/VChatSdk-Documentation/"> VCHAT DOCS</a>  <br />
-
-
-
-=======
-# V_Chat_SDK Micro service
-
-## Check Our Full documention 
-<a href="https://hatemragab.github.io/VChatSdk-Documentation/"> VCHAT Documention</a>  <br />
-<a href="https://pub.dev/packages/v_chat_sdk"> v_chat_sdk on pub.dev</a>  <br />
-
-
-## Android Test
-
-<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 />
-
-## Android Drive APK
-
-<a href="https://drive.google.com/file/d/1BpEY2wrzzPqbgT-la0-xHc6VbwFVJ5rz/view?usp=sharing"> Drive APK </a> <br />
-
-## IOS Test Flight
-
-<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 />
-
-
-
-**Quick Review**
-![carbon](https://user-images.githubusercontent.com/37384769/137525753-03155709-c903-4b4d-89bf-ee40e0525d63.png)
-
-### Android <br />
-
-<p float="left">
-  <img src="https://user-images.githubusercontent.com/37384769/138588123-8919321f-132e-4913-9e81-6c0d6a915d8f.jpeg"   width ="200" /> 
-  <img src="https://user-images.githubusercontent.com/37384769/138588161-836214c0-0d54-480a-8030-3679430656b5.jpeg"   width ="200" />
-   <img src="https://user-images.githubusercontent.com/37384769/138588227-31de6adc-fb1e-49b5-baa0-5fe554d3e841.jpeg" width ="200"  /> 
-  <img src="https://user-images.githubusercontent.com/37384769/138588252-5e7cfd5c-3955-48ca-b8d2-78352abb9d87.jpeg"   width ="200" />
-</p>
-
-
-
-### IOS <br />
-<p float="left">
-  <img src="https://user-images.githubusercontent.com/37384769/145550341-b155ce1b-ab0d-4cbe-b82f-cddf89e37638.PNG"   width ="200" /> 
-  <img src="https://user-images.githubusercontent.com/37384769/145550352-e3185015-073e-4980-b3a3-37c669ca444e.PNG"   width ="200" />
-
-
-  <img src="https://user-images.githubusercontent.com/37384769/145550367-52eda5d9-9d8f-4bc8-89a7-4373e1ab2d7f.PNG"   width ="200" /> 
-  <img src="https://user-images.githubusercontent.com/37384769/145550323-73d75d9a-dabf-4301-be56-072c2603f359.PNG"   width ="200" /> 
-</p>
-
-
-
-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 />
-
-
-
----
-# Featurs
-<table>
-  <tr>
-    <th>Name</th>
-    <th>Android</th>
-    <th>Ios</th>
-  </tr>
-
-  <tr>
-    <td>online/offline</td>
-    <td>👍</td>
-    <td>👍</td>
-  </tr>
-
-  <tr>
-    <td>textMessage/typing...</td>
-    <td>👍</td>
-    <td>👍</td>
-  </tr>
-
-
-  <tr>
-    <td>voiceRecord/recording...</td>
-    <td>👍</td>
-    <td>👍</td>
-  </tr>
-
-
-  <tr>
-    <td>saned video/file/images</td>
-    <td>👍</td>
-    <td>👍</td>
-  </tr>
-
-  <tr>
-    <td>cache all media</td>
-    <td>👍</td>
-    <td>👍</td>
-  </tr>
-
-  <tr>
-    <td>message notification</td>
-    <td>👍</td>
-    <td>👍</td>
-  </tr>
-
-
-  <tr>
-    <td>mute/un mute notification</td>
-    <td>👍</td>
-    <td>👍</td>
-  </tr>
-
- <tr>
-    <td>block/un block users</td>
-    <td>👍</td>
-    <td>👍</td>
-  </tr>
-
- <tr>
-    <td>message status/read/unread</td>
-    <td>👍</td>
-    <td>👍</td>
-  </tr>
- </tr>
-    <tr>
-    <td>un read message count</td>
-    <td>👍</td>
-    <td>👍</td>
-  </tr>
- <tr>
-    <td>smooth performance</td>
-    <td>👍</td>
-    <td>👍</td>
-
- </tr>
-    <tr>
-    <td>Group Chat with administration system</td>
-    <td>👍</td>
-    <td>👍</td>
-  </tr>
-</table>
-
-
-## Check Our Full documention 
-<a href="https://hatemragab.github.io/VChatSdk-Documentation/"> VCHAT DOCS</a>  <br />
-
-
-
+<a href="https://hatemragab.github.io/VChatSdk-Documentation/"> VCHAT DOCS</a>  <br />
diff --git a/example/lib/app_terms.dart b/example/lib/app_terms.dart
@@ -21,34 +21,56 @@ class _AppTermsState extends State<AppTerms> {
         padding: const EdgeInsets.all(8.0),
         child: Column(
           children: [
-            SizedBox(height: 5,),
+            SizedBox(
+              height: 5,
+            ),
             "* By entering and participating in the v chat 's you agree to the following terms and conditions of participation. "
                 .text,
-            SizedBox(height: 5,),
+            SizedBox(
+              height: 5,
+            ),
             "* These terms and conditions are contractually binding upon you and you agree to each of them. "
                 .text,
-            SizedBox(height: 5,),
+            SizedBox(
+              height: 5,
+            ),
             "* You enter and participate in the Chat Room and gain access to the materials contained thereon at your own risk."
                 .text,
-            SizedBox(height: 5,),
+            SizedBox(
+              height: 5,
+            ),
             "* 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. "
                 .text,
-            SizedBox(height: 5,),
+            SizedBox(
+              height: 5,
+            ),
             "* 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. "
                 .text,
-            SizedBox(height: 5,),
+            SizedBox(
+              height: 5,
+            ),
             "* We do not endorse or lend any credence for any statements that are made by any participant in the Chat Room. "
                 .text,
-            SizedBox(height: 5,),
+            SizedBox(
+              height: 5,
+            ),
             "* 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.  "
                 .text,
-            SizedBox(height: 5,),
+            SizedBox(
+              height: 5,
+            ),
             "* 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. "
                 .text,
-            SizedBox(height: 5,),
-            "* 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,
-            SizedBox(height: 5,),
-            "*  confirm that the Content is your original creation and not copied from third parties".text,
+            SizedBox(
+              height: 5,
+            ),
+            "* 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,
+            SizedBox(
+              height: 5,
+            ),
+            "*  confirm that the Content is your original creation and not copied from third parties"
+                .text,
           ],
         ),
       ),

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -8,7 +8,7 @@ import './screens/splash_screen.dart';
 import 'controllers/app_controller.dart';
 import 'controllers/home_controller.dart';
 import 'generated/l10n.dart';
-import 'utils/v_chat_custom_widgets.dart';
+import 'utils/v_chat_utils/v_chat_custom_widgets.dart';
 
 const isUseRealServer = true;
 
@@ -22,7 +22,7 @@ void main() async {
   await VChatController.instance.init(
     baseUrl: Uri.parse(serverIp),
     appName: "test_v_chat",
-    vChatNotificationType: VChatNotificationType.firebase,
+    vChatNotificationType: VChatNotificationType.none,
     widgetsBuilder: VChatCustomWidgets(),
     enableLogger: true,
     maxMediaUploadSize: 50 * 1000 * 1000,

diff --git a/example/lib/screens/group_chat_info/group_chat_info.dart b/example/lib/screens/group_chat_info/group_chat_info.dart
@@ -154,7 +154,9 @@ class _GroupChatInfoState extends State<GroupChatInfo> {
               ),
               InkWell(
                 onTap: () {
-                  updateGroupTitle();
+                  if (isMeAdmin) {
+                    updateGroupTitle();
+                  }
                 },
                 child: Row(
                   mainAxisAlignment: MainAxisAlignment.center,

diff --git a/example/lib/screens/home.dart b/example/lib/screens/home.dart
@@ -3,7 +3,6 @@ import 'package:example/generated/l10n.dart';
 import 'package:example/screens/choose_group_members/choose_group_members_screen.dart';
 import 'package:example/screens/setting_screen.dart';
 import 'package:example/screens/user_item.dart';
-
 import 'package:example/screens/users_search.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter/material.dart';

diff --git a/example/lib/utils/v_chat_custom_widgets.dart b/example/lib/utils/v_chat_custom_widgets.dart
diff --git a/example/lib/utils/v_chat_utils/custom_chat_dark_theme.dart b/example/lib/utils/v_chat_utils/custom_chat_dark_theme.dart
@@ -0,0 +1,3 @@
+import 'package:flutter/material.dart';
+
+final customChatDarkTheme = ThemeData.dark().copyWith();
diff --git a/example/lib/utils/v_chat_utils/custom_chat_light_theme.dart b/example/lib/utils/v_chat_utils/custom_chat_light_theme.dart
@@ -0,0 +1,5 @@
+import 'package:flutter/material.dart';
+
+final customChatLightTheme = ThemeData(
+  brightness: Brightness.light,
+);
diff --git a/example/lib/utils/v_chat_utils/v_chat_custom_widgets.dart b/example/lib/utils/v_chat_utils/v_chat_custom_widgets.dart
@@ -0,0 +1,34 @@
+import 'package:flutter/material.dart';
+import 'package:v_chat_sdk/v_chat_sdk.dart';
+
+/// override the widgets that you want to update it
+class VChatCustomWidgets extends VChatWidgetBuilder {
+  @override
+  Color sendButtonColor(BuildContext context, {required bool isDark}) {
+    if (isDark) {
+      return Colors.red;
+    } else {
+      return Colors.blue;
+    }
+  }
+
+  // @override
+  // Widget senderTextMessageWidget(BuildContext context, String text) {
+  //   return Container(
+  //     child: Text(text),
+  //     color: Colors.grey,
+  //     padding: EdgeInsets.all(20),
+  //   );
+  // }
+  //
+  //
+  // @override
+  // Widget receiverTextMessageWidget(BuildContext context, String text) {
+  // final isDark =  Theme.of(context).brightness == Brightness.dark;
+  //   return Container(
+  //     child: Text(text),
+  //     color:isDark?Colors.red: Colors.grey,
+  //     padding: EdgeInsets.all(20),
+  //   );
+  // }
+}
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -250,14 +250,14 @@ packages:
       name: flutter_local_notifications
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "9.1.5"
+    version: "9.2.0"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
       name: flutter_local_notifications_linux
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.0"
+    version: "0.4.1+1"
   flutter_local_notifications_platform_interface:
     dependency: transitive
     description:
@@ -886,7 +886,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.2"
+    version: "1.0.3"
   vector_math:
     dependency: transitive
     description:

diff --git a/lib/src/enums/v_chat_notification_type.dart b/lib/src/enums/v_chat_notification_type.dart
@@ -1,5 +1 @@
-enum VChatNotificationType {
-  none,
-  firebase,
-  onesignal
-}
+enum VChatNotificationType { none, firebase, onesignal }
diff --git a/lib/src/modules/message/providers/message_socket.dart b/lib/src/modules/message/providers/message_socket.dart
@@ -27,8 +27,8 @@ class MessageSocket {
 
   void connectMessageSocket() {
     _socket = _getSocket();
-    _socket.onConnect((data)  {
-      _socket.on("all_messages", (data)  {
+    _socket.onConnect((data) {
+      _socket.on("all_messages", (data) {
         final msgList = jsonDecode(data as String) as List;
         final x = msgList.map((e) => VChatMessage.fromMap(e)).toList();
         unawaited(

diff --git a/lib/src/modules/rooms/room_page.dart b/lib/src/modules/rooms/room_page.dart
@@ -53,9 +53,8 @@ class VChatRoomsScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     RoomCubit.instance.setListViewListener();
-    return Container(
-      color: Theme.of(context).scaffoldBackgroundColor,
-      child: Column(
+    return Scaffold(
+      body: Column(
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
           const ConnectionChecker(),
@@ -91,19 +90,17 @@ class VChatRoomsScreen extends StatelessWidget {
                       key: const PageStorageKey<String>('RoomsTabView'),
                       padding: const EdgeInsets.all(8.0),
                       itemBuilder: (context, index) {
-                        return Material(
-                          child: SizedBox(
-                            height: 70,
-                            child: RoomItem(rooms[index]),
-                          ),
+                        return SizedBox(
+                          height: 70,
+                          child: RoomItem(rooms[index]),
                         );
                       },
                       itemCount: rooms.length,
                     ),
                   ),
                 );
               }
-              throw UnimplementedError();
+              throw const SizedBox();
             },
           ),
         ],
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import 'package:flutter/material.dart';

		final customChatDarkTheme = ThemeData.dark().copyWith();