From 753fd7af994e381dab1d4af8e2a8578299068d5d Mon Sep 17 00:00:00 2001
From: Kolya Opahle <k.opahle@sap.com>
Date: Wed, 16 Dec 2020 17:24:38 +0100
Subject: [PATCH] Re-Added DefaultContactDiaryLocation and
DefaultContactDiaryPerson that somehow got lost during branch rescue
---
.../contactdiary/model/DefaultContactDiaryLocation.kt | 7 +++++++
.../contactdiary/model/DefaultContactDiaryPerson.kt | 7 +++++++
.../ContactDiaryLocationBottomSheetDialogViewModel.kt | 4 ++--
.../person/ContactDiaryPersonBottomSheetDialogViewModel.kt | 4 ++--
4 files changed, 18 insertions(+), 4 deletions(-)
create mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryLocation.kt
create mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryPerson.kt
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryLocation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryLocation.kt
new file mode 100644
index 000000000..3e0ec3ea9
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryLocation.kt
@@ -0,0 +1,7 @@
+package de.rki.coronawarnapp.contactdiary.model
+
+data class DefaultContactDiaryLocation(
+ override val locationId: Long = 0L,
+ override var locationName: String,
+ override val stableId: Long = locationId
+) : ContactDiaryLocation
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryPerson.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryPerson.kt
new file mode 100644
index 000000000..1d0188925
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryPerson.kt
@@ -0,0 +1,7 @@
+package de.rki.coronawarnapp.contactdiary.model
+
+data class DefaultContactDiaryPerson(
+ override val personId: Long = 0L,
+ override var fullName: String,
+ override val stableId: Long = personId
+) : ContactDiaryPerson
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/location/ContactDiaryLocationBottomSheetDialogViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/location/ContactDiaryLocationBottomSheetDialogViewModel.kt
index 974945328..42f8dc3be 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/location/ContactDiaryLocationBottomSheetDialogViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/location/ContactDiaryLocationBottomSheetDialogViewModel.kt
@@ -2,7 +2,7 @@ package de.rki.coronawarnapp.contactdiary.ui.day.sheets.location
import androidx.lifecycle.asLiveData
import com.squareup.inject.assisted.AssistedInject
-import de.rki.coronawarnapp.contactdiary.storage.entity.ContactDiaryLocationEntity
+import de.rki.coronawarnapp.contactdiary.model.DefaultContactDiaryLocation
import de.rki.coronawarnapp.contactdiary.storage.repo.ContactDiaryRepository
import de.rki.coronawarnapp.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
@@ -29,7 +29,7 @@ class ContactDiaryLocationBottomSheetDialogViewModel @AssistedInject constructor
fun saveLocation() = launch {
contactDiaryRepository.addLocation(
- ContactDiaryLocationEntity(
+ DefaultContactDiaryLocation(
locationName = text.value.take(MAX_LOCATION_NAME_LENGTH)
)
)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/person/ContactDiaryPersonBottomSheetDialogViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/person/ContactDiaryPersonBottomSheetDialogViewModel.kt
index 39f00ca23..8ea2fe868 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/person/ContactDiaryPersonBottomSheetDialogViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/sheets/person/ContactDiaryPersonBottomSheetDialogViewModel.kt
@@ -2,7 +2,7 @@ package de.rki.coronawarnapp.contactdiary.ui.day.sheets.person
import androidx.lifecycle.asLiveData
import com.squareup.inject.assisted.AssistedInject
-import de.rki.coronawarnapp.contactdiary.storage.entity.ContactDiaryPersonEntity
+import de.rki.coronawarnapp.contactdiary.model.DefaultContactDiaryPerson
import de.rki.coronawarnapp.contactdiary.storage.repo.ContactDiaryRepository
import de.rki.coronawarnapp.ui.SingleLiveEvent
import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
@@ -29,7 +29,7 @@ class ContactDiaryPersonBottomSheetDialogViewModel @AssistedInject constructor(
fun savePerson() = launch {
contactDiaryRepository.addPerson(
- ContactDiaryPersonEntity(
+ DefaultContactDiaryPerson(
fullName = text.value.take(MAX_PERSON_NAME_LENGTH)
)
)
--
GitLab