Logo changes and blood group selection change

2023-07-20 18:05:43 +05:30
parent 909fd4dc17
commit f7d27d79b5
41 changed files with 127 additions and 287 deletions
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.8.21" />
+    <option name="version" value="1.8.22" />
  </component>
 </project>
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,12 +9,12 @@ plugins {

 android {
    namespace 'in.sminnovations.hposregistration'
-    compileSdk 33
+    compileSdk 34

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

@@ -71,8 +71,8 @@ dependencies {
    kapt "androidx.hilt:hilt-compiler:1.0.0"

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

    // Retrofit + GSON
    implementation "com.squareup.retrofit2:retrofit:2.9.0"
@@ -89,9 +89,9 @@ dependencies {
    annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'

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

    // Barcode scanner
    implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -1,41 +1,41 @@
 {
  "project_info": {
-    "project_number": "650071678820",
-    "project_id": "hpos-af3cc",
-    "storage_bucket": "hpos-af3cc.appspot.com"
+    "project_number": "1012719870714",
+    "project_id": "hpos-prod",
+    "storage_bucket": "hpos-prod.appspot.com"
  },
  "client": [
    {
      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:7569c1cad4fc99916c6471",
+        "mobilesdk_app_id": "1:1012719870714:android:2122895c593b5c1bde5f43",
        "android_client_info": {
-          "package_name": "in.sminnovations.hposregistration"
+          "package_name": "com.example.hposconsentform"
        }
      },
      "oauth_client": [
        {
-          "client_id": "650071678820-70kp5jvjda4r5diqch2kn4lc40p4f42g.apps.googleusercontent.com",
+          "client_id": "1012719870714-47951kfciei7suf9lkb8h9mih5511a49.apps.googleusercontent.com",
          "client_type": 1,
          "android_info": {
-            "package_name": "in.sminnovations.hposregistration",
+            "package_name": "com.example.hposconsentform",
            "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
          }
        },
        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+          "client_id": "1012719870714-uli6cdjea3lfnnueh6e4r15i10ei1vlj.apps.googleusercontent.com",
          "client_type": 3
        }
      ],
      "api_key": [
        {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
+          "current_key": "AIzaSyCr755mlFbEbjABXRCrhlJE25lBiuJ_eiE"
        }
      ],
      "services": {
        "appinvite_service": {
          "other_platform_oauth_client": [
            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+              "client_id": "1012719870714-uli6cdjea3lfnnueh6e4r15i10ei1vlj.apps.googleusercontent.com",
              "client_type": 3
            }
          ]
@@ -44,35 +44,72 @@
    },
    {
      "client_info": {
-        "mobilesdk_app_id": "1:650071678820:android:f96be19e5d43102b6c6471",
+        "mobilesdk_app_id": "1:1012719870714:android:ef0f9ee982d1e20ade5f43",
        "android_client_info": {
-          "package_name": "in.sminnovations.hpostesting"
+          "package_name": "in.sminnovations.hposregistration.prod"
        }
      },
      "oauth_client": [
        {
-          "client_id": "650071678820-l87dnr0bdj95get0khgnvfv2an1k6ogq.apps.googleusercontent.com",
+          "client_id": "1012719870714-6bh1e40n7sn7e14obeqe06lbmn3r5qtr.apps.googleusercontent.com",
          "client_type": 1,
          "android_info": {
-            "package_name": "in.sminnovations.hpostesting",
+            "package_name": "in.sminnovations.hposregistration.prod",
            "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
          }
        },
        {
-          "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+          "client_id": "1012719870714-uli6cdjea3lfnnueh6e4r15i10ei1vlj.apps.googleusercontent.com",
          "client_type": 3
        }
      ],
      "api_key": [
        {
-          "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I"
+          "current_key": "AIzaSyCr755mlFbEbjABXRCrhlJE25lBiuJ_eiE"
        }
      ],
      "services": {
        "appinvite_service": {
          "other_platform_oauth_client": [
            {
-              "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com",
+              "client_id": "1012719870714-uli6cdjea3lfnnueh6e4r15i10ei1vlj.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:1012719870714:android:5bfc19f874284d77de5f43",
+        "android_client_info": {
+          "package_name": "in.sminnovations.hpostesting.prod"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "1012719870714-ucnt94gpjdrj8ac7rnkts9v5o2t6ae10.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "in.sminnovations.hpostesting.prod",
+            "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a"
+          }
+        },
+        {
+          "client_id": "1012719870714-uli6cdjea3lfnnueh6e4r15i10ei1vlj.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCr755mlFbEbjABXRCrhlJE25lBiuJ_eiE"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "1012719870714-uli6cdjea3lfnnueh6e4r15i10ei1vlj.apps.googleusercontent.com",
              "client_type": 3
            }
          ]
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,9 +16,9 @@
        android:allowBackup="true"
        android:dataExtractionRules="@xml/data_extraction_rules"
        android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/hpos_icon"
        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@mipmap/hpos_icon_round"
        android:supportsRtl="true"
        android:theme="@style/Theme.HPOSRegistration"
        tools:targetApi="31">
@@ -42,6 +42,11 @@
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
+        <activity
+            android:name="com.journeyapps.barcodescanner.CaptureActivity"
+            android:screenOrientation="portrait"
+            android:stateNotNeeded="true"
+            tools:replace="android:screenOrientation" />
    </application>

 </manifest>
--- 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,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
@@ -60,14 +59,13 @@ class UserDetailsRegistrationFragment : Fragment() {
            user.phoneNumber.let { etMobile.setText(it) }
            user.careOf.let { etCareof.setText(it) }
            user.maritalStatus.let { etIsMarried.setText(it, false) }
-            user.caste.let { etCategory.setText(it, false) }
+            user.caste.let { etCaste.setText(it) }
            user.subCaste.let { etSubCaste.setText(it) }
            user.house.let { etHouse.setText(it) }
            user.city.let { etCity.setText(it) }
            user.district.let { etDistrict.setText(it) }
            user.state.let { etState.setText(it) }
            user.pinCode.let { etPincode.setText(it) }
-            user.bloodGroup.let { etBloodGroup.setText(it, false) }
            user.isUnderMedication.let {
                if (it != null) {
                    yes.isChecked = it
@@ -200,19 +198,16 @@ class UserDetailsRegistrationFragment : Fragment() {
                userData.maritalStatus = maritalStatus
            }

-            val category = etCategory.text.toString()
+            val category = etCaste.text.toString()
            if (category.isEmpty()) {
-                etCategory.error = "Please enter your caste"
+                etCaste.error = "Please enter your caste"
                return false
            } else {
                userData.caste = category
            }

            val subCaste = etSubCaste.text.toString()
-            if (subCaste.isEmpty()) {
-                etSubCaste.error = "Please enter your sub caste"
-                return false
-            } else {
+            if (subCaste.isNotEmpty()) {
                userData.subCaste = subCaste
            }

@@ -256,13 +251,13 @@ class UserDetailsRegistrationFragment : Fragment() {
                userData.pinCode = pincode
            }

-            val bloodGroup = etBloodGroup.text.toString()
-            if (bloodGroup.isEmpty()) {
-                etBloodGroup.error = "Please enter your blood group"
-                return false
-            } else {
-                userData.bloodGroup = bloodGroup
-            }
+//            val bloodGroup = etBloodGroup.text.toString()
+//            if (bloodGroup.isEmpty()) {
+//                etBloodGroup.error = "Please enter your blood group"
+//                return false
+//            } else {
+//                userData.bloodGroup = bloodGroup
+//            }
            userData.isUnderMedication = yes.isChecked
            userData.isUnderTransfusion = yes1.isChecked
            userData.sickleCellHistory = yes1history.isChecked.toString()
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
--- a/app/src/main/res/layout/fragment_user_details_registration.xml
+++ b/app/src/main/res/layout/fragment_user_details_registration.xml
@@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    tools:context=".ui.fragments.registration.UserDetailsRegistrationFragment">
+    tools:context="com.example.hposregistration.ui.fragments.registration.UserDetailsRegistrationFragment">

    <ScrollView
        android:layout_width="match_parent"
@@ -134,7 +134,7 @@

            <com.google.android.material.textfield.TextInputLayout
                android:id="@+id/til_category"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginHorizontal="24dp"
@@ -143,14 +143,11 @@
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toBottomOf="@id/til_is_married">

-                <AutoCompleteTextView
-                    android:id="@+id/et_category"
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/et_Caste"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:hint="@string/caste"
-                    android:inputType="none"
-                    android:labelFor="@id/til_category"
-                    app:simpleItems="@array/category" />
+                    android:hint="@string/_2" />

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

@@ -294,37 +291,38 @@
                app:layout_constraintTop_toBottomOf="@id/til_pincode" />


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

-                <AutoCompleteTextView
-                    android:id="@+id/et_blood_group"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/blood_group"
-                    android:inputType="none"
-                    android:labelFor="@id/til_blood_group"
-                    app:simpleItems="@array/blood_group" />
+<!--                <AutoCompleteTextView-->
+<!--                    android:id="@+id/et_blood_group"-->
+<!--                    android:layout_width="match_parent"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:hint="@string/blood_group"-->
+<!--                    android:inputType="none"-->
+<!--                    android:labelFor="@id/til_blood_group"-->
+<!--                    app:simpleItems="@array/blood_group" />-->

-            </com.google.android.material.textfield.TextInputLayout>
+<!--            </com.google.android.material.textfield.TextInputLayout>-->

            <TextView
                android:id="@+id/cb_item1"
+                style="@style/title1_2"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginHorizontal="24dp"
                android:layout_marginTop="16dp"
                android:text="@string/is_patient_under_any_medication"
                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/til_blood_group" />
+                app:layout_constraintTop_toBottomOf="@id/tv_title3" />

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

            <TextView
                android:id="@+id/cb_item2"
+                style="@style/title1_2"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginHorizontal="24dp"
@@ -388,6 +387,7 @@
            </RadioGroup>
            <TextView
                android:id="@+id/cb_item3"
+                style="@style/title1_2"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginHorizontal="24dp"
--- a/app/src/main/res/mipmap-anydpi-v26/hpos_icon.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/hpos_icon.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/hpos_icon_background"/>
+    <foreground android:drawable="@mipmap/hpos_icon_foreground"/>
+</adaptive-icon>
--- a/app/src/main/res/mipmap-anydpi-v26/hpos_icon_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/hpos_icon_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/hpos_icon_background"/>
+    <foreground android:drawable="@mipmap/hpos_icon_foreground"/>
+</adaptive-icon>
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
--- a/app/src/main/res/mipmap-hdpi/hpos_icon.png
+++ b/app/src/main/res/mipmap-hdpi/hpos_icon.png
--- a/app/src/main/res/mipmap-hdpi/hpos_icon_foreground.png
+++ b/app/src/main/res/mipmap-hdpi/hpos_icon_foreground.png
--- a/app/src/main/res/mipmap-hdpi/hpos_icon_round.png
+++ b/app/src/main/res/mipmap-hdpi/hpos_icon_round.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
--- a/app/src/main/res/mipmap-mdpi/hpos_icon.png
+++ b/app/src/main/res/mipmap-mdpi/hpos_icon.png
--- a/app/src/main/res/mipmap-mdpi/hpos_icon_foreground.png
+++ b/app/src/main/res/mipmap-mdpi/hpos_icon_foreground.png
--- a/app/src/main/res/mipmap-mdpi/hpos_icon_round.png
+++ b/app/src/main/res/mipmap-mdpi/hpos_icon_round.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
--- a/app/src/main/res/mipmap-xhdpi/hpos_icon.png
+++ b/app/src/main/res/mipmap-xhdpi/hpos_icon.png
--- a/app/src/main/res/mipmap-xhdpi/hpos_icon_foreground.png
+++ b/app/src/main/res/mipmap-xhdpi/hpos_icon_foreground.png
--- a/app/src/main/res/mipmap-xhdpi/hpos_icon_round.png
+++ b/app/src/main/res/mipmap-xhdpi/hpos_icon_round.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
--- a/app/src/main/res/mipmap-xxhdpi/hpos_icon.png
+++ b/app/src/main/res/mipmap-xxhdpi/hpos_icon.png
--- a/app/src/main/res/mipmap-xxhdpi/hpos_icon_foreground.png
+++ b/app/src/main/res/mipmap-xxhdpi/hpos_icon_foreground.png
--- a/app/src/main/res/mipmap-xxhdpi/hpos_icon_round.png
+++ b/app/src/main/res/mipmap-xxhdpi/hpos_icon_round.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
--- a/app/src/main/res/mipmap-xxxhdpi/hpos_icon.png
+++ b/app/src/main/res/mipmap-xxxhdpi/hpos_icon.png
--- a/app/src/main/res/mipmap-xxxhdpi/hpos_icon_foreground.png
+++ b/app/src/main/res/mipmap-xxxhdpi/hpos_icon_foreground.png
--- a/app/src/main/res/mipmap-xxxhdpi/hpos_icon_round.png
+++ b/app/src/main/res/mipmap-xxxhdpi/hpos_icon_round.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
--- a/app/src/main/res/values/hpos_icon_background.xml
+++ b/app/src/main/res/values/hpos_icon_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="hpos_icon_background">#FFFFFF</color>
+</resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -81,6 +81,7 @@
    <string name="login_id">Login ID</string>
    <string name="password">Password</string>
    <string name="login">Login</string>
+    <string name="_2">Caste</string>


    <string-array name="category">
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ plugins {
    id 'com.android.application' version '8.0.2' apply false
    id 'com.android.library' version '8.0.2' apply false
    id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
-    id 'androidx.navigation.safeargs' version '2.7.0-beta01' apply false
+    id 'androidx.navigation.safeargs' version '2.7.0-beta02' apply false
    id 'com.google.dagger.hilt.android' version '2.46' apply false
    id "com.google.gms.google-services" version "4.3.15" apply false
 }
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jun 14 15:14:47 IST 2023
+#Wed Jul 12 14:05:11 IST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists