Merge branch 'DigitalCard' into DigitalPreprodCombine

# Conflicts:
#	app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt
#	app/src/main/java/com/example/hpostesting/data/model/patient/UserData.kt

app/src/main/java/com/example/hpostesting/data/dao/MyDataBase.kt

@@ -11,7 +11,7 @@ import com.example.hpostesting.data.model.patient.HemoCubeTestData
 import com.google.android.datatransport.runtime.dagger.Provides
 import javax.inject.Singleton
 
-@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class], version = 10, exportSchema = false)
+@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class], version = 6, exportSchema = false)
 @TypeConverters(Converters::class)
 abstract class MyDatabase : RoomDatabase() {
     abstract fun userDao(): UserDao

app/src/main/java/com/example/hpostesting/data/model/patient/HemoCubeTestData.kt

@@ -11,12 +11,16 @@ data class HemoCubeTestData(
     var incubationTime: String = "",
     var bloodGroup: String = "",
     var birthYear: String = "",
+    var state: String = "",
+    var abhaId: String = "",
+    var bloodGroup: String = "",
     var userImageURL: String = "",
     var location: UserData.Location? = null,
     var reportUploadTime: String? = "",
     var testType: String? = "HEMOCUBE",
     var testTime: String? = "",
     var testStatus: Boolean? = false,
+    var gender: String = "",
     var localFlag: Boolean = false,
     var deviceId: String? = "",
     var appVersion:String? = "",

app/src/main/java/com/example/hpostesting/data/model/patient/UserData.kt

@@ -9,10 +9,11 @@ data class UserData(
     @PrimaryKey
     var _id: String = "",
     var name: String = "",
-    var bloodGroup: String = "",
     var incubationTime: String = "",
     var birthYear: String = "",
+    var abhaId: String = "",
     var userImageURL: String = "",
+    var gender: String ="",
     var location: Location? = null,
     var createdBy: String? = "",
     var reportUploadTime: String? = "",
@@ -20,6 +21,7 @@ data class UserData(
     var testStatus: Boolean? = false,
     var mobileId: String = "",
     var deviceId: String = "",
+    var state: String = "",
     var deviceSerialNumber: String = "",
     var kitSerial: String = "",
     var csvPath: String = "",
@@ -45,7 +47,6 @@ fun UserData.toHemoCubeTestData() = HemoCubeTestData(
     birthYear = birthYear,
     userImageURL = userImageURL,
     testStatus = testStatus,
-    bloodGroup = bloodGroup,
+    location = location,
-    incubationTime = incubationTime,
+    gender = gender
-    location = location
 )

app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt

@@ -11,7 +11,6 @@ import androidx.appcompat.app.AppCompatActivity
 import com.example.hpostesting.data.DataHolder
 import com.example.hpostesting.data.constant.Constants
 import com.example.hpostesting.presentation.dashboard.DashboardActivity
-import com.example.hpostesting.presentation.diagnostics.DiagnosticsActivity
 import com.example.hpostesting.presentation.hemocube.HemocubeActivity
 import com.example.hpostesting.presentation.testRight.TestRightActivity
 import com.google.android.material.snackbar.Snackbar

app/src/main/java/com/example/hpostesting/presentation/hemocube/DigitalCardFragment.kt

@@ -0,0 +1,61 @@
+package com.example.hpostesting.presentation.hemocube
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.activityViewModels
+import com.example.hpostesting.data.DataHolder
+import com.example.hpostesting.data.model.patient.toHemoCubeTestData
+import `in`.sminnovations.hpostesting.R
+import `in`.sminnovations.hpostesting.databinding.FragmentDigitalCardBinding
+import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
+import java.text.SimpleDateFormat
+import java.util.Date
+
+class DigitalCardFragment : Fragment() {
+    private lateinit var binding: FragmentDigitalCardBinding
+    private val hemoCubeViewModel: HemoCubeViewModel by activityViewModels()
+    private lateinit var sharedPreferences: SharedPreferences
+    val testDetails = DataHolder.selectedTest?.toHemoCubeTestData()
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?,
+    ): View {
+        binding = FragmentDigitalCardBinding.inflate(inflater, container, false)
+        sharedPreferences =
+            requireContext().getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        initViews()
+    }
+
+    private fun initViews() {
+        activity?.runOnUiThread {
+            binding.progressBar.visibility = View.VISIBLE
+        }
+        val originalDateStr = testDetails?.testTime
+        val originalDateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
+        val originalDate: Date? = originalDateFormat.parse(originalDateStr)
+        val desiredDateFormat = SimpleDateFormat("MMM dd, yyyy")
+        val formattedDate: String = originalDate?.let { desiredDateFormat.format(it) } ?: "N/A"
+        activity?.runOnUiThread {
+            binding.progressBar.visibility = View.GONE
+        }
+        binding.name.text = "Name: ${testDetails?.name}"
+        binding.dob.text = "DOB: ${testDetails?.birthYear}"
+        binding.gender.text = "gender: ${testDetails?.gender}"
+        binding.State.text = "state: ${testDetails?.state}"
+        binding.abhaid.text = "ABHA ID: ${testDetails?.abhaId}"
+        binding.blood.text = "Blood Group: ${testDetails?.bloodGroup}"
+        binding.sicklecell.text = "Sickle-Cell: ${testDetails?.classificationResult}"
+        binding.issueDate.text = "Issue Date: $formattedDate"
+    }
+}

app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt

@@ -126,11 +126,23 @@ class HemoCubeFragment : Fragment() {
         hemoCubeViewModel.fireBaseUpload.observe(viewLifecycleOwner) { result ->
             if (result == "Success") {
                 showToast("Test Results Uploaded Successfully")
-                val i = Intent(
+
-                    requireContext().applicationContext, DashboardActivity::class.java
+                val digitalCardFragment = DigitalCardFragment()
-                )
+                val transaction = parentFragmentManager.beginTransaction()
-                startActivity(i)
+                transaction.replace(R.id.fragment_container, digitalCardFragment)
-                (activity as HemocubeActivity).finish()
+                transaction.addToBackStack(null)
+                transaction.commit()
+
+//                val i = Intent(
+//                    requireContext().applicationContext, DashboardActivity::class.java
+//                )
+//                startActivity(i)
+//                (activity as HemocubeActivity).finish()
+//                val i = Intent(
+//                    requireContext().applicationContext, DashboardActivity::class.java
+//                )
+//                startActivity(i)
+//                (activity as HemocubeActivity).finish()
             }
             if (result == "Local") {
                 showToast("Internet not available, test details stored locally")

app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt

@@ -2,7 +2,6 @@ package com.example.hpostesting.presentation.testRight
 
 import android.content.Context
 import android.net.Uri
-import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel

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

@@ -0,0 +1,5 @@
+<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="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>

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

@@ -0,0 +1,243 @@
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.example.hpostesting.presentation.hemocube.DigitalCardFragment">
+
+<androidx.constraintlayout.widget.ConstraintLayout
+
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/fragment_container">
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/userCard"
+        android:layout_width="match_parent"
+        android:layout_height="350dp"
+        android:layout_marginTop="24dp"
+        app:cardBackgroundColor="#C0C0C0"
+        app:cardCornerRadius="25dp"
+        app:cardElevation="0dp"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="22dp">
+
+            <ImageView
+                android:id="@+id/userImage"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:src="@drawable/karnataka" />
+
+            <ImageView
+                android:id="@+id/userName"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:layout_marginStart="46dp"
+                app:layout_constraintTop_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/userImage"
+                app:layout_constraintTop_toTopOf="@+id/userImage"
+                tools:src="@drawable/sickle_cell_gov_logo"/>
+
+
+            <ImageView
+                android:id="@+id/userImage3"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:layout_marginStart="36dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/userName"
+                app:layout_constraintTop_toTopOf="@+id/userName"
+                tools:src="@drawable/indianoil"/>
+
+            <ImageView
+                android:id="@+id/userImage4"
+                android:layout_width="80dp"
+                android:layout_height="100dp"
+                android:layout_marginTop="30dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/userImage"
+                tools:src="@drawable/person" />
+
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/userdetails"
+                android:layout_width="150dp"
+                android:layout_height="120dp"
+                android:layout_marginTop="24dp"
+                app:cardBackgroundColor="#FFFFFF"
+                app:cardCornerRadius="5dp"
+                app:layout_constraintTop_toBottomOf="@id/userImage"
+                app:layout_constraintStart_toEndOf="@+id/userImage4"
+                app:cardElevation="0dp">
+
+                <TextView
+                    android:id="@+id/name"
+                    style="@style/title1_1"
+                    android:layout_width="80dp"
+                    android:layout_height="20dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="10dp"
+                    android:gravity="center"
+                    android:textColor="@color/black"
+                    android:textSize="10sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/userImage"
+                    android:text="Name: Mariya" />
+
+
+                <TextView
+                    android:id="@+id/dob"
+                    style="@style/title1_1"
+                    android:layout_width="80dp"
+                    android:layout_height="20dp"
+                    android:layout_marginStart="16dp"
+                    android:gravity="center"
+                    android:layout_marginTop="30dp"
+                    android:textColor="@color/black"
+                    android:textSize="10sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/name"
+                    app:layout_constraintTop_toBottomOf="@id/name"
+                    android:text="DOB: 1998" />
+
+
+                <TextView
+                    android:id="@+id/gender"
+                    style="@style/title1_1"
+                    android:layout_width="80dp"
+                    android:layout_height="20dp"
+                    android:layout_marginStart="16dp"
+                    android:gravity="center"
+                    android:layout_marginTop="50dp"
+                    android:textColor="@color/black"
+                    android:textSize="10sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/dob"
+                    app:layout_constraintTop_toBottomOf="@id/dob"
+                    android:text="gender: female" />
+
+
+                <TextView
+                    android:id="@+id/State"
+                    style="@style/title1_1"
+                    android:layout_width="80dp"
+                    android:layout_height="20dp"
+                    android:layout_marginStart="16dp"
+                    android:gravity="center"
+                    android:layout_marginTop="70dp"
+                    android:textColor="@color/black"
+                    android:textSize="10sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/gender"
+                    app:layout_constraintTop_toBottomOf="@id/gender"
+                    android:text="State: Kerala" />
+
+            </androidx.cardview.widget.CardView>
+            <androidx.cardview.widget.CardView
+                android:id="@+id/userdetails2"
+                android:layout_width="150dp"
+                android:layout_marginStart="10dp"
+                android:layout_height="120dp"
+                android:layout_marginTop="24dp"
+                app:cardBackgroundColor="#FFFFFF"
+                app:cardCornerRadius="5dp"
+                app:layout_constraintTop_toBottomOf="@id/userImage3"
+                app:layout_constraintStart_toEndOf="@+id/userdetails"
+                app:cardElevation="0dp">
+
+                <TextView
+                    android:id="@+id/abhaid"
+                    style="@style/title1_1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="20dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="10dp"
+                    android:gravity="start"
+                    android:textColor="@color/black"
+                    android:textSize="10sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/userImage3"
+                    android:text="ABHA-ID: XXXX-8734" />
+
+                <TextView
+                    android:id="@+id/blood"
+                    style="@style/title1_1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="20dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="30dp"
+                    android:gravity="start"
+                    android:textColor="@color/black"
+                    android:textSize="10sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/userImage3"
+                    android:text="Blood Group: O +ve" />
+                <TextView
+                    android:id="@+id/sicklecell"
+                    style="@style/title1_1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="20dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="50dp"
+                    android:gravity="start"
+                    android:textColor="@color/black"
+                    android:textSize="8sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/userImage3"
+                    android:text="Sickle-Cell: Normal (HbA)" />
+                <TextView
+                    android:id="@+id/issueDate"
+                    style="@style/title1_1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="20dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="70dp"
+                    android:gravity="start"
+                    android:textColor="@color/black"
+                    android:textSize="10sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/userImage3"
+                    android:text="Issue Date: Oct 2,2023" />
+
+
+            </androidx.cardview.widget.CardView>
+
+
+            <Button
+                android:id="@+id/digitalcard"
+                android:backgroundTint="#00008B"
+                app:cardBackgroundColor="#00008B"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="16dp"
+                android:layout_marginTop="20dp"
+                android:text="@string/digital_card"
+                android:textColor="@color/white"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/userdetails" />
+
+            <ProgressBar
+                android:id="@+id/progressBar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:elevation="12dp"
+                android:indeterminate="true"
+                android:indeterminateDrawable="@drawable/progressbar_drawable"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.cardview.widget.CardView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

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

@@ -158,6 +158,7 @@
     <string name="is_patient_married_yes_no">Is Patient Married? (Yes/No)</string>
     <string name="category">Category</string>
     <string name="blood_group">Blood Group</string>
+    <string name="digital_card">Digital Counselling Card</string>
     <string name="patient_medical_records">Patient Medical Records</string>
     <string name="patient_address_details">Patient Address Details</string>
     <string name="district">District</string>

build.gradle

@@ -3,9 +3,9 @@ buildscript {
         kotlin_version = '1.8.21'
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.2'
+        classpath 'com.android.tools.build:gradle:8.1.1'
-        classpath 'com.google.gms:google-services:4.3.15'
+        classpath 'com.google.gms:google-services:4.4.0'
-        classpath 'com.google.firebase:firebase-appdistribution-gradle:4.0.0'
+        classpath 'com.google.firebase:firebase-appdistribution-gradle:4.0.1'
     }
     repositories {
         mavenCentral()