From 67b39ea04c2c98ab974e9e4afb72b38c51a09645 Mon Sep 17 00:00:00 2001
From: hdhimalay <hdhimalay@gmail.com>
Date: Mon, 20 May 2024 14:21:27 +0530
Subject: [PATCH] FCm Notifications

---
 TalkIn/.idea/gradle.xml                       |   1 +
 TalkIn/.idea/misc.xml                         |   1 -
 TalkIn/.idea/vcs.xml                          |   6 +
 TalkIn/app/build.gradle                       |   3 +-
 TalkIn/app/src/main/AndroidManifest.xml       |  10 ++
 .../java/com/example/talk_in/ChatActivity.kt  |  93 ++++++++++++----
 .../example/talk_in/FCMNotificationService.kt |  75 +++++++++++++
 .../example/talk_in/FcmNotificationsSender.kt |  73 +++++++++++++
 .../main/java/com/example/talk_in/LogIn.kt    | 103 +++++++++++++-----
 .../java/com/example/talk_in/MainActivity.kt  |  22 ++--
 TalkIn/app/src/main/res/layout/receive.xml    |  15 ++-
 TalkIn/app/src/main/res/layout/sent.xml       |  37 ++++---
 TalkIn/app/src/main/res/values/strings.xml    |   2 +
 13 files changed, 358 insertions(+), 83 deletions(-)
 create mode 100644 TalkIn/.idea/vcs.xml
 create mode 100644 TalkIn/app/src/main/java/com/example/talk_in/FCMNotificationService.kt
 create mode 100644 TalkIn/app/src/main/java/com/example/talk_in/FcmNotificationsSender.kt

diff --git a/TalkIn/.idea/gradle.xml b/TalkIn/.idea/gradle.xml
index 32522c1..0897082 100644
--- a/TalkIn/.idea/gradle.xml
+++ b/TalkIn/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/TalkIn/.idea/misc.xml b/TalkIn/.idea/misc.xml
index 0ad17cb..8978d23 100644
--- a/TalkIn/.idea/misc.xml
+++ b/TalkIn/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
diff --git a/TalkIn/.idea/vcs.xml b/TalkIn/.idea/vcs.xml
new file mode 100644
index 0000000..6c0b863
--- /dev/null
+++ b/TalkIn/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/TalkIn/app/build.gradle b/TalkIn/app/build.gradle
index 883dbfe..0e0215b 100644
--- a/TalkIn/app/build.gradle
+++ b/TalkIn/app/build.gradle
@@ -41,7 +41,8 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.google.firebase:firebase-auth-ktx:23.0.0'
     implementation 'com.google.firebase:firebase-firestore-ktx:23.0.3'
-
+    implementation 'com.google.firebase:firebase-messaging-ktx:24.0.0'
+    implementation 'com.android.volley:volley:1.2.1'
     implementation 'com.google.firebase:firebase-database:21.0.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation 'androidx.activity:activity:1.8.0'
diff --git a/TalkIn/app/src/main/AndroidManifest.xml b/TalkIn/app/src/main/AndroidManifest.xml
index 7213440..158b4e2 100644
--- a/TalkIn/app/src/main/AndroidManifest.xml
+++ b/TalkIn/app/src/main/AndroidManifest.xml
@@ -2,6 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.VIBRATE" />
+
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -41,6 +45,12 @@
         </activity>
         <activity android:name=".MainActivity" />
 
+        <service android:name=".FCMNotificationService" android:exported="true">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+            </intent-filter>
+        </service>
+
         <meta-data
             android:name="preloaded_fonts"
             android:resource="@array/preloaded_fonts" />
diff --git a/TalkIn/app/src/main/java/com/example/talk_in/ChatActivity.kt b/TalkIn/app/src/main/java/com/example/talk_in/ChatActivity.kt
index 2d298c0..9d2c00c 100644
--- a/TalkIn/app/src/main/java/com/example/talk_in/ChatActivity.kt
+++ b/TalkIn/app/src/main/java/com/example/talk_in/ChatActivity.kt
@@ -26,20 +26,22 @@ class ChatActivity : AppCompatActivity() {
     private lateinit var messageAdapter: MessageAdapter
     private lateinit var messageList: ArrayList<Message>
     private lateinit var mDbRef: DatabaseReference
-    var receiverRoom: String?=null
-    var senderRoom: String?=null
+    private var receiverRoom: String? = null
+    private var senderRoom: String? = null
+    private lateinit var receiverUid: String
+    private lateinit var senderName: String
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_chat)
 
 
-        val name= intent.getStringExtra("name")
-        val receiveruid= intent.getStringExtra("uid")
+        val name = intent.getStringExtra("name")
+        receiverUid = intent.getStringExtra("uid") ?: ""
         val senderUid= FirebaseAuth.getInstance().currentUser?.uid
         mDbRef= FirebaseDatabase.getInstance().getReference()
