Merge branch 'master' of https://gitlab.com/sminnovations/hpos-registration-app

# Conflicts:
#	app/build.gradle

.idea/.gitignore

@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml

.idea/deploymentTargetDropDown.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <value>
-      <entry key="app">
-        <State />
-      </entry>
-    </value>
-  </component>
-</project>

.idea/gradle.xml

@@ -6,7 +6,7 @@
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="$USER_HOME$/andriod studio gradle/gradle-7.3" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

.idea/migrations.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectMigrations">
-    <option name="MigrateToGradleLocalJavaHome">
-      <set>
-        <option value="$PROJECT_DIR$" />
-      </set>
-    </option>
-  </component>
-</project>

.idea/shelf/Changes.xml

@@ -1,4 +0,0 @@
-<changelist name="Changes" date="1696578975861" recycled="false">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Changes/shelved.patch" />
-  <option name="DESCRIPTION" value="Changes" />
-</changelist>

.idea/shelf/Changes1.xml

@@ -1,4 +0,0 @@
-<changelist name="Changes1" date="1701673804446" recycled="false">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Changes1/shelved.patch" />
-  <option name="DESCRIPTION" value="Changes" />
-</changelist>

.idea/shelf/Changes2.xml

@@ -1,4 +0,0 @@
-<changelist name="Changes2" date="1701681731623" recycled="false">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Changes2/shelved.patch" />
-  <option name="DESCRIPTION" value="Changes" />
-</changelist>

.idea/shelf/Changes2/shelved.patch

@@ -1,21 +0,0 @@
-Index: app/src/main/java/com/example/hposregistration/adapters/UserListOnlineAdapter.kt
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
-<+>package com.example.hposregistration.adapters\r\n\r\nimport android.annotation.SuppressLint\r\nimport android.view.LayoutInflater\r\nimport android.view.View\r\nimport android.view.ViewGroup\r\nimport androidx.recyclerview.widget.RecyclerView\r\nimport com.bumptech.glide.Glide\r\nimport com.example.hposregistration.data.user.UserData\r\nimport com.firebase.ui.firestore.FirestoreRecyclerAdapter\r\nimport com.firebase.ui.firestore.FirestoreRecyclerOptions\r\nimport `in`.sminnovations.hposregistration.R\r\nimport `in`.sminnovations.hposregistration.databinding.UserItemViewBinding\r\n\r\nclass UserListOnlineAdapter(options: FirestoreRecyclerOptions<UserData>, private val view: View) :\r\n    FirestoreRecyclerAdapter<UserData, UserListOnlineAdapter.OrderItemViewHolder>(options) {\r\n\r\n    class OrderItemViewHolder(val binding: UserItemViewBinding) :\r\n        RecyclerView.ViewHolder(binding.root)\r\n\r\n    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): OrderItemViewHolder {\r\n        return OrderItemViewHolder(\r\n            UserItemViewBinding\r\n                .inflate(LayoutInflater.from(parent.context), parent, false)\r\n        )\r\n    }\r\n\r\n    @SuppressLint(\"SetTextI18n\")\r\n    override fun onBindViewHolder(holder: OrderItemViewHolder, position: Int, model: UserData) {\r\n        holder.binding.apply {\r\n            userName.text = view.context.getString(R.string.name) + \": ${model.name}\"\r\n            userId.text = view.context.getString(R.string.userid) + \": ${model._id}\"\r\n            Glide.with(view).load(model.userImageURL).into(userImage)\r\n        }\r\n    }\r\n}
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/app/src/main/java/com/example/hposregistration/adapters/UserListOnlineAdapter.kt b/app/src/main/java/com/example/hposregistration/adapters/UserListOnlineAdapter.kt
---- a/app/src/main/java/com/example/hposregistration/adapters/UserListOnlineAdapter.kt	(revision 610e206f27d8ce39c57e9e76b95bfdb7b6047307)
-+++ b/app/src/main/java/com/example/hposregistration/adapters/UserListOnlineAdapter.kt	(date 1701681731375)
-@@ -28,8 +28,8 @@
-     @SuppressLint("SetTextI18n")
-     override fun onBindViewHolder(holder: OrderItemViewHolder, position: Int, model: UserData) {
-         holder.binding.apply {
--            userName.text = view.context.getString(R.string.name) + ": ${model.name}"
--            userId.text = view.context.getString(R.string.userid) + ": ${model._id}"
-+            userName.text = view.context.getString(R.string.name) + " : ${model.name}"
-+            userId.text = view.context.getString(R.string.userid) + " : ${model._id}"
-             Glide.with(view).load(model.userImageURL).into(userImage)
-         }
-     }

.idea/shelf/Uncommitted_changes_before_Checkout_at_04-12-2023_01_16_pm__Changes_.xml

@@ -1,4 +0,0 @@
-<changelist name="Uncommitted_changes_before_Checkout_at_04-12-2023_01_16_pm_[Changes]" date="1701676341703" recycled="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_04-12-2023_01_16_pm_[Changes]/shelved.patch" />
-  <option name="DESCRIPTION" value="Uncommitted changes before Checkout at 04-12-2023 01:16 pm [Changes]" />
-</changelist>

.idea/shelf/Uncommitted_changes_before_Checkout_at_04-12-2023_01_38_pm__Changes_.xml

@@ -1,4 +0,0 @@
-<changelist name="Uncommitted_changes_before_Checkout_at_04-12-2023_01_38_pm_[Changes]" date="1701677677817" recycled="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_04-12-2023_01_38_pm_[Changes]/shelved.patch" />
-  <option name="DESCRIPTION" value="Uncommitted changes before Checkout at 04-12-2023 01:38 pm [Changes]" />
-</changelist>

.idea/shelf/Uncommitted_changes_before_Checkout_at_04-12-2023_02_50_pm__Changes_.xml

@@ -1,4 +0,0 @@
-<changelist name="Uncommitted_changes_before_Checkout_at_04-12-2023_02_50_pm_[Changes]" date="1701681655205" recycled="true" deleted="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_04-12-2023_02_50_pm_[Changes]/shelved.patch" />
-  <option name="DESCRIPTION" value="Uncommitted changes before Checkout at 04-12-2023 02:50 pm [Changes]" />
-</changelist>

app/.gitignore

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

app/build.gradle

@@ -13,11 +13,11 @@ android {
     compileSdk 34
 
     defaultConfig {
-        applicationId "in.sminnovations.hposregistration"
+        applicationId "in.sminnovations.hposregistration.quality"
         minSdk 26
         targetSdk 34
-        versionCode 1
-        versionName "1.0"
+        versionCode 13
+        versionName "1.0.13"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -42,9 +42,9 @@ android {
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.10.0'
+    implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
@@ -58,24 +58,24 @@ dependencies {
     implementation 'com.google.firebase:firebase-auth-ktx'
     implementation 'com.google.firebase:firebase-storage-ktx'
     implementation 'com.firebaseui:firebase-ui-firestore:8.0.2'
-    implementation 'com.google.android.gms:play-services-auth:20.7.0'
+    implementation 'com.google.android.gms:play-services-auth:20.6.0'
 
     // Coroutines
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
 
     // Coroutine Lifecycle Scopes
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1"
 
     //Dagger - Hilt
     implementation "com.google.dagger:hilt-android:2.46"
     kapt "com.google.dagger:hilt-android-compiler:2.46"
-    kapt "androidx.hilt:hilt-compiler:1.1.0"
+    kapt "androidx.hilt:hilt-compiler:1.0.0"
 
     // Navigation Component
-    implementation "androidx.navigation:navigation-fragment-ktx:2.7.5"
-    implementation "androidx.navigation:navigation-ui-ktx:2.7.5"
+    implementation "androidx.navigation:navigation-fragment-ktx:2.7.0"
+    implementation "androidx.navigation:navigation-ui-ktx:2.7.0"
 
     // Retrofit + GSON
     implementation "com.squareup.retrofit2:retrofit:2.9.0"
@@ -85,20 +85,19 @@ dependencies {
     implementation 'com.jakewharton.timber:timber:4.7.1'
 
     // Activity KTX for viewModels()
-    implementation "androidx.activity:activity-ktx:1.8.1"
+    implementation "androidx.activity:activity-ktx:1.7.2"
 
     //image
     implementation 'com.github.bumptech.glide:glide:4.13.2'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.13.2'
 
     //Room
-    implementation "androidx.room:room-ktx:2.6.0"
-    implementation "androidx.room:room-runtime:2.6.0"
-    kapt ("androidx.room:room-compiler:2.6.0")
+    implementation "androidx.room:room-ktx:2.6.0-alpha03"
+    implementation "androidx.room:room-runtime:2.6.0-alpha03"
+    kapt ("androidx.room:room-compiler:2.6.0-alpha03")
 
     // Barcode scanner
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
 
-    implementation 'androidx.preference:preference-ktx:1.2.1'
-    implementation 'androidx.preference:preference-ktx:1.2.1'
+
 }

app/google-services.json

@@ -1,113 +0,0 @@
-{
-  "project_info": {
-    "project_number": "650071678820",
-    "project_id": "hpos-af3cc",
-    "storage_bucket": "hpos-af3cc.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:f1435a1c07f710036c6471",
-        "android_client_info": {
-          "package_name": "com.example.hposconsentform"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:7569c1cad4fc99916c6471",
-        "android_client_info": {
-          "package_name": "in.sminnovations.hposregistration"
-        }
-      },
-      "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": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:f96be19e5d43102b6c6471",
-        "android_client_info": {
-          "package_name": "in.sminnovations.hpostesting"
-        }
-      },
-      "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": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}

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

@@ -9,7 +9,6 @@ import com.bumptech.glide.Glide
 import com.example.hposregistration.data.user.UserData
 import com.firebase.ui.firestore.FirestoreRecyclerAdapter
 import com.firebase.ui.firestore.FirestoreRecyclerOptions
-import `in`.sminnovations.hposregistration.R
 import `in`.sminnovations.hposregistration.databinding.UserItemViewBinding
 
 class UserListOnlineAdapter(options: FirestoreRecyclerOptions<UserData>, private val view: View) :
@@ -28,8 +27,8 @@ class UserListOnlineAdapter(options: FirestoreRecyclerOptions<UserData>, private
     @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: OrderItemViewHolder, position: Int, model: UserData) {
         holder.binding.apply {
-            userName.text = view.context.getString(R.string.name) + ": ${model.name}"
-            userId.text = view.context.getString(R.string.userid) + ": ${model._id}"
+            userName.text = "Name: ${model.name}"
+            userId.text = "User ID: ${model._id}"
             Glide.with(view).load(model.userImageURL).into(userImage)
         }
     }

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

@@ -1,30 +0,0 @@
-package com.example.hposregistration.data
-
-import android.content.Context
-import android.content.SharedPreferences
-import java.util.Locale
-
-object LanguageManager {
-    private const val LANGUAGE_PREF_KEY = "language_pref"
-
-    fun setLocale(context: Context, languageCode: String) {
-        val locale = Locale(languageCode)
-        Locale.setDefault(locale)
-
-        val resources = context.resources
-        val configuration = resources.configuration
-        configuration.setLocale(locale)
-
-        context.createConfigurationContext(configuration)
-    }
-
-    fun persistLanguagePreference(context: Context, languageCode: String) {
-        val prefs: SharedPreferences = context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
-        prefs.edit().putString(LANGUAGE_PREF_KEY, languageCode).apply()
-    }
-
-    fun getSavedLanguage(context: Context): String {
-        val prefs: SharedPreferences = context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
-        return prefs.getString(LANGUAGE_PREF_KEY, "en") ?: "en"
-    }
-}

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

@@ -7,8 +7,11 @@ 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 = "",
@@ -18,7 +21,6 @@ data class UserData(
     var category: String = "",
     var caste: String = "",
     var subCaste: String? = "",
-    var appVersion: String ="",
     var house: String = "",
     var city: String = "",
     var district: String = "",

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

@@ -1,9 +1,11 @@
 package com.example.hposregistration.ui.activities
 
-import android.content.Context
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import com.example.hposregistration.data.LanguageManager
+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
 
@@ -11,12 +13,6 @@ import `in`.sminnovations.hposregistration.databinding.ActivityMainBinding
 class MainActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityMainBinding
-    override fun attachBaseContext(newBase: Context?) {
-        val languageCode = LanguageManager.getSavedLanguage(newBase!!)
-        LanguageManager.setLocale(newBase, languageCode)
-        super.attachBaseContext(newBase)
-    }
-
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -24,4 +20,44 @@ 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()
+            }
+    }
 }

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

@@ -1,69 +0,0 @@
-package com.example.hposregistration.ui.fragments
-
-import android.content.Context
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.preference.ListPreference
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
-import com.example.hposregistration.data.LanguageManager
-import `in`.sminnovations.hposregistration.R
-
-private var isLanguageChanged = false
-class LanguageSettingsFragment : PreferenceFragmentCompat() {
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        val preferenceScreen = preferenceManager.createPreferenceScreen(requireContext())
-
-        val languagePreference = androidx.preference.ListPreference(requireContext())
-        languagePreference.key = "language_preference"
-        languagePreference.title = getString(R.string.app_language)
-        languagePreference.summary = getString(R.string.select_language)
-        languagePreference.entries = arrayOf("English", "Kannada", "Hindi")
-        languagePreference.entryValues = arrayOf("en", "kn", "hi")
-        languagePreference.setDefaultValue("en")
-
-        languagePreference.onPreferenceChangeListener =
-            Preference.OnPreferenceChangeListener { _, newValue ->
-                val languageCode = newValue as String
-                updateLanguage(requireContext(), languageCode)
-                true
-            }
-
-        preferenceScreen.addPreference(languagePreference)
-        setPreferenceScreen(preferenceScreen)
-
-        // App Version Preference
-        val appVersionPreference = Preference(requireContext())
-        appVersionPreference.title = "App Version"
-        appVersionPreference.summary = getAppVersion(requireContext())
-
-        preferenceScreen.addPreference(languagePreference)
-        preferenceScreen.addPreference(appVersionPreference)
-        setPreferenceScreen(preferenceScreen)
-
-        if (isLanguageChanged) {
-            Toast.makeText(requireContext(), R.string.language_update, Toast.LENGTH_SHORT).show()
-        }
-    }
-
-    private fun updateLanguage(context: Context, languageCode: String) {
-        LanguageManager.persistLanguagePreference(context, languageCode)
-        LanguageManager.setLocale(context, languageCode)
-        requireActivity().recreate() // Recreate activity to apply language changes
-        isLanguageChanged = true
-    }
-
-    private fun getAppVersion(context: Context): String {
-        return try {
-            val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
-            pInfo.versionName
-        } catch (e: PackageManager.NameNotFoundException) {
-            "N/A"
-        }
-    }
-}

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 = getString(R.string.enter_proper_login_id)
+                    binding.loginId.error = "Please enter a proper Login ID"
                 }
                 if (password.isBlank()) {
-                    binding.password.error = getString(R.string.enter_proper_password)
+                    binding.password.error = "Please enter a proper password"
                 }
             }
         }
@@ -72,10 +72,10 @@ class LoginFragment : Fragment() {
                 navigateToUserListFragment()
                 return
             } else {
-                Toast.makeText(requireContext(), R.string.wrong_password, Toast.LENGTH_SHORT).show()
+                Toast.makeText(requireContext(), "Wrong Password", Toast.LENGTH_SHORT).show()
             }
         }
-        Toast.makeText(requireContext(), R.string.wrong_user_id, Toast.LENGTH_SHORT).show()
+        Toast.makeText(requireContext(), "Wrong UserID", Toast.LENGTH_SHORT).show()
     }
 
     private fun saveUserId(userId: String) {

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

@@ -8,7 +8,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
 import android.widget.Toast
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -59,6 +58,11 @@ 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)
         }
@@ -83,10 +87,6 @@ class UserListFragment : BaseFragment() {
             showUploadDialog(requireContext())
         }
 
