From 78d3b369bbdd860328a6bf704b5cc09c7f73d34d Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Wed, 31 Mar 2021 19:39:07 +0200 Subject: [PATCH] Move Parcelable inheritance --- .../com/kunzisoft/keepass/database/element/icon/IconImage.kt | 2 +- .../keepass/database/element/icon/IconImageCustom.kt | 2 +- .../kunzisoft/keepass/database/element/icon/IconImageDraw.kt | 4 +++- .../keepass/database/element/icon/IconImageStandard.kt | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImage.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImage.kt index 17d59cb1f..da9e47901 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImage.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImage.kt @@ -22,7 +22,7 @@ package com.kunzisoft.keepass.database.element.icon import android.os.Parcel import android.os.Parcelable -class IconImage() : IconImageDraw(), Parcelable { +class IconImage() : IconImageDraw() { var standard: IconImageStandard = IconImageStandard() var custom: IconImageCustom = IconImageCustom() diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageCustom.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageCustom.kt index 514222fe9..5cc43c2c3 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageCustom.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageCustom.kt @@ -25,7 +25,7 @@ import android.os.Parcelable import com.kunzisoft.keepass.database.element.database.DatabaseVersioned import java.util.* -class IconImageCustom : Parcelable, IconImageDraw { +class IconImageCustom : IconImageDraw { var uuid: UUID diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageDraw.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageDraw.kt index 978999f39..2e5e2c9da 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageDraw.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageDraw.kt @@ -19,7 +19,9 @@ */ package com.kunzisoft.keepass.database.element.icon -abstract class IconImageDraw { +import android.os.Parcelable + +abstract class IconImageDraw : Parcelable { var selected = false /** diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageStandard.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageStandard.kt index bc5ea8543..b60990f00 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageStandard.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageStandard.kt @@ -23,7 +23,7 @@ import android.os.Parcel import android.os.Parcelable import com.kunzisoft.keepass.icons.IconPack.Companion.NB_ICONS -class IconImageStandard : Parcelable, IconImageDraw { +class IconImageStandard : IconImageDraw { val id: Int