latest version of app 1.0.8

add epoch based id

See merge request sminnovations/hpos-registration-app!2

.gitignore

@@ -10,6 +10,9 @@
 .DS_Store
 /build
 /captures
+/app/google-services.json
 .externalNativeBuild
 .cxx
 local.properties
+/.idea/misc.xml
+/.idea/vcs.xml

.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

.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="Embedded JDK" />
+        <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>

.idea/kotlinc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.8.21" />
+    <option name="version" value="1.8.22" />
   </component>
 </project>

app/.gitignore

@@ -1 +1,2 @@
-/build
+/build
+/google-services*

app/build.gradle

@@ -5,18 +5,19 @@ plugins {
     id 'com.google.gms.google-services'
     id 'androidx.navigation.safeargs.kotlin'
     id 'kotlin-kapt'
+    id 'com.google.firebase.crashlytics'
 }
 
 android {
     namespace 'in.sminnovations.hposregistration'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
-        applicationId "in.sminnovations.hposregistration"
+        applicationId "in.sminnovations.hposregistration.iocl"
         minSdk 26
-        targetSdk 33
-        versionCode 1
-        versionName "1.0"
+        targetSdk 34
+        versionCode 8
+        versionName "1.0.8"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -49,17 +50,21 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
-    //firebase
-    implementation platform('com.google.firebase:firebase-bom:32.1.0')
+    // firebase
+    implementation("com.google.firebase:firebase-crashlytics-ktx")
+    implementation platform("com.google.firebase:firebase-bom:32.2.2")
+    implementation("com.google.firebase:firebase-analytics-ktx")
     implementation 'com.google.firebase:firebase-firestore-ktx'
     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.5.0'
+    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.6.4'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
+    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.1"
@@ -71,8 +76,8 @@ dependencies {
     kapt "androidx.hilt:hilt-compiler:1.0.0"
 
     // Navigation Component
-    implementation "androidx.navigation:navigation-fragment-ktx:2.7.0-beta01"
-    implementation "androidx.navigation:navigation-ui-ktx:2.7.0-beta01"
+    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"
@@ -86,12 +91,12 @@ dependencies {
 
     //image
     implementation 'com.github.bumptech.glide:glide:4.13.2'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.13.2'
 
     //Room
-    implementation "androidx.room:room-ktx:2.6.0-alpha01"
-    implementation "androidx.room:room-runtime:2.6.0-alpha01"
-    kapt ("androidx.room:room-compiler:2.6.0-alpha01")
+    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'

app/google-services.json

@@ -1,81 +1,64 @@
 {
   "project_info": {
-    "project_number": "650071678820",
-    "project_id": "hpos-af3cc",
-    "storage_bucket": "hpos-af3cc.appspot.com"
+    "project_number": "243503501547",
+    "project_id": "iocl-iisc-hpos",
+    "storage_bucket": "iocl-iisc-hpos.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:7569c1cad4fc99916c6471",
+        "mobilesdk_app_id": "1:243503501547:android:f17de652a3524d047feeae",
         "android_client_info": {
-          "package_name": "in.sminnovations.hposregistration"
+          "package_name": "com.iocl_iisc.hposqc"
         }
       },
-      "oauth_client": [
-        {
-          "client_id": "650071678820-70kp5jvjda4r5diqch2kn4lc40p4f42g.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "in.sminnovations.hposregistration",
-            "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
-          }
-        },
-        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
+      "oauth_client": [],
       "api_key": [
         {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
+          "current_key": "AIzaSyBPxgcDkZfZMr8cFrkMWkVf1a-MstzWC1k"
         }
       ],
       "services": {
         "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
+          "other_platform_oauth_client": []
         }
       }
     },
     {
       "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:f96be19e5d43102b6c6471",
+        "mobilesdk_app_id": "1:243503501547:android:e1bb0f338c8448dd7feeae",
         "android_client_info": {
-          "package_name": "in.sminnovations.hpostesting"
+          "package_name": "in.sminnovations.hposregistration.iocl"
         }
       },
-      "oauth_client": [
-        {
-          "client_id": "650071678820-l87dnr0bdj95get0khgnvfv2an1k6ogq.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "in.sminnovations.hpostesting",
-            "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
-          }
-        },
-        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
+      "oauth_client": [],
       "api_key": [
         {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
+          "current_key": "AIzaSyBPxgcDkZfZMr8cFrkMWkVf1a-MstzWC1k"
         }
       ],
       "services": {
         "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
+          "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": []
         }
       }
     }

app/src/main/AndroidManifest.xml

@@ -16,16 +16,16 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/hpos_icon"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@mipmap/hpos_icon_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.HPOSRegistration"
         tools:targetApi="31">
 
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.example.hposregistration.provider"
+            android:authorities="in.sminnovations.hposregistration.provider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
@@ -34,7 +34,6 @@
         </provider>
         <activity
             android:name="com.example.hposregistration.ui.activities.MainActivity"
-            android:screenOrientation="portrait"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -42,6 +41,11 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name="com.journeyapps.barcodescanner.CaptureActivity"
+            android:screenOrientation="portrait"
+            android:stateNotNeeded="true"
+            tools:replace="android:screenOrientation" />
     </application>
 
 </manifest>

app/src/main/java/com/example/hposregistration/adapters/UserListOfflineAdapter.kt

@@ -41,9 +41,10 @@ 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
-            Glide.with(view).load(userList.userImage).into(userImage)
+            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)
         }
     }
 }

app/src/main/java/com/example/hposregistration/adapters/UserListOnlineAdapter.kt

@@ -27,9 +27,10 @@ class UserListOnlineAdapter(options: FirestoreRecyclerOptions<UserData>, private
     @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: OrderItemViewHolder, position: Int, model: UserData) {
         holder.binding.apply {
-            userName.text = model.name
-            userId.text = model._id
-            Glide.with(view).load(model.userImage).into(userImage)
+            userName.text = "Name: ${model.name}"
+            userId.text = "Sample ID: ${model._id}"
+            timeCreated.text = "Time Created: ${model.createdAt}"
+            Glide.with(view).load(model.userImageURL).into(userImage)
         }
     }
 }

app/src/main/java/com/example/hposregistration/dao/Converters.kt

