Skip to content

Commit

Permalink
Added darkmode compatible changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@deeppp15
deeppp15 committed Oct 14, 2024
1 parent 27b9878 commit f61a99e
Show file tree
Hide file tree
Showing 3 changed files with 78 additions and 29 deletions.
23 changes: 23 additions & 0 deletions app/src/main/java/org/ole/planet/myplanet/ui/myhealth/AddMyHealthActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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()
}

Expand Down
79 changes: 52 additions & 27 deletions app/src/main/res/layout/activity_add_my_health.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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>
Expand All @@ -72,30 +81,34 @@
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"
android:layout_height="wrap_content"
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"
android:layout_height="wrap_content"
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>

Expand All @@ -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>

Expand All @@ -140,65 +157,73 @@
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"
android:layout_height="wrap_content"
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"
android:layout_height="wrap_content"
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
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/res/layout/fragment_library_filter.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down

0 comments on commit f61a99e

Please sign in to comment.