kannada and hindi version of strings added

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

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

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
@@ -59,8 +59,6 @@ dependencies {
    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.firebase:firebase-appdistribution:16.0.0-beta10'
-    implementation("com.google.firebase:firebase-appdistribution-api-ktx:16.0.0-beta10")

    // Coroutines
    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1'
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -1,64 +1,110 @@
 {
  "project_info": {
-    "project_number": "243503501547",
-    "project_id": "iocl-iisc-hpos",
-    "storage_bucket": "iocl-iisc-hpos.appspot.com"
+    "project_number": "650071678820",
+    "project_id": "hpos-af3cc",
+    "storage_bucket": "hpos-af3cc.appspot.com"
  },
  "client": [
    {
      "client_info": {
-        "mobilesdk_app_id": "1:243503501547:android:f17de652a3524d047feeae",
+        "mobilesdk_app_id": "1:650071678820:android:f1435a1c07f710036c6471",
        "android_client_info": {
-          "package_name": "com.iocl_iisc.hposqc"
+          "package_name": "com.example.hposconsentform"
        }
      },
-      "oauth_client": [],
+      "oauth_client": [
+        {
+          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
      "api_key": [
        {
-          "current_key": "AIzaSyBPxgcDkZfZMr8cFrkMWkVf1a-MstzWC1k"
+          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
        }
      ],
      "services": {
        "appinvite_service": {
-          "other_platform_oauth_client": []
+          "other_platform_oauth_client": [
+            {
+              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
        }
      }
    },
    {
      "client_info": {
-        "mobilesdk_app_id": "1:243503501547:android:e1bb0f338c8448dd7feeae",
+        "mobilesdk_app_id": "1:650071678820:android:7569c1cad4fc99916c6471",
        "android_client_info": {
-          "package_name": "in.sminnovations.hposregistration.iocl"
+          "package_name": "in.sminnovations.hposregistration"
        }
      },
-      "oauth_client": [],
+      "oauth_client": [
+        {
+          "client_id": "650071678820-70kp5jvjda4r5diqch2kn4lc40p4f42g.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "in.sminnovations.hposregistration",
+            "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
+          }
+        },
+        {
+          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
      "api_key": [
        {
-          "current_key": "AIzaSyBPxgcDkZfZMr8cFrkMWkVf1a-MstzWC1k"
+          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
        }
      ],
      "services": {
        "appinvite_service": {
-          "other_platform_oauth_client": []
+          "other_platform_oauth_client": [
+            {
+              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
        }
      }
    },
    {
      "client_info": {
-        "mobilesdk_app_id": "1:243503501547:android:18b8b33b2dc3776d7feeae",
+        "mobilesdk_app_id": "1:650071678820:android:f96be19e5d43102b6c6471",
        "android_client_info": {
-          "package_name": "in.sminnovations.hpostesting.iocl"
+          "package_name": "in.sminnovations.hpostesting"
        }
      },
-      "oauth_client": [],
+      "oauth_client": [
+        {
+          "client_id": "650071678820-l87dnr0bdj95get0khgnvfv2an1k6ogq.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "in.sminnovations.hpostesting",
+            "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
+          }
+        },
+        {
+          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
      "api_key": [
        {
-          "current_key": "AIzaSyBPxgcDkZfZMr8cFrkMWkVf1a-MstzWC1k"
+          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
        }
      ],
      "services": {
        "appinvite_service": {
-          "other_platform_oauth_client": []
+          "other_platform_oauth_client": [
+            {
+              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
        }
      }
    }
--- a/app/src/main/java/com/example/hposregistration/adapters/UserListOfflineAdapter.kt
+++ b/app/src/main/java/com/example/hposregistration/adapters/UserListOfflineAdapter.kt
@@ -41,9 +41,8 @@ class UserListOfflineAdapter(private val view: View) : RecyclerView.Adapter<User
    override fun onBindViewHolder(holder: CompanyViewHolder, position: Int) {
        val userList = differ.currentList[position]
        holder.binding.apply {
-            userName.text = "Name: ${userList.name}"
-            userId.text = "Sample ID: ${userList._id}"
-            timeCreated.text = "Time Created: ${userList.createdAt}"
+            userName.text = userList.name
+            userId.text = userList._id
            Glide.with(view).load(userList.userImageURL).into(userImage)
        }
    }
--- a/app/src/main/java/com/example/hposregistration/adapters/UserListOnlineAdapter.kt
+++ b/app/src/main/java/com/example/hposregistration/adapters/UserListOnlineAdapter.kt
@@ -28,8 +28,7 @@ class UserListOnlineAdapter(options: FirestoreRecyclerOptions<UserData>, private
    override fun onBindViewHolder(holder: OrderItemViewHolder, position: Int, model: UserData) {
        holder.binding.apply {
            userName.text = "Name: ${model.name}"
-            userId.text = "Sample ID: ${model._id}"
-            timeCreated.text = "Time Created: ${model.createdAt}"
+            userId.text = "User ID: ${model._id}"
            Glide.with(view).load(model.userImageURL).into(userImage)
        }
    }
--- a/app/src/main/java/com/example/hposregistration/data/Constant.kt
+++ b/app/src/main/java/com/example/hposregistration/data/Constant.kt
@@ -22,9 +22,6 @@ object Constant {
    const val USER_ID = "usernameId"

    val STATICID = listOf(
-        "SMIMYSURU",
-        "SMIKODAGU",
-        "SMICHAMARAJA",
        "SMIREG1",
        "SMIREG2",
        "SMIREG3",
--- a/app/src/main/java/com/example/hposregistration/data/user/UserData.kt
+++ b/app/src/main/java/com/example/hposregistration/data/user/UserData.kt
@@ -7,11 +7,8 @@ import androidx.room.PrimaryKey
 data class UserData(
    @PrimaryKey
    var _id: String = "",
-    var _idSearch: String = "",
    var abhaId: String = "",
-    var abhaIdSearch: String = "",
    var aadharId: String = "",
-    var aadharIdSearch: String = "",
    var name: String = "",
    var birthYear: String = "",
    var gender: String = "",
@@ -21,6 +18,7 @@ data class UserData(
    var category: String = "",
    var caste: String = "",
    var subCaste: String? = "",
+    var appVersion: String ="",
    var house: String = "",
    var city: String = "",
    var district: String = "",
--- a/app/src/main/java/com/example/hposregistration/ui/activities/MainActivity.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/activities/MainActivity.kt
@@ -2,10 +2,6 @@ package com.example.hposregistration.ui.activities

 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.widget.Toast
-import com.google.firebase.appdistribution.FirebaseAppDistribution
-import com.google.firebase.appdistribution.FirebaseAppDistributionException
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hposregistration.databinding.ActivityMainBinding

@@ -20,44 +16,4 @@ class MainActivity : AppCompatActivity() {
        setContentView(binding.root)

    }
-
-    override fun onResume() {
-        super.onResume()
-
-//        val firebaseAppDistribution = FirebaseAppDistribution.getInstance()
-//        firebaseAppDistribution.updateIfNewReleaseAvailable()
-//            .addOnProgressListener { updateProgress ->
-//
-//                if (updateProgress.apkBytesDownloaded > 0) {
-//                    Toast.makeText(
-//                        this,
-//                        "${updateProgress.updateStatus}. ${updateProgress.apkBytesDownloaded / 1048576} /${updateProgress.apkFileTotalBytes / 1048576} MB",
-//                        Toast.LENGTH_SHORT
-//                    ).show()
-//                }
-//            }
-//            .addOnFailureListener { e ->
-//                // (Optional) Handle errors.
-//                if (e is FirebaseAppDistributionException) {
-//                    when (e.errorCode) {
-//                        FirebaseAppDistributionException.Status.NOT_IMPLEMENTED -> {
-//                            // SDK did nothing. This is expected when building for Play.
-//                        }
-//
-//                        else -> {
-//                            // Handle other errors.
-//                            Toast.makeText(
-//                                this,
-//                                "AppDistribution error, status: ${e.errorCode}",
-//                                Toast.LENGTH_SHORT
-//                            ).show()
-//                        }
-//                    }
-//                    FirebaseCrashlytics.getInstance().recordException(e)
-//                }
-//            }
-//            .addOnSuccessListener {
-////                Toast.makeText(this, "App Update: Success!", Toast.LENGTH_SHORT).show()
-//            }
-    }
 }
--- a/app/src/main/java/com/example/hposregistration/ui/fragments/LoginFragment.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/fragments/LoginFragment.kt
@@ -47,10 +47,10 @@ class LoginFragment : Fragment() {
                performLogin(loginId, password)
            } else {
                if (loginId.isBlank()) {
-                    binding.loginId.error = "Please enter a proper Login ID"
+                    binding.loginId.error = R.string.enter_proper_login_id.toString()
                }
                if (password.isBlank()) {
-                    binding.password.error = "Please enter a proper password"
+                    binding.password.error = R.string.enter_proper_password.toString()
                }
            }
        }
@@ -72,10 +72,10 @@ class LoginFragment : Fragment() {
                navigateToUserListFragment()
                return
            } else {
-                Toast.makeText(requireContext(), "Wrong Password", Toast.LENGTH_SHORT).show()
+                Toast.makeText(requireContext(), R.string.wrong_password, Toast.LENGTH_SHORT).show()
            }
        }
-        Toast.makeText(requireContext(), "Wrong UserID", Toast.LENGTH_SHORT).show()
+        Toast.makeText(requireContext(), R.string.wrong_user_id, Toast.LENGTH_SHORT).show()
    }

    private fun saveUserId(userId: String) {
--- a/app/src/main/java/com/example/hposregistration/ui/fragments/UserListFragment.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/fragments/UserListFragment.kt
@@ -8,7 +8,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.SearchView
+import android.widget.Button
 import android.widget.Toast
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -18,23 +18,18 @@ import com.example.hposregistration.data.Constant
 import com.example.hposregistration.data.user.UserData
 import com.example.hposregistration.ui.viewmodels.RegistrationViewModel
 import com.firebase.ui.firestore.FirestoreRecyclerOptions
-import com.google.firebase.firestore.Query
 import com.google.firebase.firestore.ktx.firestore
 import com.google.firebase.ktx.Firebase
 import dagger.hilt.android.AndroidEntryPoint
 import `in`.sminnovations.hposregistration.R
 import `in`.sminnovations.hposregistration.databinding.FragmentUserListBinding
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale

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

    private var isOnline = false
@@ -46,14 +41,6 @@ class UserListFragment : BaseFragment() {
    ): View {
        _binding = FragmentUserListBinding.inflate(inflater, container, false)
        sharedPreference = requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
-        userId = sharedPreference.getString(Constant.USER_ID, "").toString()
-        if(userId=="SMIMYSURU"){
-            district = "Mysuru"
-        }else if(userId=="SMIKODAGU"){
-            district = "Kodagu"
-        }else if(userId=="SMICHAMARAJA"){
-            district = "Chamarajanagar"
-        }
        setupViews()
        return binding.root
    }
@@ -69,23 +56,15 @@ class UserListFragment : BaseFragment() {
    }

    private fun setupViews() {
-        val pInfo = requireActivity().packageManager.getPackageInfo(
-            requireActivity().packageName, 0
-        )
-        val version = pInfo.versionName
-        binding.appVersion.text = version
        binding.btnRegisterUser.setOnClickListener {
            findNavController().navigate(R.id.action_userListFragment_to_registrationFragment)
        }
-
        binding.btnLogout.setOnClickListener {
            logoutUser(requireContext())
        }
    }

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

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

    private fun logoutUser(context: Context) {
        val builder = AlertDialog.Builder(context)
-        builder.setTitle("Log Out")
-        builder.setMessage("Do you want to LogOut the Application?")
+        builder.setTitle(R.string.log_out)
+        builder.setMessage(R.string.do_log_out)

        // Positive button
        builder.setPositiveButton("Yes") { dialog, _ ->
@@ -163,16 +114,16 @@ class UserListFragment : BaseFragment() {
    }
    private fun showUploadDialog(context: Context) {
        val builder = AlertDialog.Builder(context)
-        builder.setTitle("Upload DB Registration")
-        builder.setMessage("Do you want to upload the local DB Registration to the cloud?")
+        builder.setTitle(R.string.upload_db_registration)
+        builder.setMessage(R.string.upload_local_db_to_cloud)

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

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

@@ -190,7 +141,7 @@ class UserListFragment : BaseFragment() {
                    viewModel.deleteById(userData._id)
                }
                dialog.dismiss()
-                Toast.makeText(requireContext(), "Upload  done successfully", Toast.LENGTH_SHORT)
+                Toast.makeText(requireContext(), R.string.upload_done_successfully, Toast.LENGTH_SHORT)
                    .show()
            }
        }
@@ -205,60 +156,11 @@ class UserListFragment : BaseFragment() {
            }
        }
    }
-//    private fun fetchFromServer(searchTerm: String? = null) {
-//        binding.noList.visibility = View.GONE
-//        binding.rvOrder.visibility = View.VISIBLE
-//        val dateFormat = SimpleDateFormat("yyyy-MM-dd")
-//        val currentDate = Date()
-//        val today = dateFormat.format(currentDate)
-//
-//        // Base query to fetch patient data created today
-//        var query = Firebase.firestore.collection("patientData")
-//            .whereGreaterThanOrEqualTo("createdAt", today)
-//            .orderBy("createdAt", Query.Direction.DESCENDING)
-//
-//        // If a search term is provided, add it to the query
-//        if (!searchTerm.isNullOrEmpty()) {
-//            query = query.whereEqualTo("aadharId", searchTerm)
-//        }
-//
-//        query.get().addOnSuccessListener {
-//            if (it.documents.isEmpty() && isOnline) {
-//                binding.emptyRegistrations.visibility = View.VISIBLE
-//            }
-//        }
-//
-//        val recyclerViewOptions =
-//            FirestoreRecyclerOptions.Builder<UserData>().setQuery(query, UserData::class.java)
-//                .build()
-//        val adapter = UserListOnlineAdapter(recyclerViewOptions, binding.root)
-//        binding.rvOrder.adapter = adapter
-//        adapter.startListening()
-//    }
-private fun fetchFromServer(searchTerm: String? = null) {
+
+    private fun fetchFromServer() {
        binding.noList.visibility = View.GONE
        binding.rvOrder.visibility = View.VISIBLE
-    val dateFormat = SimpleDateFormat("yyyy-MM-dd")
-    val currentDate = Date()
-    val today = dateFormat.format(currentDate)
-
-    // Base query to fetch patient data created today and from the specified district
-    var query = Firebase.firestore.collection("patientData")
-     //   .whereGreaterThanOrEqualTo("createdAt", today)
-        .whereEqualTo("district", district)
-        .orderBy("createdAt", Query.Direction.DESCENDING)
-
-    // If a search term is provided, add it to the query
-    if (!searchTerm.isNullOrEmpty()) {
-        query = query.whereEqualTo("_id", searchTerm)
-    }
-
-    query.get().addOnSuccessListener {
-        if (it.documents.isEmpty() && isOnline) {
-            binding.emptyRegistrations.visibility = View.VISIBLE
-        }
-    }
-
+        val query = Firebase.firestore.collection("patientData")
        val recyclerViewOptions =
            FirestoreRecyclerOptions.Builder<UserData>().setQuery(query, UserData::class.java)
                .build()
@@ -266,27 +168,6 @@ private fun fetchFromServer(searchTerm: String? = null) {
        binding.rvOrder.adapter = adapter
        adapter.startListening()
    }
-//    private fun fetchFromServer() {
-//        binding.noList.visibility = View.GONE
-//        binding.rvOrder.visibility = View.VISIBLE
-//        val dateFormat = SimpleDateFormat("yyyy-MM-dd")
-//        val currentDate = Date()
-//        val today = dateFormat.format(currentDate)
-//        val query = Firebase.firestore.collection("patientData")
-//            .whereGreaterThanOrEqualTo("createdAt", today)
-//            .orderBy("createdAt", Query.Direction.DESCENDING)
-//        query.get().addOnSuccessListener {
-//            if (it.documents.isEmpty() && isOnline) {
-//                binding.emptyRegistrations.visibility = View.VISIBLE
-//            }
-//        }
-//        val recyclerViewOptions =
-//            FirestoreRecyclerOptions.Builder<UserData>().setQuery(query, UserData::class.java)
-//                .build()
-//        val adapter = UserListOnlineAdapter(recyclerViewOptions, binding.root)
-//        binding.rvOrder.adapter = adapter
-//        adapter.startListening()
-//    }

    private fun fetchFromLocalDB() {
        binding.uploadData.visibility = View.GONE
@@ -295,7 +176,6 @@ private fun fetchFromServer(searchTerm: String? = null) {
                binding.noList.visibility = View.GONE
                binding.rvOrder.visibility = View.VISIBLE
            } else {
-                binding.emptyRegistrations.visibility = View.GONE
                if (userDataList.isEmpty()) {
                    binding.noList.visibility = View.VISIBLE
                    binding.rvOrder.visibility = View.GONE
@@ -303,9 +183,9 @@ private fun fetchFromServer(searchTerm: String? = null) {
                    binding.noList.visibility = View.GONE
                    binding.rvOrder.visibility = View.VISIBLE
                    deteleIncompleteRegistration(userDataList)
-                    offlineAdapter = UserListOfflineAdapter(binding.root)
-                    offlineAdapter.differ.submitList(userDataList)
-                    binding.rvOrder.adapter = offlineAdapter
+                    val adapter = UserListOfflineAdapter(binding.root)
+                    adapter.differ.submitList(userDataList)
+                    binding.rvOrder.adapter = adapter
                }
            }
        }
--- a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/AbhaRegistrationFragment.kt
@@ -1,7 +1,5 @@
 package com.example.hposregistration.ui.fragments.registration

-import android.content.Context
-import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -19,17 +17,14 @@ 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
-import java.time.Instant
-import java.util.Random

@AndroidEntryPoint
 class AbhaRegistrationFragment : BaseFragment() {

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

    private val viewModel by viewModels<RegistrationViewModel>()
@@ -40,7 +35,7 @@ class AbhaRegistrationFragment : BaseFragment() {
        registerForActivityResult(ScanContract()) { result: ScanIntentResult ->
            if (result.contents == null) {
                Toast.makeText(
-                    requireContext(), "Cancelled: Unable to scan, Try Again!!", Toast.LENGTH_LONG
+                    requireContext(), R.string.cancelled_unable_scan, Toast.LENGTH_LONG
                ).show()
            } else {
                processScannedData(result.contents)
@@ -51,8 +46,6 @@ class AbhaRegistrationFragment : BaseFragment() {
        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
    ): View {
        _binding = FragmentAbhaRegistrationBinding.inflate(inflater, container, false)
-        sharedPreference =
-            requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
        return binding.root
    }

@@ -86,30 +79,22 @@ class AbhaRegistrationFragment : BaseFragment() {
            val userName = binding.etName.text.toString()
            val aadharIdInput = binding.aadharID.text.toString()
            val centerName = binding.centerName.text.toString()
-            val currentUnixTime = Instant.now().epochSecond

            if (validateInputs(abhaIdInput, aadharIdInput, userName, centerName)) {
                userData.apply {
-                    name = userName.lowercase()
+                    name = userName
                    aadharId = aadharIdInput
                    abhaId = abhaIdInput
                    registrationCenterName = centerName
-                   // _id = centerName.substring(0, 3).uppercase() + name.substring(0, 4) +
-                    _id = userName.substring(0, 3).uppercase() + generateFourDigitNumber() +centerName.substring(0, 3).uppercase()
+                    _id = aadharId + userName.substring(0, 3).uppercase() + centerName.substring(0, 3).uppercase()
                }

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

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

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

@@ -183,20 +168,20 @@ class AbhaRegistrationFragment : BaseFragment() {
        abhaId: String, aadharId: String, userName: String, centerName: String
    ): Boolean {
        with(binding) {
-//            if (!checkAbhaIDNumber(abhaId)) {
-//                etAbhaId.error = "Invalid Abha ID"
-//                return false
-//            }
-//            if (!checkAadharIDNumber(aadharId)) {
-//                aadharID.error = "Invalid Aadhar ID"
-//                return false
-//            }
+            if (!checkAbhaIDNumber(abhaId)) {
+                etAbhaId.error = R.string.invalid_abha_id.toString()
+                return false
+            }
+            if (!checkAadharIDNumber(aadharId)) {
+                aadharID.error = R.string.invalid_aadhar_id.toString()
+                return false
+            }
            if (!checkUserName(userName)) {
-                etName.error = "Name field can't be empty or less than 3 characters"
+                etName.error = R.string.name_field_error.toString()
                return false
            }
            if (!checkCenterName(centerName)) {
-                etCenterName.error = "Center name can't be empty or less than 3 characters"
+                etCenterName.error = R.string.center_name_error.toString()
                return false
            }
        }
--- a/app/src/main/java/com/example/hposregistration/ui/fragments/registration/ReviewDetailsRegistrationFragment.kt
+++ b/app/src/main/java/com/example/hposregistration/ui/fragments/registration/ReviewDetailsRegistrationFragment.kt
@@ -67,7 +67,7 @@ class ReviewDetailsRegistrationFragment : BaseFragment() {
            } else {
                Toast.makeText(
                    requireContext(),
-                    "Internet not available, Data stored in local DB",
+                    R.string.internt_not_local,
                    Toast.LENGTH_SHORT
                ).show()
                navigateToUserListFragment()
@@ -86,7 +86,7 @@ class ReviewDetailsRegistrationFragment : BaseFragment() {
            if (it == "Success") {
                Toast.makeText(
                    requireContext(),
-                    "Registration Done Successfully",
+                    R.string.registration_success,
                    Toast.LENGTH_SHORT
                ).show()
                navigateToUserListFragment()
@@ -111,7 +111,7 @@ class ReviewDetailsRegistrationFragment : BaseFragment() {
                requireContext().getString(R.string.abha_number, userData.abhaId)
            binding.tvAadharId.text =
                requireContext().getString(R.string.aadhar_number_details, userData.aadharId)
-            binding.tvUserName.text = requireContext().getString(R.string.user_name, userData.name.lowercase())
+            binding.tvUserName.text = requireContext().getString(R.string.user_name, userData.name)
            binding.tvBirthYear.text =
                requireContext().getString(R.string.birth_year_details, userData.birthYear)
            binding.tvGender.text =
@@ -170,6 +170,13 @@ class ReviewDetailsRegistrationFragment : BaseFragment() {
                    R.string.sickle_cell_family_history, userData.sickleCellHistory
                )
            }
+
+            val pInfo = requireActivity().packageManager.getPackageInfo(
+                requireActivity().packageName, 0
+            )
+            val version = pInfo.versionName
+            userData.appVersion = version
+
        }
    }

--- 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
@@ -5,6 +5,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -12,6 +13,7 @@ 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


@@ -42,6 +44,23 @@ 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() {
@@ -59,24 +78,26 @@ class UserDetailsRegistrationFragment : Fragment() {
                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.phoneNumber.let { etMobile.setText(it) }
            user.careOf.let { etCareof.setText(it) }
            user.maritalStatus.let { etIsMarried.setText(it, false) }
-            user.caste.let { etCaste.setText(it) }
-            user.category.let { etCategory.setText(it, false) }
            user.subCaste.let { etSubCaste.setText(it) }
            user.house.let { etHouse.setText(it) }
            user.city.let { etCity.setText(it) }
-            user.district.let { etDistrict.setText(it, false) }
+            user.district.let { etDistrict.setText(it) }
+            user.state.let { etState.setText(it) }
            user.pinCode.let { etPincode.setText(it) }
            user.isUnderMedication.let {
                if (it != null) {
@@ -93,6 +114,13 @@ class UserDetailsRegistrationFragment : Fragment() {
                    yes1history.isChecked = true
                }
            }
+            user.category.let {
+                etCategory.setText(it, false)
+            }
+            user.caste.let {
+                etCaste.setText(it, false)
+            }
+
            if (yes1history.isChecked) {
                if (binding.yes1history.isChecked) View.VISIBLE else View.GONE

@@ -111,6 +139,35 @@ class UserDetailsRegistrationFragment : Fragment() {
                    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
+            }

        }
    }
@@ -122,7 +179,7 @@ class UserDetailsRegistrationFragment : Fragment() {
                viewModel.insert(userData)
                navigateToCaptureUserImageFragment()
            } else {
-                showToast("Please enter all the details properly")
+                showToast(R.string.enter_details_properly.toString())
            }
        }
    }
@@ -136,33 +193,47 @@ class UserDetailsRegistrationFragment : Fragment() {
    private fun verifyUserDetails(): Boolean {
        with(binding) {
            val yob = etYob.text.toString()
-            if (yob.isEmpty() || yob.toInt() <= 1900 || yob.toInt() > 2020) {
-                etYob.error = "Please enter a valid birth year between 1900 and 2020"
+            if (yob.isEmpty() || yob.toInt() <= 1900 || yob.toInt() > 2023) {
+                etYob.error = R.string.enter_valid_birth_year.toString()
                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 {
-                userData.gender = "Other"
+            } 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 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()
+                return false
+            } else {
                userData.phoneNumber = mobile
-//            if (mobile.isEmpty() || mobile.length != 10) {
-//                etMobile.error = "Please enter a valid 10-digit mobile number"
-//                return false
-//            } else {
-//                userData.phoneNumber = mobile
-//            }
+            }

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

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

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

            val caste = etCaste.text.toString()
+            val othercaste = etOthercaste.text.toString()
            if (caste.isEmpty()) {
-                etCaste.error = "Please enter your caste"
+                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()) {
                userData.subCaste = subCaste
@@ -199,7 +277,7 @@ class UserDetailsRegistrationFragment : Fragment() {

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

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

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

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

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

@@ -257,6 +335,8 @@ 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
@@ -13,10 +13,6 @@ import com.example.hposregistration.data.user.UserData
 import com.google.firebase.storage.FirebaseStorage
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Date
-import java.util.Locale
 import javax.inject.Inject

@HiltViewModel
@@ -67,15 +63,6 @@ class RegistrationViewModel @Inject constructor(
        get() = _networkStatusLiveData

    fun insert(userData: UserData) = viewModelScope.launch {
-        val currentDate = Date()
-        val dateFormat = SimpleDateFormat("yyyyMMdd")
-        val partition = dateFormat.format(currentDate)
-        userData._idSearch = partition + userData._id
-        userData.abhaIdSearch = partition + userData.abhaId
-        userData.aadharIdSearch = partition + userData.aadharId
-        userData.createdAt = SimpleDateFormat(
-            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
-        ).format(Calendar.getInstance().time)
        mainRepository.insert(userData)
    }

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

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

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

    <TextView
        android:id="@+id/tv_title"
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -138,7 +138,7 @@
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="parent" />

    </androidx.constraintlayout.widget.ConstraintLayout>

--- a/app/src/main/res/layout/fragment_user_details_registration.xml
+++ b/app/src/main/res/layout/fragment_user_details_registration.xml
@@ -63,7 +63,6 @@
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_marginStart="10dp"
-                    android:checked="true"
                    android:text="@string/male"
                    android:textSize="16sp" />

@@ -83,7 +82,8 @@
            </RadioGroup>

            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/til_mobile"
+                android:visibility="gone"
+                android:id="@+id/til_othergender"
                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
@@ -93,6 +93,28 @@
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@id/gender">

+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/et_othergender"
+                    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_mobile"
+                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_othergender">
+
                <com.google.android.material.textfield.TextInputEditText
                    android:id="@+id/et_mobile"
                    android:layout_width="match_parent"
@@ -160,30 +182,74 @@
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:hint="@string/category"
-                    android:inputType="none"
+                    android:inputType="text"
                    android:labelFor="@id/til_is_married"
                    app:simpleItems="@array/category" />

            </com.google.android.material.textfield.TextInputLayout>
-
            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/til_caste"
+                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="16dp"
+                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: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"
@@ -193,7 +259,7 @@
                android:layout_marginTop="16dp"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/til_caste">
+                app:layout_constraintTop_toBottomOf="@id/til_othercaste">

                <com.google.android.material.textfield.TextInputEditText
                    android:id="@+id/et_subCaste"
@@ -230,7 +296,7 @@
                    android:id="@+id/et_house"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:hint="Address" />
+                    android:hint="@string/house" />

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

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

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

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

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

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

            </com.google.android.material.textfield.TextInputLayout>
--- a/app/src/main/res/layout/fragment_user_list.xml
+++ b/app/src/main/res/layout/fragment_user_list.xml
@@ -16,20 +16,6 @@
        android:layout_height="match_parent"
        android:orientation="vertical">
    </LinearLayout>
-
-    <TextView
-        android:id="@+id/app_version"
-        style="@style/title2"
-        android:layout_width="57dp"
-        android:layout_height="15dp"
-        android:layout_marginTop="4dp"
-        android:gravity="center"
-        android:text="1.0.4"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.017"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
    <TextView
        android:id="@+id/tv_title"
        style="@style/title1"
@@ -40,20 +26,6 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

-    <TextView
-        android:id="@+id/emptyRegistrations"
-        style="@style/title1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:text="@string/empty_registrations"
-        android:textColor="@color/black"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
    <TextView
        android:id="@+id/noList"
        style="@style/title1"
@@ -89,15 +61,6 @@
        app:layout_constraintEnd_toStartOf="@+id/uploadData"
        app:layout_constraintTop_toTopOf="@+id/tv_title" />

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

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

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


--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -0,0 +1,206 @@
+<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
@@ -0,0 +1,211 @@
+<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/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,6 +8,11 @@
    <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>
@@ -48,14 +53,13 @@
    <string name="register_user">Register User</string>
    <string name="is_user_having_any_family_history_for_sickle_cell">Is user having any family history for Sickle Cell</string>
    <string name="family_history_of_sickle_cell">Family History of Sickle Cell</string>
-    <string name="mobile_number_10_digits">Mobile Number(Optional)</string>
+    <string name="mobile_number_10_digits">Mobile Number (10 digits)</string>
    <string name="sub_caste">Sub Caste</string>
    <string name="capture_user_image">Capture User Image</string>
    <string name="mobile_number">Mobile Number</string>
    <string name="edit">Edit</string>
    <string name="user_details">User Details</string>
    <string name="internet_is_not_available_and_there_is_no_data_available_in_local_db">Internet is not available and there is no Data available in Local DB</string>
-    <string name="empty_registrations">No registrations are available for display</string>
    <string name="user_id">User ID: %1$s</string>
    <string name="abha_number">Abha Number: %1$s</string>
    <string name="aadhar_number_details">Aadhar Number: %1$s</string>
@@ -89,6 +93,47 @@
    <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>
@@ -156,10 +201,5 @@
        <item>Female</item>
        <item>Other</item>
    </string-array>
-    <string-array name="district">
-        <item>Mysuru</item>
-        <item>Kodagu</item>
-        <item>Chamarajanagar</item>
-    </string-array>

 </resources>
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.4.0' apply false
-    id 'com.android.library' version '8.4.0' apply false
+    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 'com.google.dagger.hilt.android' version '2.46' apply false
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Jul 12 14:05:11 IST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
Author	SHA1	Message	Date
Mariya	e0c9c1d446	kannada and hindi version of strings added	2023-12-04 12:50:56 +05:30
Mariya	51d6cd57c3	kannada and hindi version of strings added	2023-11-28 15:38:33 +05:30
Mariya	48befc8b31	App version Added	2023-11-22 17:00:14 +05:30
Mariya	8a4cedb566	Added textbox for caste if the "OTHER" option is selected from dropdown, Added textbox for gender if the "OTHER" option is selected from gender	2023-10-09 16:30:28 +05:30
Mariya	a3d67a7a88	Added search for caste and category dropdown, and Added textbox for Under Category if the "OTHER" option is selected from dropdown	2023-10-06 15:31:25 +05:30