Update User Feed UI

RedEyesNCode · Mar 14, 2024 · 93df36a · 93df36a
1 parent ec37fb6
commit 93df36a
Show file tree

Hide file tree

Showing 32 changed files with 615 additions and 147 deletions.
diff --git a/.gradle/8.0/checksums/checksums.lock b/.gradle/8.0/checksums/checksums.lock
diff --git a/.gradle/8.0/checksums/md5-checksums.bin b/.gradle/8.0/checksums/md5-checksums.bin
diff --git a/.gradle/8.0/checksums/sha1-checksums.bin b/.gradle/8.0/checksums/sha1-checksums.bin
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/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/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "com.redeyesncode.dateme"
         minSdk 28
         targetSdk 33
-        versionCode 2
-        versionName "1.0-25Aug2023"
+        versionCode 3
+        versionName "1.0-F-GEETU"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

diff --git a/app/release/app-release.aab b/app/release/app-release.aab
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,81 +1,82 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" >
-
-    <uses-feature
-        android:name="android.hardware.camera"
-        android:required="false" />
-    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-
-    <application
-        android:name=".base.BumbleApp"
-        android:allowBackup="true"
-        android:dataExtractionRules="@xml/data_extraction_rules"
-        android:fullBackupContent="@xml/backup_rules"
-        android:icon="@drawable/ic_admingle"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.DateMe"
-        android:usesCleartextTraffic="true"
-        tools:targetApi="31" >
-        <activity
-            android:name=".dashboard.NotificationActivity"
-            android:exported="false" />
-        <activity
-            android:name=".dashboard.EditProfileActivity"
-            android:exported="false" />
-        <activity
-            android:name=".dashboard.SettingsActivity"
-            android:exported="false" />
-        <activity
-            android:name=".dashboard.DeveloperActivity"
-            android:exported="false" />
-        <activity
-            android:name=".auth.LoginUserActivity"
-            android:exported="false" />
-        <activity
-            android:name=".auth.chat.GirlChatActivity"
-            android:exported="false" />
-        <activity
-            android:name=".dashboard.BumbleAndroActivity"
-            android:exported="false" />
-        <activity
-            android:name=".auth.account.AccountActivity"
-            android:exported="false" />
-        <activity
-            android:name=".auth.VerifyOtpActivity"
-            android:exported="false" />
-        <activity
-            android:name=".auth.SplashActivity"
-            android:exported="true"
-            android:theme="@style/Theme.DateMe" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".auth.LoginActivity"
-            android:exported="false" />
-        <activity
-            android:name=".MainActivity"
-            android:exported="false"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.DateMe" />
-
-        <meta-data
-            android:name="com.google.android.geo.API_KEY"
-            android:value="AIzaSyD7PGsX_T85cAxk4z61oOrpGsAcrcdGo3o" />
-        <!--GOOGLE AD SENSE SDK-->
-        <meta-data
-            android:name="com.google.android.gms.ads.APPLICATION_ID"
-            android:value="ca-app-pub-6858809098683907~1307184214"/>
-
-    </application>
-
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
+    <application
+        android:name=".base.BumbleApp"
+        android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
+        android:icon="@drawable/ic_admingle"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.DateMe"
+        android:usesCleartextTraffic="true"
+        tools:targetApi="31">
+        <activity
+            android:name=".dashboard.ImageActivity"
+            android:exported="false" />
+        <activity
+            android:name=".dashboard.NotificationActivity"
+            android:exported="false" />
+        <activity
+            android:name=".dashboard.EditProfileActivity"
+            android:exported="false" />
+        <activity
+            android:name=".dashboard.SettingsActivity"
+            android:exported="false" />
+        <activity
+            android:name=".dashboard.DeveloperActivity"
+            android:exported="false" />
+        <activity
+            android:name=".auth.LoginUserActivity"
+            android:exported="false" />
+        <activity
+            android:name=".auth.chat.GirlChatActivity"
+            android:exported="false" />
+        <activity
+            android:name=".dashboard.BumbleAndroActivity"
+            android:exported="false" />
+        <activity
+            android:name=".auth.account.AccountActivity"
+            android:exported="false" />
+        <activity
+            android:name=".auth.VerifyOtpActivity"
+            android:exported="false" />
+        <activity
+            android:name=".auth.SplashActivity"
+            android:exported="true"
+            android:theme="@style/Theme.DateMe">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".auth.LoginActivity"
+            android:exported="false" />
+        <activity
+            android:name=".MainActivity"
+            android:exported="false"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.DateMe" />
+
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="AIzaSyD7PGsX_T85cAxk4z61oOrpGsAcrcdGo3o" /> <!-- GOOGLE AD SENSE SDK -->
+        <meta-data
+            android:name="com.google.android.gms.ads.APPLICATION_ID"
+            android:value="ca-app-pub-6858809098683907~1307184214" />
+    </application>
+
 </manifest>