@@ -1,27 +0,0 @@
-package com.example.hposregistration.dao
-
-import androidx.room.TypeConverter
-import com.example.hposregistration.data.user.UserData
-import com.google.gson.Gson
-
-class Converters {
-    private val gson = Gson()
-
-    @TypeConverter
-    fun fromString(value: String?): UserData.Location? {
-        return if (value != null) {
-            gson.fromJson(value, UserData.Location::class.java)
-        } else {
-            null
-        }
-    }
-
-    @TypeConverter
-    fun toString(location: UserData.Location?): String? {
-        return if (location != null) {
-            gson.toJson(location)
-        } else {
-            null
-        }
-    }
-}

app/src/main/java/com/example/hposregistration/dao/MyDataBase.kt

@@ -6,7 +6,6 @@ import androidx.room.TypeConverters
 import com.example.hposregistration.data.user.UserData
 
 @Database(entities = [UserData::class], version = 1, exportSchema = false)
-@TypeConverters(Converters::class)
 abstract class MyDatabase : RoomDatabase() {
     abstract fun userDao(): UserDao
 }

app/src/main/java/com/example/hposregistration/data/Constant.kt

@@ -10,12 +10,37 @@ object Constant {
     }
 
     fun String.mapToGender(): UserData.Gender {
-        return if (this.lowercase() == "m"|| this.lowercase() == "male") {
+        return if (this.lowercase() == "m" || this.lowercase() == "male") {
             UserData.Gender.MALE
-        } else if (this.lowercase() == "f"|| this.lowercase() == "female") {
+        } else if (this.lowercase() == "f" || this.lowercase() == "female") {
             UserData.Gender.FEMALE
         } else {
             UserData.Gender.OTHER
         }
     }
+
+    const val USER_ID = "usernameId"
+
+    val STATICID = listOf(
+        "SMIMYSURU",
+        "SMIKODAGU",
+        "SMICHAMARAJA",
+        "SMIREG1",
+        "SMIREG2",
+        "SMIREG3",
+        "SMIREG4",
+        "SMIREG5",
+        "SMIREG6",
+        "SMIREG7",
+        "SMIREG8",
+        "SMIREG9",
+        "SMIREG10",
+        "SMIREG11",
+        "SMIREG12",
+        "SMIREG13",
+        "SMIREG14",
+        "SMIREG15"
+    )
+
+    const val password = "SMI@12345"
 }

app/src/main/java/com/example/hposregistration/data/user/UserData.kt

@@ -7,16 +7,20 @@ import androidx.room.PrimaryKey
 data class UserData(
     @PrimaryKey
     var _id: String = "",
-    var AbhaId: String = "",
-    var AadharId: String = "",
+    var _idSearch: String = "",
+    var abhaId: String = "",
+    var abhaIdSearch: String = "",
+    var aadharId: String = "",
+    var aadharIdSearch: String = "",
     var name: String = "",
     var birthYear: String = "",
     var gender: String = "",
     var phoneNumber: String = "",
     var careOf: String = "",
     var maritalStatus: String = "",
+    var category: String = "",
     var caste: String = "",
-    var subCaste: String = "",
+    var subCaste: String? = "",
     var house: String = "",
     var city: String = "",
     var district: String = "",
@@ -26,25 +30,15 @@ data class UserData(
     var isUnderMedication: Boolean? = false,
     var isUnderTransfusion: Boolean? = false,
     var sickleCellHistory: String? = "",
-    var userImage: String = "",
-    var location: Location? = null,
-    var uploadTime: String? = "",
-    var testStatus: Boolean? = false,
-    var mobileId: String = "",
-    var deviceId: String = "",
-    var kitSerial: String = "",
-    var csvPath: String = "",
-    var reportPath: String = "",
-    var CenterName: String = ""
+    var userImageURL: String = "",
+    var registeredBy: String? = "",
+    var createdAt: String? = "",
+    var registrationCenterName: String? = "",
+    var testStatus: Boolean = false
 ){
     enum class Gender {
         MALE,
         FEMALE,
         OTHER
     }
-
-    data class Location(
-        var latitude: Double? = null,
-        var longitude: Double? = null
-    )
-}
+}

app/src/main/java/com/example/hposregistration/ui/activities/MainActivity.kt

@@ -2,6 +2,10 @@ package com.example.hposregistration.ui.activities
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.widget.Toast
+import com.google.firebase.appdistribution.FirebaseAppDistribution
+import com.google.firebase.appdistribution.FirebaseAppDistributionException
+import com.google.firebase.crashlytics.FirebaseCrashlytics
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hposregistration.databinding.ActivityMainBinding
 
@@ -14,5 +18,46 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
+
+    }
+
+    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()
+//            }
     }
 }

app/src/main/java/com/example/hposregistration/ui/fragments/LoginFragment.kt

