From c5d43b46a4e3e110f6f7b246e6f3c52898519adf Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Fri, 8 Mar 2019 15:53:55 +0100 Subject: [PATCH] Improve loader when looking for places --- .../java/net/pokeranalytics/android/model/realm/Location.kt | 1 + .../android/ui/fragment/EditableDataFragment.kt | 1 - .../pokeranalytics/android/ui/helpers/PlacePickerManager.kt | 4 ++++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt index 17e4cfca..501d43dc 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Location.kt @@ -89,6 +89,7 @@ open class Location : RealmObject(), Savable, StaticRowRepresentableDataSource, SimpleRow.NAME -> this.name = value as String? ?: "" LocationRow.ADDRESS -> this.address = value as String? ?: "" LocationRow.LOCATE_ME -> { + isLookingForPlaces = false if (value is Place) { setPlace(value) } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt index 425aba0d..eec7dc61 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt @@ -88,7 +88,6 @@ class EditableDataFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, } when (row) { LocationRow.LOCATE_ME -> { - (item as Location).isLookingForPlaces = false rowRepresentableAdapter.notifyDataSetChanged() } else -> rowRepresentableAdapter.refreshRow(row) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/helpers/PlacePickerManager.kt b/app/src/main/java/net/pokeranalytics/android/ui/helpers/PlacePickerManager.kt index e31127a8..919653c2 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/helpers/PlacePickerManager.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/helpers/PlacePickerManager.kt @@ -30,8 +30,12 @@ class PlacePickerManager { val builder = AlertDialog.Builder(activity) builder.setItems(placesArray.toTypedArray()) { _, which -> delegate.onRowValueChanged(places[which].place, row) + }.setOnCancelListener { + delegate.onRowValueChanged(null, row) } builder.show() + } else { + delegate.onRowValueChanged(null, row) } } }