binding

crop
2023-07-07 17:13:18 +05:30 · 2023-07-07 10:53:38 +05:30
73 changed files with 572 additions and 2973 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -10,9 +10,6 @@
 .DS_Store
 /build
 /captures
-/app/google-services.json
 .externalNativeBuild
 .cxx
 local.properties
-/.idea/misc.xml
-/.idea/vcs.xml
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,7 +8,7 @@
        <option name="distributionType" value="DEFAULT_WRAPPED" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
        <option name="gradleHome" value="$USER_HOME$/andriod studio gradle/gradle-7.3" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="Embedded JDK" />
        <option name="modules">
          <set>
            <option value="$PROJECT_DIR$" />
--- a/.idea/kotlinc.xml
+++ b/.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.22" />
+    <option name="version" value="1.8.21" />
  </component>
 </project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -0,0 +1,3 @@
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK" />
+</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
--- a/Login_Feature.patch
+++ b/Login_Feature.patch
--- a/README.md
+++ b/README.md
@@ -1,92 +0,0 @@
-# HPOS-Registration-App
-
-
-
-## Getting started
-
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
-
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
-
-## Add your files
-
- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
-
-```
-cd existing_repo
-git remote add origin https://gitlab.com/sminnovations/hpos-registration-app.git
-git branch -M main
-git push -uf origin main
-```
-
-## Integrate with your tools
-
- [ ] [Set up project integrations](https://gitlab.com/sminnovations/hpos-registration-app/-/settings/integrations)
-
-## Collaborate with your team
-
- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
- [ ] [Set auto-merge](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
-
-## Test and Deploy
-
-Use the built-in continuous integration in GitLab.
-
- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
-
-***
-
-# Editing this README
-
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
-
-## Suggestions for a good README
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
-
-## Name
-Choose a self-explaining name for your project.
-
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
-
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
-
-## License
-For open source projects, say how it is licensed.
-
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,17 +5,16 @@ 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 34
+    compileSdk 33

    defaultConfig {
        applicationId "in.sminnovations.hposregistration"
        minSdk 26
-        targetSdk 34
+        targetSdk 33
        versionCode 1
        versionName "1.0"

@@ -50,19 +49,17 @@ dependencies {
    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

-    // 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")
+    //firebase
+    implementation platform('com.google.firebase:firebase-bom:32.1.0')
    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.6.0'
+    implementation 'com.google.android.gms:play-services-auth:20.5.0'

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

    // Coroutine Lifecycle Scopes
    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
@@ -74,8 +71,8 @@ dependencies {
    kapt "androidx.hilt:hilt-compiler:1.0.0"

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

    // Retrofit + GSON
    implementation "com.squareup.retrofit2:retrofit:2.9.0"
@@ -89,15 +86,16 @@ dependencies {

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

    //Room
-    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")
+    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")

    // Barcode scanner
    implementation 'com.journeyapps:zxing-android-embedded:4.3.0'

-
+    // cropping
+    implementation 'com.github.yalantis:ucrop:2.2.6'
 }
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -5,35 +5,6 @@
    "storage_bucket": "hpos-af3cc.appspot.com"
  },
  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:f1435a1c07f710036c6471",
-        "android_client_info": {
-          "package_name": "com.example.hposconsentform"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
    {
      "client_info": {
        "mobilesdk_app_id": "1:650071678820:android:7569c1cad4fc99916c6471",
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -18,4 +18,9 @@

 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+# ucrop
+-dontwarn com.yalantis.ucrop**
+-keep class com.yalantis.ucrop** { *; }
+-keep interface com.yalantis.ucrop** { *; }
--- a/app/src/main/AndroidManifest.xml
+++ b/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/hpos_icon"
+        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
-        android:roundIcon="@mipmap/hpos_icon_round"
+        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
        android:theme="@style/Theme.HPOSRegistration"
        tools:targetApi="31">

        <provider
            android:name="androidx.core.content.FileProvider"
-            android:authorities="in.sminnovations.hposregistration.provider"
+            android:authorities="com.example.hposregistration.provider"
            android:exported="false"
            android:grantUriPermissions="true">
            <meta-data
@@ -34,6 +34,7 @@
        </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" />
@@ -41,11 +42,11 @@
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
+
        <activity
-            android:name="com.journeyapps.barcodescanner.CaptureActivity"
+            android:name="com.yalantis.ucrop.UCropActivity"
            android:screenOrientation="portrait"
-            android:stateNotNeeded="true"
-            tools:replace="android:screenOrientation" />
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
    </application>

 </manifest>
--- a/app/src/main/java/com/example/hposregistration/adapters/UserListOfflineAdapter.kt
+++ b/app/src/main/java/com/example/hposregistration/adapters/UserListOfflineAdapter.kt
@@ -43,7 +43,7 @@ class UserListOfflineAdapter(private val view: View) : RecyclerView.Adapter<User
        holder.binding.apply {
            userName.text = userList.name
            userId.text = userList._id
-            Glide.with(view).load(userList.userImageURL).into(userImage)
+            Glide.with(view).load(userList.userImage).into(userImage)
        }
    }
 }
--- a/app/src/main/java/com/example/hposregistration/adapters/UserListOnlineAdapter.kt
+++ b/app/src/main/java/com/example/hposregistration/adapters/UserListOnlineAdapter.kt
@@ -27,9 +27,9 @@ class UserListOnlineAdapter(options: FirestoreRecyclerOptions<UserData>, private
    @SuppressLint("SetTextI18n")
    override fun onBindViewHolder(holder: OrderItemViewHolder, position: Int, model: UserData) {
        holder.binding.apply {
-            userName.text = "Name: ${model.name}"
-            userId.text = "User ID: ${model._id}"
-            Glide.with(view).load(model.userImageURL).into(userImage)
+            userName.text = model.name
+            userId.text = model._id
+            Glide.with(view).load(model.userImage).into(userImage)
        }
    }
 }
--- a/app/src/main/java/com/example/hposregistration/dao/Converters.kt
+++ b/app/src/main/java/com/example/hposregistration/dao/Converters.kt
@@ -0,0 +1,27 @@
+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
+        }
+    }
+}
--- a/app/src/main/java/com/example/hposregistration/dao/MyDataBase.kt
+++ b/app/src/main/java/com/example/hposregistration/dao/MyDataBase.kt
@@ -6,6 +6,7 @@ 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
 }
--- a/app/src/main/java/com/example/hposregistration/data/Constant.kt
+++ b/app/src/main/java/com/example/hposregistration/data/Constant.kt
@@ -10,34 +10,12 @@ 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(
-        "SMIREG1",
-        "SMIREG2",
-        "SMIREG3",
-        "SMIREG4",
-        "SMIREG5",
-        "SMIREG6",
-        "SMIREG7",
-        "SMIREG8",
-        "SMIREG9",
-        "SMIREG10",
-        "SMIREG11",
-        "SMIREG12",
-        "SMIREG13",
-        "SMIREG14",
-        "SMIREG15"
-    )
-
-    const val password = "SMI@12345"
 }
--- a/app/src/main/java/com/example/hposregistration/data/user/UserData.kt
+++ b/app/src/main/java/com/example/hposregistration/data/user/UserData.kt
@@ -7,18 +7,16 @@ import androidx.room.PrimaryKey
 data class UserData(
    @PrimaryKey
    var _id: String = "",
-    var abhaId: String = "",
-    var aadharId: String = "",
+    var AbhaId: String = "",
+    var AadharId: 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 appVersion: String ="",
+    var subCaste: String = "",
    var house: String = "",
    var city: String = "",
    var district: String = "",
@@ -28,15 +26,25 @@ data class UserData(
    var isUnderMedication: Boolean? = false,
    var isUnderTransfusion: Boolean? = false,
    var sickleCellHistory: String? = "",
-    var userImageURL: String = "",
-    var registeredBy: String? = "",
-    var createdAt: String? = "",
-    var registrationCenterName: String? = "",
-    var testStatus: Boolean = false
+    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 = ""
 ){
    enum class Gender {
        MALE,
        FEMALE,
        OTHER
    }
-}
+
+    data class Location(
+        var latitude: Double? = null,
+        var longitude: Double? = null
+    )
+}
--- a/app/src/main/java/com/example/hposregistration/ui/activities/MainActivity.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/activities/MainActivity.kt
@@ -14,6 +14,5 @@ class MainActivity : AppCompatActivity() {
        super.onCreate(savedInstanceState)
        binding = ActivityMainBinding.inflate(layoutInflater)
        setContentView(binding.root)
-
    }
 }
--- a/app/src/main/java/com/example/hposregistration/ui/fragments/LoginFragment.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/fragments/LoginFragment.kt
@@ -1,92 +0,0 @@
-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 = R.string.enter_proper_login_id.toString()
-                }
-                if (password.isBlank()) {
-                    binding.password.error = R.string.enter_proper_password.toString()
-                }
-            }
-        }
-    }
-
-    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(), R.string.wrong_password, Toast.LENGTH_SHORT).show()
-            }
-        }
-        Toast.makeText(requireContext(), R.string.wrong_user_id, 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
-    }
-}
--- a/app/src/main/java/com/example/hposregistration/ui/fragments/UserListFragment.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/fragments/UserListFragment.kt
@@ -3,18 +3,15 @@ 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.Button
 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
@@ -34,13 +31,10 @@ class UserListFragment : BaseFragment() {

    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)
        setupViews()
        return binding.root
    }
@@ -59,9 +53,6 @@ class UserListFragment : BaseFragment() {
        binding.btnRegisterUser.setOnClickListener {
            findNavController().navigate(R.id.action_userListFragment_to_registrationFragment)
        }
-        binding.btnLogout.setOnClickListener {
-            logoutUser(requireContext())
-        }
    }

    private fun init() {
@@ -79,51 +70,20 @@ class UserListFragment : BaseFragment() {
        binding.uploadData.setOnClickListener {
            showUploadDialog(requireContext())
        }
-
-        viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
-            deteleIncompleteRegistration(userDataList)
-        }
    }