@@ -0,0 +1,92 @@
+package com.example.hposregistration.ui.fragments
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.navigation.fragment.findNavController
+import com.example.hposregistration.data.Constant
+import `in`.sminnovations.hposregistration.R
+import `in`.sminnovations.hposregistration.databinding.FragmentLoginBinding
+
+class LoginFragment : Fragment() {
+
+    private var _binding: FragmentLoginBinding? = null
+    private val binding get() = _binding!!
+    private lateinit var sharedPreference: SharedPreferences
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentLoginBinding.inflate(inflater, container, false)
+        sharedPreference = requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        init()
+    }
+
+    private fun init() {
+        if (isUserLoggedIn()) {
+            navigateToUserListFragment()
+            return
+        }
+
+        binding.btnLogin.setOnClickListener {
+            val loginId = binding.loginId.text.toString()
+            val password = binding.password.text.toString()
+
+            if (loginId.isNotBlank() && password.isNotBlank()) {
+                performLogin(loginId, password)
+            } else {
+                if (loginId.isBlank()) {
+                    binding.loginId.error = "Please enter a proper Login ID"
+                }
+                if (password.isBlank()) {
+                    binding.password.error = "Please enter a proper password"
+                }
+            }
+        }
+    }
+
+    private fun isUserLoggedIn(): Boolean {
+        return sharedPreference.getString(Constant.USER_ID, "")?.isNotBlank() == true
+    }
+
+    private fun navigateToUserListFragment() {
+        findNavController().navigate(R.id.action_loginFragment_to_userListFragment)
+    }
+
+    private fun performLogin(loginId: String, password: String) {
+        val matchingId = Constant.STATICID.firstOrNull { it == loginId }
+        if (matchingId != null) {
+            if (password == Constant.password) {
+                saveUserId(loginId)
+                navigateToUserListFragment()
+                return
+            } else {
+                Toast.makeText(requireContext(), "Wrong Password", Toast.LENGTH_SHORT).show()
+            }
+        }
+        Toast.makeText(requireContext(), "Wrong UserID", Toast.LENGTH_SHORT).show()
+    }
+
+    private fun saveUserId(userId: String) {
+        with(sharedPreference.edit()) {
+            putString(Constant.USER_ID, userId)
+            apply()
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}

app/src/main/java/com/example/hposregistration/ui/fragments/UserListFragment.kt

@@ -3,38 +3,57 @@ package com.example.hposregistration.ui.fragments
 import android.app.AlertDialog
 import android.content.Context
 import android.content.DialogInterface
+import android.content.SharedPreferences
 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
 import com.example.hposregistration.adapters.UserListOfflineAdapter
 import com.example.hposregistration.adapters.UserListOnlineAdapter
+import com.example.hposregistration.data.Constant
 import com.example.hposregistration.data.user.UserData
 import com.example.hposregistration.ui.viewmodels.RegistrationViewModel
 import com.firebase.ui.firestore.FirestoreRecyclerOptions
+import com.google.firebase.firestore.Query
 import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.ktx.Firebase
 import dagger.hilt.android.AndroidEntryPoint
 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
 
+    private lateinit var sharedPreference: SharedPreferences
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): 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
     }
@@ -50,12 +69,23 @@ class UserListFragment : BaseFragment() {
     }
 
     private fun setupViews() {
+        val pInfo = requireActivity().packageManager.getPackageInfo(
+            requireActivity().packageName, 0
+        )
+        val version = pInfo.versionName
+        binding.appVersion.text = version
         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
@@ -67,11 +97,70 @@ 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())
         }
+
+        viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
+            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)
+        builder.setTitle("Log Out")
+        builder.setMessage("Do you want to LogOut the Application?")
+
+        // Positive button
+        builder.setPositiveButton("Yes") { dialog, _ ->
+            saveUserId()
+            findNavController().navigate(R.id.action_userListFragment_to_loginFragment)
+            dialog.dismiss()
+        }
+
+        // Negative button
+        builder.setNegativeButton("No") { dialog, _ ->
+            dialog.dismiss()
+        }
+
+        val dialog = builder.create()
+        dialog.show()
+    }
+
+    private fun saveUserId() {
+        with(sharedPreference.edit()) {
+            putString(Constant.USER_ID, "")
+            apply()
+        }
+    }
     private fun showUploadDialog(context: Context) {
         val builder = AlertDialog.Builder(context)
         builder.setTitle("Upload DB Registration")
@@ -116,19 +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 query = Firebase.firestore.collection("patientData")
-        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 ->
@@ -136,6 +295,7 @@ class UserListFragment : BaseFragment() {
                 binding.noList.visibility = View.GONE
                 binding.rvOrder.visibility = View.VISIBLE
             } else {
+                binding.emptyRegistrations.visibility = View.GONE
                 if (userDataList.isEmpty()) {
                     binding.noList.visibility = View.VISIBLE
                     binding.rvOrder.visibility = View.GONE
@@ -143,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
                 }
             }
         }