-        binding.btnsettings.setOnClickListener{
-                findNavController().navigate(R.id.action_userListFragment_to_languageSettingsFragment)
-
-        }
         viewModel.allUserData.observe(viewLifecycleOwner) { userDataList ->
             deteleIncompleteRegistration(userDataList)
         }
@@ -94,18 +94,18 @@ class UserListFragment : BaseFragment() {
 
     private fun logoutUser(context: Context) {
         val builder = AlertDialog.Builder(context)
-        builder.setTitle(R.string.log_out)
-        builder.setMessage(R.string.do_log_out)
+        builder.setTitle("Log Out")
+        builder.setMessage("Do you want to LogOut the Application?")
 
         // Positive button
-        builder.setPositiveButton(R.string.yes) { dialog, _ ->
+        builder.setPositiveButton("Yes") { dialog, _ ->
             saveUserId()
             findNavController().navigate(R.id.action_userListFragment_to_loginFragment)
             dialog.dismiss()
         }
 
         // Negative button
-        builder.setNegativeButton(R.string.no) { dialog, _ ->
+        builder.setNegativeButton("No") { dialog, _ ->
             dialog.dismiss()
         }
 
@@ -121,16 +121,16 @@ class UserListFragment : BaseFragment() {
     }
     private fun showUploadDialog(context: Context) {
         val builder = AlertDialog.Builder(context)
-        builder.setTitle(R.string.upload_db_registration)
-        builder.setMessage(R.string.upload_local_db_to_cloud)
+        builder.setTitle("Upload DB Registration")
+        builder.setMessage("Do you want to upload the local DB Registration to the cloud?")
 
         // Positive button
-        builder.setPositiveButton(R.string.upload) { dialog, _ ->
+        builder.setPositiveButton("Upload") { dialog, _ ->
             uploadLoadDBData(dialog)
         }
 
         // Negative button
-        builder.setNegativeButton(R.string.cancel) { dialog, _ ->
+        builder.setNegativeButton("Cancel") { dialog, _ ->
             dialog.dismiss()
         }
 
@@ -148,7 +148,7 @@ class UserListFragment : BaseFragment() {
                     viewModel.deleteById(userData._id)
                 }
                 dialog.dismiss()
-                Toast.makeText(requireContext(), R.string.upload_done_successfully, Toast.LENGTH_SHORT)
+                Toast.makeText(requireContext(), "Upload  done successfully", Toast.LENGTH_SHORT)
                     .show()
             }
         }
@@ -193,6 +193,7 @@ class UserListFragment : BaseFragment() {
                 binding.noList.visibility = View.GONE
                 binding.rvOrder.visibility = View.VISIBLE
             } else {
+                binding.emptyRegistrations.visibility = View.GONE
                 if (userDataList.isEmpty()) {
                     binding.noList.visibility = View.VISIBLE
                     binding.rvOrder.visibility = View.GONE

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

@@ -17,7 +17,6 @@ import com.example.hposregistration.ui.viewmodels.RegistrationViewModel
 import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanIntentResult
 import dagger.hilt.android.AndroidEntryPoint
-import `in`.sminnovations.hposregistration.R
 import `in`.sminnovations.hposregistration.databinding.FragmentAbhaRegistrationBinding
 import org.json.JSONObject
 
@@ -35,7 +34,7 @@ class AbhaRegistrationFragment : BaseFragment() {
         registerForActivityResult(ScanContract()) { result: ScanIntentResult ->
             if (result.contents == null) {
                 Toast.makeText(
-                    requireContext(), R.string.cancelled_unable_scan, Toast.LENGTH_LONG
+                    requireContext(), "Cancelled: Unable to scan, Try Again!!", Toast.LENGTH_LONG
                 ).show()
             } else {
                 processScannedData(result.contents)
@@ -134,7 +133,7 @@ class AbhaRegistrationFragment : BaseFragment() {
             } catch (e: Exception) {
                 Toast.makeText(
                     requireContext(),
-                    R.string.invalid_qr_code,
+                    "The QR Code you have scanned is not valid, enter the data manually",
                     Toast.LENGTH_SHORT
                 ).show()
             }
@@ -144,23 +143,23 @@ class AbhaRegistrationFragment : BaseFragment() {
     private fun saveUserDataAsPerAbhaId() {
         with(binding) {
             tvScanMessage.visibility = View.VISIBLE
-            tvScanMessage.text =  getString(R.string.enter_aadhar_manually)
+            tvScanMessage.text = "You have scanned the Abha ID, need to enter Aadhar ID manually"
             etAbhaId.setText(userData.abhaId)
             etName.setText(userData.name)
         }
         Toast.makeText(
-            requireContext(), R.string.scanned_abha_id, Toast.LENGTH_SHORT
+            requireContext(), "You have scanned the Abha ID", Toast.LENGTH_SHORT
         ).show()
     }
 
     private fun saveUserDataAsPerAadharId() {
         with(binding) {
             tvScanMessage.text =
-                getString(R.string.scanned_aadhar_id)
+                "You have scanned the Aadhar ID, need to enter Aadhar ID number you have scan and Abha ID manually"
             etName.setText(userData.name)
         }
         Toast.makeText(
-            requireContext(), R.string.scanned_aadharid, Toast.LENGTH_SHORT
+            requireContext(), "You have scanned the Aadhar ID", Toast.LENGTH_SHORT
         ).show()
     }
 
@@ -169,19 +168,19 @@ class AbhaRegistrationFragment : BaseFragment() {
     ): Boolean {
         with(binding) {
             if (!checkAbhaIDNumber(abhaId)) {
-                etAbhaId.error = getString(R.string.invalid_abha_id)
+                etAbhaId.error = "Invalid Abha ID"
                 return false
             }
             if (!checkAadharIDNumber(aadharId)) {
-                aadharID.error = getString(R.string.invalid_aadhar_id)
+                aadharID.error = "Invalid Aadhar ID"
                 return false
             }
             if (!checkUserName(userName)) {
-                etName.error = getString(R.string.name_field_error)
+                etName.error = "Name field can't be empty or less than 3 characters"
                 return false
             }
             if (!checkCenterName(centerName)) {
-                etCenterName.error = getString(R.string.center_name_error)
+                etCenterName.error = "Center name can't be empty or less than 3 characters"
                 return false
             }
         }

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

@@ -67,7 +67,7 @@ class ReviewDetailsRegistrationFragment : BaseFragment() {
             } else {
                 Toast.makeText(
                     requireContext(),
-                    R.string.internt_not_local,
+                    "Internet not available, Data stored in local DB",
                     Toast.LENGTH_SHORT
                 ).show()
                 navigateToUserListFragment()
@@ -86,7 +86,7 @@ class ReviewDetailsRegistrationFragment : BaseFragment() {
             if (it == "Success") {
                 Toast.makeText(
                     requireContext(),
-                    R.string.registration_success,
+                    "Registration Done Successfully",
                     Toast.LENGTH_SHORT
                 ).show()
                 navigateToUserListFragment()
@@ -170,13 +170,6 @@ class ReviewDetailsRegistrationFragment : BaseFragment() {
                     R.string.sickle_cell_family_history, userData.sickleCellHistory
                 )
             }
-
-            val pInfo = requireActivity().packageManager.getPackageInfo(
-                requireActivity().packageName, 0
-            )
-            val version = pInfo.versionName
-            userData.appVersion = version
-
         }
     }
 

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

@@ -5,7 +5,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -13,7 +12,6 @@ import androidx.navigation.fragment.navArgs
 import com.example.hposregistration.data.user.UserData
 import com.example.hposregistration.ui.viewmodels.RegistrationViewModel
 import dagger.hilt.android.AndroidEntryPoint
-import `in`.sminnovations.hposregistration.R
 import `in`.sminnovations.hposregistration.databinding.FragmentUserDetailsRegistrationBinding
 
 
@@ -44,23 +42,6 @@ class UserDetailsRegistrationFragment : Fragment() {
     private fun init() {
         setupViewModel()
         setupSubmitButton()
-
-
-        binding.etCategory.setOnItemClickListener { parent, view, position, id ->
-            if (parent.getItemAtPosition(position).toString().equals("OTHER", ignoreCase = true)) {
-                binding.tilOther.visibility = View.VISIBLE
-            } else {
-                binding.tilOther.visibility = View.GONE
-            }
-        }
-
-        binding.etCaste.setOnItemClickListener { parent, view, position, id ->
-            if (parent.getItemAtPosition(position).toString().equals("OTHER", ignoreCase = true)) {
-                binding.tilOthercaste.visibility = View.VISIBLE
-            } else {
-                binding.tilOthercaste.visibility = View.GONE
-            }
-        }
     }
 
     private fun setupViewModel() {
@@ -78,21 +59,20 @@ 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, false) }
+            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) }
@@ -114,13 +94,6 @@ 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
 
@@ -139,35 +112,6 @@ 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
-            }
 
         }
     }
@@ -179,7 +123,7 @@ class UserDetailsRegistrationFragment : Fragment() {
                 viewModel.insert(userData)
                 navigateToCaptureUserImageFragment()
             } else {
-                showToast(getString(R.string.enter_details_properly))
+                showToast("Please enter all the details properly")
             }
         }
     }
@@ -194,38 +138,23 @@ class UserDetailsRegistrationFragment : Fragment() {
         with(binding) {
             val yob = etYob.text.toString()
             if (yob.isEmpty() || yob.toInt() <= 1900 || yob.toInt() > 2023) {
-                etYob.error = getString(R.string.enter_valid_birth_year)
+                etYob.error = "Please enter a valid birth year between 1900 and 2023"
                 return false
             } else {
                 userData.birthYear = yob
             }
 
             if (male.isChecked) {
-                binding.tilOthergender.visibility = View.GONE
                 userData.gender = "Male"
             } else if (female.isChecked) {
-                binding.tilOthergender.visibility = View.GONE
                 userData.gender = "Female"
-            } else if(other.isChecked) {
-                binding.tilOthergender.visibility = View.VISIBLE
-                val genderother= binding.etOthergender.text.toString()
-                userData.gender = genderother
-                if (genderother.isEmpty()) {
-                    etOthergender.error = getString(R.string.fill_field)
-                    return false
-                }
+            } else {
+                userData.gender = "Other"
             }
 
-            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 = getString(R.string.valid_mobile_number)
+                etMobile.error = "Please enter a valid 10-digit mobile number"
                 return false
             } else {
                 userData.phoneNumber = mobile
@@ -233,7 +162,7 @@ class UserDetailsRegistrationFragment : Fragment() {
 
             val careOf = etCareof.text.toString()
             if (careOf.isEmpty()) {
-                etCareof.error = getString(R.string.enter_father_husband_name)
+                etCareof.error = "Please enter your name"
                 return false
             } else {
                 userData.careOf = careOf
@@ -241,35 +170,28 @@ class UserDetailsRegistrationFragment : Fragment() {
 
             val maritalStatus = etIsMarried.text.toString()
             if (maritalStatus.isEmpty()) {
-                etIsMarried.error = getString(R.string.enter_marital_status)
+                etIsMarried.error = "Please enter your marital status"
                 return false
             } else {
                 userData.maritalStatus = maritalStatus
             }
 
             val category = etCategory.text.toString()
-            val other = etOther.text.toString()
             if (category.isEmpty()) {
-                etCategory.error = getString(R.string.enter_category)
+                etCategory.error = "Please enter your category"
                 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 = getString(R.string.enter_caste)
+                etCaste.error = "Please enter your caste"
                 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
@@ -277,7 +199,7 @@ class UserDetailsRegistrationFragment : Fragment() {
 
             val house = etHouse.text.toString()
             if (house.isEmpty()) {
-                etHouse.error = getString(R.string.enter_house_address)
+                etHouse.error = "Please enter your house address"
                 return false
             } else {
                 userData.house = house
@@ -285,7 +207,7 @@ class UserDetailsRegistrationFragment : Fragment() {
 
             val city = etCity.text.toString()
             if (city.isEmpty()) {
-                etCity.error = getString(R.string.enter_city)
+                etCity.error = "Please enter your city"
                 return false
             } else {
                 userData.city = city
@@ -293,7 +215,7 @@ class UserDetailsRegistrationFragment : Fragment() {
 
             val district = etDistrict.text.toString()
             if (district.isEmpty()) {
-                etDistrict.error = getString(R.string.enter_district)
+                etDistrict.error = "Please enter your district"
                 return false
             } else {
                 userData.district = district
@@ -301,7 +223,7 @@ class UserDetailsRegistrationFragment : Fragment() {
 
             val state = etState.text.toString()
             if (state.isEmpty()) {
-                etState.error = getString(R.string.enter_state)
+                etState.error = "Please enter your state"
                 return false
             } else {
                 userData.state = state
@@ -309,7 +231,7 @@ class UserDetailsRegistrationFragment : Fragment() {
 
             val pincode = etPincode.text.toString()
             if (pincode.isEmpty() || pincode.length != 6) {
-                etPincode.error = getString(R.string.enter_pincode)
+                etPincode.error = "Please enter a valid 6-digit pin code"
                 return false
             } else {
                 userData.pinCode = pincode
@@ -322,7 +244,7 @@ class UserDetailsRegistrationFragment : Fragment() {
             if (yes1history.isChecked) {
                 val familyHistory = etFamilyHistory.text.toString()
                 if (familyHistory.isEmpty()) {
-                    etFamilyHistory.error = getString(R.string.enter_family_history)
+                    etFamilyHistory.error = "Please enter your family history"
                     return false
                 }
 
@@ -335,8 +257,6 @@ class UserDetailsRegistrationFragment : Fragment() {
 
             return true
 
-
-
         }
     }
 

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

@@ -13,6 +13,10 @@ import com.example.hposregistration.data.user.UserData
 import com.google.firebase.storage.FirebaseStorage
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Date
+import java.util.Locale
 import javax.inject.Inject
 
 @HiltViewModel
@@ -63,6 +67,15 @@ class RegistrationViewModel @Inject constructor(
         get() = _networkStatusLiveData
 
     fun insert(userData: UserData) = viewModelScope.launch {
+        val currentDate = Date()
+        val dateFormat = SimpleDateFormat("yyyyMMdd")
+        val partition = dateFormat.format(currentDate)
+        userData._idSearch = partition + userData._id
+        userData.abhaIdSearch = partition + userData.abhaId
+        userData.aadharIdSearch = partition + userData.aadharId
+        userData.createdAt = SimpleDateFormat(
+            "yyyy-MM-dd HH:mm:ss", Locale.getDefault()
+        ).format(Calendar.getInstance().time)
         mainRepository.insert(userData)
     }
 

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

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#000000"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
-</vector>

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

@@ -1,13 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.example.hposregistration.ui.fragments.LanguageSettingsFragment">
-
-    <!-- TODO: Update blank fragment layout -->
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/hello_blank_fragment" />
-
-</FrameLayout>

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_toBottomOf="parent" />
+            app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

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

@@ -63,6 +63,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
+                    android:checked="true"
                     android:text="@string/male"
                     android:textSize="16sp" />
 
@@ -81,29 +82,6 @@
                     android:textSize="16sp" />
             </RadioGroup>
 
-            <com.google.android.material.textfield.TextInputLayout
-                android:visibility="gone"
-                android:id="@+id/til_othergender"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="24dp"
-                android:layout_marginTop="20dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/gender">
-
-                <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"
@@ -113,7 +91,7 @@
                 android:layout_marginTop="20dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/til_othergender">
+                app:layout_constraintTop_toBottomOf="@id/gender">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/et_mobile"
@@ -182,32 +160,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="@string/category"
-                    android:inputType="text"
+                    android:inputType="none"
                     android:labelFor="@id/til_is_married"
                     app:simpleItems="@array/category" />
 
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout
-                android:visibility="gone"
-                android:id="@+id/til_other"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="24dp"
-                android:layout_marginTop="20dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/til_category">
 
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/et_other"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/other"
-                    android:inputType="text"
-                    android:maxLength="10" />
-
-            </com.google.android.material.textfield.TextInputLayout>
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/til_caste"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
@@ -217,39 +175,19 @@
                 android:layout_marginTop="20dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/til_other">
+                app:layout_constraintTop_toBottomOf="@id/til_category">
 
                 <AutoCompleteTextView
                     android:id="@+id/et_Caste"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="@string/caste"
-                    android:inputType="text"
+                    android:inputType="none"
                     android:labelFor="@id/til_is_married"
                     app:simpleItems="@array/caste" />
 
             </com.google.android.material.textfield.TextInputLayout>
-            <com.google.android.material.textfield.TextInputLayout
-                android:visibility="gone"
-                android:id="@+id/til_othercaste"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="24dp"
-                android:layout_marginTop="20dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/til_caste">
 
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/et_othercaste"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/other"
-                    android:inputType="text"
-                    android:maxLength="10" />
-
-            </com.google.android.material.textfield.TextInputLayout>
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/til_subCaste"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
@@ -259,7 +197,7 @@
                 android:layout_marginTop="16dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/til_othercaste">
+                app:layout_constraintTop_toBottomOf="@id/til_caste">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/et_subCaste"

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

@@ -16,14 +16,20 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
     </LinearLayout>
-    <ImageView
-        android:id="@+id/btnsettings"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginEnd="10dp"
-        android:src="@drawable/baseline_settings_24"
+
+    <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="@+id/tv_title" />
+        app:layout_constraintTop_toTopOf="parent" />
+
     <TextView
         android:id="@+id/tv_title"
         style="@style/title1"

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

@@ -31,9 +31,6 @@
             app:destination="@id/loginFragment"
             app:popUpTo="@id/main_nav_graph"
             app:popUpToInclusive="true"/>
-        <action
-            android:id="@+id/action_userListFragment_to_languageSettingsFragment"
-            app:destination="@id/languageSettingsFragment" />
     </fragment>
     <fragment
         android:id="@+id/profileFragment"
@@ -96,16 +93,4 @@
             app:popUpTo="@id/main_nav_graph"
             app:popUpToInclusive="true"/>
     </fragment>
-    <fragment
-        android:id="@+id/languageSettingsFragment"
-        android:name="com.example.hposregistration.ui.fragments.LanguageSettingsFragment"
-        android:label="fragment_language_settings"
-        tools:layout="@layout/fragment_language_settings">
-
-        <action
-            android:id="@+id/action_userListFragment_to_languageSettingsFragment"
-            app:destination="@id/languageSettingsFragment"
-            app:popUpTo="@id/main_nav_graph"
-            app:popUpToInclusive="true"/>
-        </fragment>
 </navigation>

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

@@ -1,215 +0,0 @@
-<resources>
-    <string name="app_name">HPOS रजिस्ट्रेशन</string>
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">नमस्ते खाली फ़्रेग्मेंट</string>
-
-    <!-- त्रुटि संदेश -->
-    <string name="retry">पुनः प्रयास करें</string>
-    <string name="failed_to_connect">कनेक्ट करने में विफल</string>
-    <string name="cancel">रद्द करें</string>
-
-    <!-- पंजीकरण स्क्रीनें -->
-    <string name="scan_person_abha_id_card">व्यक्ति का ABHA ID/Aadhar ID कार्ड स्कैन करें</string>
-    <string name="scan_now">अब स्कैन करें</string>
-    <string name="or">या</string>
-    <string name="enter_abha_number_manualy">ABHA और Aadhar नंबर दर्ज करें</string>
-    <string name="abha_id">ABHA नंबर</string>
-    <string name="create_abha_id_card">ABHA ID कार्ड बनाएं</string>
-    <string name="click_here">यहां क्लिक करें</string>
-    <string name="scan_person_s_aadhaar_card">व्यक्ति का Aadhaar कार्ड स्कैन करें</string>
-    <string name="proceed">आगे बढ़ें</string>
-    <string name="enter_aadhaar_number_manualy">Aadhaar नंबर मैन्युअली दर्ज करें</string>
-    <string name="aadhaar_number">Aadhaar नंबर</string>
-    <string name="enter_person_s_details">व्यक्ति का विवरण दर्ज करें</string>
-    <string name="person_s_name">व्यक्ति का नाम</string>
-    <string name="age">आयु (वर्षों में)</string>
-    <string name="gender">लिंग चयन करें</string>
-    <string name="name_error">नाम खाली नहीं हो सकता</string>
-    <string name="age_error">आयु खाली नहीं हो सकती</string>
-    <string name="gender_error">लिंग खाली नहीं हो सकता</string>
-    <string name="age_error_out_of_bound">आयु मान्य होनी चाहिए</string>
-    <string name="birth_year">जन्म साल</string>
-    <string name="marital_status">वैवाहिक स्थिति चयन करें</string>
-    <string name="father_s_husband_s_name">पिता/पति का नाम</string>
-    <string name="caste">जाति</string>
-    <string name="person_s_address_details">व्यक्ति का पता विवरण</string>
-    <string name="district">जिला</string>
-    <string name="city_town">शहर / गाँव</string>
-    <string name="state">राज्य</string>
-    <string name="pincode">पिनकोड</string>
-    <string name="patient_medical_records">रोगी का चिकित्सा रेकॉर्ड</string>
-    <string name="review">समीक्षा</string>
-    <string name="blood_group">रक्त समूह चयन करें</string>
-    <string name="house">घर</string>
-    <string name="is_patient_under_any_medication">क्या आप पिछले तीन महीनों से सिक्ल सेल के लिए दवा ले रहे हैं?</string>
-    <string name="is_patient_undergoing_any_blood_transfusion">क्या आपने पिछले तीन महीनों में कोई रक्त प्रवाहन किया है?</string>
-
-    <string name="user_list">उपयोगकर्ता सूची</string>
-    <string name="register_user">उपयोगकर्ता पंजीकृत करें</string>
-    <string name="is_user_having_any_family_history_for_sickle_cell">क्या उपयोगकर्ता के पास सिक्ल सेल के लिए कोई परिवार का इतिहास है?</string>
-    <string name="family_history_of_sickle_cell">सिक्ल सेल का परिवारिक इतिहास</string>
-    <string name="mobile_number_10_digits">मोबाइल नंबर (10 अंक)</string>
-    <string name="sub_caste">उपजाति</string>
-    <string name="capture_user_image">उपयोगकर्ता की छवि कैद करें</string>
-    <string name="mobile_number">मोबाइल नंबर</string>
-    <string name="edit">संपादित करें</string>
-    <string name="user_details">उपयोगकर्ता विवरण</string>
-    <string name="internet_is_not_available_and_there_is_no_data_available_in_local_db">इंटरनेट उपलब्ध नहीं है और स्थानीय डेटाबेस में कोई डेटा उपलब्ध नहीं है</string>
-    <string name="user_id">उपयोगकर्ता आईडी: %1$s</string>
-    <string name="abha_number">ABHA नंबर: %1$s</string>
-    <string name="aadhar_number_details">Aadhar नंबर: %1$s</string>
-    <string name="user_name">व्यक्ति का नाम: %1$s</string>
-    <string name="birth_year_details">जन्म साल: %1$s</string>
-    <string name="gender_details">लिंग: %1$s</string>
-    <string name="phone_number_details">मोबाइल नंबर: %1$s</string>
-    <string name="care_of_details">पिता/पति का नाम: %1$s</string>
-    <string name="marital_status_details">वैवाहिक स्थिति: %1$s</string>
-    <string name="category_details">श्रेणी: %1$s</string>
-    <string name="caste_details">जाति: %1$s</string>
-    <string name="sub_caste_details">उपजाति: %1$s</string>
-    <string name="house_details">घर: %1$s</string>
-    <string name="city_town_details">शहर/गाँव: %1$s</string>
-    <string name="district_details">जिला: %1$s</string>
-    <string name="state_details">राज्य: %1$s</string>
-    <string name="centre_name">केंद्र का नाम: %1$s</string>
-
-    <string name="pincode_details">पिनकोड: %1$s</string>
-    <string name="is_patient_under_any_medication_details">क्या दवा ले रहे हैं: %1$s</string>
-    <string name="is_patient_undergoing_any_blood_transfusion_details">क्या रक्त प्रवाहन हो रहा है: %1$s</string>
-    <string name="is_any_sickle">क्या कोई सिक्ल सेल इतिहास है: %1$s</string>
-    <string name="sickle_cell_family_history">सिक्ल सेल परिवारिक इतिहास: %1$s</string>
-    <string name="center_name">केंद्र का नाम</string>
-    <string name="login_id">लॉगिन आईडी</string>
-    <string name="password">पासवर्ड</string>
-    <string name="login">लॉगिन</string>
-    <string name="_2">श्रेणी</string>
-    <string name="category">श्रेणी</string>
-    <string name="male">पुरुष</string>
-    <string name="female">महिला</string>
-    <string name="other">अन्य</string>
-    <string name="cancelled_unable_scan">रद्द किया गया: स्कैन करने में असमर्थ, पुनः प्रयास करें!!</string>
-    <string name="scan_abha_card">कृपया एबीए आईडी / आधार आईडी स्कैन करें</string>
-    <string name="invalid_qr_code">आपने स्कैन किया हुआ QR कोड अमान्य है, कृपया डेटा मैन्युअली दर्ज करें</string>
-    <string name="enter_aadhar_manually">आपने एबीए आईडी स्कैन किया है, आधार आईडी को मैन्युअली दर्ज करने की आवश्यकता है</string>
-    <string name="invalid_abha_id">अमान्य एबीए आईडी</string>
-    <string name="invalid_aadhar_id">अमान्य आधार आईडी</string>
-    <string name="name_field_error">नाम फील्ड खाली नहीं हो सकती या 3 अक्षरों से कम होनी चाहिए</string>
-    <string name="center_name_error">केंद्र का नाम खाली नहीं हो सकता या 3 अक्षरों से कम होना चाहिए</string>
-    <string name="registration_success">पंजीकरण सफलतापूर्वक हुआ</string>
-    <string name="internt_not_local">इंटरनेट उपलब्ध नहीं है, परीक्षण विवरण स्थानीय रूप से संग्रहित किए गए हैं</string>
-    <string name="enter_details_properly">कृपया सभी विवरणों को ठीक से दर्ज करें</string>
-    <string name="enter_valid_birth_year">कृपया 1900 से 2023 के बीच एक मान्य जन्म वर्ष दर्ज करें</string>
-    <string name="fill_field">कृपया फ़ील्ड भरें</string>
-    <string name="valid_mobile_number">कृपया एक मान्य 10-अंकों का मोबाइल नंबर दर्ज करें</string>
-    <string name="enter_name">कृपया अपना नाम दर्ज करें</string>
-    <string name="enter_marital_status">कृपया अपनी वैवाहिक स्थिति दर्ज करें</string>
-    <string name="enter_category">कृपया अपनी श्रेणी दर्ज करें</string>
-    <string name="enter_caste">कृपया अपनी जाति दर्ज करें</string>
-    <string name="enter_house_address">कृपया अपना घर का पता दर्ज करें</string>
-    <string name="enter_city">कृपया अपने शहर को दर्ज करें</string>
-    <string name="enter_district">कृपया अपने जिले को दर्ज करें</string>
-    <string name="enter_state">कृपया अपने राज्य को दर्ज करें</string>
-    <string name="enter_pincode">कृपया एक मान्य 6-अंकों कोड दर्ज करें</string>
-    <string name="enter_family_history">कृपया अपना परिवार का इतिहास दर्ज करें</string>
-    <string name="enter_guardian_name">कृपया अपने पालक का नाम दर्ज करें</string>
-    <string name="enter_father_husband_name">पिता / पति का नाम दर्ज करें</string>
-    <string name="do_log_out">क्या आप ऐप्लिकेशन से लॉग आउट करना चाहते हैं?</string>
-    <string name="log_out">लॉग आउट</string>
-
-    <string name="upload_db_registration">डीबी पंजीकरण अपलोड करें</string>
-    <string name="upload_local_db_to_cloud">क्या आप स्थानीय डीबी को क्लाउड पर अपलोड करना चाहते हैं?</string>
-    <string name="upload">अपलोड</string>
-    <string name="upload_done_successfully">अपलोड सफलतापूर्वक हुआ</string>
-
-    <string name="enter_proper_login_id">कृपया सही लॉगिन आईडी दर्ज करें</string>
-    <string name="enter_proper_password">कृपया सही पासवर्ड दर्ज करें</string>
-    <string name="wrong_password">गलत पासवर्ड</string>
-    <string name="wrong_user_id">गलत उपयोगकर्ता आईडी</string>
-    <string name="scanned_aadhar_id">आपने आधार आईडी स्कैन की है, कृपया आधार आईडी नंबर और अभा आईडी को मैन्युअली दर्ज करें</string>
-    <string name="scanned_abha_id">आपने आभा आईडी स्कैन की है</string>
-    <string name="scanned_aadharid">आपने आधार आईडी स्कैन की है</string>
-    <string name="language_update">भाषा सफलतापूर्वक अपडेट की गई है</string>
-    <string name="select_language">अपनी पसंदीदा भाषा का चयन करें</string>
-    <string name="app_language">ऐप भाषा</string>
-    <string name="add_blood_group">रक्त समूह जोड़ें</string>
-    <string name="ok">ठीक है</string>
-    <string name="userid">उपयोगकर्ता आईडी</string>
-
-    <string name="yes">हाँ</string>
-    <string name="no">नहीं</string>
-    <string name="name">नाम</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>

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

@@ -1,218 +0,0 @@
-<resources>
-    <string name="app_name">HPOS ನೋಂದಾಯಿಸಲು</string>
-    <string name="hello_blank_fragment">ಹಲೋ ಖಾಲಿ ಫ್ರ್ಯಾಗ್ಮೆಂಟ್</string>
-
-    // ದೋಷ ಸಂದೇಶಗಳು
-    <string name="retry">ಮರುಪ್ರಯಾಸ</string>
-    <string name="failed_to_connect">ಸಂಪರ್ಕ ಸಾಧಿಸಲಾಗಿಲ್ಲ</string>
-    <string name="cancel">ರದ್ದು ಮಾಡಿ</string>
-
-
-    //Registration Screens
-    <string name="scan_person_abha_id_card">ವ್ಯಕ್ತಿಯ ಏಬಿಎ ಐಡಿ / ಆಧಾರ್ ಐಡಿ ಕಾರ್ಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
-    <string name="scan_now">ಈಗ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
-    <string name="or">ಅಥವಾ</string>
-    <string name="enter_abha_number_manualy">ಏಬಿಎ ಮತ್ತು ಆಧಾರ್ ಸಂಖ್ಯೆಗಳನ್ನು ಕೈಮಾಡಿ</string>
-    <string name="abha_id">ಏಬಿಎ ಸಂಖ್ಯೆ</string>
-    <string name="create_abha_id_card">ಏಬಿಎ ಐಡಿ ಕಾರ್ಡ್ ರಚಿಸಿ</string>
-    <string name="click_here">ಇಲ್ಲಿ ಕ್ಲಿಕ್ ಮಾಡಿ</string>
-    <string name="scan_person_s_aadhaar_card">ವ್ಯಕ್ತಿಯ ಆಧಾರ್ ಕಾರ್ಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
-    <string name="proceed">ಮುಂದುವರಿಸಿ</string>
-    <string name="enter_aadhaar_number_manualy">ಆಧಾರ್ ಸಂಖ್ಯೆಯನ್ನು ಕೈಮಾಡಿ</string>
-    <string name="aadhaar_number">ಆಧಾರ್ ಸಂಖ್ಯೆ</string>
-    <string name="enter_person_s_details">ವ್ಯಕ್ತಿಯ ವಿವರಗಳನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="person_s_name">ವ್ಯಕ್ತಿಯ ಹೆಸರು</string>
-    <string name="age">ವಯಸ್ಸು ವರ್ಷಗಳಲ್ಲಿ</string>
-    <string name="gender">ಲಿಂಗ ಆಯ್ಕೆ ಮಾಡಿ</string>
-    <string name="name_error">ಹೆಸರು ಖಾಲಿ ಇರಬಾರದು</string>
-    <string name="age_error">ವಯಸ್ಸು ಖಾಲಿ ಇರಬಾರದು</string>
-    <string name="gender_error">ಲಿಂಗ ಖಾಲಿ ಇರಬಾರದು</string>
-    <string name="age_error_out_of_bound">ವಯಸ್ಸು ಯೋಗ್ಯವಾಗಿರಬೇಕು</string>
-    <string name="birth_year">ಹುಟ್ಟಿದ ವರ್ಷ</string>
-    <string name="marital_status">ವೈವಾಹಿಕ ಸ್ಥಿತಿ ಆಯ್ಕೆ ಮಾಡಿ</string>
-    <string name="father_s_husband_s_name">ತಂದೆಯ / ಗಂಡನ ಹೆಸರು</string>
-    <string name="caste">ಜಾತಿ</string>
-    <string name="person_s_address_details">ವ್ಯಕ್ತಿಯ ವಿಳಾಸ ವಿವರಗಳು</string>
-    <string name="district">ಜಿಲ್ಲೆ</string>
-    <string name="city_town">ನಗರ / ಹಳ್ಳಿ</string>
-    <string name="state">ರಾಜ್ಯ</string>
-    <string name="pincode">ಪಿನ್‌ಕೋಡ್</string>
-    <string name="patient_medical_records">ರೋಗಿಯ ವೈದ್ಯಕೀಯ ದಾಖಲೆಗಳು</string>
-    <string name="review">ಸಮೀಕ್ಷಿಸಿ</string>
-    <string name="blood_group">ರಕ್ತ ಗುಂಪು ಆಯ್ಕೆ ಮಾಡಿ</string>
-    <string name="house">ಮನೆ</string>
-    <string name="is_patient_under_any_medication">ಹಳೆಯ ಮೂಲಕ ಸಿಕ್ಕಲ್ ಸೆಲ್ ಗೆ ನೀವು ಔಷಧಿಗೆ ಒಳಪಟ್ಟಿದ್ದೀರಾ?</string>
-    <string name="is_patient_undergoing_any_blood_transfusion">ಹಳೆಯ ಮೂಲಕ ರಕ್ತ ಸಂಚಾರ ನಡೆಸಲಾಗಿದೆಯೇ?</string>
-
-
-    <string name="user_list">ಬಳಕೆದಾರ ಪಟ್ಟಿ</string>
-    <string name="register_user">ಬಳಕೆದಾರ ನೋಂದಣಿ</string>
-    <string name="is_user_having_any_family_history_for_sickle_cell">ಬಳಕೆದಾರನಿಗೆ ಸಿಕ್ಕಲ್ ಸೆಲ್ ಕುಟುಂಬ ಇತಿಹಾಸವಿದೆಯೇ</string>
-    <string name="family_history_of_sickle_cell">ಸಿಕ್ಕಲ್ ಸೆಲ್ ಕುಟುಂಬ ಇತಿಹಾಸ</string>
-    <string name="mobile_number_10_digits">ಮೊಬೈಲ್ ಸಂಖ್ಯೆ (10 ಅಂಕಗಳು)</string>
-    <string name="sub_caste">ಉಪ ಜಾತಿ</string>
-    <string name="capture_user_image">ಬಳಕೆದಾರ ಚಿತ್ರ ಹಿಡಿಯಿರಿ</string>
-    <string name="mobile_number">ಮೊಬೈಲ್ ಸಂಖ್ಯೆ</string>
-    <string name="edit">ಸಂಪಾದಿಸಿ</string>
-    <string name="user_details">ಬಳಕೆದಾರ ವಿವರಗಳು</string>
-    <string name="internet_is_not_available_and_there_is_no_data_available_in_local_db">ಇಂಟರ್ನೆಟ್ ಲಭ್ಯವಿಲ್ಲ ಮತ್ತು ಸ್ಥಳಿಯ ಡಿಬಿಯಲ್ಲಿ ಯಾವುದೇ ಡೇಟಾ ಲಭ್ಯವಿಲ್ಲ</string>
-    <string name="user_id">ಬಳಕೆದಾರ ಐಡಿ: %1$s</string>
-    <string name="abha_number">ಆಭಾ ಸಂಖ್ಯೆ: %1$s</string>
-    <string name="aadhar_number_details">ಆಧಾರ ಸಂಖ್ಯೆ: %1$s</string>
-    <string name="user_name">ವ್ಯಕ್ತಿಯ ಹೆಸರು: %1$s</string>
-    <string name="birth_year_details">ಹುಟ್ಟಿದ ವರ್ಷ: %1$s</string>
-    <string name="gender_details">ಲಿಂಗ: %1$s</string>
-    <string name="phone_number_details">ಮೊಬೈಲ್ ಸಂಖ್ಯೆ: %1$s</string>
-    <string name="care_of_details">ತಂದೆಯ / ಗಂಡನ ಹೆಸರು: %1$s</string>
-    <string name="marital_status_details">ವೈವಾಹಿಕ ಸ್ಥಿತಿ: %1$s</string>
-    <string name="category_details">ವರ್ಗ: %1$s</string>
-    <string name="caste_details">ಜಾತಿ: %1$s</string>
-    <string name="sub_caste_details">ಉಪ ಜಾತಿ: %1$s</string>
-    <string name="house_details">ಮನೆ: %1$s</string>
-    <string name="city_town_details">ನಗರ / ಹಳ್ಳಿ: %1$s</string>
-    <string name="district_details">ಜಿಲ್ಲೆ: %1$s</string>
-    <string name="state_details">ರಾಜ್ಯ: %1$s</string>
-    <string name="centre_name">ಕೇಂದ್ರ ಹೆಸರು: %1$s</string>
-
-
-    <string name="pincode_details">ಪಿನ್‌ಕೋಡ್: %1$s</string>
-    <string name="is_patient_under_any_medication_details">ಔಷಧಿಗಳ ಕೆಳಗೆ ಇದ್ದಾರೆ: %1$s</string>
-    <string name="is_patient_undergoing_any_blood_transfusion_details">ರಕ್ತ ಸಂರಚನೆಯಲ್ಲಿ ಇದ್ದಾರೆ: %1$s</string>
-    <string name="is_any_sickle">ಯಾವುದೇ ಸಿಕ್ಕಲ್ ಸೆಲ್ ಇತಿಹಾಸವಿದೆಯೇ: %1$s</string>
-    <string name="sickle_cell_family_history">ಸಿಕ್ಕಲ್ ಸೆಲ್ ಕುಟುಂಬ ಇತಿಹಾಸ: %1$s</string>
-    <string name="center_name">ಕೇಂದ್ರ ಹೆಸರು</string>
-    <string name="login_id">ಲಾಗಿನ್ ಐಡಿ</string>
-    <string name="password">ಪಾಸ್‌ವರ್ಡ್</string>
-    <string name="login">ಲಾಗಿನ್</string>
-    <string name="_2">ವರ್ಗ</string>
-    <string name="category">ವರ್ಗ</string>
-    <string name="male">ಗಂಡು</string>
-    <string name="female">ಹೆಣ್ಣು</string>
-    <string name="other">ಇತರ</string>
-
-
-    <string name="cancelled_unable_scan">ರದ್ದು ಮಾಡಲಾಗಿದೆ: ಸ್ಕ್ಯಾನ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ, ಮತ್ತೊಮ್ಮೆ ಪ್ರಯಾಸಿಸಿ!!</string>
-    <string name="scan_abha_card">ದಯವಿಟ್ಟು ಆಭಾ ಐಡಿ / ಆಧಾರ್ ಐಡಿ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
-    <string name="invalid_qr_code">ನೀವು ಸ್ಕ್ಯಾನ್ ಮಾಡಿದ QR ಕೋಡ್ ಮಾನ್ಯವಿಲ್ಲ, ದಯವಿಟ್ಟು ಮಾಹಿತಿಯನ್ನು ಕೈಮಾಡಿ ನಮೂದಿಸಿ</string>
-    <string name="enter_aadhar_manually">ನೀವು ಅಬ ಹಾ ಐಡಿ ಸ್ಕ್ಯಾನ್ ಮಾಡಿದ್ದೀರಿ, ಆಧಾರ್ ಐಡಿ ಅನ್ನು ಕೈಮಾತ್ರ ನಮೂದಿಸಿ</string>
-    <string name="invalid_abha_id">ಅಮಾನ್ಯವಾದ ಅಬ ಹಾ ಐಡಿ</string>
-    <string name="invalid_aadhar_id">ಅಮಾನ್ಯವಾದ ಆಧಾರ್ ಐಡಿ</string>
-    <string name="name_field_error">ಹೆಸರು ಕ್ಷೇತ್ರವು ಖಾಲಿ ಇರಲಾರದು ಅಥವಾ 3 ಅಕ್ಷರಗಳಿಂದ ಕಡಿಮೆ ಇರಲಾರದು</string>
-    <string name="center_name_error">ಕೇಂದ್ರದ ಹೆಸರು ಖಾಲಿ ಇರಲಾರದು ಅಥವಾ 3 ಅಕ್ಷರಗಳಿಂದ ಕಡಿಮೆ ಇರಲಾರದು</string>
-    <string name="registration_success">ಯಶಸ್ವಿಯಾಗಿ ನೋಂದಾಯಿಸಲಾಗಿದೆ</string>
-    <string name="internt_not_local">ಇಂಟರ್ನೆಟ್ ಲಭ್ಯವಿಲ್ಲ, ಪರೀಕ್ಷೆ ವಿವರಗಳನ್ನು ಸ್ಥಾನಿಕವಾಗಿ ಉಳಿಸಲಾಗಿದೆ</string>
-    <string name="enter_details_properly">ದಯವಿಟ್ಟು ಎಲ್ಲಾ ವಿವರಗಳನ್ನು ಸರಿಯಾಗಿ ನಮೂದಿಸಿ</string>
-    <string name="enter_valid_birth_year">ದಯವಿಟ್ಟು 1900 ಮತ್ತು 2023 ನ ನಡುವೆ ಒಂದು ವಾಸಿಸುವ ತಾರೀಖು ನಮೂದಿಸಿ</string>
-    <string name="fill_field">ದಯವಿಟ್ಟು ಕ್ಷೇತ್ರವನ್ನು ನಿರೂಪಿಸಿ</string>
-    <string name="valid_mobile_number">ದಯವಿಟ್ಟು ಒಂದು ಮಾನ್ಯವಾದ 10 ಅಂಕದ ಮೊಬೈಲ್ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="enter_name">ದಯವಿಟ್ಟು ನಿಮ್ಮ ಹೆಸರನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="enter_marital_status">ದಯವಿಟ್ಟು ನಿಮ್ಮ ವೈವಾಹಿಕ ಸ್ಥಿತಿಯನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="enter_category">ದಯವಿಟ್ಟು ನಿಮ್ಮ ವರ್ಗವನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="enter_caste">ದಯವಿಟ್ಟು ನಿಮ್ಮ ಜಾತಿಯನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="enter_house_address">ದಯವಿಟ್ಟು ನಿಮ್ಮ ಮನೆಯ ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="enter_city">ದಯವಿಟ್ಟು ನಿಮ್ಮ ನಗರವನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="enter_district">ದಯವಿಟ್ಟು ನಿಮ್ಮ ಜಿಲ್ಲೆಯನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="enter_state">ದಯವಿಟ್ಟು ನಿಮ್ಮ ರಾಜ್ಯವನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="enter_pincode">ದಯವಿಟ್ಟು ಒಂದು ಮಾನ್ಯ ಆರು-ಅಂಕ ಪಿನ್‌ಕೋಡ್ ನಮೂದಿಸಿ</string>
-    <string name="enter_family_history">ದಯವಿಟ್ಟು ನಿಮ್ಮ ಕುಟುಂಬದ ಇತಿಹಾಸವನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="enter_guardian_name">ದಯವಿಟ್ಟು ನಿಮ್ಮ ಅಭಿಭಾವಕರ ಹೆಸರನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="enter_father_husband_name">ದಯವಿಟ್ಟು ನಿಮ್ಮ ತಂದೆ / ಗಂಡನ ಹೆಸರನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="do_log_out">ನೀವು ಅಪ್ಲಿಕೇಶನ್ ನಿಂದ ಲಾಗೌಟ್ ಮಾಡಲು ಇಚ್ಛಿಸುತ್ತೀರಾ?</string>
-    <string name="log_out">ಲಾಗೌಟ್</string>
-
-    <string name="upload_db_registration">ಡಿಬಿ ನೋಂದಾಯಿಸುವ ಕೊರಕು</string>
-    <string name="upload_local_db_to_cloud">ನೀವು ಲೋಕಲ್ ಡಿಬಿ ನೋಂದಾಯಿಸನ್ನು ಮೇಘಮಾರ್ಗಕ್ಕೆ ಅಪ್ಲೋಡ್ ಮಾಡಲು ಇಚ್ಛಿಸುವಿರಾ?</string>
-    <string name="upload">ಅಪ್ಲೋಡ್</string>
-    <string name="upload_done_successfully">ಅಪ್ಲೋಡ್ ಯಶಸ್ವಿಯಾಗಿ ನಡೆಯಿತು</string>
-    <string name="enter_proper_login_id">ದಯವಿಟ್ಟು ಸರಿಯಾದ ಲಾಗಿನ್ ಐಡಿ ನಮೂದಿಸಿ</string>
-    <string name="enter_proper_password">ದಯವಿಟ್ಟು ಸರಿಯಾದ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸಿ</string>
-    <string name="wrong_password">ತಪ್ಪಾದ ಪಾಸ್‌ವರ್ಡ್</string>
-    <string name="wrong_user_id">ತಪ್ಪಾದ ಬಳಕೆದಾರ ಐಡಿ</string>
-    <string name="scanned_aadhar_id">ನೀವು ಆಧಾರ್ ಐಡನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿದ್ದೀರಿ, ದಯವಿಟ್ಟು ಆಧಾರ್ ಐಡನ್ನು ನೀವು ಸ್ಕ್ಯಾನ್ ಮಾಡಿದ ಮತ್ತು ಅಭಾ ಐಡನ್ನು ಕೈಯಾರೆ ನಮೂದಿಸಿ</string>
-
-    <string name="scanned_abha_id">ನೀವು ಅಭಾ ಐಡನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿದಿರಿ</string>
-    <string name="scanned_aadharid">ನೀವು ಆಧಾರ್ ಐಡನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿದಿರಿ</string>
-    <string name="language_update">ಭಾಷೆ ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಗಿದೆ</string>
-    <string name="select_language">ನಿಮ್ಮ ಆದರಿತ ಭಾಷೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ</string>
-    <string name="app_language">ಅಪ್ಲಿಕೇಶನ್ ಭಾಷೆ</string>
-    <string name="add_blood_group">ರಕ್ತ ಗುಂಡನ್ನು ಸೇರಿಸಿ</string>
-    <string name="userid">ಬಳಕೆದಾರ ಐಡಿ</string>
-    <string name="ok">ಸರಿ</string>
-    <string name="yes">ಹೌದು</string>
-    <string name="no">ಇಲ್ಲ</string>
-    <string name="name">ಹೆಸರು</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>

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

@@ -7,12 +7,6 @@
     <string name="retry">Retry</string>
     <string name="failed_to_connect">Failed to connect</string>
     <string name="cancel">Cancel</string>
-    <string name="yes">Yes</string>
-    <string name="no">No</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>
@@ -61,6 +55,7 @@
     <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>
@@ -94,53 +89,6 @@
     <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="empty_registrations">No registrations are available for display</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="language_update">Language updated successfully</string>
-    <string name="select_language">Select your preferred language</string>
-    <string name="app_language">App Language</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="userid">User Id</string>
-    <string name="name">Name</string>
-    <string name="ok">OK</string>
-    <string name="add_blood_group">Add Blood Group</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>