From 30665be147d9f410d2f3733acf54587f27d80da2 Mon Sep 17 00:00:00 2001 From: vsuryakumar Date: Fri, 26 May 2023 01:22:38 +0530 Subject: [PATCH] Added new UI to dashboard. --- .idea/misc.xml | 2 +- app/src/main/AndroidManifest.xml | 6 + .../example/hpos/data/model/PendingQueue.kt | 8 + .../hpos/presentation/DashboardFragment.kt | 20 ++ .../RegisterOneScanAbhaFragment.kt | 20 ++ app/src/main/res/drawable/baseline_add_24.xml | 5 + .../drawable/baseline_qr_code_scanner_24.xml | 5 + app/src/main/res/drawable/test_tube.xml | 5 + app/src/main/res/font/roboto.xml | 7 + app/src/main/res/font/roboto_medium.xml | 7 + .../main/res/layout/fragment_dashboard.xml | 71 +++++++ .../fragment_register_one_scan_abha.xml | 181 ++++++++++++++++++ app/src/main/res/layout/table_item.xml | 58 +++++- app/src/main/res/values/colors.xml | 8 +- app/src/main/res/values/preloaded_fonts.xml | 7 + app/src/main/res/values/strings.xml | 11 ++ app/src/main/res/values/styles.xml | 16 ++ build.gradle | 6 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 19 files changed, 435 insertions(+), 10 deletions(-) create mode 100644 app/src/main/java/com/example/hpos/data/model/PendingQueue.kt create mode 100644 app/src/main/java/com/example/hpos/presentation/DashboardFragment.kt create mode 100644 app/src/main/java/com/example/hpos/presentation/RegisterOneScanAbhaFragment.kt create mode 100644 app/src/main/res/drawable/baseline_add_24.xml create mode 100644 app/src/main/res/drawable/baseline_qr_code_scanner_24.xml create mode 100644 app/src/main/res/drawable/test_tube.xml create mode 100644 app/src/main/res/font/roboto.xml create mode 100644 app/src/main/res/font/roboto_medium.xml create mode 100644 app/src/main/res/layout/fragment_dashboard.xml create mode 100644 app/src/main/res/layout/fragment_register_one_scan_abha.xml create mode 100644 app/src/main/res/values/preloaded_fonts.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index 2c67699..59172e5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -33,7 +33,7 @@ - + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 33541dc..3f374e3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,6 +10,9 @@ + + + + diff --git a/app/src/main/java/com/example/hpos/data/model/PendingQueue.kt b/app/src/main/java/com/example/hpos/data/model/PendingQueue.kt new file mode 100644 index 0000000..18385e2 --- /dev/null +++ b/app/src/main/java/com/example/hpos/data/model/PendingQueue.kt @@ -0,0 +1,8 @@ +package com.example.hpos.data.model + +data class PendingQueue( + val photoInDevicePath: String?, + val csvInDevicePath: String?, + val detailedCsvInDevicePath: String?, + val pdfReportInDevicePath: String? +) diff --git a/app/src/main/java/com/example/hpos/presentation/DashboardFragment.kt b/app/src/main/java/com/example/hpos/presentation/DashboardFragment.kt new file mode 100644 index 0000000..49960fa --- /dev/null +++ b/app/src/main/java/com/example/hpos/presentation/DashboardFragment.kt @@ -0,0 +1,20 @@ +package com.example.hpos.presentation + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.example.hpos.R + +class DashboardFragment : Fragment() { + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_dashboard, container, false) + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/hpos/presentation/RegisterOneScanAbhaFragment.kt b/app/src/main/java/com/example/hpos/presentation/RegisterOneScanAbhaFragment.kt new file mode 100644 index 0000000..69b3ee3 --- /dev/null +++ b/app/src/main/java/com/example/hpos/presentation/RegisterOneScanAbhaFragment.kt @@ -0,0 +1,20 @@ +package com.example.hpos.presentation + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.example.hpos.R + +class RegisterOneScanAbhaFragment : Fragment() { + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_register_one_scan_abha, container, false) + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable/baseline_add_24.xml b/app/src/main/res/drawable/baseline_add_24.xml new file mode 100644 index 0000000..508e699 --- /dev/null +++ b/app/src/main/res/drawable/baseline_add_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/baseline_qr_code_scanner_24.xml b/app/src/main/res/drawable/baseline_qr_code_scanner_24.xml new file mode 100644 index 0000000..206747a --- /dev/null +++ b/app/src/main/res/drawable/baseline_qr_code_scanner_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/test_tube.xml b/app/src/main/res/drawable/test_tube.xml new file mode 100644 index 0000000..c4e5379 --- /dev/null +++ b/app/src/main/res/drawable/test_tube.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/font/roboto.xml b/app/src/main/res/font/roboto.xml new file mode 100644 index 0000000..2641caf --- /dev/null +++ b/app/src/main/res/font/roboto.xml @@ -0,0 +1,7 @@ + + + diff --git a/app/src/main/res/font/roboto_medium.xml b/app/src/main/res/font/roboto_medium.xml new file mode 100644 index 0000000..59df90b --- /dev/null +++ b/app/src/main/res/font/roboto_medium.xml @@ -0,0 +1,7 @@ + + + diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml new file mode 100644 index 0000000..d39206f --- /dev/null +++ b/app/src/main/res/layout/fragment_dashboard.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_register_one_scan_abha.xml b/app/src/main/res/layout/fragment_register_one_scan_abha.xml new file mode 100644 index 0000000..590a070 --- /dev/null +++ b/app/src/main/res/layout/fragment_register_one_scan_abha.xml @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/table_item.xml b/app/src/main/res/layout/table_item.xml index 41d2ef1..c95b0dc 100644 --- a/app/src/main/res/layout/table_item.xml +++ b/app/src/main/res/layout/table_item.xml @@ -1,6 +1,60 @@ - - \ No newline at end of file + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 1c5fe51..bbb6efe 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -9,7 +9,9 @@ #FFFFFFFF #808080 - #219AD6 - #0082C3 - #80219AD6 + #4daaff + #005db3 + #e5f3ff + + \ No newline at end of file diff --git a/app/src/main/res/values/preloaded_fonts.xml b/app/src/main/res/values/preloaded_fonts.xml new file mode 100644 index 0000000..87d1584 --- /dev/null +++ b/app/src/main/res/values/preloaded_fonts.xml @@ -0,0 +1,7 @@ + + + + @font/roboto + @font/roboto_medium + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2678247..eb69625 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -88,5 +88,16 @@ Patient Details OR Scan ABHA\nCard + List Of Patients + No Patient Records \nFound to Test. \nPlease Add one from below. + Add + Test + Pending + Scan Patient ABHA ID Card + Scan Now + Enter ABHA number manualy + ABHA ID + GO + Click Here \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 6a53051..c3b9ad6 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -18,6 +18,22 @@ -0.62sp + + + +