@@ -153,7 +313,7 @@ class UserListFragment : BaseFragment() {
 
     private fun deteleIncompleteRegistration(userDataList: List<UserData>) {
         userDataList.forEach {
-            if (it._id.isEmpty()) {
+            if (it.userImageURL.isEmpty()) {
                 viewModel.deleteById(it._id)
             }
         }

app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt

@@ -1,5 +1,7 @@
 package com.example.hposregistration.ui.fragments.registration
 
+import android.content.Context
+import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -19,11 +21,15 @@ 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>()
@@ -45,6 +51,8 @@ class AbhaRegistrationFragment : BaseFragment() {
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View {
         _binding = FragmentAbhaRegistrationBinding.inflate(inflater, container, false)
+        sharedPreference =
+            requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
         return binding.root
     }
 
@@ -65,42 +73,50 @@ class AbhaRegistrationFragment : BaseFragment() {
         viewModel.userData.observe(viewLifecycleOwner) { user ->
             userData = user
             with(binding) {
-                aadharID.setText(user.AadharId)
-                etAbhaId.setText(user.AbhaId)
+                aadharID.setText(user.aadharId)
+                etAbhaId.setText(user.abhaId)
                 etName.setText(user.name)
-                centerName.setText(user.CenterName)
+                centerName.setText(user.registrationCenterName)
 
             }
         }
 
         binding.btnProceed.setOnClickListener {
-            val abhaId = binding.etAbhaId.text.toString()
+            val abhaIdInput = binding.etAbhaId.text.toString()
             val userName = binding.etName.text.toString()
-            val aadharId = binding.aadharID.text.toString()
+            val aadharIdInput = binding.aadharID.text.toString()
             val centerName = binding.centerName.text.toString()
+            val currentUnixTime = Instant.now().epochSecond
 
-            if (validateInputs(abhaId, aadharId, userName, centerName)) {
+            if (validateInputs(abhaIdInput, aadharIdInput, userName, centerName)) {
                 userData.apply {
-                    name = userName
-                    AadharId = aadharId
-                    AbhaId = abhaId
-                    CenterName = centerName
-                    _id = aadharId + userName.substring(0, 3).uppercase() + centerName.substring(0, 3).uppercase()
+                    name = userName.lowercase()
+                    aadharId = aadharIdInput
+                    abhaId = abhaIdInput
+                    registrationCenterName = centerName
+                   // _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)
-
+                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 {
             val obj = JSONObject(contents)
 
             userData.apply {
-                AbhaId = obj.getString("hidn").replace("-", "")
+                abhaId = obj.getString("hidn").replace("-", "")
                 name = obj.getString("name")
                 birthYear = obj.getString("dob").fetchYOBFromDOB().toString()
                 gender = obj.getString("gender").mapToGender().toString()
@@ -111,7 +127,7 @@ class AbhaRegistrationFragment : BaseFragment() {
                 house = obj.getString("address")
             }
 
-            if (userData.AbhaId.isNotEmpty()) {
+            if (userData.abhaId.isNotEmpty()) {
                 saveUserDataAsPerAbhaId()
             } else {
                 saveUserDataAsPerAadharId()
@@ -144,7 +160,7 @@ class AbhaRegistrationFragment : BaseFragment() {
         with(binding) {
             tvScanMessage.visibility = View.VISIBLE
             tvScanMessage.text = "You have scanned the Abha ID, need to enter Aadhar ID manually"
-            etAbhaId.setText(userData.AbhaId)
+            etAbhaId.setText(userData.abhaId)
             etName.setText(userData.name)
         }
         Toast.makeText(
@@ -167,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

app/src/main/java/com/example/hposregistration/ui/fragments/registration/CaptureUserImageFragment.kt

@@ -70,8 +70,8 @@ class CaptureUserImageFragment : Fragment() {
         viewModel.getUserByID(args.userId)
         viewModel.userData.observe(viewLifecycleOwner) { user ->
             userData = user
-            if (userData.userImage.isNotEmpty()) {
-                binding.userImage.loadImageFromUri(Uri.parse(user.userImage))
+            if (userData.userImageURL.isNotEmpty()) {
+                binding.userImage.loadImageFromUri(Uri.parse(user.userImageURL))
                 binding.btnSubmit.isEnabled = true
                 binding.btnSubmit.setOnClickListener {
                     navigate()
@@ -122,7 +122,7 @@ class CaptureUserImageFragment : Fragment() {
     }
 
     private fun submitImage(uri: Uri) {
-        userData.userImage = uri.toString()
+        userData.userImageURL = uri.toString()
         viewModel.insert(userData)
         navigate()
     }

app/src/main/java/com/example/hposregistration/ui/fragments/registration/ReviewDetailsRegistrationFragment.kt

@@ -1,5 +1,7 @@
 package com.example.hposregistration.ui.fragments.registration
 
+import android.content.Context
+import android.content.SharedPreferences
 import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -10,18 +12,23 @@ import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.bumptech.glide.Glide
+import com.example.hposregistration.data.Constant
 import com.example.hposregistration.data.user.UserData
 import com.example.hposregistration.ui.fragments.BaseFragment
 import com.example.hposregistration.ui.viewmodels.RegistrationViewModel
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hposregistration.R
 import `in`.sminnovations.hposregistration.databinding.FragmentReviewDetailsRegistrationBinding
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Locale
 
 @AndroidEntryPoint
 class ReviewDetailsRegistrationFragment : BaseFragment() {
 
     private var _binding: FragmentReviewDetailsRegistrationBinding? = null
     private val binding get() = _binding!!
+    private lateinit var sharedPreference: SharedPreferences
 
     private val viewModel by viewModels<RegistrationViewModel>()
     private val args: ReviewDetailsRegistrationFragmentArgs by navArgs()
@@ -32,6 +39,8 @@ class ReviewDetailsRegistrationFragment : BaseFragment() {
         inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
     ): View {
         _binding = FragmentReviewDetailsRegistrationBinding.inflate(inflater, container, false)
+        sharedPreference =
+            requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
         return binding.root
     }
 
@@ -75,27 +84,34 @@ class ReviewDetailsRegistrationFragment : BaseFragment() {
 
         viewModel.fireBaseUpload.observe(viewLifecycleOwner) {
             if (it == "Success") {
-                Toast.makeText(requireContext(), "Registration Done Successfully", Toast.LENGTH_SHORT)
-                    .show()
+                Toast.makeText(
+                    requireContext(),
+                    "Registration Done Successfully",
+                    Toast.LENGTH_SHORT
+                ).show()
                 navigateToUserListFragment()
             }
         }
     }
 
     private fun addDataToFirebase() {
+        userData.createdAt = SimpleDateFormat(
+            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+        ).format(Calendar.getInstance().time)
+        userData.registeredBy = sharedPreference.getString(Constant.USER_ID, "")
         viewModel.addUserToDatabase(userData)
         viewModel.deleteById(args.userId)
     }
 
     private fun setUserData(userData: UserData) {
         with(binding) {
-            Glide.with(requireActivity()).load(Uri.parse(userData.userImage)).into(userImage)
+            Glide.with(requireActivity()).load(Uri.parse(userData.userImageURL)).into(userImage)
             binding.tvUserID.text = requireContext().getString(R.string.user_id, userData._id)
             binding.tvAbhaId.text =
-                requireContext().getString(R.string.abha_number, userData.AbhaId)
+                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)
+                requireContext().getString(R.string.aadhar_number_details, userData.aadharId)
+            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 =
@@ -106,10 +122,14 @@ class ReviewDetailsRegistrationFragment : BaseFragment() {
                 requireContext().getString(R.string.care_of_details, userData.careOf)
             binding.tvMaritalStatus.text =
                 requireContext().getString(R.string.marital_status_details, userData.maritalStatus)
+            binding.tvCategory.text =
+                requireContext().getString(R.string.category_details, userData.category)
             binding.tvCaste.text =
                 requireContext().getString(R.string.caste_details, userData.caste)
-            binding.tvSubCaste.text =
-                requireContext().getString(R.string.sub_caste_details, userData.subCaste)
+            if (userData.subCaste != "") {
+                binding.tvSubCaste.text =
+                    requireContext().getString(R.string.sub_caste_details, userData.subCaste)
+            }
             binding.tvHouse.text =
                 requireContext().getString(R.string.house_details, userData.house)
             binding.tvCity.text =
@@ -121,7 +141,7 @@ class ReviewDetailsRegistrationFragment : BaseFragment() {
             binding.tvPincode.text =
                 requireContext().getString(R.string.pincode_details, userData.pinCode)
             binding.centerName.text =
-                requireContext().getString(R.string.centre_name, userData.CenterName)
+                requireContext().getString(R.string.centre_name, userData.registrationCenterName)
             if (userData.isUnderMedication!!) {
                 binding.tvIsUnderMedication.text = requireContext().getString(
                     R.string.is_patient_under_any_medication_details, "Yes"
@@ -135,7 +155,7 @@ class ReviewDetailsRegistrationFragment : BaseFragment() {
                 binding.tvIsUnderTransfusion.text = requireContext().getString(
                     R.string.is_patient_undergoing_any_blood_transfusion_details, "Yes"
                 )
-            }else{
+            } else {
                 binding.tvIsUnderTransfusion.text = requireContext().getString(
                     R.string.is_patient_undergoing_any_blood_transfusion_details, "No"
                 )
@@ -145,7 +165,7 @@ class ReviewDetailsRegistrationFragment : BaseFragment() {
                     R.string.sickle_cell_family_history, "No"
                 )
 
-            }else{
+            } else {
                 binding.tvSickleCellFamilyHistory.text = requireContext().getString(
                     R.string.sickle_cell_family_history, userData.sickleCellHistory
                 )

app/src/main/java/com/example/hposregistration/ui/fragments/registration/UserDetailsRegistrationFragment.kt

@@ -5,7 +5,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -56,18 +55,29 @@ class UserDetailsRegistrationFragment : Fragment() {
     private fun autoFillUserData(user: UserData) {
         with(binding) {
             user.birthYear.let { etYob.setText(it) }
-            user.gender.let { etGenderBlock.setText(it, false) }
+            user.gender.let {
+                when (it) {
+                    "Male" -> {
+                        male.isChecked = true
+                    }
+                    "Female" -> {
+                        female.isChecked = true
+                    }
+                    else -> {
+                        other.isChecked = true
+                    }
+                }
+            }
             user.phoneNumber.let { etMobile.setText(it) }
             user.careOf.let { etCareof.setText(it) }
             user.maritalStatus.let { etIsMarried.setText(it, false) }
-            user.caste.let { etCategory.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.bloodGroup.let { etBloodGroup.setText(it, false) }
             user.isUnderMedication.let {
                 if (it != null) {
                     yes.isChecked = it
@@ -78,59 +88,24 @@ class UserDetailsRegistrationFragment : Fragment() {
                     yes1.isChecked = it
                 }
             }
-//            user.sickleCellHistory.let{
-//                if (it != null) {
-//                    if (binding.etFamilyHistory.isVisible) {
-//                        binding.etFamilyHistory.setText(it)
-//                        yes1history.isChecked = true
-//                    }else{
-//                        no1history.isChecked = true
-//                    }
-//                }
-//            }
-//            user.isUnderMedication.let {
-//                if (it != null) {
-//                    yes.isChecked = it
-//                }
-//            }
             user.sickleCellHistory.let {
                 if (it != null) {
                     yes1history.isChecked = true
                 }
             }
-
-//            user.sickleCellHistory.let{
-//                if (it != null) {
-//                    if(yes1history.isChecked){
-//                        yes1history.isChecked = true
-//                    }else if(no1history.isChecked){
-//                        no1history.isChecked
-//                    }
-//
-//
-//                }
-//            }
-
-
             if (yes1history.isChecked) {
                 if (binding.yes1history.isChecked) View.VISIBLE else View.GONE
 
                 user.sickleCellHistory.let { etFamilyHistory.setText(it) }
-
-
-
-
             } else {
                 binding.tilFamilyHistory.visibility = View.GONE
             }
-
             binding.yes1history.setOnClickListener {
                 binding.tilFamilyHistory.visibility =
                     if (binding.yes1history.isChecked) View.VISIBLE else View.GONE
                 user.sickleCellHistory.let { etFamilyHistory.setText(it) }
 
             }
-//
             binding.no1history.setOnClickListener {
                 binding.tilFamilyHistory.visibility =
                     if (binding.no1history.isChecked) View.GONE else View.VISIBLE
@@ -161,28 +136,29 @@ 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
             }
 
-            val gender = etGenderBlock.text.toString()
-            if (gender.isEmpty()) {
-                etGenderBlock.error = "Please enter your gender"
-                return false
+            if (male.isChecked) {
+                userData.gender = "Male"
+            } else if (female.isChecked) {
+                userData.gender = "Female"
             } else {
-                userData.gender = gender
+                userData.gender = "Other"
             }
 
             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()) {
@@ -202,17 +178,22 @@ class UserDetailsRegistrationFragment : Fragment() {
 
             val category = etCategory.text.toString()
             if (category.isEmpty()) {
-                etCategory.error = "Please enter your caste"
+                etCategory.error = "Please enter your category"
                 return false
             } else {
-                userData.caste = category
+                userData.category = category
+            }
+
+            val caste = etCaste.text.toString()
+            if (caste.isEmpty()) {
+                etCaste.error = "Please enter your caste"
+                return false
+            } else {
+                userData.caste = caste
             }
 
             val subCaste = etSubCaste.text.toString()
-            if (subCaste.isEmpty()) {
-                etSubCaste.error = "Please enter your sub caste"
-                return false
-            } else {
+            if (subCaste.isNotEmpty()) {
                 userData.subCaste = subCaste
             }
 
@@ -256,13 +237,6 @@ class UserDetailsRegistrationFragment : Fragment() {
                 userData.pinCode = pincode
             }
 
-            val bloodGroup = etBloodGroup.text.toString()
-            if (bloodGroup.isEmpty()) {
-                etBloodGroup.error = "Please enter your blood group"
-                return false
-            } else {
-                userData.bloodGroup = bloodGroup
-            }
             userData.isUnderMedication = yes.isChecked
             userData.isUnderTransfusion = yes1.isChecked
             userData.sickleCellHistory = yes1history.isChecked.toString()

app/src/main/java/com/example/hposregistration/ui/viewmodels/RegistrationViewModel.kt

@@ -13,6 +13,10 @@ import com.example.hposregistration.data.user.UserData
 import com.google.firebase.storage.FirebaseStorage
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Date
+import java.util.Locale
 import javax.inject.Inject
 
 @HiltViewModel
@@ -28,7 +32,7 @@ class RegistrationViewModel @Inject constructor(
     val fireBaseUpload = MutableLiveData<String>()
 
     fun addUserToDatabase(userData: UserData) = viewModelScope.launch {
-        val file = Uri.parse(userData.userImage)
+        val file = Uri.parse(userData.userImageURL)
         val storageRef = FirebaseStorage.getInstance().reference
         val imageRef = storageRef.child("${userData._id}/${file.lastPathSegment}")
 
@@ -39,7 +43,7 @@ class RegistrationViewModel @Inject constructor(
             }
             imageRef.downloadUrl
         }.addOnSuccessListener { uri ->
-            userData.userImage = uri.toString()
+            userData.userImageURL = uri.toString()
             addDataToFirebase(userData)
         }.addOnFailureListener { exception ->
 
@@ -63,6 +67,15 @@ class RegistrationViewModel @Inject constructor(
         get() = _networkStatusLiveData
 
     fun insert(userData: UserData) = viewModelScope.launch {
+        val currentDate = Date()
+        val dateFormat = SimpleDateFormat("yyyyMMdd")
+        val partition = dateFormat.format(currentDate)
+        userData._idSearch = partition + userData._id
+        userData.abhaIdSearch = partition + userData.abhaId
+        userData.aadharIdSearch = partition + userData.aadharId
+        userData.createdAt = SimpleDateFormat(
+            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+        ).format(Calendar.getInstance().time)
         mainRepository.insert(userData)
     }
 

app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>

app/src/main/res/drawable/ic_launcher_background.xml

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>

app/src/main/res/drawable/ic_logout.xml

@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="@color/red" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/red" android:pathData="M17,7l-1.41,1.41L18.17,11H8v2h10.17l-2.58,2.58L17,17l5,-5zM4,5h8V3H4c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h8v-2H4V5z"/>
+</vector>

app/src/main/res/layout/fragment_abha_registration.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.fragments.registration.AbhaRegistrationFragment">
+    tools:context="com.example.hposregistration.ui.fragments.registration.AbhaRegistrationFragment">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -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,9 +172,9 @@
                     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"
-                    android:maxLength="12" />
+                    android:inputType="text" />
             </com.google.android.material.textfield.TextInputLayout>
 
             <TextView
@@ -190,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"
@@ -201,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">
@@ -247,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"
@@ -255,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"

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"

app/src/main/res/layout/fragment_login.xml

@@ -0,0 +1,145 @@
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context="com.example.hposregistration.ui.fragments.LoginFragment">
+
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="16dp">
+
+            <TextView
+                android:id="@+id/tv_title"
+                style="@style/title1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/login"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <ImageView
+                android:id="@+id/imageView"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:src="@drawable/smi_logo"
+                android:layout_marginTop="24dp"
+                app:layout_constraintEnd_toStartOf="@id/imageView2"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_title" />
+
+            <ImageView
+                android:id="@+id/imageView2"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:layout_marginTop="24dp"
+                android:src="@drawable/sickle_cell_gov_logo"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/imageView"
+                app:layout_constraintTop_toBottomOf="@+id/tv_title" />
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/et_aadharID"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/imageView">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/loginId"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/login_id"
+                    android:inputType="textCapCharacters"
+                    android:maxLength="12" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/et_centerName"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/et_aadharID">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/password"
+                    android:inputType="text"
+                    android:maxLength="12" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btnLogin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:text="@string/login"
+                app:cornerRadius="16dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/et_centerName" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </ScrollView>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/errorMessageCL"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#80000000"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <include
+            android:id="@+id/itemErrorMessage"
+            layout="@layout/item_error_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/progressBarCL"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#80000000"
+        android:visibility="gone">
+
+        <ProgressBar
+            android:id="@+id/progressBar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:indeterminateDrawable="@drawable/progressbar_costume_view"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_review_details_registration.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".ui.fragments.registration.ReviewDetailsRegistrationFragment">
+    tools:context="com.example.hposregistration.ui.fragments.registration.ReviewDetailsRegistrationFragment">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -126,7 +126,7 @@
                 app:layout_constraintTop_toBottomOf="@id/tvCareOf" />
 
             <TextView
-                android:id="@+id/tvCaste"
+                android:id="@+id/tvCategory"
                 style="@style/title1_1"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -135,6 +135,16 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvMaritalStatus" />
 
+            <TextView
+                android:id="@+id/tvCaste"
+                style="@style/title1_1"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:textSize="16sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tvCategory" />
+
             <TextView
                 android:id="@+id/tvSubCaste"
                 style="@style/title1_1"

app/src/main/res/layout/fragment_user_details_registration.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.fragments.registration.UserDetailsRegistrationFragment">
+    tools:context="com.example.hposregistration.ui.fragments.registration.UserDetailsRegistrationFragment">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -48,27 +48,39 @@
 
             </com.google.android.material.textfield.TextInputLayout>
 
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/til_gender"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+            <RadioGroup
+                android:id="@+id/gender"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
                 android:layout_marginHorizontal="24dp"
-                android:layout_marginTop="20dp"
-                app:layout_constraintEnd_toEndOf="parent"
+                android:orientation="horizontal"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/til_yob">
 
-                <AutoCompleteTextView
-                    android:id="@+id/et_gender_block"
-                    android:layout_width="match_parent"
+                <RadioButton
+                    android:id="@+id/male"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:hint="@string/gender"
-                    android:inputType="none"
-                    android:labelFor="@id/til_gender"
-                    app:simpleItems="@array/gender" />
+                    android:layout_marginStart="10dp"
+                    android:checked="true"
+                    android:text="@string/male"
+                    android:textSize="16sp" />
 
-            </com.google.android.material.textfield.TextInputLayout>
+                <RadioButton
+                    android:id="@+id/female"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/female"
+                    android:textSize="16sp" />
+
+                <RadioButton
+                    android:id="@+id/other"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/other"
+                    android:textSize="16sp" />
+            </RadioGroup>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/til_mobile"
@@ -79,7 +91,7 @@
                 android:layout_marginTop="20dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/til_gender">
+                app:layout_constraintTop_toBottomOf="@id/gender">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/et_mobile"
@@ -147,13 +159,31 @@
                     android:id="@+id/et_category"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:hint="@string/caste"
+                    android:hint="@string/category"
                     android:inputType="none"
-                    android:labelFor="@id/til_category"
+                    android:labelFor="@id/til_is_married"
                     app:simpleItems="@array/category" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/til_caste"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="24dp"
+                android:layout_marginTop="16dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/til_category">
+                <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" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/til_subCaste"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
@@ -163,7 +193,7 @@
                 android:layout_marginTop="16dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/til_category">
+                app:layout_constraintTop_toBottomOf="@id/til_caste">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/et_subCaste"
@@ -200,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>
 
@@ -222,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>
 
@@ -257,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>
@@ -294,37 +327,38 @@
                 app:layout_constraintTop_toBottomOf="@id/til_pincode" />
 
 
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/til_blood_group"
-                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"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tv_title3">
+<!--            <com.google.android.material.textfield.TextInputLayout-->
+<!--                android:id="@+id/til_blood_group"-->
+<!--                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"-->
+<!--                app:layout_constraintEnd_toEndOf="parent"-->
+<!--                app:layout_constraintStart_toStartOf="parent"-->
+<!--                app:layout_constraintTop_toBottomOf="@id/tv_title3">-->
 
-                <AutoCompleteTextView
-                    android:id="@+id/et_blood_group"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/blood_group"
-                    android:inputType="none"
-                    android:labelFor="@id/til_blood_group"
-                    app:simpleItems="@array/blood_group" />
+<!--                <AutoCompleteTextView-->
+<!--                    android:id="@+id/et_blood_group"-->
+<!--                    android:layout_width="match_parent"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:hint="@string/blood_group"-->
+<!--                    android:inputType="none"-->
+<!--                    android:labelFor="@id/til_blood_group"-->
+<!--                    app:simpleItems="@array/blood_group" />-->
 
-            </com.google.android.material.textfield.TextInputLayout>
+<!--            </com.google.android.material.textfield.TextInputLayout>-->
 
             <TextView
                 android:id="@+id/cb_item1"
+                style="@style/title1_2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="24dp"
                 android:layout_marginTop="16dp"
                 android:text="@string/is_patient_under_any_medication"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/til_blood_group" />
+                app:layout_constraintTop_toBottomOf="@id/tv_title3" />
 
             <RadioGroup
                 android:id="@+id/radioGroup"
@@ -354,6 +388,7 @@
 
             <TextView
                 android:id="@+id/cb_item2"
+                style="@style/title1_2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="24dp"
@@ -388,6 +423,7 @@
             </RadioGroup>
             <TextView
                 android:id="@+id/cb_item3"
+                style="@style/title1_2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="24dp"

app/src/main/res/layout/fragment_user_list.xml

@@ -1,11 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+
+
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".ui.fragments.UserListFragment"
-    android:padding="24dp">
+    android:padding="24dp"
+    tools:context="com.example.hposregistration.ui.fragments.UserListFragment">
+    <LinearLayout
+        android:visibility="gone"
+        android:id="@+id/fragment_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/app_version"
+        style="@style/title2"
+        android:layout_width="57dp"
+        android:layout_height="15dp"
+        android:layout_marginTop="4dp"
+        android:gravity="center"
+        android:text="1.0.4"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.017"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/tv_title"
@@ -18,14 +41,28 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/noList"
+        android:id="@+id/emptyRegistrations"
         style="@style/title1"
-        android:visibility="gone"
-        android:gravity="center"
-        android:text="@string/internet_is_not_available_and_there_is_no_data_available_in_local_db"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/empty_registrations"
+        android:textColor="@color/black"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/noList"
+        style="@style/title1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/internet_is_not_available_and_there_is_no_data_available_in_local_db"
         android:textColor="@color/red"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -33,14 +70,34 @@
 
     <ImageView
         android:id="@+id/uploadData"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_margin="5dp"
         android:src="@drawable/upload_data"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/tv_title"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/tv_title" />
 
+    <ImageView
+        android:id="@+id/btnLogout"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_marginEnd="10dp"
+        android:src="@drawable/ic_logout"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_title"
+        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"
@@ -49,19 +106,21 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tv_title"
-        tools:listitem="@layout/user_item_view"/>
+        app:layout_constraintTop_toBottomOf="@+id/searchUser"
+        tools:listitem="@layout/user_item_view" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/btnRegisterUser"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:elevation="1dp"
         android:layout_margin="8dp"
-        android:src="@drawable/ic_add"
         android:backgroundTint="@color/primary"
+        android:contentDescription="@string/register_user"
+        android:src="@drawable/ic_add"
+        app:elevation="1dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:contentDescription="@string/register_user" />
+        app:layout_constraintEnd_toEndOf="parent" />
+
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/user_item_view.xml

@@ -1,60 +1,94 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="wrap_content">
 
     <androidx.cardview.widget.CardView
-    android:id="@+id/newPaperCard"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="24dp"
-    app:cardBackgroundColor="@color/primary_light"
-    app:cardCornerRadius="25dp"
-    app:cardElevation="0dp"
-    app:layout_constraintTop_toTopOf="parent">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/userCard"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="12dp">
+        android:layout_marginTop="24dp"
+        app:cardBackgroundColor="@color/primary_light"
+        app:cardCornerRadius="25dp"
+        app:cardElevation="0dp"
+        app:layout_constraintTop_toTopOf="parent">
 
-        <ImageView
-            android:id="@+id/userImage"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/userName"
-            android:layout_width="0dp"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:fontFamily="@font/poppins_bold"
-            android:layout_marginTop="16dp"
-            android:gravity="center"
-            android:textColor="@color/black"
-            android:textSize="16sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/userImage" />
+            android:padding="12dp">
 
-        <TextView
-            android:id="@+id/userId"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:fontFamily="@font/poppins_bold"
-            android:layout_marginTop="16dp"
-            android:gravity="center"
-            android:textColor="@color/black"
-            android:textSize="16sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/userName" />
+            <ImageView
+                android:id="@+id/userImage"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:src="@drawable/ic_qr_code_scanner" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            <TextView
+                android:id="@+id/userName"
+                style="@style/title1_1"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:gravity="start"
+                android:textColor="@color/black"
+                android:textSize="14sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/userImage"
+                app:layout_constraintTop_toTopOf="@+id/userImage"
+                tools:text="Name: MohamedKaif" />
 
-</androidx.cardview.widget.CardView>
+            <TextView
+                android:id="@+id/userId"
+                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/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"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                style="@style/title1_1"
+                android:layout_marginTop="4dp"
+                android:layout_marginStart="16dp"
+                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/timeCreated"
+                tools:text="Test Status: Completed"/>
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.cardview.widget.CardView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/mipmap-anydpi-v26/hpos_icon.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/hpos_icon_background"/>
+    <foreground android:drawable="@mipmap/hpos_icon_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/hpos_icon_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/hpos_icon_background"/>
+    <foreground android:drawable="@mipmap/hpos_icon_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

app/src/main/res/navigation/main_nav_graph.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_nav_graph"
-    app:startDestination="@id/userListFragment">
+    app:startDestination="@id/loginFragment">
 
     <fragment
         android:id="@+id/registrationFragment"
@@ -26,6 +26,11 @@
         <action
             android:id="@+id/action_userListFragment_to_registrationFragment"
             app:destination="@id/registrationFragment" />
+        <action
+            android:id="@+id/action_userListFragment_to_loginFragment"
+            app:destination="@id/loginFragment"
+            app:popUpTo="@id/main_nav_graph"
+            app:popUpToInclusive="true"/>
     </fragment>
     <fragment
         android:id="@+id/profileFragment"
@@ -76,4 +81,16 @@
             app:argType="string"
             android:defaultValue="null" />
     </fragment>
+
+    <fragment
+        android:id="@+id/loginFragment"
+        android:name="com.example.hposregistration.ui.fragments.LoginFragment"
+        android:label="fragment_login"
+        tools:layout="@layout/fragment_login" >
+        <action
+            android:id="@+id/action_loginFragment_to_userListFragment"
+            app:destination="@id/userListFragment"
+            app:popUpTo="@id/main_nav_graph"
+            app:popUpToInclusive="true"/>
+    </fragment>
 </navigation>

app/src/main/res/values/hpos_icon_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="hpos_icon_background">#FFFFFF</color>
+</resources>

app/src/main/res/values/strings.xml

@@ -31,7 +31,7 @@
     <string name="birth_year">Birth Year</string>
     <string name="marital_status">Select Marital status</string>
     <string name="father_s_husband_s_name">Father\'s/Husband\'s Name</string>
-    <string name="caste">Select Caste</string>
+    <string name="caste">Caste</string>
     <string name="person_s_address_details">Person\'s Address Details</string>
     <string name="district">District</string>
     <string name="city_town">City / Town</string>
@@ -41,20 +41,21 @@
     <string name="review">Review</string>
     <string name="blood_group">Select Blood Group</string>
     <string name="house">House</string>
-    <string name="is_patient_under_any_medication">Is user under any medication or treatment?</string>
-    <string name="is_patient_undergoing_any_blood_transfusion">Is user undergoing any blood transfusion?</string>
+    <string name="is_patient_under_any_medication">Have you been under medication for Sickle Cell in the past three months?</string>
+    <string name="is_patient_undergoing_any_blood_transfusion">Have you undergone any Blood transfusions in the Past three months ?</string>
 
     <string name="user_list">User List</string>
     <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>
     <string name="edit">Edit</string>
     <string name="user_details">User Details</string>
     <string name="internet_is_not_available_and_there_is_no_data_available_in_local_db">Internet is not available and there is no Data available in Local DB</string>
+    <string name="empty_registrations">No registrations are available for display</string>
     <string name="user_id">User ID: %1$s</string>
     <string name="abha_number">Abha Number: %1$s</string>
     <string name="aadhar_number_details">Aadhar Number: %1$s</string>
@@ -64,6 +65,7 @@
     <string name="phone_number_details">Mobile Number: %1$s</string>
     <string name="care_of_details">Father\'s/Husband\'s Name: %1$s</string>
     <string name="marital_status_details">Marital Status: %1$s</string>
+    <string name="category_details">Category: %1$s</string>
     <string name="caste_details">Caste: %1$s</string>
     <string name="sub_caste_details">Sub Caste: %1$s</string>
     <string name="house_details">House: %1$s</string>
@@ -78,15 +80,60 @@
     <string name="is_any_sickle">Is Any Sickle cell History: %1$s</string>
     <string name="sickle_cell_family_history">Sickle cell Family History: %1$s</string>
     <string name="center_name">Center Name</string>
+    <string name="login_id">Login ID</string>
+    <string name="password">Password</string>
+    <string name="login">Login</string>
+    <string name="_2">Category</string>
+    <string name="category">Category</string>
+    <string name="male">Male</string>
+    <string name="female">Female</string>
+    <string name="other">Other</string>
 
 
     <string-array name="category">
-        <item>GEN</item>
+        <item>NT-A</item>
+        <item>NT-B</item>
+        <item>NT-C</item>
+        <item>NT-D</item>
         <item>OBC</item>
+        <item>OPEN</item>
+        <item>OTHER</item>
+        <item>SBC</item>
         <item>SC</item>
         <item>ST</item>
     </string-array>
 
+    <string-array name="caste">
+        <item>AHIR</item>
+        <item>BARAI</item>
+        <item>BRAHMAN</item>
+        <item>BUDDHIST</item>
+        <item>CHAMBHAR</item>
+        <item>CHAMAR</item>
+        <item>DEWANGAN</item>
+        <item>DHIWAR</item>
+        <item>FULMALI</item>
+        <item>GOND</item>
+        <item>JAIN</item>
+        <item>KOLI</item>
+        <item>KOSHTI</item>
+        <item>KUMBHAR</item>
+        <item>KUNBI</item>
+        <item>LOHAR</item>
+        <item>MALI</item>
+        <item>MANNA</item>
+        <item>MAHAR</item>
+        <item>MOURYA</item>
+        <item>MUSLIM</item>
+        <item>NAVI</item>
+        <item>OTHER</item>
+        <item>PAWAR</item>
+        <item>PARDESI</item>
+        <item>SHAHU</item>
+        <item>SONAR</item>
+        <item>TELI</item>
+    </string-array>
+
     <string-array name="marital_status">
         <item>Married</item>
         <item>Single</item>
@@ -109,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>

build.gradle

@@ -1,9 +1,10 @@
 // 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-beta01' apply false
+    id 'androidx.navigation.safeargs' version '2.7.0-beta02' apply false
     id 'com.google.dagger.hilt.android' version '2.46' apply false
     id "com.google.gms.google-services" version "4.3.15" apply false
+    id 'com.google.firebase.crashlytics' version "2.9.8" apply false
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Jun 14 15:14:47 IST 2023
+#Wed Jul 12 14:05:11 IST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists