diff --git a/iosHyperskillApp/iosHyperskillApp/Sources/Extensions/Shared/Model/BlockOptionsExtensions.swift b/iosHyperskillApp/iosHyperskillApp/Sources/Extensions/Shared/Model/BlockOptionsExtensions.swift index 8b4aaa2d5..eacf1f3ae 100644 --- a/iosHyperskillApp/iosHyperskillApp/Sources/Extensions/Shared/Model/BlockOptionsExtensions.swift +++ b/iosHyperskillApp/iosHyperskillApp/Sources/Extensions/Shared/Model/BlockOptionsExtensions.swift @@ -14,6 +14,7 @@ extension Block.Options { codeBlanksStrings: [String]? = nil, codeBlanksVariables: [String]? = nil, codeBlanksOperations: [String]? = nil, + codeBlanksAvailableConditions: Set? = nil, codeBlanksEnabled: Bool? = nil, codeBlanksTemplateString: String? = nil ) { @@ -28,6 +29,7 @@ extension Block.Options { codeBlanksStrings: codeBlanksStrings, codeBlanksVariables: codeBlanksVariables, codeBlanksOperations: codeBlanksOperations, + codeBlanksAvailableConditions: codeBlanksAvailableConditions, codeBlanksEnabled: codeBlanksEnabled.flatMap(KotlinBoolean.init(value:)), codeBlanksTemplateString: codeBlanksTemplateString ) diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/step/domain/model/Block.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/step/domain/model/Block.kt index 0bde6e7b1..db254cd03 100644 --- a/shared/src/commonMain/kotlin/org/hyperskill/app/step/domain/model/Block.kt +++ b/shared/src/commonMain/kotlin/org/hyperskill/app/step/domain/model/Block.kt @@ -38,12 +38,12 @@ data class Block( val codeBlanksVariables: List? = null, @SerialName("code_blanks_operations") val codeBlanksOperations: List? = null, + @SerialName("code_blanks_available_conditions") + val codeBlanksAvailableConditions: Set? = null, @SerialName("code_blanks_enabled") val codeBlanksEnabled: Boolean? = null, @SerialName("code_blanks_template") - val codeBlanksTemplateString: String? = null, - @SerialName("code_blanks_available_conditions") - val codeBlanksAvailableConditions: Set? = null + val codeBlanksTemplateString: String? = null ) { val samples: List? get() = internalSamples?.mapNotNull {