Skip to content
Snippets Groups Projects
Unverified Commit 842e2aa2 authored by AlexanderAlferov's avatar AlexanderAlferov Committed by GitHub
Browse files

Contact diary edit fragments fix (EXPOSUREAPP-4152) #1951

parent 2b7f8bc0
No related branches found
No related tags found
No related merge requests found
......@@ -6,6 +6,7 @@ import android.view.View
import android.view.ViewGroup
import android.view.accessibility.AccessibilityEvent
import android.widget.TextView
import androidx.core.view.isGone
import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.RecyclerView
import de.rki.coronawarnapp.R
......@@ -34,7 +35,6 @@ class ContactDiaryEditLocationsFragment : Fragment(R.layout.contact_diary_edit_l
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
binding.viewModel = viewModel
setupRecyclerView()
......@@ -42,6 +42,14 @@ class ContactDiaryEditLocationsFragment : Fragment(R.layout.contact_diary_edit_l
popBackStack()
}
viewModel.isListVisible.observe2(this) {
binding.contactDiaryLocationListNoItemsGroup.isGone = it
}
viewModel.isButtonEnabled.observe2(this) {
binding.deleteButton.isEnabled = it
}
viewModel.locationsLiveData.observe2(this) {
locationList.clear()
locationList.addAll(it)
......@@ -62,6 +70,10 @@ class ContactDiaryEditLocationsFragment : Fragment(R.layout.contact_diary_edit_l
}
}
}
binding.apply {
deleteButton.setOnClickListener { viewModel.onDeleteAllLocationsClick() }
}
}
override fun onResume() {
......
......@@ -6,6 +6,7 @@ import android.view.View
import android.view.ViewGroup
import android.view.accessibility.AccessibilityEvent
import android.widget.TextView
import androidx.core.view.isGone
import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.RecyclerView
import de.rki.coronawarnapp.R
......@@ -34,7 +35,6 @@ class ContactDiaryEditPersonsFragment : Fragment(R.layout.contact_diary_edit_per
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
binding.viewModel = viewModel
setupRecyclerView()
......@@ -42,6 +42,14 @@ class ContactDiaryEditPersonsFragment : Fragment(R.layout.contact_diary_edit_per
popBackStack()
}
viewModel.isListVisible.observe2(this) {
binding.contactDiaryPersonListNoItemsGroup.isGone = it
}
viewModel.isButtonEnabled.observe2(this) {
binding.deleteButton.isEnabled = it
}
viewModel.personsLiveData.observe2(this) {
personList.clear()
personList.addAll(it)
......@@ -62,6 +70,10 @@ class ContactDiaryEditPersonsFragment : Fragment(R.layout.contact_diary_edit_per
}
}
}
binding.apply {
deleteButton.setOnClickListener { viewModel.onDeleteAllPersonsClick() }
}
}
override fun onResume() {
......
......@@ -2,14 +2,6 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<variable
name="viewModel"
type="de.rki.coronawarnapp.contactdiary.ui.edit.ContactDiaryEditLocationsViewModel" />
</data>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/content_container"
android:layout_width="match_parent"
......@@ -30,7 +22,6 @@
android:id="@+id/contact_diary_location_list_no_items_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:gone="@{viewModel.isListVisible()}"
app:constraint_referenced_ids="contact_diary_location_list_no_items_image,contact_diary_location_list_no_items_title" />
<ImageView
......@@ -82,8 +73,6 @@
android:layout_height="wrap_content"
android:text="@string/contact_diary_remove_all_button"
android:textAllCaps="true"
android:onClick="@{ () -> viewModel.onDeleteAllLocationsClick()}"
android:enabled="@{viewModel.isButtonEnabled()}"
android:layout_margin="@dimen/spacing_normal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......
......@@ -2,14 +2,6 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<variable
name="viewModel"
type="de.rki.coronawarnapp.contactdiary.ui.edit.ContactDiaryEditPersonsViewModel" />
</data>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/content_container"
android:layout_width="match_parent"
......@@ -30,7 +22,6 @@
android:id="@+id/contact_diary_person_list_no_items_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:gone="@{viewModel.isListVisible()}"
app:constraint_referenced_ids="contact_diary_person_list_no_items_image,contact_diary_person_list_no_items_title" />
<ImageView
......@@ -82,8 +73,6 @@
android:layout_height="wrap_content"
android:text="@string/contact_diary_remove_all_button"
android:textAllCaps="true"
android:onClick="@{ () -> viewModel.onDeleteAllPersonsClick()}"
android:enabled="@{viewModel.isButtonEnabled()}"
android:layout_margin="@dimen/spacing_normal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment