From e93c14de03b4a3dfcb1f2fcb0ae5092558361d97 Mon Sep 17 00:00:00 2001 From: Julian Raufelder Date: Fri, 17 Sep 2021 10:47:22 +0200 Subject: [PATCH] Simplify ProgressStateModel --- .../presentation/model/ProgressStateModel.kt | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/presentation/src/main/java/org/cryptomator/presentation/model/ProgressStateModel.kt b/presentation/src/main/java/org/cryptomator/presentation/model/ProgressStateModel.kt index 18a2372f..93acd60c 100644 --- a/presentation/src/main/java/org/cryptomator/presentation/model/ProgressStateModel.kt +++ b/presentation/src/main/java/org/cryptomator/presentation/model/ProgressStateModel.kt @@ -5,9 +5,9 @@ import java.io.Serializable open class ProgressStateModel private constructor(private val name: String, image: Image, text: Text, selectable: Boolean) : Serializable { - private val imageResourceId: Int - private val textResourceId: Int - val isSelectable: Boolean + private val imageResourceId: Int = image.id() + private val textResourceId: Int = text.id() + val isSelectable: Boolean = selectable private constructor(name: String) : this(name, noImage(), noText()) private constructor(name: String, text: Text) : this(name, noImage(), text) @@ -76,9 +76,4 @@ open class ProgressStateModel private constructor(private val name: String, imag } } - init { - imageResourceId = image.id() - textResourceId = text.id() - isSelectable = selectable - } }