From 4d991ad0c46634976947cc83aea3588a6aa6bb13 Mon Sep 17 00:00:00 2001
From: BMItter <berndus@gmx.de>
Date: Mon, 7 Dec 2020 16:38:49 +0100
Subject: [PATCH] created list, interface etc.
---
.../contactdiary/model/ContactDiaryElement.kt | 17 +++++++++++++++++
.../contactdiary/model/ContactDiaryEntry.kt | 4 ++--
.../contactdiary/model/Location.kt | 2 +-
.../coronawarnapp/contactdiary/model/Person.kt | 2 +-
4 files changed, 21 insertions(+), 4 deletions(-)
create mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryElement.kt
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryElement.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryElement.kt
new file mode 100644
index 000000000..56c42f77d
--- /dev/null
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryElement.kt
@@ -0,0 +1,17 @@
+package de.rki.coronawarnapp.contactdiary.model
+
+import java.time.Instant
+
+interface ContactDiaryElement {
+
+ val createdAt: Instant
+
+ val persons: List<Person>?
+ val locations: List<Location>?
+
+ val numberOfPersons: Int?
+ get() = persons?.size
+
+ val numberOfLocations: Int?
+ get() = locations?.size
+}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryEntry.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryEntry.kt
index f75080471..89c74aa45 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryEntry.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/ContactDiaryEntry.kt
@@ -3,7 +3,7 @@ package de.rki.coronawarnapp.contactdiary.model
import java.time.Instant
data class ContactDiaryEntry(
- val person: Person,
- val location: Location,
+ val person: List<Person>?,
+ val location: List<Location>?,
val dateAddedEntry: Instant?
)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Location.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Location.kt
index 7ea04e56f..b5d6bca26 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Location.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Location.kt
@@ -1,5 +1,5 @@
package de.rki.coronawarnapp.contactdiary.model
data class Location(
- val locationName:String
+ val locationName: String
)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Person.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Person.kt
index 5088f0c6b..729634876 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Person.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/Person.kt
@@ -1,5 +1,5 @@
package de.rki.coronawarnapp.contactdiary.model
data class Person(
- val completeName:String
+ val completeName: String
)
--
GitLab