New

eslam2010011 · Sep 1, 2021 · 5959ec3 · 5959ec3
1 parent 9cb5fd4
commit 5959ec3
Show file tree

Hide file tree

Showing 14 changed files with 99 additions and 3 deletions.
diff --git a/FastChat/src/main/java/com/fastchat/Core/UiConfig.java b/FastChat/src/main/java/com/fastchat/Core/UiConfig.java
@@ -1,5 +1,7 @@
 package com.fastchat.Core;
 
+import android.view.View;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -151,6 +153,9 @@ interface OnChatListener {
 
             void onVoice(User user, BaseMessage baseMessage);
 
+
+            void info(View view);
+
         }
 
 

diff --git a/FastChat/src/main/java/com/fastchat/Ui/Chat/fragmentChat.java b/FastChat/src/main/java/com/fastchat/Ui/Chat/fragmentChat.java
@@ -203,9 +203,52 @@ public void onClick(View v) {
                 getActivity().finish();
             }
         });
+        info.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (FastChat.getUiConfig().getOnChatListener() != null) {
+                    FastChat.getUiConfig().getOnChatListener().info(v);
+                }
+
+            }
+        });
         video_call.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (Utils.hasPermissions(getActivity(), new String[]{Manifest.permission.RECORD_AUDIO, Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA})) {
+                    FastChat.getFastChat().getChatInteract().sendMessageCall(groupId, FastChatConstants.MESSAGE_TYPE_VIDEO, receiverId, userId, new Chat.CallbackListener() {
+                              @Override
+                              public void onSuccess(BaseMessage textMessage) {
+                                    MediaUtils.playSendSound(getActivity(), R.raw.outgoing_message);
+                                    SendNotification(receiverId, (Call) textMessage);
+                                    DatabaseReference databaseReference = FastChat.getFastChat().getChatInteract().getUser(receiverId);
+                                    ValueEventListener valueEventListener = new ValueEventListener() {
+                                      @Override
+                                   public void onDataChange(@NonNull DataSnapshot snapshot) {
+                                           User user1 = snapshot.getValue(User.class);
+                                            if ((user1 != null ? user1.getUserName() : null) != null) {
+                                                 if (FastChat.getUiConfig().getOnChatListener() != null) {
+                                                  FastChat.getUiConfig().getOnChatListener().onVideo(user1, (Call) textMessage);
+                                               }
+
+                                            }
+                                        }
+                                                                               @Override
+                                     public void onCancelled(@NonNull DatabaseError error) {
+
+                                       }
+                                    };
+                                   databaseReference.addListenerForSingleValueEvent(valueEventListener);
+                                }
+                           });
+
+
+                }else {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                        ( getActivity()).requestPermissions(new String[]{Manifest.permission.RECORD_AUDIO, Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA},
+                                30);
+                    }
+                }
 //                FastPermissions.with(getActivity())
 //                        .request(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
 //                        .ifNecessary()
@@ -250,6 +293,41 @@ public void onClick(View v) {
         voice_call.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+
+                if (Utils.hasPermissions(getActivity(), new String[]{Manifest.permission.RECORD_AUDIO, Manifest.permission.WRITE_EXTERNAL_STORAGE})) {
+                    FastChat.getFastChat().getChatInteract().sendMessageCall(groupId, FastChatConstants.MESSAGE_TYPE_VIDEO, receiverId, userId, new Chat.CallbackListener() {
+                        @Override
+                        public void onSuccess(BaseMessage textMessage) {
+                            MediaUtils.playSendSound(getActivity(), R.raw.outgoing_message);
+                            SendNotification(receiverId, (Call) textMessage);
+                            DatabaseReference databaseReference = FastChat.getFastChat().getChatInteract().getUser(receiverId);
+                            ValueEventListener valueEventListener = new ValueEventListener() {
+                                @Override
+                                public void onDataChange(@NonNull DataSnapshot snapshot) {
+                                    User user1 = snapshot.getValue(User.class);
+                                    if ((user1 != null ? user1.getUserName() : null) != null) {
+                                        if (FastChat.getUiConfig().getOnChatListener() != null) {
+                                            FastChat.getUiConfig().getOnChatListener().onVoice(user1, (Call) textMessage);
+                                        }
+
+                                    }
+                                }
+                                @Override
+                                public void onCancelled(@NonNull DatabaseError error) {
+
+                                }
+                            };
+                            databaseReference.addListenerForSingleValueEvent(valueEventListener);
+                        }
+                    });
+
+
+                }else {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                        ( getActivity()).requestPermissions(new String[]{Manifest.permission.RECORD_AUDIO, Manifest.permission.WRITE_EXTERNAL_STORAGE},
+                                30);
+                    }
+                }
 //                FastPermissions.with(getActivity())
 //                        .request(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
 //                        .ifNecessary()

diff --git a/FastChat/src/main/res/layout/conversation_list_row.xml b/FastChat/src/main/res/layout/conversation_list_row.xml
@@ -41,6 +41,7 @@
                     android:layout_toEndOf="@id/av_user"
                     android:layout_height="wrap_content"
                     tools:text="@tools:sample/full_names"
+                    android:textColor="@color/textColorBlack"
                     android:layout_marginEnd="16dp"
                     android:textSize="@dimen/name"
                     android:maxLines="1"
