From 9cb5fd481aa32d00a53abc77352c80b12f3e46fb Mon Sep 17 00:00:00 2001 From: eslam2010011 Date: Wed, 1 Sep 2021 14:48:59 +0200 Subject: [PATCH] New --- FastChat/src/main/AndroidManifest.xml | 2 +- .../com/fastchat/adapter/MessageAdapter2.java | 6 +++--- .../main/java/com/fastchat/widget/Avatar.java | 2 +- FastChat/src/main/res/layout-ar/fragmentchat.xml | 2 +- .../res/layout/fragment_conversation_screen.xml | 2 +- FastChat/src/main/res/layout/fragmentchat.xml | 2 +- FastChat/src/main/res/layout/layout_chatting.xml | 2 +- .../src/main/res/layout/left_message_item.xml | 2 +- .../main/res/layout/left_message_link_item.xml | 2 +- .../res/layout/message_left_file_message.xml | 6 +++--- FastChat/src/main/res/values/color.xml | 5 +++++ app/build.gradle | 16 +++++----------- app/src/main/AndroidManifest.xml | 2 +- 13 files changed, 25 insertions(+), 26 deletions(-) diff --git a/FastChat/src/main/AndroidManifest.xml b/FastChat/src/main/AndroidManifest.xml index 289c06a..fcfda66 100644 --- a/FastChat/src/main/AndroidManifest.xml +++ b/FastChat/src/main/AndroidManifest.xml @@ -30,7 +30,7 @@ \ No newline at end of file diff --git a/FastChat/src/main/java/com/fastchat/adapter/MessageAdapter2.java b/FastChat/src/main/java/com/fastchat/adapter/MessageAdapter2.java index 1943058..36221a0 100644 --- a/FastChat/src/main/java/com/fastchat/adapter/MessageAdapter2.java +++ b/FastChat/src/main/java/com/fastchat/adapter/MessageAdapter2.java @@ -791,7 +791,7 @@ private void setActionData(ActionMessageViewHolder viewHolder, int i, BaseMessag if (Utils.isDarkMode(context)) viewHolder.textView.setTextColor(context.getResources().getColor(R.color.textColorWhite)); else - viewHolder.textView.setTextColor(context.getResources().getColor(R.color.primaryTextColor)); + viewHolder.textView.setTextColor(context.getResources().getColor(R.color.textColorBlack)); if (baseMessage instanceof Action) viewHolder.textView.setText(((Action) baseMessage).getMessage()); else if (baseMessage instanceof Call) { @@ -958,7 +958,7 @@ public void deleteMessage(Button button) { viewHolder.txtMessage.setTextColor(context.getResources().getColor(R.color.textColorWhite)); } else { PatternUtils.setHyperLinkSupport(context, viewHolder.txtMessage, R.color.textColorWhite); - viewHolder.txtMessage.setTextColor(context.getResources().getColor(R.color.primaryTextColor)); + viewHolder.txtMessage.setTextColor(context.getResources().getColor(R.color.textColorBlack)); } @@ -1082,7 +1082,7 @@ public void deleteMessage(Button button) { viewHolder.txtMessage.setTextColor(context.getResources().getColor(R.color.textColorWhite)); } else { PatternUtils.setHyperLinkSupport(context, viewHolder.txtMessage, R.color.textColorWhite); - viewHolder.txtMessage.setTextColor(context.getResources().getColor(R.color.primaryTextColor)); + viewHolder.txtMessage.setTextColor(context.getResources().getColor(R.color.textColorBlack)); } diff --git a/FastChat/src/main/java/com/fastchat/widget/Avatar.java b/FastChat/src/main/java/com/fastchat/widget/Avatar.java index 0664683..d45fd0c 100644 --- a/FastChat/src/main/java/com/fastchat/widget/Avatar.java +++ b/FastChat/src/main/java/com/fastchat/widget/Avatar.java @@ -225,7 +225,7 @@ protected void init() { cornerRadius = (int) Utils.dpToPixel(2, getResources()); paint = new Paint(Paint.ANTI_ALIAS_FLAG); - paint.setColor(getResources().getColor(R.color.colorPrimary)); + paint.setColor(getResources().getColor(R.color.GPrimary)); textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG); textPaint.setTextSize(16f * getResources().getDisplayMetrics().scaledDensity); textPaint.setColor(Color.WHITE); diff --git a/FastChat/src/main/res/layout-ar/fragmentchat.xml b/FastChat/src/main/res/layout-ar/fragmentchat.xml index b7aeffd..d566bf4 100644 --- a/FastChat/src/main/res/layout-ar/fragmentchat.xml +++ b/FastChat/src/main/res/layout-ar/fragmentchat.xml @@ -50,7 +50,7 @@ android:layout_toEndOf="@+id/iv_user" android:singleLine="true" android:text="Eslam Mostafa Mohemd " - android:textColor="@color/primaryTextColor" + android:textColor="@color/textColorBlack" android:textSize="15sp" android:textStyle="bold" /> diff --git a/FastChat/src/main/res/layout/fragment_conversation_screen.xml b/FastChat/src/main/res/layout/fragment_conversation_screen.xml index 12d8bff..4ffd1dd 100644 --- a/FastChat/src/main/res/layout/fragment_conversation_screen.xml +++ b/FastChat/src/main/res/layout/fragment_conversation_screen.xml @@ -20,7 +20,7 @@ android:textSize="22sp" android:visibility="gone" android:textStyle="bold" - android:textColor="@color/primaryTextColor" + android:textColor="@color/textColorBlack" android:id="@+id/tv_title" android:layout_margin="16dp" android:layout_width="wrap_content" diff --git a/FastChat/src/main/res/layout/fragmentchat.xml b/FastChat/src/main/res/layout/fragmentchat.xml index b7aeffd..d566bf4 100644 --- a/FastChat/src/main/res/layout/fragmentchat.xml +++ b/FastChat/src/main/res/layout/fragmentchat.xml @@ -50,7 +50,7 @@ android:layout_toEndOf="@+id/iv_user" android:singleLine="true" android:text="Eslam Mostafa Mohemd " - android:textColor="@color/primaryTextColor" + android:textColor="@color/textColorBlack" android:textSize="15sp" android:textStyle="bold" /> diff --git a/FastChat/src/main/res/layout/layout_chatting.xml b/FastChat/src/main/res/layout/layout_chatting.xml index 6e723f4..a7f6573 100644 --- a/FastChat/src/main/res/layout/layout_chatting.xml +++ b/FastChat/src/main/res/layout/layout_chatting.xml @@ -39,7 +39,7 @@ tools:text="Eslam Mostafa Mohemd" android:textSize="15sp" android:textStyle="bold" - android:textColor="@color/primaryTextColor" + android:textColor="@color/textColorBlack" android:layout_marginTop="8dp" android:layout_marginLeft="10dp" android:layout_toEndOf="@+id/iv_user" diff --git a/FastChat/src/main/res/layout/left_message_item.xml b/FastChat/src/main/res/layout/left_message_item.xml index a4a686d..34d903d 100644 --- a/FastChat/src/main/res/layout/left_message_item.xml +++ b/FastChat/src/main/res/layout/left_message_item.xml @@ -66,7 +66,7 @@ android:focusableInTouchMode="true" android:maxWidth="250dp" android:padding="10dp" - android:textColor="@color/primaryTextColor" + android:textColor="@color/textColorBlack" tools:text="message" /> diff --git a/FastChat/src/main/res/layout/message_left_file_message.xml b/FastChat/src/main/res/layout/message_left_file_message.xml index f750cd6..7333c13 100644 --- a/FastChat/src/main/res/layout/message_left_file_message.xml +++ b/FastChat/src/main/res/layout/message_left_file_message.xml @@ -48,7 +48,7 @@ android:id="@+id/tvFileName" android:layout_width="wrap_content" tools:text="File Name" - android:textColor="@color/primaryTextColor" + android:textColor="@color/textColorBlack" android:focusable="true" android:ellipsize="end" android:singleLine="true" @@ -101,7 +101,7 @@ android:src="@drawable/ic_insert_drive_file_black_24dp" android:layout_width="wrap_content" android:layout_height="wrap_content" - custom:tint="@color/primaryTextColor" /> + custom:tint="@color/textColorBlack" /> diff --git a/FastChat/src/main/res/values/color.xml b/FastChat/src/main/res/values/color.xml index 26df558..ff147c5 100644 --- a/FastChat/src/main/res/values/color.xml +++ b/FastChat/src/main/res/values/color.xml @@ -8,6 +8,11 @@ #000000 + #3D51FE + + + #000000 + #FFFFFF #FAFAFA diff --git a/app/build.gradle b/app/build.gradle index 2a99719..f9aed27 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,13 +40,7 @@ dependencies { api 'com.vanniktech:emoji-twitter:0.7.0' - implementation 'com.github.dueeeke.dkplayer:dkplayer-java:3.2.6' - - implementation 'com.github.dueeeke.dkplayer:dkplayer-ui:3.2.6' - - implementation 'com.github.dueeeke.dkplayer:player-exo:3.2.6' - - implementation 'com.github.dueeeke.dkplayer:videocache:3.2.6' + //RecyclerView implementation 'androidx.recyclerview:recyclerview:1.1.0' @@ -58,12 +52,12 @@ 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.0' + implementation 'com.github.eslam2010011:FastChat:v2.1' - implementation 'com.github.bumptech.glide:glide:4.11.0' - annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0' - implementation 'org.jsoup:jsoup:1.13.1' + // implementation 'com.github.bumptech.glide:glide:4.11.0' + // annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0' + //implementation 'org.jsoup:jsoup:1.13.1' // implementation project(path: ':FastChat') diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 446ee7d..8eb1337 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,7 +13,7 @@ android:supportsRtl="true" >