-        senderRoom= receiveruid+senderUid
-        receiverRoom=senderUid+receiveruid
+        senderRoom = "$receiverUid$senderUid"
+        receiverRoom = "$senderUid$receiverUid"
         supportActionBar?.hide()
 
         chatRecyclerView=findViewById(R.id.chatRecyclerView)
@@ -54,36 +56,39 @@ class ChatActivity : AppCompatActivity() {
 
         chatRecyclerView.layoutManager=LinearLayoutManager(this)
         chatRecyclerView.adapter=messageAdapter
-        //logic to add data to recyclerview
-        mDbRef.child("chats").child(senderRoom!!).child("messages")
-            .addValueEventListener(object: ValueEventListener{
-                override fun onDataChange(snapshot: DataSnapshot) {
-                    messageList.clear()
-
-                    for (postSnapshot in snapshot.children){
-                        val message = postSnapshot.getValue(Message::class.java)
-                        messageList.add(message!!)
-                    }
-                   messageAdapter.notifyDataSetChanged()
+
+        // Fetch sender's name
+        senderUid?.let {
+            mDbRef.child("user").child(it).addListenerForSingleValueEvent(object : ValueEventListener {
+                override fun onDataChange(dataSnapshot: DataSnapshot) {
+                    senderName = dataSnapshot.child("name").value.toString()
+                    // Load chat messages
+                    loadChatMessages()
                 }
 
-                override fun onCancelled(error: DatabaseError) {
+                override fun onCancelled(databaseError: DatabaseError) {
 
                 }
+
             })
-       //adding message to data base
-        sendButton.setOnClickListener{
-         val message=messageBox.text.toString()
-            val messageObject= Message(message,senderUid)
+        }
+
+        // Adding message to database
+        sendButton.setOnClickListener {
+            val message = messageBox.text.toString()
+            val messageObject = Message(message, senderUid)
             mDbRef.child("chats").child(senderRoom!!).child("messages").push()
                 .setValue(messageObject).addOnSuccessListener {
                     mDbRef.child("chats").child(receiverRoom!!).child("messages").push()
                         .setValue(messageObject)
-
+                        .addOnSuccessListener {
+                            sendNotificationToReceiver(receiverUid, message)
+                        }
                 }
             messageBox.setText("")
         }
 
+
         backbtnImage.setOnClickListener {
             val intent = Intent(this@ChatActivity, MainActivity::class.java)
             startActivity(intent)
@@ -122,4 +127,46 @@ class ChatActivity : AppCompatActivity() {
         }
         popupMenu.show()
     }
+
+    private fun loadChatMessages() {
+        mDbRef.child("chats").child(senderRoom!!).child("messages").addValueEventListener(object : ValueEventListener {
+            override fun onDataChange(snapshot: DataSnapshot) {
+                messageList.clear()
+                for (postSnapshot in snapshot.children) {
+                    val message = postSnapshot.getValue(Message::class.java)
+                    messageList.add(message!!)
+                }
+                messageAdapter.notifyDataSetChanged()
+                // Scroll RecyclerView to the bottom
+                chatRecyclerView.scrollToPosition(messageAdapter.itemCount - 1)
+            }
+
+            override fun onCancelled(error: DatabaseError) {
+            }
+        })
+    }
+
+    private fun sendNotificationToReceiver(receiverUid: String, message: String) {
+        // Fetch receiver's device token
+        mDbRef.child("users-device-tokens").child(receiverUid).addListenerForSingleValueEvent(object : ValueEventListener {
+            override fun onDataChange(dataSnapshot: DataSnapshot) {
+                val receiverDeviceToken = dataSnapshot.child("deviceToken").value.toString()
+
+                val notificationSender = FcmNotificationsSender(
+                    receiverDeviceToken,
+                    "New Message from $senderName",
+                    message,
+                    FirebaseAuth.getInstance().currentUser?.uid ?: "",
+                    senderName,
+                    applicationContext,
+                    this@ChatActivity
+                )
+                notificationSender.sendNotifications()
+            }
+
+            override fun onCancelled(databaseError: DatabaseError) {
+
+            }
+        })
+    }
 }
\ No newline at end of file
diff --git a/TalkIn/app/src/main/java/com/example/talk_in/FCMNotificationService.kt b/TalkIn/app/src/main/java/com/example/talk_in/FCMNotificationService.kt
new file mode 100644
index 0000000..d7d939a
--- /dev/null
+++ b/TalkIn/app/src/main/java/com/example/talk_in/FCMNotificationService.kt
@@ -0,0 +1,75 @@
+package com.example.talk_in
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Intent
+import android.media.RingtoneManager
+import android.net.Uri
+import android.os.Build
+import android.os.Vibrator
+import androidx.core.app.NotificationCompat
+import com.google.firebase.messaging.FirebaseMessagingService
+import com.google.firebase.messaging.RemoteMessage
+
+class FCMNotificationService : FirebaseMessagingService() {
+
+    private lateinit var mNotificationManager: NotificationManager
+
+    override fun onMessageReceived(remoteMessage: RemoteMessage) {
+        super.onMessageReceived(remoteMessage)
+
+        // Play notification sound
+        val notification: Uri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
+        val r = RingtoneManager.getRingtone(applicationContext, notification)
+        r.play()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            r.isLooping = false
+        }
+
+        // Vibrate the device
+        val v = getSystemService(VIBRATOR_SERVICE) as Vibrator
+        val pattern = longArrayOf(100, 300, 300, 300)
+        v.vibrate(pattern, -1)
+
+        val resourceImage = resources.getIdentifier(remoteMessage.notification?.icon, "drawable", packageName)
+
+        val builder = NotificationCompat.Builder(this, "CHANNEL_ID")
+        builder.setSmallIcon(resourceImage)
+
+        // Extract data payload
+        val senderUid = remoteMessage.data["senderUid"]
+        val senderName = remoteMessage.data["senderName"]
+
+        // Open ChatActivity when notification is clicked
+        val resultIntent = Intent(this, ChatActivity::class.java).apply {
+            putExtra("uid", senderUid)
+            putExtra("name", senderName)
+        }
+
+        val pendingIntent = PendingIntent.getActivity(this, 1, resultIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+
+        builder.setContentTitle(remoteMessage.notification?.title)
+        builder.setContentText(remoteMessage.notification?.body)
+        builder.setContentIntent(pendingIntent)
+        builder.setStyle(NotificationCompat.BigTextStyle().bigText(remoteMessage.notification?.body))
+        builder.setAutoCancel(true)
+        builder.priority = Notification.PRIORITY_MAX
+
+        mNotificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val channelId = "Your_channel_id"
+            val channel = NotificationChannel(
+                channelId,
+                "Messages Notification",
+                NotificationManager.IMPORTANCE_HIGH
+            )
+            mNotificationManager.createNotificationChannel(channel)
+            builder.setChannelId(channelId)
+        }
+
+        mNotificationManager.notify(100, builder.build())
+    }
+}
\ No newline at end of file
diff --git a/TalkIn/app/src/main/java/com/example/talk_in/FcmNotificationsSender.kt b/TalkIn/app/src/main/java/com/example/talk_in/FcmNotificationsSender.kt
new file mode 100644
index 0000000..623d1be
--- /dev/null
+++ b/TalkIn/app/src/main/java/com/example/talk_in/FcmNotificationsSender.kt
@@ -0,0 +1,73 @@
+package com.example.talk_in
+
+import android.app.Activity
+import android.content.Context
+import android.util.Log
+import com.android.volley.AuthFailureError
+import com.android.volley.Request
+import com.android.volley.RequestQueue
+import com.android.volley.Response
+import com.android.volley.toolbox.JsonObjectRequest
+import com.android.volley.toolbox.Volley
+import org.json.JSONException
+import org.json.JSONObject
+import java.util.HashMap
+
+class FcmNotificationsSender(
+    private val userFcmToken: String,
+    private val title: String,
+    private val body: String,
+    private val senderUid: String,
+    private val senderName: String,
+    private val mContext: Context,
+    private val mActivity: Activity
+) {
+    private val requestQueue: RequestQueue = Volley.newRequestQueue(mContext)
+    private val postUrl = "https://fcm.googleapis.com/fcm/send"
+    private val fcmServerKey = "AAAAt0loRzU:APA91bE7oxyox_4Q2dHihHCKlQCe9pV7wbGgPXL4uvRsC-1kKfV-H0v37M4prqmV784RdKK7nW8c7POGh3Psyb-gAaqq78wya6yoEdimE0XLARHPtvi1VHdG5VrwHx4n9m6YRqZvY7-s"
+
+    fun sendNotifications() {
+        Log.d(TAG, "Sending FCM notification")
+        val mainObj = JSONObject()
+        try {
+            mainObj.put("to", userFcmToken)
+            val notiObject = JSONObject()
+            notiObject.put("title", title)
+            notiObject.put("body", body)
+            notiObject.put("icon", R.drawable.talkin)
+            mainObj.put("notification", notiObject)
+
+            // Add data payload
+            val dataObject = JSONObject()
+            dataObject.put("senderUid", senderUid)
+            dataObject.put("senderName", senderName)
+            dataObject.put("message", body)
+            mainObj.put("data", dataObject)
+
+            val request = object : JsonObjectRequest(
+                Request.Method.POST, postUrl, mainObj,
+                Response.Listener { response ->
+
+                },
+                Response.ErrorListener { error ->
+
+                }
+            ) {
+                @Throws(AuthFailureError::class)
+                override fun getHeaders(): Map<String, String> {
+                    val header = HashMap<String, String>()
+                    header["content-type"] = "application/json"
+                    header["authorization"] = "key=$fcmServerKey"
+                    return header
+                }
+            }
+            requestQueue.add(request)
+        } catch (e: JSONException) {
+            e.printStackTrace()
+        }
+    }
+
+    companion object {
+        private const val TAG = "FcmNotificationsSender"
+    }
+}
\ No newline at end of file
diff --git a/TalkIn/app/src/main/java/com/example/talk_in/LogIn.kt b/TalkIn/app/src/main/java/com/example/talk_in/LogIn.kt
index 12f8acc..d403e5e 100644
--- a/TalkIn/app/src/main/java/com/example/talk_in/LogIn.kt
+++ b/TalkIn/app/src/main/java/com/example/talk_in/LogIn.kt
@@ -1,8 +1,6 @@
 package com.example.talk_in
 
 import android.content.Intent
-import android.graphics.Color
-import android.graphics.PorterDuff
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.View
@@ -12,25 +10,27 @@ import android.widget.ProgressBar
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.ContextCompat
-import com.google.android.gms.tasks.OnCompleteListener
-import com.google.android.gms.tasks.OnFailureListener
-import com.google.firebase.auth.AuthResult
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException
 import com.google.firebase.auth.FirebaseAuthInvalidUserException
-
-
-
+import com.google.firebase.database.DataSnapshot
+import com.google.firebase.database.DatabaseError
+import com.google.firebase.database.DatabaseReference
+import com.google.firebase.database.FirebaseDatabase
+import com.google.firebase.database.ValueEventListener
+import com.google.firebase.messaging.FirebaseMessaging
 
 class LogIn : AppCompatActivity() {
   private lateinit var mAuth: FirebaseAuth
-  private lateinit var edtEmail : com.google.android.material.textfield.TextInputEditText
-  private lateinit var edtPassword : com.google.android.material.textfield.TextInputEditText
+  private lateinit var edtEmail: com.google.android.material.textfield.TextInputEditText
+  private lateinit var edtPassword: com.google.android.material.textfield.TextInputEditText
+  private lateinit var mDbRef: DatabaseReference
+
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_log_in)
     mAuth = FirebaseAuth.getInstance()
+    mDbRef = FirebaseDatabase.getInstance().reference
     supportActionBar?.hide()
 
     edtEmail = findViewById(R.id.edt_email)
@@ -40,8 +40,9 @@ class LogIn : AppCompatActivity() {
     val backbtn = findViewById<ImageView>(R.id.btnBack)
     val forgetPassword = findViewById<TextView>(R.id.forgetPassword)
     val loginMobBtn = findViewById<Button>(R.id.loginMobile)
+
     loginMobBtn.setOnClickListener {
-      val i = Intent(this@LogIn,MobileAuthActivity::class.java)
+      val i = Intent(this@LogIn, MobileAuthActivity::class.java)
       startActivity(i)
     }
 
@@ -50,13 +51,13 @@ class LogIn : AppCompatActivity() {
       val password = edtPassword.text.toString()
       if (email.isBlank() || password.isBlank()) {
         Toast.makeText(this, "Please enter details.", Toast.LENGTH_SHORT).show()
-      } else{
+      } else {
         progressLogin.visibility = View.VISIBLE
         login(email, password)
       }
     }
-    backbtn.setOnClickListener{
-      val intent = Intent(this@LogIn,EntryActivity::class.java)
+    backbtn.setOnClickListener {
+      val intent = Intent(this@LogIn, EntryActivity::class.java)
       startActivity(intent)
       finish()
     }
@@ -65,8 +66,6 @@ class LogIn : AppCompatActivity() {
       startActivity(intent)
       finish()
     }
-
-
   }
 
   private fun login(email: String, pwd: String) {
@@ -76,30 +75,32 @@ class LogIn : AppCompatActivity() {
         .addOnCompleteListener { task ->
           if (task.isSuccessful) {
             if (mAuth.currentUser?.isEmailVerified == true) {
-              progressLogin.visibility = View.GONE
-              val intent = Intent(this@LogIn, MainActivity::class.java)
-              Toast.makeText(this, "Login Successful", Toast.LENGTH_SHORT).show()
-              startActivity(intent)
-              finish()
+              FirebaseMessaging.getInstance().token.addOnCompleteListener { tokenTask ->
+                if (tokenTask.isSuccessful) {
+                  val deviceToken = tokenTask.result
+                  handleDeviceToken(deviceToken, email, progressLogin)
+                } else {
+                  progressLogin.visibility = View.GONE
+                  Toast.makeText(this, "Failed to get device token: ${tokenTask.exception?.message}", Toast.LENGTH_SHORT).show()
+                }
+              }
             } else {
               progressLogin.visibility = View.GONE
               Toast.makeText(this, "Please verify your email id.", Toast.LENGTH_SHORT).show()
             }
           }
         }.addOnFailureListener { e ->
+          progressLogin.visibility = View.GONE
           when (e) {
             is FirebaseAuthInvalidCredentialsException -> {
-              progressLogin.visibility = View.GONE
               edtPassword.error = "Invalid Password"
               edtPassword.requestFocus()
             }
             is FirebaseAuthInvalidUserException -> {
-              progressLogin.visibility = View.GONE
               edtEmail.error = "Email Not Registered"
               edtEmail.requestFocus()
             }
             else -> {
-              progressLogin.visibility = View.GONE
               Toast.makeText(this, "Something went Wrong", Toast.LENGTH_SHORT).show()
             }
           }
@@ -109,4 +110,56 @@ class LogIn : AppCompatActivity() {
       Toast.makeText(this, "Please Enter Email & Password", Toast.LENGTH_SHORT).show()
     }
   }
+
+  private fun handleDeviceToken(deviceToken: String, email: String, progressLogin: ProgressBar) {
+    val usersRef = mDbRef.child("users-device-tokens")
+    usersRef.orderByChild("deviceToken").equalTo(deviceToken).addListenerForSingleValueEvent(object : ValueEventListener {
+      override fun onDataChange(dataSnapshot: DataSnapshot) {
+        if (dataSnapshot.exists()) {
+          for (userSnapshot in dataSnapshot.children) {
+            val storedEmail = userSnapshot.child("email").getValue(String::class.java)
+            if (storedEmail == email) {
+              saveDeviceToken(mAuth.currentUser?.uid!!, deviceToken)
+              navigateToMainActivity(progressLogin)
+            } else {
+              progressLogin.visibility = View.GONE
+              Toast.makeText(this@LogIn, "Another user is already logged in with this device!", Toast.LENGTH_SHORT).show()
+            }
+          }
+        } else {
+          saveDeviceToken(mAuth.currentUser?.uid!!, deviceToken)
+          navigateToMainActivity(progressLogin)
+        }
+      }
+
+      override fun onCancelled(databaseError: DatabaseError) {
+        progressLogin.visibility = View.GONE
+        Toast.makeText(this@LogIn, "Failed to check device token: ${databaseError.message}", Toast.LENGTH_SHORT).show()
+      }
+    })
+  }
+
+  private fun saveDeviceToken(userId: String, deviceToken: String) {
+    val userData = hashMapOf(
+      "userId" to userId,
+      "email" to mAuth.currentUser?.email,
+      "deviceToken" to deviceToken
+    )
+
+    mDbRef.child("users-device-tokens").child(userId).setValue(userData)
+      .addOnSuccessListener {
+        // Device token saved successfully
+      }
+      .addOnFailureListener { e ->
+        Toast.makeText(this, "Failed to save device token: ${e.message}", Toast.LENGTH_SHORT).show()
+      }
+  }
+
+  private fun navigateToMainActivity(progressLogin: ProgressBar) {
+    progressLogin.visibility = View.GONE
+    val intent = Intent(this@LogIn, MainActivity::class.java)
+    startActivity(intent)
+    finish()
+    Toast.makeText(this, "Login Successful", Toast.LENGTH_SHORT).show()
+  }
 }
\ No newline at end of file
diff --git a/TalkIn/app/src/main/java/com/example/talk_in/MainActivity.kt b/TalkIn/app/src/main/java/com/example/talk_in/MainActivity.kt
index 010fa8a..ffa4378 100644
--- a/TalkIn/app/src/main/java/com/example/talk_in/MainActivity.kt
+++ b/TalkIn/app/src/main/java/com/example/talk_in/MainActivity.kt
@@ -98,17 +98,25 @@ class MainActivity : AppCompatActivity() {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == R.id.logout) {
-            //logic for logout
-            mAuth.signOut()
-            val intent = Intent(this@MainActivity,EntryActivity::class.java)
-            startActivity(intent)
-            finish()
-           // finish()
+            // Remove device token from Firebase database
+            val currentUser = mAuth.currentUser
+            currentUser?.uid?.let { userId ->
+                mDbRef.child("users-device-tokens").child(userId).removeValue()
+                    .addOnSuccessListener {
+                        mAuth.signOut()
+                        val intent = Intent(this@MainActivity, LogIn::class.java)
+                        finish()
+                        startActivity(intent)
+                    }
+                    .addOnFailureListener { e ->
+                    }
+            }
             return true
         }
-        return true
+        return super.onOptionsItemSelected(item)
     }
     override fun onBackPressed() {
+        super.onBackPressed()
         val intent = Intent(Intent.ACTION_MAIN)
         intent.addCategory(Intent.CATEGORY_HOME)
         startActivity(intent)
diff --git a/TalkIn/app/src/main/res/layout/receive.xml b/TalkIn/app/src/main/res/layout/receive.xml
index 6435071..9ecd248 100644
--- a/TalkIn/app/src/main/res/layout/receive.xml
+++ b/TalkIn/app/src/main/res/layout/receive.xml
@@ -1,24 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
     <RelativeLayout
         android:layout_width="wrap_content"
-
         android:layout_height="wrap_content"
-
-        android:layout_marginLeft="5dp"
+        android:layout_marginStart="5dp"
         android:layout_marginTop="5dp"
+        android:layout_marginBottom="5dp"
         android:background="@drawable/edt_background2"
-        >
+        tools:ignore="UselessParent">
 
         <TextView
             android:id="@+id/txt_receive_message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-
             android:padding="10dp"
-            android:text="This is receive message"
+            android:text="@string/this_is_receive_message"
             android:textColor="@color/white"
             android:textSize="18sp"/>
     </RelativeLayout>
diff --git a/TalkIn/app/src/main/res/layout/sent.xml b/TalkIn/app/src/main/res/layout/sent.xml
index d69d505..e846cd6 100644
--- a/TalkIn/app/src/main/res/layout/sent.xml
+++ b/TalkIn/app/src/main/res/layout/sent.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-<RelativeLayout
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
-
-    android:layout_height="wrap_content"
-    android:layout_alignParentRight="true"
-    android:layout_marginRight="5dp"
-    android:layout_marginTop="5dp"
-    android:background="@drawable/edt_background2"
-    >
-
-    <TextView
-        android:id="@+id/txt_sent_message"
+    android:layout_height="wrap_content">
+    <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-       android:textColor="@color/white"
-        android:padding="10dp"
-        android:text="This is sent message"
-        android:textSize="18sp"/>
-</RelativeLayout>
+        android:layout_alignParentEnd="true"
+        android:layout_marginEnd="5dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="5dp"
+        android:background="@drawable/edt_background2"
+        tools:ignore="UselessParent">
+
+        <TextView
+            android:id="@+id/txt_sent_message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+           android:textColor="@color/white"
+            android:padding="10dp"
+            android:text="@string/this_is_sent_message"
+            android:textSize="18sp"/>
+    </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/TalkIn/app/src/main/res/values/strings.xml b/TalkIn/app/src/main/res/values/strings.xml
index a135535..ae48b21 100644
--- a/TalkIn/app/src/main/res/values/strings.xml
+++ b/TalkIn/app/src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
 <resources>
     <string name="app_name">Talk-In</string>
+    <string name="this_is_receive_message">This is receive message</string>
+    <string name="this_is_sent_message">This is sent message</string>
 </resources>
\ No newline at end of file