Update for socket recycler and update new ec2 ip

RedEyesNCode · Mar 13, 2024 · ec37fb6 · ec37fb6
1 parent d8bc861
commit ec37fb6
Show file tree

Hide file tree

Showing 29 changed files with 159 additions and 27 deletions.
diff --git a/.gradle/8.0/checksums/checksums.lock b/.gradle/8.0/checksums/checksums.lock
diff --git a/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock b/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock
diff --git a/.gradle/8.0/dependencies-accessors/gc.properties b/.gradle/8.0/dependencies-accessors/gc.properties
diff --git a/.gradle/8.0/executionHistory/executionHistory.bin b/.gradle/8.0/executionHistory/executionHistory.bin
diff --git a/.gradle/8.0/executionHistory/executionHistory.lock b/.gradle/8.0/executionHistory/executionHistory.lock
diff --git a/.gradle/8.0/fileChanges/last-build.bin b/.gradle/8.0/fileChanges/last-build.bin
diff --git a/.gradle/8.0/fileHashes/fileHashes.bin b/.gradle/8.0/fileHashes/fileHashes.bin
diff --git a/.gradle/8.0/fileHashes/fileHashes.lock b/.gradle/8.0/fileHashes/fileHashes.lock
diff --git a/.gradle/8.0/fileHashes/resourceHashesCache.bin b/.gradle/8.0/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/8.0/gc.properties b/.gradle/8.0/gc.properties
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
@@ -0,0 +1,2 @@
+#Tue Mar 12 19:56:01 IST 2024
+gradle.version=8.0
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/.gradle/config.properties b/.gradle/config.properties
@@ -0,0 +1,2 @@
+#Tue Mar 12 19:55:45 IST 2024
+java.home=/opt/android-studio-2023.1.1/android-studio/jbr
diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/src/main/java/com/redeyesncode/dateme/auth/chat/GirlChatActivity.kt b/app/src/main/java/com/redeyesncode/dateme/auth/chat/GirlChatActivity.kt
@@ -3,7 +3,6 @@ package com.redeyesncode.dateme.auth.chat
 import android.os.Bundle
 import android.util.Log
 import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.gms.ads.AdRequest
 import com.google.android.gms.ads.LoadAdError
@@ -25,10 +24,7 @@ import com.redeyesncode.dateme.network.response.UserLoginResponse
 import com.redeyesncode.dateme.session.AppSession
 import com.redeyesncode.dateme.session.Constant
 import io.socket.client.IO
-import io.socket.client.Manager
 import io.socket.client.Socket
-import io.socket.engineio.client.Transport
-import io.socket.engineio.client.transports.WebSocket
 import javax.inject.Inject
 
 
@@ -91,6 +87,8 @@ class GirlChatActivity : BaseActivity() {
                         layoutManager = LinearLayoutManager(this@GirlChatActivity,LinearLayoutManager.VERTICAL,false)
                         adapter = adapterChat
                     }
+                    binding.rcvChat.post { binding.rcvChat.scrollToPosition(adapterChat.getItemCount() - 1) }
+
                 }else{
                     showSnackbar("No Chat History Available")
                 }
