latest version of app 1.0.8

add google services for pipeline
Update .gitlab-ci.yml file
2024-07-08 14:33:02 +05:30 · 2024-01-20 04:55:01 +00:00 · 2024-01-08 17:56:48 +00:00 · 2024-01-08 17:47:02 +00:00 · 2024-01-08 23:12:46 +05:30
24 changed files with 447 additions and 257 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -0,0 +1,88 @@
+# This file is a template, and might need editing before it works on your project.
+# To contribute improvements to CI/CD templates, please follow the Development guide at:
+# https://docs.gitlab.com/ee/development/cicd/templates.html
+# This specific template is located at:
+# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Android.gitlab-ci.yml
+
+# Read more about this script on this blog post https://about.gitlab.com/2018/10/24/setting-up-gitlab-ci-for-android-projects/, by Jason Lenny
+# If you are interested in using Android with FastLane for publishing take a look at the Android-Fastlane template.
+
+image: eclipse-temurin:17-jdk-jammy
+
+variables:
+
+  # ANDROID_COMPILE_SDK is the version of Android you're compiling with.
+  # It should match compileSdkVersion.
+  ANDROID_COMPILE_SDK: "34"
+
+  # ANDROID_BUILD_TOOLS is the version of the Android build tools you are using.
+  # It should match buildToolsVersion.
+  ANDROID_BUILD_TOOLS: "33.0.2"
+
+  # It's what version of the command line tools we're going to download from the official site.
+  # Official Site-> https://developer.android.com/studio/index.html
+  # There, look down below at the cli tools only, sdk tools package is of format:
+  #        commandlinetools-os_type-ANDROID_SDK_TOOLS_latest.zip
+  # when the script was last modified for latest compileSdkVersion, it was which is written down below
+  ANDROID_SDK_TOOLS: "9477386"
+
+# Packages installation before running script
+before_script:
+  - apt-get --quiet update --yes
+  - apt-get --quiet install --yes wget unzip
+
+  # Setup path as android_home for moving/exporting the downloaded sdk into it
+  - export ANDROID_HOME="${PWD}/android-sdk-root"
+  # Create a new directory at specified location
+  - install -d $ANDROID_HOME
+  # Here we are installing androidSDK tools from official source,
+  # (the key thing here is the url from where you are downloading these sdk tool for command line, so please do note this url pattern there and here as well)
+  # after that unzipping those tools and
+  # then running a series of SDK manager commands to install necessary android SDK packages that'll allow the app to build
+  - wget --no-verbose --output-document=$ANDROID_HOME/cmdline-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_TOOLS}_latest.zip
+  - unzip -q -d "$ANDROID_HOME/cmdline-tools" "$ANDROID_HOME/cmdline-tools.zip"
+  - mv -T "$ANDROID_HOME/cmdline-tools/cmdline-tools" "$ANDROID_HOME/cmdline-tools/tools"
+  - export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/cmdline-tools/tools/bin
+
+  # Nothing fancy here, just checking sdkManager version
+  - sdkmanager --version
+
+  # use yes to accept all licenses
+  - yes | sdkmanager --licenses > /dev/null || true
+  - sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}"
+  - sdkmanager "platform-tools"
+  - sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}"
+
+  # Not necessary, but just for surity
+  - chmod +x ./gradlew
+
+# Basic android and gradle stuff
+# Check linting
+lintDebug:
+  interruptible: true
+  stage: build
+  script:
+    - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint
+  artifacts:
+    paths:
+      - app/lint/reports/lint-results-debug.html
+    expose_as: "lint-report"
+    when: always
+
+# Make Project
+assembleDebug:
+  interruptible: true
+  stage: build
+  script:
+    - ./gradlew assembleDebug
+  artifacts:
+    paths:
+      - app/build/outputs/
+
+# Run all tests, if any fails, interrupt the pipeline(fail it)
+debugTests:
+  needs: [lintDebug, assembleDebug]
+  interruptible: true
+  stage: test
+  script:
+    - ./gradlew -Pci --console=plain :app:testDebug
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,17 +4,16 @@
  <component name="GradleSettings">
    <option name="linkedExternalProjectsSettings">
      <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
        <option name="gradleHome" value="$USER_HOME$/andriod studio gradle/gradle-7.3" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
        <option name="modules">
          <set>
            <option value="$PROJECT_DIR$" />
            <option value="$PROJECT_DIR$/app" />
          </set>
        </option>