-    private fun logoutUser(context: Context) {
-        val builder = AlertDialog.Builder(context)
-        builder.setTitle(R.string.log_out)
-        builder.setMessage(R.string.do_log_out)
-
-        // 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(R.string.upload_db_registration)
-        builder.setMessage(R.string.upload_local_db_to_cloud)
+        builder.setTitle("Upload DB Registration")
+        builder.setMessage("Do you want to upload the local DB Registration to the cloud?")

        // Positive button
-        builder.setPositiveButton(R.string.upload) { dialog, _ ->
+        builder.setPositiveButton("Upload") { dialog, _ ->
            uploadLoadDBData(dialog)
        }

        // Negative button
-        builder.setNegativeButton(R.string.cancel) { dialog, _ ->
+        builder.setNegativeButton("Cancel") { dialog, _ ->
            dialog.dismiss()
        }

@@ -141,7 +101,7 @@ class UserListFragment : BaseFragment() {
                    viewModel.deleteById(userData._id)
                }
                dialog.dismiss()
-                Toast.makeText(requireContext(), R.string.upload_done_successfully, Toast.LENGTH_SHORT)
+                Toast.makeText(requireContext(), "Upload  done successfully", Toast.LENGTH_SHORT)
                    .show()
            }
        }
@@ -193,7 +153,7 @@ class UserListFragment : BaseFragment() {

    private fun deteleIncompleteRegistration(userDataList: List<UserData>) {
        userDataList.forEach {
-            if (it.userImageURL.isEmpty()) {
+            if (it._id.isEmpty()) {
                viewModel.deleteById(it._id)
            }
        }
--- a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt
@@ -17,7 +17,6 @@ import com.example.hposregistration.ui.viewmodels.RegistrationViewModel
 import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanIntentResult
 import dagger.hilt.android.AndroidEntryPoint
-import `in`.sminnovations.hposregistration.R
 import `in`.sminnovations.hposregistration.databinding.FragmentAbhaRegistrationBinding
 import org.json.JSONObject

@@ -35,7 +34,7 @@ class AbhaRegistrationFragment : BaseFragment() {
        registerForActivityResult(ScanContract()) { result: ScanIntentResult ->
            if (result.contents == null) {
                Toast.makeText(
-                    requireContext(), R.string.cancelled_unable_scan, Toast.LENGTH_LONG
+                    requireContext(), "Cancelled: Unable to scan, Try Again!!", Toast.LENGTH_LONG
                ).show()
            } else {
                processScannedData(result.contents)
@@ -66,26 +65,26 @@ 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.registrationCenterName)
+                centerName.setText(user.CenterName)

            }
        }

        binding.btnProceed.setOnClickListener {
-            val abhaIdInput = binding.etAbhaId.text.toString()
+            val abhaId = binding.etAbhaId.text.toString()
            val userName = binding.etName.text.toString()
-            val aadharIdInput = binding.aadharID.text.toString()
+            val aadharId = binding.aadharID.text.toString()
            val centerName = binding.centerName.text.toString()

-            if (validateInputs(abhaIdInput, aadharIdInput, userName, centerName)) {
+            if (validateInputs(abhaId, aadharId, userName, centerName)) {
                userData.apply {
                    name = userName
-                    aadharId = aadharIdInput
-                    abhaId = abhaIdInput
-                    registrationCenterName = centerName
+                    AadharId = aadharId
+                    AbhaId = abhaId
+                    CenterName = centerName
                    _id = aadharId + userName.substring(0, 3).uppercase() + centerName.substring(0, 3).uppercase()
                }

@@ -101,7 +100,7 @@ class AbhaRegistrationFragment : BaseFragment() {
            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()
@@ -112,7 +111,7 @@ class AbhaRegistrationFragment : BaseFragment() {
                house = obj.getString("address")
            }

-            if (userData.abhaId.isNotEmpty()) {
+            if (userData.AbhaId.isNotEmpty()) {
                saveUserDataAsPerAbhaId()
            } else {
                saveUserDataAsPerAadharId()
@@ -134,7 +133,7 @@ class AbhaRegistrationFragment : BaseFragment() {
            } catch (e: Exception) {
                Toast.makeText(
                    requireContext(),
-                    R.string.invalid_qr_code,
+                    "The QR Code you have scanned is not valid, enter the data manually",
                    Toast.LENGTH_SHORT
                ).show()
            }
@@ -144,23 +143,23 @@ class AbhaRegistrationFragment : BaseFragment() {
    private fun saveUserDataAsPerAbhaId() {
        with(binding) {
            tvScanMessage.visibility = View.VISIBLE
-            tvScanMessage.text =  R.string.enter_aadhar_manually.toString()
-            etAbhaId.setText(userData.abhaId)
+            tvScanMessage.text = "You have scanned the Abha ID, need to enter Aadhar ID manually"
+            etAbhaId.setText(userData.AbhaId)
            etName.setText(userData.name)
        }
        Toast.makeText(
-            requireContext(), R.string.scanned_abha_id, Toast.LENGTH_SHORT
+            requireContext(), "You have scanned the Abha ID", Toast.LENGTH_SHORT
        ).show()
    }

    private fun saveUserDataAsPerAadharId() {
        with(binding) {
            tvScanMessage.text =
-                R.string.scanned_aadhar_id.toString()
+                "You have scanned the Aadhar ID, need to enter Aadhar ID number you have scan and Abha ID manually"
            etName.setText(userData.name)
        }
        Toast.makeText(
-            requireContext(), R.string.scanned_aadharid, Toast.LENGTH_SHORT
+            requireContext(), "You have scanned the Aadhar ID", Toast.LENGTH_SHORT
        ).show()
    }

@@ -169,19 +168,19 @@ class AbhaRegistrationFragment : BaseFragment() {
    ): Boolean {
        with(binding) {
            if (!checkAbhaIDNumber(abhaId)) {
-                etAbhaId.error = R.string.invalid_abha_id.toString()
+                etAbhaId.error = "Invalid Abha ID"
                return false
            }
            if (!checkAadharIDNumber(aadharId)) {
-                aadharID.error = R.string.invalid_aadhar_id.toString()
+                aadharID.error = "Invalid Aadhar ID"
                return false
            }
            if (!checkUserName(userName)) {
-                etName.error = R.string.name_field_error.toString()
+                etName.error = "Name field can't be empty or less than 3 characters"
                return false
            }
            if (!checkCenterName(centerName)) {
-                etCenterName.error = R.string.center_name_error.toString()
+                etCenterName.error = "Center name can't be empty or less than 3 characters"
                return false
            }
        }
--- a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/CaptureUserImageFragment.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/CaptureUserImageFragment.kt
@@ -2,13 +2,13 @@ package com.example.hposregistration.ui.fragments.registration

 import android.Manifest
 import android.app.Activity
+import android.app.Activity.RESULT_OK
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.Bitmap
 import android.net.Uri
 import android.os.Bundle
 import android.provider.MediaStore
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -16,12 +16,14 @@ import android.widget.ImageView
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
 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.user.UserData
 import com.example.hposregistration.ui.viewmodels.RegistrationViewModel
+import com.yalantis.ucrop.UCrop
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hposregistration.databinding.FragmentCaptureUserImageBinding
 import java.io.File
@@ -70,8 +72,8 @@ class CaptureUserImageFragment : Fragment() {
        viewModel.getUserByID(args.userId)
        viewModel.userData.observe(viewLifecycleOwner) { user ->
            userData = user
-            if (userData.userImageURL.isNotEmpty()) {
-                binding.userImage.loadImageFromUri(Uri.parse(user.userImageURL))
+            if (userData.userImage.isNotEmpty()) {
+                binding.userImage.loadImageFromUri(Uri.parse(user.userImage))
                binding.btnSubmit.isEnabled = true
                binding.btnSubmit.setOnClickListener {
                    navigate()
@@ -82,7 +84,7 @@ class CaptureUserImageFragment : Fragment() {

    private fun setupCameraLauncher() {
        cameraLauncher =  registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-            if (result.resultCode == Activity.RESULT_OK && result.data != null) {
+            if (result.resultCode == RESULT_OK && result.data != null) {
                val thumbnail: Bitmap = result.data!!.extras!!.get("data") as Bitmap
                val uri: Uri = saveImageToInternalStorage(thumbnail)
                uri.let {
@@ -122,9 +124,42 @@ class CaptureUserImageFragment : Fragment() {
    }

    private fun submitImage(uri: Uri) {
-        userData.userImageURL = uri.toString()
-        viewModel.insert(userData)
-        navigate()
+
+        val cropLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+            if (result.resultCode == RESULT_OK && result.data != null) {
+                val resultUri: Uri? = UCrop.getOutput(result.data!!)
+                binding.userImage.loadImageFromUri(Uri.parse(resultUri.toString()))
+            } else if (result.resultCode == UCrop.RESULT_ERROR) {
+                val cropError: Throwable? = UCrop.getError(result.data!!)
+            }
+        }
+
+//        val cropIntent: Intent = // Create your crop intent here
+//            cropLauncher.launch(cropIntent)
+
+
+//        userData.userImage = uri.toString()
+//        viewModel.insert(userData)
+//        navigate()
+        var sourceUri = uri
+        var destinationUri = uri
+        val maxWidth = 160
+        val maxHeight = 90
+
+//        val context = getContext().getA
+        UCrop.of(sourceUri, destinationUri)
+            .withAspectRatio(9F, 16F)
+            .withMaxResultSize(maxWidth, maxHeight)
+            .start(requireActivity())
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (resultCode == RESULT_OK && requestCode == UCrop.REQUEST_CROP) {
+            val resultUri: Uri? = data?.let { UCrop.getOutput(it) }
+            binding.userImage.loadImageFromUri(Uri.parse(resultUri.toString()))
+        } else if (resultCode == UCrop.RESULT_ERROR) {
+            val cropError: Throwable? = data?.let { UCrop.getError(it) }
+        }
    }

    private fun navigate() {
@@ -177,14 +212,14 @@ class CaptureUserImageFragment : Fragment() {
        requestPermissionLauncher.launch(permissions)
    }

+    private fun ImageView.loadImageFromUri(uri: Uri) {
+        Glide.with(this)
+            .load(uri)
+            .into(this)
+    }
+
    override fun onDestroyView() {
        super.onDestroyView()
        _binding = null
    }
-}
-
-private fun ImageView.loadImageFromUri(uri: Uri) {
-    Glide.with(this)
-        .load(uri)
-        .into(this)
-}
+}
--- a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/ReviewDetailsRegistrationFragment.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/ReviewDetailsRegistrationFragment.kt
@@ -1,7 +1,5 @@
 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
@@ -12,23 +10,18 @@ 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()
@@ -39,8 +32,6 @@ 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
    }

@@ -67,7 +58,7 @@ class ReviewDetailsRegistrationFragment : BaseFragment() {
            } else {
                Toast.makeText(
                    requireContext(),
-                    R.string.internt_not_local,
+                    "Internet not available, Data stored in local DB",
                    Toast.LENGTH_SHORT
                ).show()
                navigateToUserListFragment()
@@ -84,33 +75,26 @@ class ReviewDetailsRegistrationFragment : BaseFragment() {

        viewModel.fireBaseUpload.observe(viewLifecycleOwner) {
            if (it == "Success") {
-                Toast.makeText(
-                    requireContext(),
-                    R.string.registration_success,
-                    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.userImageURL)).into(userImage)
+            Glide.with(requireActivity()).load(Uri.parse(userData.userImage)).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)
+                requireContext().getString(R.string.aadhar_number_details, userData.AadharId)
            binding.tvUserName.text = requireContext().getString(R.string.user_name, userData.name)
            binding.tvBirthYear.text =
                requireContext().getString(R.string.birth_year_details, userData.birthYear)
@@ -122,14 +106,10 @@ 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)
-            if (userData.subCaste != "") {
-                binding.tvSubCaste.text =
-                    requireContext().getString(R.string.sub_caste_details, 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 =
@@ -141,7 +121,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.registrationCenterName)
+                requireContext().getString(R.string.centre_name, userData.CenterName)
            if (userData.isUnderMedication!!) {
                binding.tvIsUnderMedication.text = requireContext().getString(
                    R.string.is_patient_under_any_medication_details, "Yes"
@@ -155,7 +135,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"
                )
@@ -165,18 +145,11 @@ 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
                )
            }
-
-            val pInfo = requireActivity().packageManager.getPackageInfo(
-                requireActivity().packageName, 0
-            )
-            val version = pInfo.versionName
-            userData.appVersion = version
-
        }
    }

--- a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/UserDetailsRegistrationFragment.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/UserDetailsRegistrationFragment.kt
@@ -13,7 +13,6 @@ import androidx.navigation.fragment.navArgs
 import com.example.hposregistration.data.user.UserData
 import com.example.hposregistration.ui.viewmodels.RegistrationViewModel
 import dagger.hilt.android.AndroidEntryPoint
-import `in`.sminnovations.hposregistration.R
 import `in`.sminnovations.hposregistration.databinding.FragmentUserDetailsRegistrationBinding


@@ -44,23 +43,6 @@ class UserDetailsRegistrationFragment : Fragment() {
    private fun init() {
        setupViewModel()
        setupSubmitButton()
-
-
-        binding.etCategory.setOnItemClickListener { parent, view, position, id ->
-            if (parent.getItemAtPosition(position).toString().equals("OTHER", ignoreCase = true)) {
-                binding.tilOther.visibility = View.VISIBLE
-            } else {
-                binding.tilOther.visibility = View.GONE
-            }
-        }
-
-        binding.etCaste.setOnItemClickListener { parent, view, position, id ->
-            if (parent.getItemAtPosition(position).toString().equals("OTHER", ignoreCase = true)) {
-                binding.tilOthercaste.visibility = View.VISIBLE
-            } else {
-                binding.tilOthercaste.visibility = View.GONE
-            }
-        }
    }

    private fun setupViewModel() {
@@ -74,31 +56,18 @@ class UserDetailsRegistrationFragment : Fragment() {
    private fun autoFillUserData(user: UserData) {
        with(binding) {
            user.birthYear.let { etYob.setText(it) }
-            user.gender.let {
-                when (it) {
-                    "Male" -> {
-                        male.isChecked = true
-                        binding.tilOthergender.visibility = View.GONE
-                    }
-                    "Female" -> {
-                        female.isChecked = true
-                        binding.tilOthergender.visibility = View.GONE
-                    }
-                    else -> {
-                        other.isChecked = true
-                        binding.tilOthergender.visibility = View.VISIBLE
-                    }
-                }
-            }
+            user.gender.let { etGenderBlock.setText(it, false) }
            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.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.pinCode.let { etPincode.setText(it) }
+            user.bloodGroup.let { etBloodGroup.setText(it, false) }
            user.isUnderMedication.let {
                if (it != null) {
                    yes.isChecked = it
@@ -109,65 +78,64 @@ 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.category.let {
-                etCategory.setText(it, false)
-            }
-            user.caste.let {
-                etCaste.setText(it, false)
-            }
+
+//            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
            }

-            if(other.isChecked){
-                user.gender.let { etOthergender.setText(it) }
-            }
-
-            binding.male.setOnClickListener {
-                binding.tilOthergender.visibility =  View.GONE
-            }
-
-            binding.female.setOnClickListener {
-                binding.tilOthergender.visibility =  View.GONE
-            }
-
-            binding.other.setOnClickListener {
-                binding.tilOthergender.visibility = View.VISIBLE
-            }
-
-            if (binding.etCategory.text.toString().equals("OTHER", ignoreCase = true)) {
-                binding.tilOther.visibility = View.VISIBLE
-                binding.etOther.visibility = View.VISIBLE
-            } else {
-                binding.tilOther.visibility = View.GONE
-            }
-
-            if (binding.etCaste.text.toString().equals("OTHER", ignoreCase = true)) {
-                binding.tilOthercaste.visibility = View.VISIBLE
-                binding.etOthercaste.visibility = View.VISIBLE
-            } else {
-                binding.tilOthercaste.visibility = View.GONE
-            }

        }
    }
@@ -179,7 +147,7 @@ class UserDetailsRegistrationFragment : Fragment() {
                viewModel.insert(userData)
                navigateToCaptureUserImageFragment()
            } else {
-                showToast(R.string.enter_details_properly.toString())
+                showToast("Please enter all the details properly")
            }
        }
    }
@@ -194,38 +162,23 @@ class UserDetailsRegistrationFragment : Fragment() {
        with(binding) {
            val yob = etYob.text.toString()
            if (yob.isEmpty() || yob.toInt() <= 1900 || yob.toInt() > 2023) {
-                etYob.error = R.string.enter_valid_birth_year.toString()
+                etYob.error = "Please enter a valid birth year between 1900 and 2023"
                return false
            } else {
                userData.birthYear = yob
            }

-            if (male.isChecked) {
-                binding.tilOthergender.visibility = View.GONE
-                userData.gender = "Male"
-            } else if (female.isChecked) {
-                binding.tilOthergender.visibility = View.GONE
-                userData.gender = "Female"
-            } else if(other.isChecked) {
-                binding.tilOthergender.visibility = View.VISIBLE
-                val genderother= binding.etOthergender.text.toString()
-                userData.gender = genderother
-                if (genderother.isEmpty()) {
-                    etOthergender.error = R.string.fill_field.toString()
-                    return false
-                }
+            val gender = etGenderBlock.text.toString()
+            if (gender.isEmpty()) {
+                etGenderBlock.error = "Please enter your gender"
+                return false
+            } else {
+                userData.gender = gender
            }

-            val pInfo = requireActivity().packageManager.getPackageInfo(
-                requireActivity().packageName, 0
-            )
-            val version = pInfo.versionName
-            userData.appVersion = version
-
-
            val mobile = etMobile.text.toString()
            if (mobile.isEmpty() || mobile.length != 10) {
-                etMobile.error = R.string.valid_mobile_number.toString()
+                etMobile.error = "Please enter a valid 10-digit mobile number"
                return false
            } else {
                userData.phoneNumber = mobile
@@ -233,7 +186,7 @@ class UserDetailsRegistrationFragment : Fragment() {

            val careOf = etCareof.text.toString()
            if (careOf.isEmpty()) {
-                etCareof.error = R.string.enter_father_husband_name.toString()
+                etCareof.error = "Please enter your name"
                return false
            } else {
                userData.careOf = careOf
@@ -241,43 +194,31 @@ class UserDetailsRegistrationFragment : Fragment() {

            val maritalStatus = etIsMarried.text.toString()
            if (maritalStatus.isEmpty()) {
-                etIsMarried.error = R.string.enter_marital_status.toString()
+                etIsMarried.error = "Please enter your marital status"
                return false
            } else {
                userData.maritalStatus = maritalStatus
            }

            val category = etCategory.text.toString()
-            val other = etOther.text.toString()
            if (category.isEmpty()) {
-                etCategory.error = R.string.enter_category.toString()
+                etCategory.error = "Please enter your caste"
                return false
-            } else if (category == "OTHER" && tilOther.isVisible) {
-                userData.category = other
            } else {
-                userData.category = category
+                userData.caste = category
            }

-            val caste = etCaste.text.toString()
-            val othercaste = etOthercaste.text.toString()
-            if (caste.isEmpty()) {
-                etCaste.error = R.string.enter_caste.toString()
-                return false
-            } else if (caste == "OTHER" && tilOthercaste.isVisible) {
-                userData.caste = othercaste
-            } else {
-                userData.caste = caste
-            }
-
-
            val subCaste = etSubCaste.text.toString()
-            if (subCaste.isNotEmpty()) {
+            if (subCaste.isEmpty()) {
+                etSubCaste.error = "Please enter your sub caste"
+                return false
+            } else {
                userData.subCaste = subCaste
            }

            val house = etHouse.text.toString()
            if (house.isEmpty()) {
-                etHouse.error = R.string.enter_house_address.toString()
+                etHouse.error = "Please enter your house address"
                return false
            } else {
                userData.house = house
@@ -285,7 +226,7 @@ class UserDetailsRegistrationFragment : Fragment() {

            val city = etCity.text.toString()
            if (city.isEmpty()) {
-                etCity.error = R.string.enter_city.toString()
+                etCity.error = "Please enter your city"
                return false
            } else {
                userData.city = city
@@ -293,7 +234,7 @@ class UserDetailsRegistrationFragment : Fragment() {

            val district = etDistrict.text.toString()
            if (district.isEmpty()) {
-                etDistrict.error = R.string.enter_district.toString()
+                etDistrict.error = "Please enter your district"
                return false
            } else {
                userData.district = district
@@ -301,7 +242,7 @@ class UserDetailsRegistrationFragment : Fragment() {

            val state = etState.text.toString()
            if (state.isEmpty()) {
-                etState.error = R.string.enter_state.toString()
+                etState.error = "Please enter your state"
                return false
            } else {
                userData.state = state
@@ -309,12 +250,19 @@ class UserDetailsRegistrationFragment : Fragment() {

            val pincode = etPincode.text.toString()
            if (pincode.isEmpty() || pincode.length != 6) {
-                etPincode.error = R.string.enter_pincode.toString()
+                etPincode.error = "Please enter a valid 6-digit pin code"
                return false
            } else {
                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()
@@ -322,7 +270,7 @@ class UserDetailsRegistrationFragment : Fragment() {
            if (yes1history.isChecked) {
                val familyHistory = etFamilyHistory.text.toString()
                if (familyHistory.isEmpty()) {
-                    etFamilyHistory.error = R.string.enter_family_history.toString()
+                    etFamilyHistory.error = "Please enter your family history"
                    return false
                }

@@ -335,8 +283,6 @@ class UserDetailsRegistrationFragment : Fragment() {

            return true

-
-
        }
    }

--- a/app/src/main/java/com/example/hposregistration/ui/viewmodels/RegistrationViewModel.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/viewmodels/RegistrationViewModel.kt
@@ -28,7 +28,7 @@ class RegistrationViewModel @Inject constructor(
    val fireBaseUpload = MutableLiveData<String>()

    fun addUserToDatabase(userData: UserData) = viewModelScope.launch {
-        val file = Uri.parse(userData.userImageURL)
+        val file = Uri.parse(userData.userImage)
        val storageRef = FirebaseStorage.getInstance().reference
        val imageRef = storageRef.child("${userData._id}/${file.lastPathSegment}")

@@ -39,7 +39,7 @@ class RegistrationViewModel @Inject constructor(
            }
            imageRef.downloadUrl
        }.addOnSuccessListener { uri ->
-            userData.userImageURL = uri.toString()
+            userData.userImage = uri.toString()
            addDataToFirebase(userData)
        }.addOnFailureListener { exception ->

--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+<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>
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,170 @@
+<?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>
--- a/app/src/main/res/drawable/ic_logout.xml
+++ b/app/src/main/res/drawable/ic_logout.xml
@@ -1,5 +0,0 @@
-<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>
--- a/app/src/main/res/drawable/sickle_cell_gov_logo.png
+++ b/app/src/main/res/drawable/sickle_cell_gov_logo.png
--- a/app/src/main/res/drawable/smi_logo.png
+++ b/app/src/main/res/drawable/smi_logo.png
--- a/app/src/main/res/layout/fragment_abha_registration.xml
+++ b/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="com.example.hposregistration.ui.fragments.registration.AbhaRegistrationFragment">
+    tools:context=".ui.fragments.registration.AbhaRegistrationFragment">

    <ScrollView
        android:layout_width="match_parent"
@@ -169,7 +169,8 @@
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:hint="@string/center_name"
-                    android:inputType="text" />
+                    android:inputType="text"
+                    android:maxLength="12" />
            </com.google.android.material.textfield.TextInputLayout>

            <TextView
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -1,145 +0,0 @@
-<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_toBottomOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/fragment_review_details_registration.xml
+++ b/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="com.example.hposregistration.ui.fragments.registration.ReviewDetailsRegistrationFragment">
+    tools:context=".ui.fragments.registration.ReviewDetailsRegistrationFragment">

    <ScrollView
        android:layout_width="match_parent"
@@ -125,16 +125,6 @@
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@id/tvCareOf" />

-            <TextView
-                android:id="@+id/tvCategory"
-                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/tvMaritalStatus" />
-
            <TextView
                android:id="@+id/tvCaste"
                style="@style/title1_1"
@@ -143,7 +133,7 @@
                android:textSize="16sp"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tvCategory" />
+                app:layout_constraintTop_toBottomOf="@id/tvMaritalStatus" />

            <TextView
                android:id="@+id/tvSubCaste"
--- a/app/src/main/res/layout/fragment_user_details_registration.xml
+++ b/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="com.example.hposregistration.ui.fragments.registration.UserDetailsRegistrationFragment">
+    tools:context=".ui.fragments.registration.UserDetailsRegistrationFragment">

    <ScrollView
        android:layout_width="match_parent"
@@ -48,62 +48,28 @@

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

-            <RadioGroup
-                android:id="@+id/gender"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:layout_marginHorizontal="24dp"
-                android:orientation="horizontal"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/til_yob">
-
-                <RadioButton
-                    android:id="@+id/male"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="10dp"
-                    android:text="@string/male"
-                    android:textSize="16sp" />
-
-                <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:visibility="gone"
-                android:id="@+id/til_othergender"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:layout_width="0dp"
+                android:id="@+id/til_gender"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginHorizontal="24dp"
                android:layout_marginTop="20dp"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/gender">
+                app:layout_constraintTop_toBottomOf="@id/til_yob">

-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/et_othergender"
+                <AutoCompleteTextView
+                    android:id="@+id/et_gender_block"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:hint="@string/other"
-                    android:inputType="text"
-                    android:maxLength="10" />
+                    android:hint="@string/gender"
+                    android:inputType="none"
+                    android:labelFor="@id/til_gender"
+                    app:simpleItems="@array/gender" />

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

-
            <com.google.android.material.textfield.TextInputLayout
                android:id="@+id/til_mobile"
                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
@@ -113,7 +79,7 @@
                android:layout_marginTop="20dp"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/til_othergender">
+                app:layout_constraintTop_toBottomOf="@id/til_gender">

                <com.google.android.material.textfield.TextInputEditText
                    android:id="@+id/et_mobile"
@@ -181,75 +147,13 @@
                    android:id="@+id/et_category"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:hint="@string/category"
-                    android:inputType="text"
-                    android:labelFor="@id/til_is_married"
+                    android:hint="@string/caste"
+                    android:inputType="none"
+                    android:labelFor="@id/til_category"
                    app:simpleItems="@array/category" />

            </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout
-                android:visibility="gone"
-                android:id="@+id/til_other"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="24dp"
-                android:layout_marginTop="20dp"
-                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_other"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/other"
-                    android:inputType="text"
-                    android:maxLength="10" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/til_caste"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="24dp"
-                android:layout_marginTop="20dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/til_other">
-
-                <AutoCompleteTextView
-                    android:id="@+id/et_Caste"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/caste"
-                    android:inputType="text"
-                    android:labelFor="@id/til_is_married"
-                    app:simpleItems="@array/caste" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout
-                android:visibility="gone"
-                android:id="@+id/til_othercaste"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="24dp"
-                android:layout_marginTop="20dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/til_caste">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/et_othercaste"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/other"
-                    android:inputType="text"
-                    android:maxLength="10" />
-
-            </com.google.android.material.textfield.TextInputLayout>
            <com.google.android.material.textfield.TextInputLayout
                android:id="@+id/til_subCaste"
                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
@@ -259,7 +163,7 @@
                android:layout_marginTop="16dp"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/til_othercaste">
+                app:layout_constraintTop_toBottomOf="@id/til_category">

                <com.google.android.material.textfield.TextInputEditText
                    android:id="@+id/et_subCaste"
@@ -390,38 +294,37 @@
                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/tv_title3" />
+                app:layout_constraintTop_toBottomOf="@id/til_blood_group" />

            <RadioGroup
                android:id="@+id/radioGroup"
@@ -451,7 +354,6 @@

            <TextView
                android:id="@+id/cb_item2"
-                style="@style/title1_2"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginHorizontal="24dp"
@@ -486,7 +388,6 @@
            </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"
--- a/app/src/main/res/layout/fragment_user_list.xml
+++ b/app/src/main/res/layout/fragment_user_list.xml
@@ -1,21 +1,12 @@
 <?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"
-    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>
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context=".ui.fragments.UserListFragment"
+    android:padding="24dp">
+
    <TextView
        android:id="@+id/tv_title"
        style="@style/title1"
@@ -29,12 +20,12 @@
    <TextView
        android:id="@+id/noList"
        style="@style/title1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        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:textColor="@color/red"
-        android:visibility="gone"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@@ -42,25 +33,14 @@

    <ImageView
        android:id="@+id/uploadData"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_margin="5dp"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
        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" />
-
    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/rv_order"
        android:layout_width="0dp"
@@ -70,20 +50,18 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/tv_title"
-        tools:listitem="@layout/user_item_view" />
+        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"
-        android:layout_margin="8dp"
-        android:backgroundTint="@color/primary"
-        android:contentDescription="@string/register_user"
-        android:src="@drawable/ic_add"
        app:elevation="1dp"
+        android:layout_margin="8dp"
+        android:src="@drawable/ic_add"
+        android:backgroundTint="@color/primary"
        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
-
-
+        app:layout_constraintEnd_toEndOf="parent"
+        android:contentDescription="@string/register_user" />

 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/user_item_view.xml
+++ b/app/src/main/res/layout/user_item_view.xml
@@ -1,80 +1,60 @@
 <?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">
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto">

    <androidx.cardview.widget.CardView
-        android:id="@+id/userCard"
+    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: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">
+        android:padding="12dp">

-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_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"
            android:layout_height="wrap_content"
-            android:padding="12dp">
+            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" />

-            <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" />
+        <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" />

-            <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.constraintlayout.widget.ConstraintLayout>

-            <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/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/userId"
-                tools:text="Test Status: Completed"/>
-
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </androidx.cardview.widget.CardView>
+</androidx.cardview.widget.CardView>

 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/mipmap-anydpi-v26/hpos_icon.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/hpos_icon.xml
@@ -1,5 +0,0 @@
-<?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>
--- a/app/src/main/res/mipmap-anydpi-v26/hpos_icon_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/hpos_icon_round.xml
@@ -1,5 +0,0 @@
-<?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>
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,6 @@
+<?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>
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,6 @@
+<?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>
--- a/app/src/main/res/mipmap-hdpi/hpos_icon.png
+++ b/app/src/main/res/mipmap-hdpi/hpos_icon.png
--- a/app/src/main/res/mipmap-hdpi/hpos_icon_foreground.png
+++ b/app/src/main/res/mipmap-hdpi/hpos_icon_foreground.png
--- a/app/src/main/res/mipmap-hdpi/hpos_icon_round.png
+++ b/app/src/main/res/mipmap-hdpi/hpos_icon_round.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
--- a/app/src/main/res/mipmap-mdpi/hpos_icon.png
+++ b/app/src/main/res/mipmap-mdpi/hpos_icon.png
--- a/app/src/main/res/mipmap-mdpi/hpos_icon_foreground.png
+++ b/app/src/main/res/mipmap-mdpi/hpos_icon_foreground.png
--- a/app/src/main/res/mipmap-mdpi/hpos_icon_round.png
+++ b/app/src/main/res/mipmap-mdpi/hpos_icon_round.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
--- a/app/src/main/res/mipmap-xhdpi/hpos_icon.png
+++ b/app/src/main/res/mipmap-xhdpi/hpos_icon.png
--- a/app/src/main/res/mipmap-xhdpi/hpos_icon_foreground.png
+++ b/app/src/main/res/mipmap-xhdpi/hpos_icon_foreground.png
--- a/app/src/main/res/mipmap-xhdpi/hpos_icon_round.png
+++ b/app/src/main/res/mipmap-xhdpi/hpos_icon_round.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
--- a/app/src/main/res/mipmap-xxhdpi/hpos_icon.png
+++ b/app/src/main/res/mipmap-xxhdpi/hpos_icon.png
--- a/app/src/main/res/mipmap-xxhdpi/hpos_icon_foreground.png
+++ b/app/src/main/res/mipmap-xxhdpi/hpos_icon_foreground.png
--- a/app/src/main/res/mipmap-xxhdpi/hpos_icon_round.png
+++ b/app/src/main/res/mipmap-xxhdpi/hpos_icon_round.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
--- a/app/src/main/res/mipmap-xxxhdpi/hpos_icon.png
+++ b/app/src/main/res/mipmap-xxxhdpi/hpos_icon.png
--- a/app/src/main/res/mipmap-xxxhdpi/hpos_icon_foreground.png
+++ b/app/src/main/res/mipmap-xxxhdpi/hpos_icon_foreground.png
--- a/app/src/main/res/mipmap-xxxhdpi/hpos_icon_round.png
+++ b/app/src/main/res/mipmap-xxxhdpi/hpos_icon_round.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
--- a/app/src/main/res/navigation/main_nav_graph.xml
+++ b/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/loginFragment">
+    app:startDestination="@id/userListFragment">

    <fragment
        android:id="@+id/registrationFragment"
@@ -26,11 +26,6 @@
        <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"
@@ -81,16 +76,4 @@
            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>
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -1,206 +0,0 @@
-<resources>
-    <string name="app_name">HPOS रजिस्ट्रेशन</string>
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">नमस्ते खाली फ़्रेग्मेंट</string>
-
-    <!-- त्रुटि संदेश -->
-    <string name="retry">पुनः प्रयास करें</string>
-    <string name="failed_to_connect">कनेक्ट करने में विफल</string>
-    <string name="cancel">रद्द करें</string>
-
-    <!-- पंजीकरण स्क्रीनें -->
-    <string name="scan_person_abha_id_card">व्यक्ति का ABHA ID/Aadhar ID कार्ड स्कैन करें</string>
-    <string name="scan_now">अब स्कैन करें</string>
-    <string name="or">या</string>
-    <string name="enter_abha_number_manualy">ABHA और Aadhar नंबर दर्ज करें</string>
-    <string name="abha_id">ABHA नंबर</string>
-    <string name="create_abha_id_card">ABHA ID कार्ड बनाएं</string>
-    <string name="click_here">यहां क्लिक करें</string>
-    <string name="scan_person_s_aadhaar_card">व्यक्ति का Aadhaar कार्ड स्कैन करें</string>
-    <string name="proceed">आगे बढ़ें</string>
-    <string name="enter_aadhaar_number_manualy">Aadhaar नंबर मैन्युअली दर्ज करें</string>
-    <string name="aadhaar_number">Aadhaar नंबर</string>
-    <string name="enter_person_s_details">व्यक्ति का विवरण दर्ज करें</string>
-    <string name="person_s_name">व्यक्ति का नाम</string>
-    <string name="age">आयु (वर्षों में)</string>
-    <string name="gender">लिंग चयन करें</string>
-    <string name="name_error">नाम खाली नहीं हो सकता</string>
-    <string name="age_error">आयु खाली नहीं हो सकती</string>
-    <string name="gender_error">लिंग खाली नहीं हो सकता</string>
-    <string name="age_error_out_of_bound">आयु मान्य होनी चाहिए</string>
-    <string name="birth_year">जन्म साल</string>
-    <string name="marital_status">वैवाहिक स्थिति चयन करें</string>
-    <string name="father_s_husband_s_name">पिता/पति का नाम</string>
-    <string name="caste">जाति</string>
-    <string name="person_s_address_details">व्यक्ति का पता विवरण</string>
-    <string name="district">जिला</string>
-    <string name="city_town">शहर / गाँव</string>
-    <string name="state">राज्य</string>
-    <string name="pincode">पिनकोड</string>
-    <string name="patient_medical_records">रोगी का चिकित्सा रेकॉर्ड</string>
-    <string name="review">समीक्षा</string>
-    <string name="blood_group">रक्त समूह चयन करें</string>
-    <string name="house">घर</string>
-    <string name="is_patient_under_any_medication">क्या आप पिछले तीन महीनों से सिक्ल सेल के लिए दवा ले रहे हैं?</string>
-    <string name="is_patient_undergoing_any_blood_transfusion">क्या आपने पिछले तीन महीनों में कोई रक्त प्रवाहन किया है?</string>
-
-    <string name="user_list">उपयोगकर्ता सूची</string>
-    <string name="register_user">उपयोगकर्ता पंजीकृत करें</string>
-    <string name="is_user_having_any_family_history_for_sickle_cell">क्या उपयोगकर्ता के पास सिक्ल सेल के लिए कोई परिवार का इतिहास है?</string>
-    <string name="family_history_of_sickle_cell">सिक्ल सेल का परिवारिक इतिहास</string>
-    <string name="mobile_number_10_digits">मोबाइल नंबर (10 अंक)</string>
-    <string name="sub_caste">उपजाति</string>
-    <string name="capture_user_image">उपयोगकर्ता की छवि कैद करें</string>
-    <string name="mobile_number">मोबाइल नंबर</string>
-    <string name="edit">संपादित करें</string>
-    <string name="user_details">उपयोगकर्ता विवरण</string>
-    <string name="internet_is_not_available_and_there_is_no_data_available_in_local_db">इंटरनेट उपलब्ध नहीं है और स्थानीय डेटाबेस में कोई डेटा उपलब्ध नहीं है</string>
-    <string name="user_id">उपयोगकर्ता आईडी: %1$s</string>
-    <string name="abha_number">ABHA नंबर: %1$s</string>
-    <string name="aadhar_number_details">Aadhar नंबर: %1$s</string>
-    <string name="user_name">व्यक्ति का नाम: %1$s</string>
-    <string name="birth_year_details">जन्म साल: %1$s</string>
-    <string name="gender_details">लिंग: %1$s</string>
-    <string name="phone_number_details">मोबाइल नंबर: %1$s</string>
-    <string name="care_of_details">पिता/पति का नाम: %1$s</string>
-    <string name="marital_status_details">वैवाहिक स्थिति: %1$s</string>
-    <string name="category_details">श्रेणी: %1$s</string>
-    <string name="caste_details">जाति: %1$s</string>
-    <string name="sub_caste_details">उपजाति: %1$s</string>
-    <string name="house_details">घर: %1$s</string>
-    <string name="city_town_details">शहर/गाँव: %1$s</string>
-    <string name="district_details">जिला: %1$s</string>
-    <string name="state_details">राज्य: %1$s</string>
-    <string name="centre_name">केंद्र का नाम: %1$s</string>
-
-    <string name="pincode_details">पिनकोड: %1$s</string>
-    <string name="is_patient_under_any_medication_details">क्या दवा ले रहे हैं: %1$s</string>
-    <string name="is_patient_undergoing_any_blood_transfusion_details">क्या रक्त प्रवाहन हो रहा है: %1$s</string>
-    <string name="is_any_sickle">क्या कोई सिक्ल सेल इतिहास है: %1$s</string>
-    <string name="sickle_cell_family_history">सिक्ल सेल परिवारिक इतिहास: %1$s</string>
-    <string name="center_name">केंद्र का नाम</string>
-    <string name="login_id">लॉगिन आईडी</string>
-    <string name="password">पासवर्ड</string>
-    <string name="login">लॉगिन</string>
-    <string name="_2">श्रेणी</string>
-    <string name="category">श्रेणी</string>
-    <string name="male">पुरुष</string>
-    <string name="female">महिला</string>
-    <string name="other">अन्य</string>
-    <string name="cancelled_unable_scan">रद्द किया गया: स्कैन करने में असमर्थ, पुनः प्रयास करें!!</string>
-    <string name="scan_abha_card">कृपया एबीए आईडी / आधार आईडी स्कैन करें</string>
-    <string name="invalid_qr_code">आपने स्कैन किया हुआ QR कोड अमान्य है, कृपया डेटा मैन्युअली दर्ज करें</string>
-    <string name="enter_aadhar_manually">आपने एबीए आईडी स्कैन किया है, आधार आईडी को मैन्युअली दर्ज करने की आवश्यकता है</string>
-    <string name="invalid_abha_id">अमान्य एबीए आईडी</string>
-    <string name="invalid_aadhar_id">अमान्य आधार आईडी</string>
-    <string name="name_field_error">नाम फील्ड खाली नहीं हो सकती या 3 अक्षरों से कम होनी चाहिए</string>
-    <string name="center_name_error">केंद्र का नाम खाली नहीं हो सकता या 3 अक्षरों से कम होना चाहिए</string>
-    <string name="registration_success">पंजीकरण सफलतापूर्वक हुआ</string>
-    <string name="internt_not_local">इंटरनेट उपलब्ध नहीं है, परीक्षण विवरण स्थानीय रूप से संग्रहित किए गए हैं</string>
-    <string name="enter_details_properly">कृपया सभी विवरणों को ठीक से दर्ज करें</string>
-    <string name="enter_valid_birth_year">कृपया 1900 से 2023 के बीच एक मान्य जन्म वर्ष दर्ज करें</string>
-    <string name="fill_field">कृपया फ़ील्ड भरें</string>
-    <string name="valid_mobile_number">कृपया एक मान्य 10-अंकों का मोबाइल नंबर दर्ज करें</string>
-    <string name="enter_name">कृपया अपना नाम दर्ज करें</string>
-    <string name="enter_marital_status">कृपया अपनी वैवाहिक स्थिति दर्ज करें</string>
-    <string name="enter_category">कृपया अपनी श्रेणी दर्ज करें</string>
-    <string name="enter_caste">कृपया अपनी जाति दर्ज करें</string>
-    <string name="enter_house_address">कृपया अपना घर का पता दर्ज करें</string>
-    <string name="enter_city">कृपया अपने शहर को दर्ज करें</string>
-    <string name="enter_district">कृपया अपने जिले को दर्ज करें</string>
-    <string name="enter_state">कृपया अपने राज्य को दर्ज करें</string>
-    <string name="enter_pincode">कृपया एक मान्य 6-अंकों कोड दर्ज करें</string>
-    <string name="enter_family_history">कृपया अपना परिवार का इतिहास दर्ज करें</string>
-    <string name="enter_guardian_name">कृपया अपने पालक का नाम दर्ज करें</string>
-    <string name="enter_father_husband_name">पिता / पति का नाम दर्ज करें</string>
-    <string name="do_log_out">क्या आप ऐप्लिकेशन से लॉग आउट करना चाहते हैं?</string>
-    <string name="log_out">लॉग आउट</string>
-
-    <string name="upload_db_registration">डीबी पंजीकरण अपलोड करें</string>
-    <string name="upload_local_db_to_cloud">क्या आप स्थानीय डीबी को क्लाउड पर अपलोड करना चाहते हैं?</string>
-    <string name="upload">अपलोड</string>
-    <string name="upload_done_successfully">अपलोड सफलतापूर्वक हुआ</string>
-
-    <string name="enter_proper_login_id">कृपया सही लॉगिन आईडी दर्ज करें</string>
-    <string name="enter_proper_password">कृपया सही पासवर्ड दर्ज करें</string>
-    <string name="wrong_password">गलत पासवर्ड</string>
-    <string name="wrong_user_id">गलत उपयोगकर्ता आईडी</string>
-    <string name="scanned_aadhar_id">आपने आधार आईडी स्कैन की है, कृपया आधार आईडी नंबर और अभा आईडी को मैन्युअली दर्ज करें</string>
-    <string name="scanned_abha_id">आपने आभा आईडी स्कैन की है</string>
-    <string name="scanned_aadharid">आपने आधार आईडी स्कैन की है</string>
-
-    <string-array name="category">
-        <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>अहीर</item>
-        <item>बराई</item>
-        <item>ब्राह्मण</item>
-        <item>बौद्ध</item>
-        <item>चांब़चार</item>
-        <item>चामार</item>
-        <item>देवांगन</item>
-        <item>धीवर</item>
-        <item>फुलमाली</item>
-        <item>गोंड</item>
-        <item>जैन</item>
-        <item>कोली</item>
-        <item>कोष्टी</item>
-        <item>कुंभार</item>
-        <item>कुंबी</item>
-        <item>लोहार</item>
-        <item>माळी</item>
-        <item>माणा</item>
-        <item>महार</item>
-        <item>मौर्या</item>
-        <item>मुसलमान</item>
-        <item>नवी</item>
-        <item>अन्य</item>
-        <item>पवार</item>
-        <item>परदेसी</item>
-        <item>शाहू</item>
-        <item>सोनार</item>
-        <item>तेली</item>
-    </string-array>
-
-
-    <string-array name="marital_status">
-        <item>विवाहित</item>
-        <item>एकत्र</item>
-        <item>तलाकशुदा</item>
-    </string-array>
-
-
-    <string-array name="blood_group">
-        <item>O+ve</item>
-        <item>O-ve</item>
-        <item>A+ve</item>
-        <item>A-ve</item>
-        <item>B+ve</item>
-        <item>B-ve</item>
-        <item>AB+ve</item>
-        <item>AB-ve</item>
-    </string-array>
-
-    <string-array name="gender">
-        <item>पुरुष</item>
-        <item>महिला</item>
-        <item>अन्य</item>
-    </string-array>
-
-    <string-array name="yes_no">
-        <item>हाँ</item>
-        <item>नहीं</item>
-    </string-array>
-
-</resources>
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -1,211 +0,0 @@
-<resources>
-    <string name="app_name">HPOS ನೋಂದಾಯಿಸಲು</string>
-    <string name="hello_blank_fragment">ಹಲೋ ಖಾಲಿ ಫ್ರ್ಯಾಗ್ಮೆಂಟ್</string>
-
-    // ದೋಷ ಸಂದೇಶಗಳು
-    <string name="retry">ಮರುಪ್ರಯಾಸ</string>
-    <string name="failed_to_connect">ಸಂಪರ್ಕ ಸಾಧಿಸಲಾಗಿಲ್ಲ</string>
-    <string name="cancel">ರದ್ದು ಮಾಡಿ</string>
-
-
-    //Registration Screens
-    <string name="scan_person_abha_id_card">ವ್ಯಕ್ತಿಯ ಏಬಿಎ ಐಡಿ / ಆಧಾರ್ ಐಡಿ ಕಾರ್ಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
-    <string name="scan_now">ಈಗ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
-    <string name="or">ಅಥವಾ</string>
-    <string name="enter_abha_number_manualy">ಏಬಿಎ ಮತ್ತು ಆಧಾರ್ ಸಂಖ್ಯೆಗಳನ್ನು ಕೈಮಾಡಿ</string>
-    <string name="abha_id">ಏಬಿಎ ಸಂಖ್ಯೆ</string>
-    <string name="create_abha_id_card">ಏಬಿಎ ಐಡಿ ಕಾರ್ಡ್ ರಚಿಸಿ</string>
-    <string name="click_here">ಇಲ್ಲಿ ಕ್ಲಿಕ್ ಮಾಡಿ</string>
-    <string name="scan_person_s_aadhaar_card">ವ್ಯಕ್ತಿಯ ಆಧಾರ್ ಕಾರ್ಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
-    <string name="proceed">ಮುಂದುವರಿಸಿ</string>
-    <string name="enter_aadhaar_number_manualy">ಆಧಾರ್ ಸಂಖ್ಯೆಯನ್ನು ಕೈಮಾಡಿ</string>
-    <string name="aadhaar_number">ಆಧಾರ್ ಸಂಖ್ಯೆ</string>
-    <string name="enter_person_s_details">ವ್ಯಕ್ತಿಯ ವಿವರಗಳನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="person_s_name">ವ್ಯಕ್ತಿಯ ಹೆಸರು</string>
-    <string name="age">ವಯಸ್ಸು ವರ್ಷಗಳಲ್ಲಿ</string>
-    <string name="gender">ಲಿಂಗ ಆಯ್ಕೆ ಮಾಡಿ</string>
-    <string name="name_error">ಹೆಸರು ಖಾಲಿ ಇರಬಾರದು</string>
-    <string name="age_error">ವಯಸ್ಸು ಖಾಲಿ ಇರಬಾರದು</string>
-    <string name="gender_error">ಲಿಂಗ ಖಾಲಿ ಇರಬಾರದು</string>
-    <string name="age_error_out_of_bound">ವಯಸ್ಸು ಯೋಗ್ಯವಾಗಿರಬೇಕು</string>
-    <string name="birth_year">ಹುಟ್ಟಿದ ವರ್ಷ</string>
-    <string name="marital_status">ವೈವಾಹಿಕ ಸ್ಥಿತಿ ಆಯ್ಕೆ ಮಾಡಿ</string>
-    <string name="father_s_husband_s_name">ತಂದೆಯ / ಗಂಡನ ಹೆಸರು</string>
-    <string name="caste">ಜಾತಿ</string>
-    <string name="person_s_address_details">ವ್ಯಕ್ತಿಯ ವಿಳಾಸ ವಿವರಗಳು</string>
-    <string name="district">ಜಿಲ್ಲೆ</string>
-    <string name="city_town">ನಗರ / ಹಳ್ಳಿ</string>
-    <string name="state">ರಾಜ್ಯ</string>
-    <string name="pincode">ಪಿನ್‌ಕೋಡ್</string>
-    <string name="patient_medical_records">ರೋಗಿಯ ವೈದ್ಯಕೀಯ ದಾಖಲೆಗಳು</string>
-    <string name="review">ಸಮೀಕ್ಷಿಸಿ</string>
-    <string name="blood_group">ರಕ್ತ ಗುಂಪು ಆಯ್ಕೆ ಮಾಡಿ</string>
-    <string name="house">ಮನೆ</string>
-    <string name="is_patient_under_any_medication">ಹಳೆಯ ಮೂಲಕ ಸಿಕ್ಕಲ್ ಸೆಲ್ ಗೆ ನೀವು ಔಷಧಿಗೆ ಒಳಪಟ್ಟಿದ್ದೀರಾ?</string>
-    <string name="is_patient_undergoing_any_blood_transfusion">ಹಳೆಯ ಮೂಲಕ ರಕ್ತ ಸಂಚಾರ ನಡೆಸಲಾಗಿದೆಯೇ?</string>
-
-
-    <string name="user_list">ಬಳಕೆದಾರ ಪಟ್ಟಿ</string>
-    <string name="register_user">ಬಳಕೆದಾರ ನೋಂದಣಿ</string>
-    <string name="is_user_having_any_family_history_for_sickle_cell">ಬಳಕೆದಾರನಿಗೆ ಸಿಕ್ಕಲ್ ಸೆಲ್ ಕುಟುಂಬ ಇತಿಹಾಸವಿದೆಯೇ</string>
-    <string name="family_history_of_sickle_cell">ಸಿಕ್ಕಲ್ ಸೆಲ್ ಕುಟುಂಬ ಇತಿಹಾಸ</string>
-    <string name="mobile_number_10_digits">ಮೊಬೈಲ್ ಸಂಖ್ಯೆ (10 ಅಂಕಗಳು)</string>
-    <string name="sub_caste">ಉಪ ಜಾತಿ</string>
-    <string name="capture_user_image">ಬಳಕೆದಾರ ಚಿತ್ರ ಹಿಡಿಯಿರಿ</string>
-    <string name="mobile_number">ಮೊಬೈಲ್ ಸಂಖ್ಯೆ</string>
-    <string name="edit">ಸಂಪಾದಿಸಿ</string>
-    <string name="user_details">ಬಳಕೆದಾರ ವಿವರಗಳು</string>
-    <string name="internet_is_not_available_and_there_is_no_data_available_in_local_db">ಇಂಟರ್ನೆಟ್ ಲಭ್ಯವಿಲ್ಲ ಮತ್ತು ಸ್ಥಳಿಯ ಡಿಬಿಯಲ್ಲಿ ಯಾವುದೇ ಡೇಟಾ ಲಭ್ಯವಿಲ್ಲ</string>
-    <string name="user_id">ಬಳಕೆದಾರ ಐಡಿ: %1$s</string>
-    <string name="abha_number">ಆಭಾ ಸಂಖ್ಯೆ: %1$s</string>
-    <string name="aadhar_number_details">ಆಧಾರ ಸಂಖ್ಯೆ: %1$s</string>
-    <string name="user_name">ವ್ಯಕ್ತಿಯ ಹೆಸರು: %1$s</string>
-    <string name="birth_year_details">ಹುಟ್ಟಿದ ವರ್ಷ: %1$s</string>
-    <string name="gender_details">ಲಿಂಗ: %1$s</string>
-    <string name="phone_number_details">ಮೊಬೈಲ್ ಸಂಖ್ಯೆ: %1$s</string>
-    <string name="care_of_details">ತಂದೆಯ / ಗಂಡನ ಹೆಸರು: %1$s</string>
-    <string name="marital_status_details">ವೈವಾಹಿಕ ಸ್ಥಿತಿ: %1$s</string>
-    <string name="category_details">ವರ್ಗ: %1$s</string>
-    <string name="caste_details">ಜಾತಿ: %1$s</string>
-    <string name="sub_caste_details">ಉಪ ಜಾತಿ: %1$s</string>
-    <string name="house_details">ಮನೆ: %1$s</string>
-    <string name="city_town_details">ನಗರ / ಹಳ್ಳಿ: %1$s</string>
-    <string name="district_details">ಜಿಲ್ಲೆ: %1$s</string>
-    <string name="state_details">ರಾಜ್ಯ: %1$s</string>
-    <string name="centre_name">ಕೇಂದ್ರ ಹೆಸರು: %1$s</string>
-
-
-    <string name="pincode_details">ಪಿನ್‌ಕೋಡ್: %1$s</string>
-    <string name="is_patient_under_any_medication_details">ಔಷಧಿಗಳ ಕೆಳಗೆ ಇದ್ದಾರೆ: %1$s</string>
-    <string name="is_patient_undergoing_any_blood_transfusion_details">ರಕ್ತ ಸಂರಚನೆಯಲ್ಲಿ ಇದ್ದಾರೆ: %1$s</string>
-    <string name="is_any_sickle">ಯಾವುದೇ ಸಿಕ್ಕಲ್ ಸೆಲ್ ಇತಿಹಾಸವಿದೆಯೇ: %1$s</string>
-    <string name="sickle_cell_family_history">ಸಿಕ್ಕಲ್ ಸೆಲ್ ಕುಟುಂಬ ಇತಿಹಾಸ: %1$s</string>
-    <string name="center_name">ಕೇಂದ್ರ ಹೆಸರು</string>
-    <string name="login_id">ಲಾಗಿನ್ ಐಡಿ</string>
-    <string name="password">ಪಾಸ್‌ವರ್ಡ್</string>
-    <string name="login">ಲಾಗಿನ್</string>
-    <string name="_2">ವರ್ಗ</string>
-    <string name="category">ವರ್ಗ</string>
-    <string name="male">ಗಂಡು</string>
-    <string name="female">ಹೆಣ್ಣು</string>
-    <string name="other">ಇತರ</string>
-
-
-    <string name="cancelled_unable_scan">ರದ್ದು ಮಾಡಲಾಗಿದೆ: ಸ್ಕ್ಯಾನ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ, ಮತ್ತೊಮ್ಮೆ ಪ್ರಯಾಸಿಸಿ!!</string>
-    <string name="scan_abha_card">ದಯವಿಟ್ಟು ಆಭಾ ಐಡಿ / ಆಧಾರ್ ಐಡಿ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
-    <string name="invalid_qr_code">ನೀವು ಸ್ಕ್ಯಾನ್ ಮಾಡಿದ QR ಕೋಡ್ ಮಾನ್ಯವಿಲ್ಲ, ದಯವಿಟ್ಟು ಮಾಹಿತಿಯನ್ನು ಕೈಮಾಡಿ ನಮೂದಿಸಿ</string>
-    <string name="enter_aadhar_manually">ನೀವು ಅಬ ಹಾ ಐಡಿ ಸ್ಕ್ಯಾನ್ ಮಾಡಿದ್ದೀರಿ, ಆಧಾರ್ ಐಡಿ ಅನ್ನು ಕೈಮಾತ್ರ ನಮೂದಿಸಿ</string>
-    <string name="invalid_abha_id">ಅಮಾನ್ಯವಾದ ಅಬ ಹಾ ಐಡಿ</string>
-    <string name="invalid_aadhar_id">ಅಮಾನ್ಯವಾದ ಆಧಾರ್ ಐಡಿ</string>
-    <string name="name_field_error">ಹೆಸರು ಕ್ಷೇತ್ರವು ಖಾಲಿ ಇರಲಾರದು ಅಥವಾ 3 ಅಕ್ಷರಗಳಿಂದ ಕಡಿಮೆ ಇರಲಾರದು</string>
-    <string name="center_name_error">ಕೇಂದ್ರದ ಹೆಸರು ಖಾಲಿ ಇರಲಾರದು ಅಥವಾ 3 ಅಕ್ಷರಗಳಿಂದ ಕಡಿಮೆ ಇರಲಾರದು</string>
-    <string name="registration_success">ಯಶಸ್ವಿಯಾಗಿ ನೋಂದಾಯಿಸಲಾಗಿದೆ</string>
-    <string name="internt_not_local">ಇಂಟರ್ನೆಟ್ ಲಭ್ಯವಿಲ್ಲ, ಪರೀಕ್ಷೆ ವಿವರಗಳನ್ನು ಸ್ಥಾನಿಕವಾಗಿ ಉಳಿಸಲಾಗಿದೆ</string>
-    <string name="enter_details_properly">ದಯವಿಟ್ಟು ಎಲ್ಲಾ ವಿವರಗಳನ್ನು ಸರಿಯಾಗಿ ನಮೂದಿಸಿ</string>
-    <string name="enter_valid_birth_year">ದಯವಿಟ್ಟು 1900 ಮತ್ತು 2023 ನ ನಡುವೆ ಒಂದು ವಾಸಿಸುವ ತಾರೀಖು ನಮೂದಿಸಿ</string>
-    <string name="fill_field">ದಯವಿಟ್ಟು ಕ್ಷೇತ್ರವನ್ನು ನಿರೂಪಿಸಿ</string>
-    <string name="valid_mobile_number">ದಯವಿಟ್ಟು ಒಂದು ಮಾನ್ಯವಾದ 10 ಅಂಕದ ಮೊಬೈಲ್ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="enter_name">ದಯವಿಟ್ಟು ನಿಮ್ಮ ಹೆಸರನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="enter_marital_status">ದಯವಿಟ್ಟು ನಿಮ್ಮ ವೈವಾಹಿಕ ಸ್ಥಿತಿಯನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="enter_category">ದಯವಿಟ್ಟು ನಿಮ್ಮ ವರ್ಗವನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="enter_caste">ದಯವಿಟ್ಟು ನಿಮ್ಮ ಜಾತಿಯನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="enter_house_address">ದಯವಿಟ್ಟು ನಿಮ್ಮ ಮನೆಯ ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="enter_city">ದಯವಿಟ್ಟು ನಿಮ್ಮ ನಗರವನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="enter_district">ದಯವಿಟ್ಟು ನಿಮ್ಮ ಜಿಲ್ಲೆಯನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="enter_state">ದಯವಿಟ್ಟು ನಿಮ್ಮ ರಾಜ್ಯವನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="enter_pincode">ದಯವಿಟ್ಟು ಒಂದು ಮಾನ್ಯ ಆರು-ಅಂಕ ಪಿನ್‌ಕೋಡ್ ನಮೂದಿಸಿ</string>
-    <string name="enter_family_history">ದಯವಿಟ್ಟು ನಿಮ್ಮ ಕುಟುಂಬದ ಇತಿಹಾಸವನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="enter_guardian_name">ದಯವಿಟ್ಟು ನಿಮ್ಮ ಅಭಿಭಾವಕರ ಹೆಸರನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="enter_father_husband_name">ದಯವಿಟ್ಟು ನಿಮ್ಮ ತಂದೆ / ಗಂಡನ ಹೆಸರನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="do_log_out">ನೀವು ಅಪ್ಲಿಕೇಶನ್ ನಿಂದ ಲಾಗೌಟ್ ಮಾಡಲು ಇಚ್ಛಿಸುತ್ತೀರಾ?</string>
-    <string name="log_out">ಲಾಗೌಟ್</string>
-
-    <string name="upload_db_registration">ಡಿಬಿ ನೋಂದಾಯಿಸುವ ಕೊರಕು</string>
-    <string name="upload_local_db_to_cloud">ನೀವು ಲೋಕಲ್ ಡಿಬಿ ನೋಂದಾಯಿಸನ್ನು ಮೇಘಮಾರ್ಗಕ್ಕೆ ಅಪ್ಲೋಡ್ ಮಾಡಲು ಇಚ್ಛಿಸುವಿರಾ?</string>
-    <string name="upload">ಅಪ್ಲೋಡ್</string>
-    <string name="upload_done_successfully">ಅಪ್ಲೋಡ್ ಯಶಸ್ವಿಯಾಗಿ ನಡೆಯಿತು</string>
-    <string name="enter_proper_login_id">ದಯವಿಟ್ಟು ಸರಿಯಾದ ಲಾಗಿನ್ ಐಡಿ ನಮೂದಿಸಿ</string>
-    <string name="enter_proper_password">ದಯವಿಟ್ಟು ಸರಿಯಾದ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸಿ</string>
-    <string name="wrong_password">ತಪ್ಪಾದ ಪಾಸ್‌ವರ್ಡ್</string>
-    <string name="wrong_user_id">ತಪ್ಪಾದ ಬಳಕೆದಾರ ಐಡಿ</string>
-    <string name="scanned_aadhar_id">ನೀವು ಆಧಾರ್ ಐಡನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿದ್ದೀರಿ, ದಯವಿಟ್ಟು ಆಧಾರ್ ಐಡನ್ನು ನೀವು ಸ್ಕ್ಯಾನ್ ಮಾಡಿದ ಮತ್ತು ಅಭಾ ಐಡನ್ನು ಕೈಯಾರೆ ನಮೂದಿಸಿ</string>
-
-    <string name="scanned_abha_id">ನೀವು ಅಭಾ ಐಡನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿದಿರಿ</string>
-    <string name="scanned_aadharid">ನೀವು ಆಧಾರ್ ಐಡನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿದಿರಿ</string>
-
-
-    <string-array name="yes_no">
-        <item>ಹೌದು</item>
-        <item>ಇಲ್ಲ</item>
-    </string-array>
-
-    <string-array name="category">
-        <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>ಅಹೀರ್</item>
-        <item>ಬರಾಯಿ</item>
-        <item>ಬ್ರಾಹ್ಮಣ</item>
-        <item>ಬೌದ್ಧ</item>
-        <item>ಚಾಂಭಾರ್</item>
-        <item>ಚಾಮಾರ್</item>
-        <item>ದೇವಾಂಗನ್</item>
-        <item>ಧಿವರ್</item>
-        <item>ಫುಲ್ಮಾಲಿ</item>
-        <item>ಗೊಂಡ್</item>
-        <item>ಜೈನ್</item>
-        <item>ಕೊಲಿ</item>
-        <item>ಕೊಶ್ತಿ</item>
-        <item>ಕುಂಭಾರ</item>
-        <item>ಕುಂಬಿ</item>
-        <item>ಲೊಹರ್</item>
-        <item>ಮಾಳಿ</item>
-        <item>ಮಣ್ಣ</item>
-        <item>ಮಹಾರ್</item>
-        <item>ಮೌರ್ಯ</item>
-        <item>ಮಸ್ಲಿಮ್</item>
-        <item>ನಾವಿ</item>
-        <item>ಇತರ</item>
-        <item>ಪವಾರ್</item>
-        <item>ಪರ್ದೇಶಿ</item>
-        <item>ಶಾಹು</item>
-        <item>ಸೋನಾರ್</item>
-        <item>ತೆಲಿ</item>
-    </string-array>
-
-    <string-array name="marital_status">
-        <item>ವಿವಾಹಿತ</item>
-        <item>ಅವಿವಾಹಿತ</item>
-        <item>ವಿವಾಹ ವಿಚ್ಛೇದ</item>
-    </string-array>
-
-
-    <string-array name="blood_group">
-        <item>O+ve</item>
-        <item>O-ve</item>
-        <item>A+ve</item>
-        <item>A-ve</item>
-        <item>B+ve</item>
-        <item>B-ve</item>
-        <item>AB+ve</item>
-        <item>AB-ve</item>
-    </string-array>
-
-    <string-array name="gender">
-        <item>ಗಂಡು</item>
-        <item>ಹೆಣ್ಣು</item>
-        <item>ಇತರ</item>
-    </string-array>
-
-
-</resources>
--- a/app/src/main/res/values/hpos_icon_background.xml
+++ b/app/src/main/res/values/hpos_icon_background.xml
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="hpos_icon_background">#FFFFFF</color>
-</resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,11 +8,6 @@
    <string name="failed_to_connect">Failed to connect</string>
    <string name="cancel">Cancel</string>

-    <string-array name="yes_no">
-        <item>Yes</item>
-        <item>No</item>
-    </string-array>
-
    //Registration Screens
    <string name="scan_person_abha_id_card">Scan Person ABHA ID/Aadhar ID Card</string>
    <string name="scan_now">Scan Now</string>
@@ -36,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">Caste</string>
+    <string name="caste">Select 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>
@@ -46,8 +41,8 @@
    <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">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="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="user_list">User List</string>
    <string name="register_user">Register User</string>
@@ -69,7 +64,6 @@
    <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>
@@ -84,101 +78,15 @@
    <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 name="cancelled_unable_scan">Cancelled: Unable to scan, Try Again!!</string>
-    <string name="scan_abha_card">Please Scan the Abha ID/Aadhar ID</string>
-    <string name="invalid_qr_code">The QR Code you have scanned is not valid, enter the data manually</string>
-    <string name="enter_aadhar_manually">You have scanned the Abha ID, need to enter Aadhar ID manually</string>
-    <string name="invalid_abha_id">Invalid Abha ID</string>
-    <string name="invalid_aadhar_id">Invalid Aadhar ID</string>
-    <string name="name_field_error">Name field can\'t be empty or less than 3 characters</string>
-    <string name="center_name_error">Center name can\'t be empty or less than 3 characters</string>
-    <string name="registration_success">Registration Done Successfully</string>
-    <string name="internt_not_local">Internet not available, test details stored locally</string>
-    <string name="enter_details_properly">Please enter all the details properly</string>
-    <string name="enter_valid_birth_year">Please enter a valid birth year between 1900 and 2023</string>
-    <string name="fill_field">Please fill the field</string>
-    <string name="valid_mobile_number">Please enter a valid 10-digit mobile number</string>
-    <string name="enter_name">Please enter your name</string>
-    <string name="enter_marital_status">Please enter your marital status</string>
-    <string name="enter_category">Please enter your category</string>
-    <string name="enter_caste">Please enter your caste</string>
-    <string name="enter_house_address">Please enter your house address</string>
-    <string name="enter_city">Please enter your city</string>
-    <string name="enter_district">Please enter your district</string>
-    <string name="enter_state">Please enter your state</string>
-    <string name="enter_pincode">Please enter a valid 6-digit pin code</string>
-    <string name="enter_family_history">Please enter your family history</string>
-    <string name="enter_guardian_name">Please enter your guardian name</string>
-    <string name="enter_father_husband_name">enter father/husband name</string>
-    <string name="do_log_out">Do you want to LogOut the Application?</string>
-    <string name="log_out">Log Out</string>
-    <string name="upload_db_registration">Upload DB Registration</string>
-    <string name="upload_local_db_to_cloud">Do you want to upload the local DB Registration to the cloud?</string>
-    <string name="upload">Upload</string>
-    <string name="upload_done_successfully">Upload done successfully</string>
-
-    <string name="enter_proper_login_id">Please enter a proper Login ID</string>
-    <string name="enter_proper_password">Please enter a proper password</string>
-    <string name="wrong_password">Wrong Password</string>
-    <string name="wrong_user_id">Wrong UserID</string>
-
-    <string name="scanned_aadhar_id">You have scanned the Aadhar ID, need to enter Aadhar ID number you have scanned and Abha ID manually</string>
-    <string name="scanned_abha_id">You have scanned the Abha ID</string>
-    <string name="scanned_aadharid">You have scanned the Aadhar ID</string>

    <string-array name="category">
-        <item>NT-A</item>
-        <item>NT-B</item>
-        <item>NT-C</item>
-        <item>NT-D</item>
+        <item>GEN</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>
--- a/build.gradle
+++ b/build.gradle
@@ -3,8 +3,7 @@ plugins {
    id 'com.android.application' version '8.0.2' apply false
    id 'com.android.library' version '8.0.2' apply false
    id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
-    id 'androidx.navigation.safeargs' version '2.7.0-beta02' apply false
+    id 'androidx.navigation.safeargs' version '2.7.0-beta01' 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
 }
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jul 12 14:05:11 IST 2023
+#Wed Jun 14 15:14:47 IST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,6 +10,7 @@ dependencyResolutionManagement {
    repositories {
        google()
        mavenCentral()
+        maven {url "https://jitpack.io"}
    }
 }
 rootProject.name = "HPOS Registration"
Author	SHA1	Message	Date
prisar	c2078d91dd	binding	2023-07-07 17:13:18 +05:30
prisar	b9a669e5e5	crop	2023-07-07 10:53:38 +05:30