From 4c97ccdc4c8def88dc0b366528b3e719ec0f41be Mon Sep 17 00:00:00 2001
From: BMItter <berndus@gmx.de>
Date: Mon, 7 Dec 2020 17:40:09 +0100
Subject: [PATCH] clean structure
---
.../contactdiary/model/ContactDiaryElement.kt | 8 ++++----
.../contactdiary/model/DefaultContactDiaryElement.kt | 8 ++++----
.../coronawarnapp/contactdiary/model/DefaultLocation.kt | 2 +-
.../rki/coronawarnapp/contactdiary/model/DefaultPerson.kt | 2 +-
.../de/rki/coronawarnapp/contactdiary/model/Location.kt | 5 +----
.../de/rki/coronawarnapp/contactdiary/model/Person.kt | 5 +----
6 files changed, 12 insertions(+), 18 deletions(-)
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
index dd94048a8..0d4af5f51 100644
--- 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
@@ -6,12 +6,12 @@ interface ContactDiaryElement {
val createdAt: Instant
- val defaultPeople: List<DefaultPerson>
- val defaultLocations: List<DefaultLocation>
+ val people: List<Person>
+ val locations: List<Location>
val numberOfPersons: Int?
- get() = defaultPeople?.size
+ get() = people?.size
val numberOfLocations: Int?
- get() = defaultLocations?.size
+ get() = locations?.size
}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryElement.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryElement.kt
index 527127acb..e1c40c0de 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryElement.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultContactDiaryElement.kt
@@ -3,7 +3,7 @@ package de.rki.coronawarnapp.contactdiary.model
import java.time.Instant
data class DefaultContactDiaryElement(
- val defaultPeople: List<DefaultPerson>,
- val defaultLocation: List<DefaultLocation>,
- val dateAddedEntry: Instant?
-)
+ override val createdAt: Instant,
+ override val defaultPeople: List<DefaultPerson>,
+ override val defaultLocations: List<DefaultLocation>
+) : ContactDiaryElement
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultLocation.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultLocation.kt
index 8782ba850..111b0338b 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultLocation.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultLocation.kt
@@ -1,5 +1,5 @@
package de.rki.coronawarnapp.contactdiary.model
data class DefaultLocation(
- val locationName: String
+ var locationName: String
)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultPerson.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultPerson.kt
index c34c6d79d..cb4f11271 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultPerson.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/model/DefaultPerson.kt
@@ -1,5 +1,5 @@
package de.rki.coronawarnapp.contactdiary.model
data class DefaultPerson(
- val completeName: String
+ var completeName: String
)
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 2bc7220b8..0d59a555d 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,8 +1,5 @@
package de.rki.coronawarnapp.contactdiary.model
-import java.time.Instant
-
interface Location {
- val createdAt: Instant
- val location: Location
+ var location: Location
}
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 ae8371b1a..45fcb4066 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,8 +1,5 @@
package de.rki.coronawarnapp.contactdiary.model
-import java.time.Instant
-
interface Person {
- val createdAt: Instant
- val person: Person
+ var person: Person
}
--
GitLab