@@ -57,6 +58,7 @@
                     android:layout_below="@id/txt_user_name"
                     android:layout_toEndOf="@id/av_user"
                     android:maxLines="1"
+                    android:textColor="@color/secondaryTextColor"
                     android:layout_marginRight="8dp"
                     android:layout_toStartOf="@+id/messageTime"
                     tools:text="online"
@@ -81,6 +83,7 @@
                     android:textSize="12sp"
                     android:layout_alignTop="@id/txt_user_name"
                     tools:text="11:50"
+                    android:textColor="@color/secondaryTextColor"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
                 <com.fastchat.widget.BadgeCount

diff --git a/FastChat/src/main/res/layout/layout_compose_box.xml b/FastChat/src/main/res/layout/layout_compose_box.xml
@@ -153,6 +153,7 @@
                     android:layout_weight="1"
                     android:background="@null"
                     android:ems="10"
+                     android:textColor="@color/textColorBlack"
                     android:hint="@string/type_a_message"
                     android:inputType="textMultiLine"
                     android:maxLines="6"

diff --git a/FastChat/src/main/res/layout/left_message_item.xml b/FastChat/src/main/res/layout/left_message_item.xml
@@ -141,6 +141,7 @@
 
         <TextView
             android:id="@+id/txt_time"
+            android:textColor="@color/secondaryTextColor"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBottom="@+id/cv_message_container"

diff --git a/FastChat/src/main/res/layout/left_message_link_item.xml b/FastChat/src/main/res/layout/left_message_link_item.xml
@@ -160,6 +160,7 @@
             android:layout_alignBottom="@+id/cv_message_container"
             android:layout_gravity="center"
             android:layout_marginBottom="8dp"
+            android:textColor="@color/secondaryTextColor"
             android:layout_toRightOf="@id/cv_message_container"
             android:textSize="12sp"
             android:textStyle="bold"

diff --git a/FastChat/src/main/res/layout/left_reply_message_item.xml b/FastChat/src/main/res/layout/left_reply_message_item.xml
@@ -224,6 +224,7 @@
             android:layout_below="@+id/cv_message_container"
             android:visibility="gone"
             android:id="@+id/txt_time"
+            android:textColor="@color/secondaryTextColor"
             android:layout_marginEnd="10dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

diff --git a/FastChat/src/main/res/layout/message_left_list_image_item.xml b/FastChat/src/main/res/layout/message_left_list_image_item.xml
@@ -145,7 +145,8 @@
             android:layout_alignBottom="@id/cv_image_message_container"
             android:layout_gravity="center"
             android:layout_marginBottom="8dp"
-            tools:drawableStart="@drawable/ic_double_tick"            android:textColor="@color/secondaryTextColor"
+            tools:drawableStart="@drawable/ic_double_tick"
+            android:textColor="@color/secondaryTextColor"
             android:textSize="12sp"
             android:textStyle="bold"
             android:visibility="gone"

diff --git a/FastChat/src/main/res/layout/right_message_item.xml b/FastChat/src/main/res/layout/right_message_item.xml
@@ -111,6 +111,7 @@
             android:layout_marginBottom="8dp"
             android:gravity="center_vertical"
             android:textSize="12sp"
+            android:textColor="@color/secondaryTextColor"
             android:textStyle="bold"
             android:visibility="gone"
             tools:text="11:00 PM"

diff --git a/FastChat/src/main/res/layout/right_message_link_item.xml b/FastChat/src/main/res/layout/right_message_link_item.xml
@@ -127,6 +127,7 @@
             android:layout_marginBottom="8dp"
             android:gravity="center_vertical"
             android:textSize="12sp"
+            android:textColor="@color/secondaryTextColor"
             android:textStyle="bold"
             android:visibility="gone"
             tools:text="11:00 PM"

diff --git a/FastChat/src/main/res/layout/right_reply_file_message_item.xml b/FastChat/src/main/res/layout/right_reply_file_message_item.xml
@@ -179,6 +179,7 @@
             tools:text="11:00 PM"
             android:layout_marginBottom="8dp"
             android:textSize="12sp"
+            android:textColor="@color/secondaryTextColor"
             android:layout_alignBottom="@+id/cv_message_container"
             android:layout_toLeftOf="@+id/cv_message_container"
             android:textStyle="bold"

diff --git a/FastChat/src/main/res/layout/right_reply_message_item.xml b/FastChat/src/main/res/layout/right_reply_message_item.xml
@@ -237,6 +237,7 @@
             android:layout_marginBottom="8dp"
             android:gravity="center_vertical"
             android:textSize="12sp"
+            android:textColor="@color/secondaryTextColor"
             android:textStyle="bold"
             android:visibility="gone"
             tools:text="11:00 PM"

diff --git a/app/build.gradle b/app/build.gradle
@@ -40,7 +40,7 @@ dependencies {
     api 'com.vanniktech:emoji-twitter:0.7.0'
 
 
-    
+
 
     //RecyclerView
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
@@ -52,7 +52,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-database:20.0.1'
     implementation 'com.firebaseui:firebase-ui-database:6.3.0'
 
-    implementation 'com.github.eslam2010011:FastChat:v2.1'
+    implementation 'com.github.eslam2010011:FastChat:v2.2'
 
 
    // implementation 'com.github.bumptech.glide:glide:4.11.0'

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/layout"
+    android:background="@color/white"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
      tools:context=".MainActivity">