improving the chat section

YassineBOUJNAH · Jun 3, 2020 · caa297b · caa297b
1 parent 52cdfed
commit caa297b
Show file tree

Hide file tree

Showing 7 changed files with 103 additions and 14 deletions.
diff --git a/app/src/main/java/com/ensias/healthcareapp/adapter/MessageAdapter.java b/app/src/main/java/com/ensias/healthcareapp/adapter/MessageAdapter.java
@@ -25,12 +25,19 @@ public MessageAdapter(@NonNull FirestoreRecyclerOptions<Message> options) {
 
     @Override
     protected void onBindViewHolder(@NonNull MessageHolder holder, int position, @NonNull Message model) {
-        holder.text.setText(model.getMessage());
         if(model.getUserSender().compareTo(getCurrentUser().getEmail()+"") != 0){
-            holder.text.setBackgroundColor(0xC0C0C0);
-            CoordinatorLayout.LayoutParams  lllp= (CoordinatorLayout.LayoutParams) holder.text.getLayoutParams();
-            lllp.gravity= Gravity.LEFT;
-            holder.text.setLayoutParams(lllp);
+            //holder.text.setTextSize(20);
+            //holder.text.setBackgroundColor(0xC0C0C0);
+           // CoordinatorLayout.LayoutParams  lllp= (CoordinatorLayout.LayoutParams) holder.text.getLayoutParams();
+           // lllp.gravity= Gravity.LEFT;
+            //holder.text.setLayoutParams(lllp);
+            //holder.text.setBackground(holder.text.getContext().getResources().getDrawable(R.drawable.rounded_message2));
+            holder.text2.setText(model.getMessage());
+            holder.text2.setPadding(35,35,35,35);
+        }
+        else {
+            holder.text.setText(model.getMessage());
+            holder.text.setPadding(35,35,35,35);
         }
 
     }
@@ -44,11 +51,12 @@ public MessageHolder onCreateViewHolder(ViewGroup parent, int viewType) {
     class MessageHolder extends RecyclerView.ViewHolder{
 
         TextView text;
+        TextView text2;
 
         public MessageHolder(View itemView){
             super(itemView);
             text = itemView.findViewById(R.id.message_item_text);
-
+            text2 = itemView.findViewById(R.id.message_item_text2);
         }
     }
 

diff --git a/app/src/main/res/drawable/rounded_message.xml b/app/src/main/res/drawable/rounded_message.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="https://schemas.android.com/apk/res/android" >
+    <stroke
+        android:width="1dp"
+        android:color="#22BE87" />
+    <solid android:color="#22BE87" />
+
+    <padding
+        android:left="1dp"
+        android:right="1dp"
+        android:bottom="1dp"
+        android:top="1dp" />
+
+    <corners android:topLeftRadius="15dp"
+        android:topRightRadius="15dp"
+        android:bottomLeftRadius="15dp"
+        android:bottomRightRadius="3dp"/>
+</shape>
diff --git a/app/src/main/res/drawable/rounded_message2.xml b/app/src/main/res/drawable/rounded_message2.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="https://schemas.android.com/apk/res/android" >
+    <stroke
+        android:width="1dp"
+        android:color="#EAEDED" />
+    <solid android:color="#EAEDED" />
+
+    <padding
+        android:left="1dp"
+        android:right="1dp"
+        android:bottom="1dp"
+        android:top="1dp" />
+
+    <corners android:topLeftRadius="15dp"
+        android:topRightRadius="15dp"
+        android:bottomLeftRadius="3dp"
+        android:bottomRightRadius="15dp"/>
+
+</shape>
diff --git a/app/src/main/res/font/courgette.xml b/app/src/main/res/font/courgette.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="https://schemas.android.com/apk/res-auto"
+        app:fontProviderAuthority="com.google.android.gms.fonts"
+        app:fontProviderPackage="com.google.android.gms"
+        app:fontProviderQuery="Courgette"
+        app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
+</font-family>
diff --git a/app/src/main/res/layout/activity_chat.xml b/app/src/main/res/layout/activity_chat.xml
@@ -5,7 +5,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="https://schemas.android.com/apk/res-auto"
-    tools:context=".DoctorHomeActivity">
+    tools:context=".DoctorHomeActivity"
+    android:background="#FFFFFF">
+
 
     <!-- RECYCLER VIEW CONTAINER -->
     <LinearLayout
@@ -14,6 +16,20 @@
         android:layout_height="match_parent"
         android:orientation="vertical"
         android:layout_above="@id/activity_mentor_chat_add_message_container">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:background="#22BEA9">
+            <TextView
+                android:layout_marginTop="8dp"
+                android:layout_marginLeft="20dp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:textSize="30dp"
+                android:fontFamily="@font/courgette"
+                android:textColor="#FFFFFF"
+                android:text="Messages" />
+        </LinearLayout>
         <!-- RECYCLER VIEW -->
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/activity_mentor_chat_recycler_view"
@@ -33,7 +49,7 @@
         <!-- TEXT MESSAGE EDIT TEXT -->
         <com.google.android.material.textfield.TextInputLayout
             android:layout_width="300dp"
-            android:layout_height="36dp">
+            android:layout_height="55dp">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/activity_mentor_chat_message_edit_text"

diff --git a/app/src/main/res/layout/message_chat_item.xml b/app/src/main/res/layout/message_chat_item.xml
@@ -1,21 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="https://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent" android:layout_height="wrap_content">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="https://schemas.android.com/apk/res-auto"
+    xmlns:card_view="https://schemas.android.com/tools"
+    app:cardBackgroundColor="#FFFFFF"
+    card_view:cardPreventCornerOverlap="false"
+    app:cardElevation="0dp">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_margin="5px"
+        card_view:cardPreventCornerOverlap="false">
 
         <TextView
             android:id="@+id/message_item_text"
             android:layout_width="wrap_content"
             android:maxWidth="200dp"
             android:layout_height="wrap_content"
-            android:text="message"
+            android:text=""
             android:layout_gravity="right"
-            android:background="#4267B2"
-            android:textSize="25dp"
-            android:padding="10dp"
+            android:fontFamily="@font/courgette"
+            android:background="@drawable/rounded_message"
+            android:textSize="18dp"
             android:shadowRadius="@android:integer/config_shortAnimTime"/>
+
+        <TextView
+            android:id="@+id/message_item_text2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:background="@drawable/rounded_message2"
+            android:fontFamily="@font/roboto"
+            android:maxWidth="200dp"
+            android:shadowRadius="@android:integer/config_shortAnimTime"
+            android:text=""
+            android:textSize="18dp" />
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/values/preloaded_fonts.xml b/app/src/main/res/values/preloaded_fonts.xml
@@ -2,5 +2,6 @@
 <resources>
     <array name="preloaded_fonts" translatable="false">
         <item>@font/amita</item>
+        <item>@font/courgette</item>
     </array>
 </resources>