From f1b03c93a2d0188259c207394e47e8b5037d7f86 Mon Sep 17 00:00:00 2001
From: tanx <taneshborkar9@gmail.com>
Date: Mon, 25 Mar 2024 12:40:59 +0530
Subject: [PATCH] chenges buttons and text inputs attributes.

---
 app/src/main/res/drawable/pannel_button.xml   |  10 +
 app/src/main/res/layout/fragment_gallery.xml  | 214 +++++++++---------
 ...t_register_three_enter_patient_details.xml |  18 +-
 app/src/main/res/layout/user_item_view.xml    |   5 +-
 app/src/main/res/values/colors.xml            |   1 +
 5 files changed, 126 insertions(+), 122 deletions(-)
 create mode 100644 app/src/main/res/drawable/pannel_button.xml

diff --git a/app/src/main/res/drawable/pannel_button.xml b/app/src/main/res/drawable/pannel_button.xml
new file mode 100644
index 0000000..3506a1c
--- /dev/null
+++ b/app/src/main/res/drawable/pannel_button.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/card_blue_app" />
+            <corners android:radius="20dp" />
+            <stroke android:color="@color/red" android:width="1dp" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_gallery.xml b/app/src/main/res/layout/fragment_gallery.xml
index ae5ad7d..f57637e 100644
--- a/app/src/main/res/layout/fragment_gallery.xml
+++ b/app/src/main/res/layout/fragment_gallery.xml
@@ -26,121 +26,113 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-
-    <Button
-        android:id="@+id/btn_submit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="24dp"
-        android:clickable="false"
-        android:text="@string/check_buffer"
-        android:textColor="@color/white"
-        app:cornerRadius="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
-
-
-    <Button
-        android:id="@+id/btn_diagnostics"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="24dp"
-        android:clickable="false"
-        android:text="@string/diagnostics"
-        android:textColor="@color/white"
-        app:cornerRadius="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_submit" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_auto_dac"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="24dp"
-        android:clickable="false"
-        android:text="@string/auto_dac"
-        android:textColor="@color/white"
-        app:cornerRadius="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_diagnostics" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_calibration"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="24dp"
-        android:clickable="false"
-        android:text="@string/calibration"
-        android:textColor="@color/white"
-        app:cornerRadius="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_auto_dac" />
-
-        
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_deviceInfo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="24dp"
-        android:clickable="false"
-        android:text="@string/deviceinfo"
-        android:textColor="@color/white"
-        app:cornerRadius="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_calibration" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/btn_deviceProvision"
+        <GridLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="visible"
-            android:layout_marginHorizontal="16dp"
-            android:layout_marginTop="24dp"
-            android:clickable="false"
-            android:text="@string/deviceProvision"
-            android:textColor="@color/white"
-            app:cornerRadius="16dp"
+            android:layout_height="600dp"
+            android:layout_margin="10sp"
+            android:columnCount="2"
+            android:rowCount="4"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_deviceInfo" />
+            app:layout_constraintTop_toBottomOf="@+id/tv_subtitle4"
+            app:layout_constraintVertical_bias="0.471">
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_firefox"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="24dp"
-        android:clickable="false"
-        android:text="@string/Firefox"
-        android:textColor="@color/white"
-        app:cornerRadius="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_deviceProvision" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_files"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="24dp"
-        android:clickable="false"
-        android:text="@string/Files"
-        android:textColor="@color/white"
-        app:cornerRadius="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/btn_firefox" />
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btn_submit"
+                android:layout_width="150dp"
+                android:layout_height="130dp"
+                android:layout_margin="15sp"
+                android:clickable="false"
+                android:background="@drawable/pannel_button"
+                android:text="@string/check_buffer"
+                android:textColor="@color/blue_text_color" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btn_diagnostics"
+                android:layout_width="150dp"
+                android:layout_height="130dp"
+                android:layout_margin="15sp"
+                android:clickable="false"
+                android:text="@string/diagnostics"
+                android:background="@drawable/pannel_button"
+                android:textColor="@color/blue_text_color"
+                app:cornerRadius="16dp" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btn_auto_dac"
+                android:layout_width="150dp"
+                android:layout_height="130dp"
+                android:layout_margin="15sp"
+                android:clickable="false"
+                android:text="@string/auto_dac"
+                android:background="@drawable/pannel_button"
+                android:textColor="@color/blue_text_color"
+                app:cornerRadius="16dp" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btn_calibration"
+                android:layout_width="150dp"
+                android:layout_height="130dp"
+                android:layout_margin="15sp"
+                android:clickable="false"
+                android:text="@string/calibration"
+                android:background="@drawable/pannel_button"
+                android:textColor="@color/blue_text_color"
+                app:cornerRadius="16dp" />
+
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btn_deviceInfo"
+                android:layout_width="150dp"
+                android:layout_height="130dp"
+                android:layout_margin="15sp"
+                android:clickable="false"
+                android:text="@string/deviceinfo"
+                android:background="@drawable/pannel_button"
+                android:textColor="@color/blue_text_color"
+                app:cornerRadius="16dp" />
+
+            <Button
+                android:id="@+id/btn_deviceProvision"
+                android:layout_width="150dp"
+                android:layout_height="130dp"
+                android:layout_margin="15sp"
+                android:text="@string/deviceProvision"
+                android:background="@drawable/pannel_button"
+                android:textColor="@color/blue_text_color"
+                android:visibility="visible"
+                app:cornerRadius="16dp" />
+
+            <Button
+                android:id="@+id/btn_firefox"
+                android:layout_width="150dp"
+                android:layout_height="130dp"
+                android:layout_margin="15sp"
+                android:clickable="false"
+                android:text="@string/Firefox"
+                android:background="@drawable/pannel_button"
+                android:textColor="@color/blue_text_color"
+                app:cornerRadius="16dp" />
+
+            <Button
+                android:id="@+id/btn_files"
+                android:layout_width="150dp"
+                android:layout_height="130dp"
+                android:layout_margin="15sp"
+                android:clickable="false"
+                android:text="@string/Files"
+                android:background="@drawable/pannel_button"
+                android:textColor="@color/blue_text_color"
+                app:cornerRadius="16dp"
+                tools:layout_editor_absoluteX="208dp"
+                tools:layout_editor_absoluteY="240dp" />
+
+
+        </GridLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout
+     >
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_register_three_enter_patient_details.xml b/app/src/main/res/layout/fragment_register_three_enter_patient_details.xml
index e5b6b7a..f1a3118 100644
--- a/app/src/main/res/layout/fragment_register_three_enter_patient_details.xml
+++ b/app/src/main/res/layout/fragment_register_three_enter_patient_details.xml
@@ -137,15 +137,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/til_careof">
 
