Skip to content

Commit

Permalink
New
Browse files Browse the repository at this point in the history
  • Loading branch information
eslam2010011 committed Sep 1, 2021
1 parent b8fa290 commit 9cb5fd4
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 26 deletions.
2 changes: 1 addition & 1 deletion FastChat/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<application>
<activity android:name=".Ui.Chat.ChatActivity"
android:theme="@style/Theme.AppCompat"
android:theme="@style/Theme.AppCompat.NoActionBar"
/>
</application>
</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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));

}

Expand Down Expand Up @@ -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));

}

Expand Down
2 changes: 1 addition & 1 deletion FastChat/src/main/java/com/fastchat/widget/Avatar.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion FastChat/src/main/res/layout-ar/fragmentchat.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion FastChat/src/main/res/layout/fragmentchat.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

Expand Down
2 changes: 1 addition & 1 deletion FastChat/src/main/res/layout/layout_chatting.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion FastChat/src/main/res/layout/left_message_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
android:focusableInTouchMode="true"
android:maxWidth="250dp"
android:padding="10dp"
android:textColor="@color/primaryTextColor"
android:textColor="@color/textColorBlack"
tools:text="message" />

<RelativeLayout
Expand Down
2 changes: 1 addition & 1 deletion FastChat/src/main/res/layout/left_message_link_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
android:focusableInTouchMode="true"
android:maxWidth="250dp"
android:padding="10dp"
android:textColor="@color/primaryTextColor"
android:textColor="@color/textColorBlack"
tools:text="message" />
</LinearLayout>

Expand Down
6 changes: 3 additions & 3 deletions FastChat/src/main/res/layout/message_left_file_message.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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" />
<TextView
android:id="@+id/tvFileExtension"
android:layout_width="wrap_content"
Expand All @@ -110,7 +110,7 @@
android:textStyle="bold"
android:textSize="8sp"
android:paddingBottom="2dp"
android:textColor="@color/primaryTextColor"
android:textColor="@color/textColorBlack"
android:visibility="visible" />
</LinearLayout>
</FrameLayout>
Expand Down
5 changes: 5 additions & 0 deletions FastChat/src/main/res/values/color.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@

<color name="primaryTextColor">#000000</color>

<color name="GPrimary">#3D51FE</color>


<color name="textColorBlack">#000000</color>

<color name="textColorWhite">#FFFFFF</color>

<color name="bottom">#FAFAFA</color>
Expand Down
16 changes: 5 additions & 11 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
android:supportsRtl="true"
>
<activity android:name=".MainActivity"
android:theme="@style/Theme.AppCompat"
android:theme="@style/Theme.AppCompat.NoActionBar"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down

0 comments on commit 9cb5fd4

Please sign in to comment.