+        <option name="resolveExternalAnnotations" value="false" />
      </GradleProjectSettings>
    </option>
  </component>
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,11 +13,11 @@ android {
    compileSdk 34

    defaultConfig {
-        applicationId "in.sminnovations.hposregistration"
+        applicationId "in.sminnovations.hposregistration.iocl"
        minSdk 26
        targetSdk 34
-        versionCode 6
-        versionName "1.0.6"
+        versionCode 8
+        versionName "1.0.8"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
@@ -42,9 +42,9 @@ android {

 dependencies {

-    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.10.0'
+    implementation 'com.google.android.material:material:1.9.0'
    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
    testImplementation 'junit:junit:4.13.2'
    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
@@ -58,26 +58,26 @@ dependencies {
    implementation 'com.google.firebase:firebase-auth-ktx'
    implementation 'com.google.firebase:firebase-storage-ktx'
    implementation 'com.firebaseui:firebase-ui-firestore:8.0.2'
-    implementation 'com.google.android.gms:play-services-auth:20.7.0'
-    implementation 'com.google.firebase:firebase-appdistribution:16.0.0-beta11'
-    implementation("com.google.firebase:firebase-appdistribution-api-ktx:16.0.0-beta11")
+    implementation 'com.google.android.gms:play-services-auth:20.6.0'
+    implementation 'com.google.firebase:firebase-appdistribution:16.0.0-beta10'
+    implementation("com.google.firebase:firebase-appdistribution-api-ktx:16.0.0-beta10")

    // Coroutines
    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1'
    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'

    // Coroutine Lifecycle Scopes
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1"

    //Dagger - Hilt
    implementation "com.google.dagger:hilt-android:2.46"
    kapt "com.google.dagger:hilt-android-compiler:2.46"
-    kapt "androidx.hilt:hilt-compiler:1.1.0"
+    kapt "androidx.hilt:hilt-compiler:1.0.0"

    // Navigation Component
-    implementation "androidx.navigation:navigation-fragment-ktx:2.7.5"
-    implementation "androidx.navigation:navigation-ui-ktx:2.7.5"
+    implementation "androidx.navigation:navigation-fragment-ktx:2.7.0"
+    implementation "androidx.navigation:navigation-ui-ktx:2.7.0"

    // Retrofit + GSON
    implementation "com.squareup.retrofit2:retrofit:2.9.0"
@@ -87,16 +87,16 @@ dependencies {
    implementation 'com.jakewharton.timber:timber:4.7.1'

    // Activity KTX for viewModels()
-    implementation "androidx.activity:activity-ktx:1.8.1"
+    implementation "androidx.activity:activity-ktx:1.7.2"

    //image
    implementation 'com.github.bumptech.glide:glide:4.13.2'
    annotationProcessor 'com.github.bumptech.glide:compiler:4.13.2'

    //Room
-    implementation "androidx.room:room-ktx:2.6.1"
-    implementation "androidx.room:room-runtime:2.6.1"
-    kapt ("androidx.room:room-compiler:2.6.1")
+    implementation "androidx.room:room-ktx:2.6.0-alpha03"
+    implementation "androidx.room:room-runtime:2.6.0-alpha03"
+    kapt ("androidx.room:room-compiler:2.6.0-alpha03")

    // Barcode scanner
    implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -0,0 +1,67 @@
+{
+  "project_info": {
+    "project_number": "243503501547",
+    "project_id": "iocl-iisc-hpos",
+    "storage_bucket": "iocl-iisc-hpos.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:243503501547:android:f17de652a3524d047feeae",
+        "android_client_info": {
+          "package_name": "com.iocl_iisc.hposqc"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBPxgcDkZfZMr8cFrkMWkVf1a-MstzWC1k"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:243503501547:android:e1bb0f338c8448dd7feeae",
+        "android_client_info": {
+          "package_name": "in.sminnovations.hposregistration.iocl"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBPxgcDkZfZMr8cFrkMWkVf1a-MstzWC1k"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:243503501547:android:18b8b33b2dc3776d7feeae",
+        "android_client_info": {
+          "package_name": "in.sminnovations.hpostesting.iocl"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBPxgcDkZfZMr8cFrkMWkVf1a-MstzWC1k"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
--- a/app/src/main/java/com/example/hposregistration/adapters/UserListOfflineAdapter.kt
+++ b/app/src/main/java/com/example/hposregistration/adapters/UserListOfflineAdapter.kt
@@ -41,8 +41,9 @@ class UserListOfflineAdapter(private val view: View) : RecyclerView.Adapter<User
    override fun onBindViewHolder(holder: CompanyViewHolder, position: Int) {
        val userList = differ.currentList[position]
        holder.binding.apply {
-            userName.text = userList.name
-            userId.text = userList._id
+            userName.text = "Name: ${userList.name}"
+            userId.text = "Sample ID: ${userList._id}"
+            timeCreated.text = "Time Created: ${userList.createdAt}"
            Glide.with(view).load(userList.userImageURL).into(userImage)
        }
    }
--- a/app/src/main/java/com/example/hposregistration/adapters/UserListOnlineAdapter.kt
+++ b/app/src/main/java/com/example/hposregistration/adapters/UserListOnlineAdapter.kt
@@ -28,7 +28,8 @@ class UserListOnlineAdapter(options: FirestoreRecyclerOptions<UserData>, private
    override fun onBindViewHolder(holder: OrderItemViewHolder, position: Int, model: UserData) {
        holder.binding.apply {
            userName.text = "Name: ${model.name}"
-            userId.text = "User ID: ${model._id}"
+            userId.text = "Sample ID: ${model._id}"
+            timeCreated.text = "Time Created: ${model.createdAt}"
            Glide.with(view).load(model.userImageURL).into(userImage)
        }
    }
--- a/app/src/main/java/com/example/hposregistration/dao/MyDataBase.kt
+++ b/app/src/main/java/com/example/hposregistration/dao/MyDataBase.kt
@@ -1,36 +1,11 @@
 package com.example.hposregistration.dao

-import android.content.Context
 import androidx.room.Database
-import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
 import com.example.hposregistration.data.user.UserData

-@Database(entities = [UserData::class], version = 3, exportSchema = false)
+@Database(entities = [UserData::class], version = 1, exportSchema = false)
 abstract class MyDatabase : RoomDatabase() {
-
    abstract fun userDao(): UserDao
-
-    companion object {
-        val MIGRATION_2_3: Migration = object : Migration(2, 3) {
-            override fun migrate(database: SupportSQLiteDatabase) {
-                // Define the necessary SQL statements for migration from version 2 to 3
-                // For example, you can alter tables or create new ones
-                 database.execSQL("ALTER TABLE user_table ADD COLUMN aadharIdSearch TEXT")
-            }
-        }
-
-        fun getInstance(context: Context): MyDatabase {
-            return Room.databaseBuilder(
-                context.applicationContext,
-                MyDatabase::class.java,
-                "my_database"
-            )
-                .addMigrations(MIGRATION_2_3)
-                .build()
-        }
-    }
-}
+}
--- a/app/src/main/java/com/example/hposregistration/data/Constant.kt
+++ b/app/src/main/java/com/example/hposregistration/data/Constant.kt
@@ -22,6 +22,9 @@ object Constant {
    const val USER_ID = "usernameId"

    val STATICID = listOf(
+        "SMIMYSURU",
+        "SMIKODAGU",
+        "SMICHAMARAJA",
        "SMIREG1",
        "SMIREG2",
        "SMIREG3",
--- a/app/src/main/java/com/example/hposregistration/data/user/UserData.kt
+++ b/app/src/main/java/com/example/hposregistration/data/user/UserData.kt
@@ -34,10 +34,7 @@ data class UserData(
    var registeredBy: String? = "",
    var createdAt: String? = "",
    var registrationCenterName: String? = "",
-    var testStatus: Boolean = false,
-    var userAbhaRegistrationLog:String = "",
-    var userDetailsLog: String = "",
-    var appVersion: String = "",
+    var testStatus: Boolean = false
 ){
    enum class Gender {
        MALE,
--- a/app/src/main/java/com/example/hposregistration/network/UserDao.kt
+++ b/app/src/main/java/com/example/hposregistration/network/UserDao.kt
@@ -27,7 +27,4 @@ class UserDao {
 //    suspend fun getPatientList(): List<UserData> {
 //        return patientCollection.get().await().toObjects(UserData::class.java)
 //    }
-
-
-
 }
--- a/app/src/main/java/com/example/hposregistration/ui/activities/MainActivity.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/activities/MainActivity.kt
@@ -24,40 +24,40 @@ class MainActivity : AppCompatActivity() {
    override fun onResume() {
        super.onResume()

-        val firebaseAppDistribution = FirebaseAppDistribution.getInstance()
-        firebaseAppDistribution.updateIfNewReleaseAvailable()
-            .addOnProgressListener { updateProgress ->
-
-                if (updateProgress.apkBytesDownloaded > 0) {
-                    Toast.makeText(
-                        this,
-                        "${updateProgress.updateStatus}. ${updateProgress.apkBytesDownloaded / 1048576} /${updateProgress.apkFileTotalBytes / 1048576} MB",
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
-            }
-            .addOnFailureListener { e ->
-                // (Optional) Handle errors.
-                if (e is FirebaseAppDistributionException) {
-                    when (e.errorCode) {
-                        FirebaseAppDistributionException.Status.NOT_IMPLEMENTED -> {
-                            // SDK did nothing. This is expected when building for Play.
-                        }
-
-                        else -> {
-                            // Handle other errors.
-                            Toast.makeText(
-                                this,
-                                "AppDistribution error, status: ${e.errorCode}",
-                                Toast.LENGTH_SHORT
-                            ).show()
-                        }
-                    }
-                    FirebaseCrashlytics.getInstance().recordException(e)
-                }
-            }
-            .addOnSuccessListener {
-//                Toast.makeText(this, "App Update: Success!", Toast.LENGTH_SHORT).show()
-            }
+//        val firebaseAppDistribution = FirebaseAppDistribution.getInstance()
+//        firebaseAppDistribution.updateIfNewReleaseAvailable()
+//            .addOnProgressListener { updateProgress ->
+//
+//                if (updateProgress.apkBytesDownloaded > 0) {
+//                    Toast.makeText(
+//                        this,
+//                        "${updateProgress.updateStatus}. ${updateProgress.apkBytesDownloaded / 1048576} /${updateProgress.apkFileTotalBytes / 1048576} MB",
+//                        Toast.LENGTH_SHORT
+//                    ).show()
+//                }
+//            }
+//            .addOnFailureListener { e ->
+//                // (Optional) Handle errors.
+//                if (e is FirebaseAppDistributionException) {
+//                    when (e.errorCode) {
+//                        FirebaseAppDistributionException.Status.NOT_IMPLEMENTED -> {
+//                            // SDK did nothing. This is expected when building for Play.
+//                        }
+//
+//                        else -> {
+//                            // Handle other errors.
+//                            Toast.makeText(
+//                                this,
+//                                "AppDistribution error, status: ${e.errorCode}",
+//                                Toast.LENGTH_SHORT
+//                            ).show()
+//                        }
+//                    }
+//                    FirebaseCrashlytics.getInstance().recordException(e)
+//                }
+//            }
+//            .addOnSuccessListener {
+////                Toast.makeText(this, "App Update: Success!", Toast.LENGTH_SHORT).show()
+//            }
    }
 }
--- a/app/src/main/java/com/example/hposregistration/ui/fragments/UserListFragment.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/fragments/UserListFragment.kt
@@ -8,6 +8,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.SearchView
 import android.widget.Toast
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -25,13 +26,15 @@ import `in`.sminnovations.hposregistration.R
 import `in`.sminnovations.hposregistration.databinding.FragmentUserListBinding
 import java.text.SimpleDateFormat
 import java.util.Date
+import java.util.Locale

@AndroidEntryPoint
 class UserListFragment : BaseFragment() {
-
+    private lateinit var userId:String
+    private var district:String ="Mysuru"
    private var _binding: FragmentUserListBinding? = null
    private val binding get() = _binding!!
-
+    private lateinit var offlineAdapter:UserListOfflineAdapter
    private val viewModel by viewModels<RegistrationViewModel>()

    private var isOnline = false
@@ -43,6 +46,14 @@ class UserListFragment : BaseFragment() {
    ): View {
        _binding = FragmentUserListBinding.inflate(inflater, container, false)
        sharedPreference = requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
+        userId = sharedPreference.getString(Constant.USER_ID, "").toString()
+        if(userId=="SMIMYSURU"){
+            district = "Mysuru"
+        }else if(userId=="SMIKODAGU"){
+            district = "Kodagu"
+        }else if(userId=="SMICHAMARAJA"){
+            district = "Chamarajanagar"
+        }
        setupViews()
        return binding.root
    }
@@ -66,12 +77,15 @@ class UserListFragment : BaseFragment() {
        binding.btnRegisterUser.setOnClickListener {
            findNavController().navigate(R.id.action_userListFragment_to_registrationFragment)
        }
+
        binding.btnLogout.setOnClickListener {
            logoutUser(requireContext())
        }
    }

    private fun init() {
+        binding.searchUser.isIconified = false
+
        viewModel.networkStatusLiveData.observe(viewLifecycleOwner) { isNetworkAvailable ->
            if (isNetworkAvailable) {
                isOnline = isNetworkAvailable
@@ -83,6 +97,28 @@ class UserListFragment : BaseFragment() {
            }
        }

+        binding.searchUser.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+            override fun onQueryTextSubmit(query: String?): Boolean {
+                // Perform the final search
+                if(isOnline){
+                    fetchFromServer(query)
+                }else{
+                    filterList(query)
+                }
+                return true
+            }
+
+            override fun onQueryTextChange(newText: String?): Boolean {
+                // Perform search as the user types
+                if(isOnline){
+                    fetchFromServer(newText)
+                }else{
+                    filterList(newText)
+                }
+                return true
+            }
+        })
+
        binding.uploadData.setOnClickListener {
            showUploadDialog(requireContext())
        }
@@ -91,6 +127,12 @@ class UserListFragment : BaseFragment() {
            deteleIncompleteRegistration(userDataList)
        }
    }
+    private fun filterList(query: String?) {
+        val filteredList = viewModel.allUserData.value?.filter { userData ->
+            userData.name.contains(query ?: "", ignoreCase = true)
+        }
+        offlineAdapter.differ.submitList(filteredList)
+    }

    private fun logoutUser(context: Context) {
        val builder = AlertDialog.Builder(context)
@@ -163,29 +205,89 @@ class UserListFragment : BaseFragment() {
            }
        }
    }
+//    private fun fetchFromServer(searchTerm: String? = null) {
+//        binding.noList.visibility = View.GONE
+//        binding.rvOrder.visibility = View.VISIBLE
+//        val dateFormat = SimpleDateFormat("yyyy-MM-dd")
+//        val currentDate = Date()
+//        val today = dateFormat.format(currentDate)
+//
+//        // Base query to fetch patient data created today
+//        var query = Firebase.firestore.collection("patientData")
+//            .whereGreaterThanOrEqualTo("createdAt", today)
+//            .orderBy("createdAt", Query.Direction.DESCENDING)
+//
+//        // If a search term is provided, add it to the query
+//        if (!searchTerm.isNullOrEmpty()) {
+//            query = query.whereEqualTo("aadharId", searchTerm)
+//        }
+//
+//        query.get().addOnSuccessListener {
+//            if (it.documents.isEmpty() && isOnline) {
+//                binding.emptyRegistrations.visibility = View.VISIBLE
+//            }
+//        }
+//
+//        val recyclerViewOptions =
+//            FirestoreRecyclerOptions.Builder<UserData>().setQuery(query, UserData::class.java)
+//                .build()
+//        val adapter = UserListOnlineAdapter(recyclerViewOptions, binding.root)
+//        binding.rvOrder.adapter = adapter
+//        adapter.startListening()
+//    }
+private fun fetchFromServer(searchTerm: String? = null) {
+    binding.noList.visibility = View.GONE
+    binding.rvOrder.visibility = View.VISIBLE
+    val dateFormat = SimpleDateFormat("yyyy-MM-dd")
+    val currentDate = Date()
+    val today = dateFormat.format(currentDate)

-    private fun fetchFromServer() {
-        binding.noList.visibility = View.GONE
-        binding.rvOrder.visibility = View.VISIBLE
-        val dateFormat = SimpleDateFormat("yyyy-MM-dd")
-        val currentDate = Date()
-        val today = dateFormat.format(currentDate)
-        val query = Firebase.firestore.collection("patientData")
-            .whereGreaterThanOrEqualTo("createdAt", today)
-            .orderBy("createdAt", Query.Direction.DESCENDING)
-        query.get().addOnSuccessListener {
-            if (it.documents.isEmpty() && isOnline) {
-                binding.emptyRegistrations.visibility = View.VISIBLE
-            }
-        }
-        val recyclerViewOptions =
-            FirestoreRecyclerOptions.Builder<UserData>().setQuery(query, UserData::class.java)
-                .build()
-        val adapter = UserListOnlineAdapter(recyclerViewOptions, binding.root)
-        binding.rvOrder.adapter = adapter
-        adapter.startListening()
+    // Base query to fetch patient data created today and from the specified district
+    var query = Firebase.firestore.collection("patientData")
+     //   .whereGreaterThanOrEqualTo("createdAt", today)
+        .whereEqualTo("district", district)
+        .orderBy("createdAt", Query.Direction.DESCENDING)
+
+    // If a search term is provided, add it to the query
+    if (!searchTerm.isNullOrEmpty()) {
+        query = query.whereEqualTo("_id", searchTerm)
    }

+    query.get().addOnSuccessListener {
+        if (it.documents.isEmpty() && isOnline) {
+            binding.emptyRegistrations.visibility = View.VISIBLE
+        }
+    }
+
+    val recyclerViewOptions =
+        FirestoreRecyclerOptions.Builder<UserData>().setQuery(query, UserData::class.java)
+            .build()
+    val adapter = UserListOnlineAdapter(recyclerViewOptions, binding.root)
+    binding.rvOrder.adapter = adapter
+    adapter.startListening()
+}
+//    private fun fetchFromServer() {
+//        binding.noList.visibility = View.GONE
+//        binding.rvOrder.visibility = View.VISIBLE
+//        val dateFormat = SimpleDateFormat("yyyy-MM-dd")
+//        val currentDate = Date()
+//        val today = dateFormat.format(currentDate)
+//        val query = Firebase.firestore.collection("patientData")
+//            .whereGreaterThanOrEqualTo("createdAt", today)
+//            .orderBy("createdAt", Query.Direction.DESCENDING)
+//        query.get().addOnSuccessListener {
+//            if (it.documents.isEmpty() && isOnline) {
+//                binding.emptyRegistrations.visibility = View.VISIBLE
+//            }
+//        }
+//        val recyclerViewOptions =
+//            FirestoreRecyclerOptions.Builder<UserData>().setQuery(query, UserData::class.java)
+//                .build()
+//        val adapter = UserListOnlineAdapter(recyclerViewOptions, binding.root)
+//        binding.rvOrder.adapter = adapter
+//        adapter.startListening()
+//    }
+
    private fun fetchFromLocalDB() {
        binding.uploadData.visibility = View.GONE
        viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
@@ -201,9 +303,9 @@ class UserListFragment : BaseFragment() {
                    binding.noList.visibility = View.GONE
                    binding.rvOrder.visibility = View.VISIBLE
                    deteleIncompleteRegistration(userDataList)
-                    val adapter = UserListOfflineAdapter(binding.root)
-                    adapter.differ.submitList(userDataList)
-                    binding.rvOrder.adapter = adapter
+                    offlineAdapter = UserListOfflineAdapter(binding.root)
+                    offlineAdapter.differ.submitList(userDataList)
+                    binding.rvOrder.adapter = offlineAdapter
                }
            }
        }
--- a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt
@@ -1,15 +1,12 @@
 package com.example.hposregistration.ui.fragments.registration

-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.core.content.edit
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
@@ -24,17 +21,20 @@ import com.journeyapps.barcodescanner.ScanIntentResult
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hposregistration.databinding.FragmentAbhaRegistrationBinding
 import org.json.JSONObject
+import java.time.Instant
+import java.util.Random

@AndroidEntryPoint
 class AbhaRegistrationFragment : BaseFragment() {

    private var _binding: FragmentAbhaRegistrationBinding? = null
+    private lateinit var sharedPreference: SharedPreferences
+
    private val binding get() = _binding!!

    private val viewModel by viewModels<RegistrationViewModel>()
    private val args: AbhaRegistrationFragmentArgs by navArgs()
    private var userData = UserData()
-    private lateinit var sharedPreference:SharedPreferences

    private val barcodeLauncher =
        registerForActivityResult(ScanContract()) { result: ScanIntentResult ->
@@ -54,8 +54,6 @@ class AbhaRegistrationFragment : BaseFragment() {
        sharedPreference =
            requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
        return binding.root
-
-
    }

    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -63,7 +61,6 @@ class AbhaRegistrationFragment : BaseFragment() {
        init()
    }

-    @SuppressLint("LogNotTimber", "CommitPrefEdits")
    private fun init() {
        binding.btnScanNow.setOnClickListener {
            barcodeLauncher.launch(scanQR("Please Scan the Abha ID/Aadhar ID"))
@@ -89,33 +86,30 @@ class AbhaRegistrationFragment : BaseFragment() {
            val userName = binding.etName.text.toString()
            val aadharIdInput = binding.aadharID.text.toString()
            val centerName = binding.centerName.text.toString()
+            val currentUnixTime = Instant.now().epochSecond
+
            if (validateInputs(abhaIdInput, aadharIdInput, userName, centerName)) {
                userData.apply {
-                    name = userName
+                    name = userName.lowercase()
                    aadharId = aadharIdInput
                    abhaId = abhaIdInput
                    registrationCenterName = centerName
-                    _id = aadharId + userName.substring(0, 3).uppercase() + centerName.substring(0, 3)
-                            .uppercase()
-                    userData.userAbhaRegistrationLog = "${userData.abhaId}," + "${userData.name}," +"${userData.aadharId}," + "${userData.registrationCenterName}"
-                    Log.e(
-                        "userAbhaRegistrationLog",
-                        "Assigned userAbhaRegistrationLog: ${userData.userAbhaRegistrationLog}"
-                    )
-
-                    sharedPreference.edit()
-                        .putString("userAbhaRegistrationLog", userData.userAbhaRegistrationLog)
-                        .apply()
-
-                    Log.e("userAbhaRegistrationLog", sharedPreference.getString("userAbhaRegistrationLog","").toString())
+                   // _id = centerName.substring(0, 3).uppercase() + name.substring(0, 4) +
+                    _id = userName.substring(0, 3).uppercase() + generateFourDigitNumber() +centerName.substring(0, 3).uppercase()
                }
-                    viewModel.insert(userData)
-                  // Make sure this provides a meaningful string representation of userData

+                viewModel.insert(userData)
+                Toast.makeText(requireActivity(),"ID"+userData._id,Toast.LENGTH_SHORT).show()
                navigateToUserDetailsFragment(userData._id)
            }
+
        }
    }
+    private fun generateFourDigitNumber(): String {
+        val random = Random()
+        val number: Int = 1000 + random.nextInt(9000) // Ensures a 4-digit number
+        return number.toString()
+    }

    private fun processScannedData(contents: String) {
        try {
@@ -131,7 +125,6 @@ class AbhaRegistrationFragment : BaseFragment() {
                state = obj.getString("state name")
                district = obj.getString("district_name")
                house = obj.getString("address")
-                userAbhaRegistrationLog = obj.getString("userAbhaRegistrationLog")
            }

            if (userData.abhaId.isNotEmpty()) {
@@ -190,14 +183,14 @@ class AbhaRegistrationFragment : BaseFragment() {
        abhaId: String, aadharId: String, userName: String, centerName: String
    ): Boolean {
        with(binding) {
-            if (!checkAbhaIDNumber(abhaId)) {
-                etAbhaId.error = "Invalid Abha ID"
-                return false
-            }
-            if (!checkAadharIDNumber(aadharId)) {
-                aadharID.error = "Invalid Aadhar ID"
-                return false
-            }
+//            if (!checkAbhaIDNumber(abhaId)) {
+//                etAbhaId.error = "Invalid Abha ID"
+//                return false
+//            }
+//            if (!checkAadharIDNumber(aadharId)) {
+//                aadharID.error = "Invalid Aadhar ID"
+//                return false
+//            }
            if (!checkUserName(userName)) {
                etName.error = "Name field can't be empty or less than 3 characters"
                return false
--- a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/ReviewDetailsRegistrationFragment.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/ReviewDetailsRegistrationFragment.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.net.Uri
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -48,15 +47,12 @@ class ReviewDetailsRegistrationFragment : BaseFragment() {
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        super.onViewCreated(view, savedInstanceState)
        init()
-
    }

    private fun init() {
        viewModel.getUserByID(args.userId)
        viewModel.userData.observe(viewLifecycleOwner) { user ->
            userData = user
-            userData.userAbhaRegistrationLog = sharedPreference.getString("userAbhaRegistrationLog", "").toString()
-            userData.userDetailsLog = sharedPreference.getString("userDetailslog", "").toString()
            setUserData(user)
        }

@@ -115,7 +111,7 @@ class ReviewDetailsRegistrationFragment : BaseFragment() {
                requireContext().getString(R.string.abha_number, userData.abhaId)
            binding.tvAadharId.text =
                requireContext().getString(R.string.aadhar_number_details, userData.aadharId)
-            binding.tvUserName.text = requireContext().getString(R.string.user_name, userData.name)
+            binding.tvUserName.text = requireContext().getString(R.string.user_name, userData.name.lowercase())
            binding.tvBirthYear.text =
                requireContext().getString(R.string.birth_year_details, userData.birthYear)
            binding.tvGender.text =
@@ -174,18 +170,6 @@ class ReviewDetailsRegistrationFragment : BaseFragment() {
                    R.string.sickle_cell_family_history, userData.sickleCellHistory
                )
            }
-
-
-            val pInfo = requireActivity().packageManager.getPackageInfo(
-                requireActivity().packageName, 0
-            )
-            val version = pInfo.versionName
-            userData.appVersion = version
-            userData.userAbhaRegistrationLog = "${userData.abhaId}," + "${userData.name}," +"${userData.aadharId}," + "${userData.registrationCenterName}"
-            userData.userAbhaRegistrationLog = sharedPreference.getString("userAbhaRegistrationLog", "").toString()
-            userData.userDetailsLog = sharedPreference.getString("userDetailslog", "").toString()
-            Log.e("userAbhaRegistrationLog",userData.userAbhaRegistrationLog)
-            Log.e("userAbhaRegistrationLog",userData.userDetailsLog)
        }
    }

--- a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/UserDetailsRegistrationFragment.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/UserDetailsRegistrationFragment.kt
@@ -1,10 +1,6 @@
 package com.example.hposregistration.ui.fragments.registration

-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.SharedPreferences
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -28,7 +24,6 @@ class UserDetailsRegistrationFragment : Fragment() {
    private val viewModel by viewModels<RegistrationViewModel>()

    private lateinit var userData: UserData
-    private lateinit var sharedPreference: SharedPreferences

    private val args: UserDetailsRegistrationFragmentArgs by navArgs()

@@ -36,9 +31,6 @@ class UserDetailsRegistrationFragment : Fragment() {
        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
    ): View {
        _binding = FragmentUserDetailsRegistrationBinding.inflate(inflater, container, false)
-        sharedPreference =
-            requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
-
        return binding.root
    }

@@ -79,13 +71,12 @@ class UserDetailsRegistrationFragment : Fragment() {
            user.phoneNumber.let { etMobile.setText(it) }
            user.careOf.let { etCareof.setText(it) }
            user.maritalStatus.let { etIsMarried.setText(it, false) }
-            user.caste.let { etCaste.setText(it, false) }
+            user.caste.let { etCaste.setText(it) }
            user.category.let { etCategory.setText(it, false) }
            user.subCaste.let { etSubCaste.setText(it) }
            user.house.let { etHouse.setText(it) }
            user.city.let { etCity.setText(it) }
-            user.district.let { etDistrict.setText(it) }
-            user.state.let { etState.setText(it) }
+            user.district.let { etDistrict.setText(it, false) }
            user.pinCode.let { etPincode.setText(it) }
            user.isUnderMedication.let {
                if (it != null) {
@@ -119,43 +110,16 @@ class UserDetailsRegistrationFragment : Fragment() {
                binding.tilFamilyHistory.visibility =
                    if (binding.no1history.isChecked) View.GONE else View.VISIBLE
            }
+
+
        }
    }

-    @SuppressLint("LogNotTimber")
    private fun setupSubmitButton() {
        binding.btnSubmit.setOnClickListener {
            if (verifyUserDetails()) {
                userData._id = args.userId
                viewModel.insert(userData)
-                userData.userDetailsLog = "${userData.birthYear}," +
-                        "${userData.gender}," +
-                        "${userData.phoneNumber}," +
-                        "${userData.careOf}," +
-                        "${userData.maritalStatus}," +
-                        "${userData.category}," +
-                        "${userData.caste}," +
-                        "${userData.subCaste ?: ""}," + // Using Elvis operator for nullable fields
-                        "${userData.appVersion}," +
-                        "${userData.house}," +
-                        "${userData.city}," +
-                        "${userData.district}," +
-                        "${userData.state}," +
-                        "${userData.pinCode}," +
-                        "${userData.bloodGroup}," +
-                        "${userData.isUnderMedication ?: false}," + // Converting null to false
-                        "${userData.isUnderTransfusion ?: false}," +
-                        "${userData.sickleCellHistory ?: ""}," +
-                        "${userData.userImageURL}," +
-                        "${userData.registeredBy ?: ""}," +
-                        "${userData.createdAt ?: ""}," +
-                        "${userData.registrationCenterName ?: ""}," +
-                        "${userData.testStatus},"
-                val userDataString = userData.userDetailsLog// Make sure this provides a meaningful string representation of userData
-                sharedPreference.edit()
-                    .putString("userDetailslog", userData.userDetailsLog)
-                    .apply()
-                Log.e("userAbhaRegistrationLog",userData.userDetailsLog)
                navigateToCaptureUserImageFragment()
            } else {
                showToast("Please enter all the details properly")
@@ -172,8 +136,8 @@ class UserDetailsRegistrationFragment : Fragment() {
    private fun verifyUserDetails(): Boolean {
        with(binding) {
            val yob = etYob.text.toString()
-            if (yob.isEmpty() || yob.toInt() <= 1900 || yob.toInt() > 2023) {
-                etYob.error = "Please enter a valid birth year between 1900 and 2023"
+            if (yob.isEmpty() || yob.toInt() <= 1900 || yob.toInt() > 2020) {
+                etYob.error = "Please enter a valid birth year between 1900 and 2020"
                return false
            } else {
                userData.birthYear = yob
@@ -188,12 +152,13 @@ class UserDetailsRegistrationFragment : Fragment() {
            }

            val mobile = etMobile.text.toString()
-            if (mobile.isEmpty() || mobile.length != 10) {
-                etMobile.error = "Please enter a valid 10-digit mobile number"
-                return false
-            } else {
-                userData.phoneNumber = mobile
-            }
+            userData.phoneNumber = mobile
+//            if (mobile.isEmpty() || mobile.length != 10) {
+//                etMobile.error = "Please enter a valid 10-digit mobile number"
+//                return false
+//            } else {
+//                userData.phoneNumber = mobile
+//            }

            val careOf = etCareof.text.toString()
            if (careOf.isEmpty()) {
--- a/app/src/main/java/com/example/hposregistration/ui/viewmodels/RegistrationViewModel.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/viewmodels/RegistrationViewModel.kt
@@ -1,9 +1,7 @@
 package com.example.hposregistration.ui.viewmodels

 import android.content.Context
-import android.content.SharedPreferences
 import android.net.Uri
-import androidx.core.content.ContentProviderCompat.requireContext
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -32,11 +30,8 @@ class RegistrationViewModel @Inject constructor(
    val allUserData = mainRepository.allUsers

    val fireBaseUpload = MutableLiveData<String>()
-    private val sharedPreference =
-        context.getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
+
    fun addUserToDatabase(userData: UserData) = viewModelScope.launch {
-        userData.userAbhaRegistrationLog = sharedPreference.getString("userAbhaRegistrationLog", "").toString()
-        userData.userDetailsLog = sharedPreference.getString("userDetailslog", "").toString()
        val file = Uri.parse(userData.userImageURL)
        val storageRef = FirebaseStorage.getInstance().reference
        val imageRef = storageRef.child("${userData._id}/${file.lastPathSegment}")
@@ -71,8 +66,6 @@ class RegistrationViewModel @Inject constructor(
    val networkStatusLiveData: LiveData<Boolean>
        get() = _networkStatusLiveData

-
-
    fun insert(userData: UserData) = viewModelScope.launch {
        val currentDate = Date()
        val dateFormat = SimpleDateFormat("yyyyMMdd")
@@ -83,16 +76,6 @@ class RegistrationViewModel @Inject constructor(
        userData.createdAt = SimpleDateFormat(
            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
        ).format(Calendar.getInstance().time)
-
-
-        val  useAbhaRegistrationLog =  sharedPreference.getString("userAbhaRegistrationLog", "").toString()
-        val  userDetailsLog = sharedPreference.getString("userDetailslog", "").toString()
-        userData.userAbhaRegistrationLog = sharedPreference.getString("userAbhaRegistrationLog", "").toString()
-        userData.userDetailsLog = sharedPreference.getString("userDetailslog", "").toString()
-
-
-        userData.userAbhaRegistrationLog= useAbhaRegistrationLog
-        userData.userDetailsLog = userDetailsLog
        mainRepository.insert(userData)
    }

--- a/app/src/main/res/layout/fragment_abha_registration.xml
+++ b/app/src/main/res/layout/fragment_abha_registration.xml
@@ -18,6 +18,7 @@
            <TextView
                android:id="@+id/tv_title"
                style="@style/title1"
+                android:visibility="gone"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="16dp"
@@ -31,6 +32,7 @@
                android:layout_height="wrap_content"
                android:layout_marginTop="16dp"
                android:text="@string/scan_now"
+                android:visibility="gone"
                android:textColor="@color/black"
                app:backgroundTint="@color/primary_light"
                app:cornerRadius="100dp"
@@ -45,6 +47,7 @@
                android:layout_height="wrap_content"
                android:layout_centerVertical="true"
                android:layout_marginTop="24dp"
+                android:visibility="gone"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@id/btn_scan_now">
@@ -93,7 +96,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="24dp"
-                android:text="@string/enter_abha_number_manualy"
+                android:text="Enter Details to proceed\n(ABHA and Aadhar are optional)"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@id/seperator1" />

@@ -111,6 +114,7 @@
                    android:id="@+id/et_name"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
+                    android:maxLength="24"
                    android:hint="@string/person_s_name" />

            </com.google.android.material.textfield.TextInputLayout>
@@ -168,6 +172,7 @@
                    android:id="@+id/centerName"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
+                    android:maxLength="24"
                    android:hint="@string/center_name"
                    android:inputType="text" />
            </com.google.android.material.textfield.TextInputLayout>
@@ -189,6 +194,7 @@
                android:layout_height="wrap_content"
                android:layout_marginTop="16dp"
                android:text="@string/proceed"
+                android:textColor="@color/white"
                app:cornerRadius="16dp"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
@@ -200,6 +206,7 @@
                android:layout_height="wrap_content"
                android:layout_centerVertical="true"
                android:layout_marginTop="24dp"
+                android:visibility="gone"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@id/btnProceed">
@@ -246,6 +253,7 @@
                style="@style/title1"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
+                android:visibility="gone"
                android:layout_marginTop="24dp"
                android:text="@string/create_abha_id_card"
                app:layout_constraintStart_toStartOf="parent"
@@ -254,6 +262,7 @@
            <com.google.android.material.button.MaterialButton
                android:id="@+id/btn_click_here"
                android:layout_width="wrap_content"
+                android:visibility="gone"
                android:layout_height="wrap_content"
                android:layout_marginTop="16dp"
                android:text="@string/click_here"
--- a/app/src/main/res/layout/fragment_capture_user_image.xml
+++ b/app/src/main/res/layout/fragment_capture_user_image.xml
@@ -4,8 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:padding="24dp"
-    tools:context=".ui.fragments.registration.CaptureUserImageFragment">
+    android:padding="24dp">

    <TextView
        android:id="@+id/tv_title"
--- a/app/src/main/res/layout/fragment_user_details_registration.xml
+++ b/app/src/main/res/layout/fragment_user_details_registration.xml
@@ -168,23 +168,19 @@

            <com.google.android.material.textfield.TextInputLayout
                android:id="@+id/til_caste"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                android:layout_width="match_parent"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_marginHorizontal="24dp"
-                android:layout_marginTop="20dp"
+                android:layout_marginTop="16dp"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@id/til_category">
-
-                <AutoCompleteTextView
+                <com.google.android.material.textfield.TextInputEditText
                    android:id="@+id/et_Caste"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:hint="@string/caste"
-                    android:inputType="none"
-                    android:labelFor="@id/til_is_married"
-                    app:simpleItems="@array/caste" />
+                    android:hint="@string/caste" />

            </com.google.android.material.textfield.TextInputLayout>

@@ -234,7 +230,7 @@
                    android:id="@+id/et_house"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:hint="@string/house" />
+                    android:hint="Address" />

            </com.google.android.material.textfield.TextInputLayout>

@@ -256,23 +252,25 @@
                    android:hint="@string/city_town" />

            </com.google.android.material.textfield.TextInputLayout>
-
            <com.google.android.material.textfield.TextInputLayout
                android:id="@+id/til_district"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:layout_width="0dp"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginHorizontal="24dp"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="20dp"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@id/til_city">

-                <com.google.android.material.textfield.TextInputEditText
+                <AutoCompleteTextView
                    android:id="@+id/et_district"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:hint="@string/district" />
+                    android:hint="@string/district"
+                    android:inputType="none"
+                    android:labelFor="@id/til_district"
+                    app:simpleItems="@array/district" />

            </com.google.android.material.textfield.TextInputLayout>

@@ -291,6 +289,7 @@
                    android:id="@+id/et_state"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
+                    android:text="Karnataka"
                    android:hint="@string/state" />

            </com.google.android.material.textfield.TextInputLayout>
--- a/app/src/main/res/layout/fragment_user_list.xml
+++ b/app/src/main/res/layout/fragment_user_list.xml
@@ -89,6 +89,15 @@
        app:layout_constraintEnd_toStartOf="@+id/uploadData"
        app:layout_constraintTop_toTopOf="@+id/tv_title" />

+    <SearchView
+        android:id="@+id/searchUser"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_title"/>
+
+
    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/rv_order"
        android:layout_width="0dp"
@@ -97,7 +106,7 @@
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv_title"
+        app:layout_constraintTop_toBottomOf="@+id/searchUser"
        tools:listitem="@layout/user_item_view" />

    <com.google.android.material.floatingactionbutton.FloatingActionButton
--- a/app/src/main/res/layout/user_item_view.xml
+++ b/app/src/main/res/layout/user_item_view.xml
@@ -56,6 +56,20 @@
                app:layout_constraintStart_toEndOf="@+id/userImage"
                app:layout_constraintTop_toBottomOf="@id/userName"
                tools:text="UserID: MohamedKaif" />
+            <TextView
+                android:id="@+id/timeCreated"
+                style="@style/title1_1"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="4dp"
+                android:gravity="start"
+                android:textColor="@color/black"
+                android:textSize="14sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/userImage"
+                app:layout_constraintTop_toBottomOf="@id/userId"
+                tools:text="time" />

            <TextView
                android:id="@+id/teststatus"
@@ -69,7 +83,7 @@
                android:textSize="14sp"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toEndOf="@+id/userImage"
-                app:layout_constraintTop_toBottomOf="@id/userId"
+                app:layout_constraintTop_toBottomOf="@id/timeCreated"
                tools:text="Test Status: Completed"/>


--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -48,7 +48,7 @@
    <string name="register_user">Register User</string>
    <string name="is_user_having_any_family_history_for_sickle_cell">Is user having any family history for Sickle Cell</string>
    <string name="family_history_of_sickle_cell">Family History of Sickle Cell</string>
-    <string name="mobile_number_10_digits">Mobile Number (10 digits)</string>
+    <string name="mobile_number_10_digits">Mobile Number(Optional)</string>
    <string name="sub_caste">Sub Caste</string>
    <string name="capture_user_image">Capture User Image</string>
    <string name="mobile_number">Mobile Number</string>
@@ -156,5 +156,10 @@
        <item>Female</item>
        <item>Other</item>
    </string-array>
+    <string-array name="district">
+        <item>Mysuru</item>
+        <item>Kodagu</item>
+        <item>Chamarajanagar</item>
+    </string-array>

 </resources>
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.0.2' apply false
-    id 'com.android.library' version '8.0.2' apply false
+    id 'com.android.application' version '8.4.0' apply false
+    id 'com.android.library' version '8.4.0' apply false
    id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
    id 'androidx.navigation.safeargs' version '2.7.0-beta02' apply false
    id 'com.google.dagger.hilt.android' version '2.46' apply false
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Jul 12 14:05:11 IST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
Author	SHA1	Message	Date
chandrashekhar reddy	943430af24	latest version of app 1.0.8	2024-07-08 14:33:02 +05:30
Pritimay Sarkar	76b98e8d88	add google services for pipeline	2024-01-20 04:55:01 +00:00
Pritimay Sarkar	f231e9a449	Update .gitlab-ci.yml file	2024-01-08 17:56:48 +00:00
Pritimay Sarkar	d2550ca82b	Merge branch 'epoch-id' into 'dev' add epoch based id See merge request sminnovations/hpos-registration-app!2	2024-01-08 17:47:02 +00:00
Pritimay Sarkar	466864377a	add epoch based id	2024-01-08 23:12:46 +05:30