-                <AutoCompleteTextView
-                    android:id="@+id/et_is_married"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/is_patient_married_yes_no"
-                    android:inputType="none"
-                    android:labelFor="@id/til_is_married"
-                    app:simpleItems="@array/yes_no" />
-
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
@@ -168,6 +159,15 @@
                     android:labelFor="@id/til_category"
                     app:simpleItems="@array/category" />
 
+                <AutoCompleteTextView
+                    android:id="@+id/et_is_married"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/is_patient_married_yes_no"
+                    android:inputType="none"
+                    android:labelFor="@id/til_is_married"
+                    app:simpleItems="@array/yes_no" />
+
             </com.google.android.material.textfield.TextInputLayout>
 
             <TextView
diff --git a/app/src/main/res/layout/user_item_view.xml b/app/src/main/res/layout/user_item_view.xml
index 81d677d..3d73c4f 100644
--- a/app/src/main/res/layout/user_item_view.xml
+++ b/app/src/main/res/layout/user_item_view.xml
@@ -24,6 +24,7 @@
                 android:id="@+id/userImage"
                 android:layout_width="100dp"
                 android:layout_height="100dp"
+                android:layout_marginLeft="10dp"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:src="@drawable/ic_launcher_foreground" />
@@ -91,8 +92,8 @@
                 android:layout_marginTop="15dp"
                 android:layout_marginEnd="60dp"
                 android:background="@drawable/bloodgroup_button"
-                android:paddingLeft="10dp"
-                android:paddingRight="10dp"
+                android:paddingLeft="15dp"
+                android:paddingRight="15dp"
                 android:text="@string/blood_group"
                 android:textColor="@color/white"
                 app:layout_constraintEnd_toStartOf="@+id/btn_startIncubation"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 72bdcef..d0e04f1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -16,6 +16,7 @@
     <color name="red">#FF0000</color>
     <color name="red_light">#88FF0000</color>
     <color name="blue_app">#4daaff</color>
+    <color name="card_blue_app">#6600A3E0</color>
     <color name="blue_app_dark">#005db3</color>
     <color name="blue_app_light">#e5f3ff</color>
     <color name="new_blue">#A2C3FA</color>