@@ -146,6 +144,8 @@ class GirlChatActivity : BaseActivity() {
                 messageMap.put("type","ANDROID")
                 messageMap.put("room",currentRoomName)
                 messageMap.put("senderId",user.data?.userId.toString())
+
+//                showCustomDialog("Info","senderId : ${user.data?.userId.toString()} Roomname : ${currentRoomName} clientId ${intent.getStringExtra("clientUserId").toString()}")
                 messageMap.put("receiverId",intent.getStringExtra("clientUserId").toString())
 
                 val userChatBody = UserChatBody("ANDROID",binding.messageInput.text.toString(),currentRoomName,
@@ -162,9 +162,15 @@ class GirlChatActivity : BaseActivity() {
                 binding.messageInput.text.clear()
 
                 messagesData.clear()
-                val chatHistoryMap = hashMapOf<String,String>()
-                chatHistoryMap.put("roomName",currentRoomName)
-                chatViewModel.getRoomChatMessages(chatHistoryMap)
+
+                showSnackbar("Loading New Messages !")
+
+                android.os.Handler().postDelayed(Runnable {
+                    val chatHistoryMap = hashMapOf<String,String>()
+                    chatHistoryMap.put("roomName",currentRoomName)
+                    chatViewModel.getRoomChatMessages(chatHistoryMap)
+                },4000)
+
             }else{
                 setupSocket()
                 Toast.makeText(this@GirlChatActivity,"SOCKET NOT CONNECTED",Toast.LENGTH_LONG).show()

diff --git a/app/src/main/java/com/redeyesncode/dateme/dashboard/fragments/UserFeedFragment.kt b/app/src/main/java/com/redeyesncode/dateme/dashboard/fragments/UserFeedFragment.kt
@@ -192,7 +192,7 @@ open class UserFeedFragment : BaseFragment() {
             },
             onSuccess = {
                 hideLoadingDialog()
-                googleAdSense()
+//                googleAdSense()
 
                 if(it.data.isNotEmpty()){
                     setupUserFeed(it.data)

diff --git a/app/src/main/java/com/redeyesncode/dateme/dashboard/fragments/UserPageFragment.kt b/app/src/main/java/com/redeyesncode/dateme/dashboard/fragments/UserPageFragment.kt
@@ -64,9 +64,12 @@ class UserPageFragment : BaseFragment() {
 
         binding.apply {
             tvFullName.text = "${dataSet?.firstName} ${dataSet?.lastName}, "
-            tvAge.text = dataSet?.dateOfBirth.toString()
-            tvLocationName.text = dataSet?.lat_.toString()
-
+            tvAge.text = "Age ${dataSet?.age.toString()}"
+            tvNumber.text = "Number : ${dataSet?.number.toString()}"
+            tvEmailAddress.text = "Mail : ${dataSet?.email.toString()}"
+            tvDob.text = "Birthday : ${dataSet?.dateOfBirth.toString()}"
+            tvLocationName.text = "${dataSet?.lat_.toString()}, ${dataSet?.long_.toString()}"
+            tvUsername.text = "Username : ${dataSet?.userName.toString()}"
             if(dataSet?.bio.toString().isEmpty()){
                 tvUserBio.text = "No Bio"
             }else{

diff --git a/app/src/main/res/layout/activity_girl_chat.xml b/app/src/main/res/layout/activity_girl_chat.xml
@@ -58,16 +58,13 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rcvChat"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="145dp"
-        android:scrollbars="vertical"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constraintBottom_toTopOf="@+id/input_layout"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/adView"
-        tools:itemCount="5"
-        tools:listitem="@layout/incoming_message" />
+        android:layout_height="0dp"
+    android:scrollbars="vertical"
+    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+    app:layout_constraintTop_toBottomOf="@+id/adView"
+    app:layout_constraintBottom_toTopOf="@id/input_layout"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent" />
 
     <LinearLayout
         android:id="@+id/input_layout"

diff --git a/app/src/main/res/layout/fragment_user_page.xml b/app/src/main/res/layout/fragment_user_page.xml
@@ -37,6 +37,12 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:fillViewport="true"
+
+                android:fadeScrollbars="false"
+                android:scrollbarSize="@dimen/_4sdp"
+                android:scrollIndicators="start"
+                android:scrollbarAlwaysDrawVerticalTrack="true"
+
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/guideline"
                 android:background="@android:color/transparent">
@@ -52,29 +58,75 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:orientation="horizontal"
+                        android:weightSum="2"
                         android:layout_height="wrap_content">
                         <TextView
                             android:id="@+id/tvFullName"
                             android:singleLine="true"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_centerInParent="true"
+                            android:layout_weight="1"
                             android:fontFamily="@font/raleway_bold"
                             android:text="@string/name"
                             android:textColor="@color/black"
                             android:textSize="@dimen/_21sdp" />
-                        <TextView
-                            android:id="@+id/tvAge"
-                            android:layout_weight="1"
+                    </LinearLayout>
+                    <TextView
+                        android:id="@+id/tvAge"
+                        android:layout_weight="1"
+
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerInParent="true"
+                        android:fontFamily="@font/raleway_bold"
+                        android:text="@string/name"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/_21sdp" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:orientation="vertical"
+                        android:layout_height="wrap_content">
 
+                        <TextView
+                            android:id="@+id/tvNumber"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/_4sdp"
+                            android:visibility="invisible"
                             android:layout_centerInParent="true"
-                            android:fontFamily="@font/raleway_bold"
+                            android:fontFamily="@font/raleway_regular"
                             android:text="@string/name"
                             android:textColor="@color/black"
-                            android:textSize="@dimen/_21sdp" />
+                            android:textSize="@dimen/_15sdp" />
+                        <TextView
+                            android:id="@+id/tvUsername"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerInParent="true"
+                            android:fontFamily="@font/raleway_regular"
+                            android:text="@string/name"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/_15sdp" />
+                        <TextView
+                            android:id="@+id/tvDob"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerInParent="true"
+                            android:fontFamily="@font/raleway_regular"
+                            android:text="@string/name"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/_15sdp" />
+                        <TextView
+                            android:id="@+id/tvEmailAddress"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerInParent="true"
+                            android:fontFamily="@font/raleway_regular"
+                            android:text="@string/name"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/_15sdp" />
+
                     </LinearLayout>
 
                     <LinearLayout
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#Tue Mar 12 19:56:01 IST 2024
		gradle.version=8.0
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#Tue Mar 12 19:55:45 IST 2024
		java.home=/opt/android-studio-2023.1.1/android-studio/jbr