diff --git a/app/src/main/java/com/redeyesncode/dateme/dagger/DaggerComp.kt b/app/src/main/java/com/redeyesncode/dateme/dagger/DaggerComp.kt
@@ -13,6 +13,7 @@ import com.redeyesncode.dateme.dashboard.EditProfileActivity
 import com.redeyesncode.dateme.dashboard.NotificationActivity
 import com.redeyesncode.dateme.dashboard.fragments.MatchFragment
 import com.redeyesncode.dateme.dashboard.fragments.UserFeedFragment
+import com.redeyesncode.dateme.dashboard.fragments.UserPageFragment
 import com.redeyesncode.dateme.dashboard.fragments.ViewFragment
 import com.redeyesncode.dateme.network.RetrofitInstance
 import dagger.Component
@@ -26,6 +27,8 @@ interface DaggerComp {
     fun injectUserViewFragment(viewFragment: ViewFragment)
 
     fun injectUserInterestFragment(userInterestFragment: UserInterestFragment)
+    fun injectUserPageFragment(userInterestFragment: UserPageFragment)
+
 
     fun injectLoginAuth(loginActivity:LoginUserActivity)
 

diff --git a/app/src/main/java/com/redeyesncode/dateme/dashboard/ImageActivity.kt b/app/src/main/java/com/redeyesncode/dateme/dashboard/ImageActivity.kt
@@ -0,0 +1,20 @@
+package com.redeyesncode.dateme.dashboard
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.bumptech.glide.Glide
+import com.redeyesncode.dateme.R
+import com.redeyesncode.dateme.base.BaseActivity
+import com.redeyesncode.dateme.databinding.ActivityImageBinding
+
+class ImageActivity : BaseActivity() {
+    lateinit var binding:ActivityImageBinding
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityImageBinding.inflate(layoutInflater)
+
+        Glide.with(binding.root).load(intent.getStringExtra("URL")).into(binding.ivCoverImage)
+
+        setContentView(binding.root)
+    }
+}
diff --git a/app/src/main/java/com/redeyesncode/dateme/dashboard/ImageDialog.kt b/app/src/main/java/com/redeyesncode/dateme/dashboard/ImageDialog.kt
@@ -0,0 +1,29 @@
+package com.redeyesncode.dateme.dashboard
+
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import android.view.ViewGroup
+import android.view.Window
+import android.widget.ImageView
+import com.bumptech.glide.Glide
+import com.redeyesncode.dateme.R
+
+class ImageDialog(context: Context, private val imageUrl: String) : Dialog(context) {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        requestWindowFeature(Window.FEATURE_NO_TITLE)
+        window?.setLayout(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.MATCH_PARENT
+        )
+        setContentView(R.layout.dialog_image) // Create a layout file for your dialog
+
+        val imageView: ImageView = findViewById(R.id.imageView)
+        Glide.with(context)
+            .load(imageUrl)
+            .placeholder(R.drawable.ic_admingle) // You can set a placeholder image
+            .into(imageView)
+    }
+}
diff --git a/app/src/main/java/com/redeyesncode/dateme/dashboard/ImageDialogFragment.kt b/app/src/main/java/com/redeyesncode/dateme/dashboard/ImageDialogFragment.kt
@@ -0,0 +1,41 @@
+package com.redeyesncode.dateme.dashboard
+
+import android.app.Dialog
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.Window
+import android.widget.ImageView
+import androidx.fragment.app.DialogFragment
+import com.bumptech.glide.Glide
+import com.redeyesncode.dateme.R
+
+class ImageDialogFragment(private val imageUrl: String) : DialogFragment() {
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val view = inflater.inflate(R.layout.dialog_image, container, false)
+
+        val imageView: ImageView = view.findViewById(R.id.imageView)
+        Glide.with(requireContext())
+            .load(imageUrl)
+            .placeholder(R.drawable.ic_admingle)
+            .into(imageView)
+
+        return view
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = super.onCreateDialog(savedInstanceState)
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
+        dialog.window?.setLayout(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.MATCH_PARENT
+        )
+        return dialog
+    }
+}
diff --git a/app/src/main/java/com/redeyesncode/dateme/dashboard/adapter/ImagePagerAdapter.kt b/app/src/main/java/com/redeyesncode/dateme/dashboard/adapter/ImagePagerAdapter.kt
@@ -0,0 +1,34 @@
+package com.redeyesncode.dateme.dashboard.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.viewpager.widget.PagerAdapter
+import com.bumptech.glide.Glide
+
+class ImagePagerAdapter(private val context: Context, private val imageUrls: List<String>) : PagerAdapter() {
+
+    override fun getCount(): Int {
+        return imageUrls.size
+    }
+
+    override fun isViewFromObject(view: View, `object`: Any): Boolean {
+        return view === `object`
+    }
+
+    override fun instantiateItem(container: ViewGroup, position: Int): Any {
+        val imageView = ImageView(context)
+        imageView.scaleType = ImageView.ScaleType.CENTER_CROP
+
+        // Load image from URL using Picasso (replace with your preferred image loading library)
+        Glide.with(context).load(imageUrls[position]).into(imageView)
+        container.addView(imageView)
+        return imageView
+    }
+
+    override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) {
+        container.removeView(`object` as View)
+    }
+}
diff --git a/app/src/main/java/com/redeyesncode/dateme/dashboard/adapter/UserInterestFeedAdapter.kt b/app/src/main/java/com/redeyesncode/dateme/dashboard/adapter/UserInterestFeedAdapter.kt
@@ -0,0 +1,35 @@
+package com.redeyesncode.dateme.dashboard.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.redeyesncode.dateme.databinding.ItemUserFeedInterestsBinding
+
+class UserInterestFeedAdapter(var context:Context,var data:ArrayList<String>) :RecyclerView.Adapter<UserInterestFeedAdapter.MyViewholder>() {
+
+    lateinit var binding: ItemUserFeedInterestsBinding
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyViewholder {
+
+
+        binding = ItemUserFeedInterestsBinding.inflate(LayoutInflater.from(context),parent,false)
+
+        return MyViewholder(binding)
+
+    }
+
+    override fun onBindViewHolder(holder: MyViewholder, position: Int) {
+        val dataText = data[position]
+
+        holder.binding.tvInterest.text = dataText
+
+
+
+    }
+
+    override fun getItemCount(): Int {
+        return data.size
+    }
+
+    class MyViewholder(var binding:ItemUserFeedInterestsBinding) :RecyclerView.ViewHolder(binding.root)
+}
diff --git a/app/src/main/java/com/redeyesncode/dateme/dashboard/data/UserFeedResponse.kt b/app/src/main/java/com/redeyesncode/dateme/dashboard/data/UserFeedResponse.kt
@@ -20,6 +20,8 @@ data class UserFeedResponse(  @SerializedName("status"  ) var status  : String?
         @SerializedName("bio"           ) var bio          : String?  = null,
         @SerializedName("interested_id" ) var interestedId : Int?     = null,
         @SerializedName("dateOfBirth" ) var dateOfBirth : String?     = null,
+        @SerializedName("userInterests" ) var userInterests : ArrayList<Int>?     = null,
+        @SerializedName("additionalImages" ) var additionalImages : ArrayList<String>?     = null,
         @SerializedName("age" ) var age : String?     = null,
         @SerializedName("coverImg"      ) var coverImg     : String?  = null,
         @SerializedName("verified"      ) var verified     : Boolean? = null,