From f61a99e5614c3da684a7d44022de0b8b8fd19196 Mon Sep 17 00:00:00 2001
From: deeppp15 <voradeep15@gmail.com>
Date: Mon, 14 Oct 2024 14:55:39 -0400
Subject: [PATCH] Added darkmode compatible changes

---
 .../ui/myhealth/AddMyHealthActivity.kt        | 23 ++++++
 .../res/layout/activity_add_my_health.xml     | 79 ++++++++++++-------
 .../res/layout/fragment_library_filter.xml    |  5 +-
 3 files changed, 78 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/myhealth/AddMyHealthActivity.kt b/app/src/main/java/org/ole/planet/myplanet/ui/myhealth/AddMyHealthActivity.kt
index 75f277d10..a5fabaf09 100644
--- a/app/src/main/java/org/ole/planet/myplanet/ui/myhealth/AddMyHealthActivity.kt
+++ b/app/src/main/java/org/ole/planet/myplanet/ui/myhealth/AddMyHealthActivity.kt
@@ -4,6 +4,10 @@ import android.os.Bundle
 import android.text.TextUtils
 import android.view.MenuItem
 import android.view.View
+import android.view.ViewGroup
+import android.widget.ArrayAdapter
+import android.widget.Spinner
+import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import com.google.gson.Gson
 import io.realm.Realm
@@ -19,6 +23,7 @@ import org.ole.planet.myplanet.utilities.AndroidDecrypter.Companion.encrypt
 import org.ole.planet.myplanet.utilities.AndroidDecrypter.Companion.generateKey
 import org.ole.planet.myplanet.utilities.Utilities
 
+
 class AddMyHealthActivity : AppCompatActivity() {
     private lateinit var activityAddMyHealthBinding: ActivityAddMyHealthBinding
     lateinit var realm: Realm
@@ -47,6 +52,24 @@ class AddMyHealthActivity : AppCompatActivity() {
             createMyHealth()
             Utilities.toast(this@AddMyHealthActivity, getString(R.string.my_health_saved_successfully))
         }
+        val spinner: Spinner = findViewById(R.id.spn_contact_type)
+
+        val adapter = object : ArrayAdapter<String>(
+            this, R.layout.spinner_item, resources.getStringArray(R.array.contact_type)
+        ) {
+            override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
+                val view = super.getView(position, convertView, parent) as TextView
+                return view
+            }
+
+            override fun getDropDownView(position: Int, convertView: View?, parent: ViewGroup): View {
+                val view = super.getDropDownView(position, convertView, parent) as TextView
+                return view
+            }
+        }
+
+        spinner.adapter = adapter
+
         initViews()
     }
 
diff --git a/app/src/main/res/layout/activity_add_my_health.xml b/app/src/main/res/layout/activity_add_my_health.xml
index b43da97cc..f9e7b0a06 100644
--- a/app/src/main/res/layout/activity_add_my_health.xml
+++ b/app/src/main/res/layout/activity_add_my_health.xml
@@ -5,16 +5,19 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="@dimen/padding_large"
-    tools:context=".ui.myhealth.AddMyHealthActivity">
+    tools:context=".ui.myhealth.AddMyHealthActivity"
+    android:background="@color/secondary_bg" >
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@color/secondary_bg"  >
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:background="@color/secondary_bg" >
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -24,42 +27,48 @@
                     android:id="@+id/et_fname"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:textColorHint="@color/daynight_textColor">
 
                     <EditText
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/first_name"
                         android:padding="@dimen/padding_normal"
-                        android:backgroundTint="@color/daynight_textColor"  />
+                        android:backgroundTint="@color/daynight_textColor"
+                        android:textColor="@color/daynight_textColor" />
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/et_mname"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:textColorHint="@color/daynight_textColor">
 
                     <EditText
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/middle_name"
                         android:padding="@dimen/padding_normal"
-                        android:backgroundTint="@color/daynight_textColor"  />
+                        android:backgroundTint="@color/daynight_textColor"
+                        android:textColor="@color/daynight_textColor" />
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/et_lname"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:textColorHint="@color/daynight_textColor">
 
                     <EditText
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/last_name"
                         android:padding="@dimen/padding_normal"
-                        android:backgroundTint="@color/daynight_textColor"  />
+                        android:backgroundTint="@color/daynight_textColor"
+                        android:textColor="@color/daynight_textColor" />
                 </com.google.android.material.textfield.TextInputLayout>
 
             </LinearLayout>
@@ -72,7 +81,8 @@
                     android:id="@+id/et_email"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:textColorHint="@color/daynight_textColor">
 
                     <EditText
                         android:layout_width="match_parent"
@@ -80,14 +90,16 @@
                         android:hint="@string/email"
                         android:inputType="textEmailAddress"
                         android:padding="@dimen/padding_normal"
-                        android:backgroundTint="@color/daynight_textColor" />
+                        android:backgroundTint="@color/daynight_textColor"
+                        android:textColor="@color/daynight_textColor" />
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/et_phone"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:textColorHint="@color/daynight_textColor">
 
                     <EditText
                         android:layout_width="match_parent"
@@ -95,7 +107,8 @@
                         android:hint="@string/phone_number"
                         android:inputType="phone"
                         android:padding="@dimen/padding_normal"
-                        android:backgroundTint="@color/daynight_textColor"  />
+                        android:backgroundTint="@color/daynight_textColor"
+                        android:textColor="@color/daynight_textColor" />
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
@@ -107,28 +120,32 @@
                     android:id="@+id/et_birthplace"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:textColorHint="@color/daynight_textColor">
 
                     <EditText
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/birth_place"
                         android:padding="@dimen/padding_normal"
-                        android:backgroundTint="@color/daynight_textColor"  />
+                        android:backgroundTint="@color/daynight_textColor"
+                        android:textColor="@color/daynight_textColor" />
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/et_birthdate"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:textColorHint="@color/daynight_textColor">
 
                     <EditText
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/birth_date"
                         android:padding="@dimen/padding_normal"
-                        android:backgroundTint="@color/daynight_textColor"  />
+                        android:backgroundTint="@color/daynight_textColor"
+                        android:textColor="@color/daynight_textColor" />
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
@@ -140,43 +157,48 @@
                     android:id="@+id/et_emergency"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:textColorHint="@color/daynight_textColor">
 
                     <EditText
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/emergency_contact"
                         android:padding="@dimen/padding_normal"
-                        android:backgroundTint="@color/daynight_textColor" />
+                        android:backgroundTint="@color/daynight_textColor"
+                        android:textColor="@color/daynight_textColor" />
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <Spinner
                     android:id="@+id/spn_contact_type"
+                    style="@style/SpinnerItemStyle"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_weight="1"
-                    android:entries="@array/contact_type"
-                    android:padding="@dimen/padding_normal" />
+                    android:padding="@dimen/padding_large" />
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/et_contact"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1">
+                    android:layout_weight="1"
+                    android:textColorHint="@color/daynight_textColor">
 
                     <EditText
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/contact"
                         android:padding="@dimen/padding_normal"
-                        android:backgroundTint="@color/daynight_textColor" />
+                        android:backgroundTint="@color/daynight_textColor"
+                        android:textColor="@color/daynight_textColor" />
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/et_special_need"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:textColorHint="@color/daynight_textColor">
 
                 <EditText
                     android:layout_width="match_parent"
@@ -184,13 +206,15 @@
                     android:hint="@string/special_needs"
                     android:lines="2"
                     android:padding="@dimen/padding_normal"
-                    android:backgroundTint="@color/daynight_textColor"  />
+                    android:backgroundTint="@color/daynight_textColor"
+                    android:textColor="@color/daynight_textColor" />
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/et_other_need"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:textColorHint="@color/daynight_textColor">
 
                 <EditText
                     android:layout_width="match_parent"
@@ -198,7 +222,8 @@
                     android:hint="@string/other_need"
                     android:lines="2"
                     android:padding="@dimen/padding_normal"
-                    android:backgroundTint="@color/daynight_textColor" />
+                    android:backgroundTint="@color/daynight_textColor"
+                    android:textColor="@color/daynight_textColor" />
             </com.google.android.material.textfield.TextInputLayout>
 
             <Button
diff --git a/app/src/main/res/layout/fragment_library_filter.xml b/app/src/main/res/layout/fragment_library_filter.xml
index 998494611..3a47ee8ac 100644
--- a/app/src/main/res/layout/fragment_library_filter.xml
+++ b/app/src/main/res/layout/fragment_library_filter.xml
@@ -78,10 +78,11 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text="@string/languages" />
+
             <ImageView
                 android:id="@+id/languagesDropdownIcon"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+                android:layout_width="19dp"
+                android:layout_height="10dp"
                 android:src="@drawable/down_arrow" />
         </LinearLayout>