Update language name in StepQuizCodeEditorView

hyperskill · Oct 6, 2023 · 5347b07 · 5347b07
1 parent 6a7a011
commit 5347b07
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 2 deletions.
diff --git a/...llApp/Sources/Modules/StepQuizSubmodules/StepQuizCode/ViewData/StepQuizCodeViewData.swift b/...llApp/Sources/Modules/StepQuizSubmodules/StepQuizCode/ViewData/StepQuizCodeViewData.swift
@@ -3,6 +3,7 @@ import Foundation
 struct StepQuizCodeViewData {
     let language: CodeLanguage?
     let languageStringValue: String?
+    let languageHumanReadableName: String?
 
     var code: String?
     let codeTemplate: String?

diff --git a/...Sources/Modules/StepQuizSubmodules/StepQuizCode/ViewData/StepQuizCodeViewDataMapper.swift b/...Sources/Modules/StepQuizSubmodules/StepQuizCode/ViewData/StepQuizCodeViewDataMapper.swift
@@ -23,6 +23,7 @@ class StepQuizCodeViewDataMapper {
             }
             return nil
         }()
+        let languageHumanReadableName = step.displayLanguage ?? language?.humanReadableName
 
         let codeTemplate: String? = {
             guard let languageStringValue = languageStringValue else {
@@ -43,6 +44,7 @@ class StepQuizCodeViewDataMapper {
         return StepQuizCodeViewData(
             language: language,
             languageStringValue: languageStringValue,
+            languageHumanReadableName: languageHumanReadableName,
             code: reply?.code ?? codeTemplate,
             codeTemplate: codeTemplate,
             samples: samples,

diff --git a/...illApp/Sources/Modules/StepQuizSubmodules/StepQuizCode/Views/StepQuizCodeEditorView.swift b/...illApp/Sources/Modules/StepQuizSubmodules/StepQuizCode/Views/StepQuizCodeEditorView.swift
@@ -15,6 +15,7 @@ struct StepQuizCodeEditorView: View {
     let codeTemplate: String?
 
     let language: CodeLanguage?
+    let languageHumanReadableName: String?
 
     let onExpandButtonTap: () -> Void
 
@@ -33,8 +34,8 @@ struct StepQuizCodeEditorView: View {
                     .font(.headline)
                     .foregroundColor(.primaryText)
 
-                if let languageName = language?.humanReadableName {
-                    Text("(\(languageName))")
+                if let languageHumanReadableName {
+                    Text("(\(languageHumanReadableName))")
                         .font(.subheadline)
                         .foregroundColor(.tertiaryText)
                 }
@@ -91,6 +92,7 @@ struct StepQuizCodeEditorView: View {
         code: .constant(CodeLanguageSamples.sample(for: .java)),
         codeTemplate: nil,
         language: .java,
+        languageHumanReadableName: CodeLanguage.java.humanReadableName,
         onExpandButtonTap: {},
         onInputAccessoryButtonTap: { _ in }
     )
@@ -101,6 +103,7 @@ struct StepQuizCodeEditorView: View {
         code: .constant(CodeLanguageSamples.sample(for: .java)),
         codeTemplate: nil,
         language: .java,
+        languageHumanReadableName: CodeLanguage.java.humanReadableName,
         onExpandButtonTap: {},
         onInputAccessoryButtonTap: { _ in }
     )

diff --git a/...yperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizCode/Views/StepQuizCodeView.swift b/...yperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizCode/Views/StepQuizCodeView.swift
@@ -21,6 +21,7 @@ struct StepQuizCodeView: View {
                 ),
                 codeTemplate: viewData.codeTemplate,
                 language: viewData.language,
+                languageHumanReadableName: viewData.languageHumanReadableName,
                 onExpandButtonTap: viewModel.doFullScreenCodeEditorPresentation,
                 onInputAccessoryButtonTap: viewModel.logClickedInputAccessoryButton(symbol:)
             )

diff --git a/...es/Modules/StepQuizSubmodules/StepQuizCodeFullScreen/StepQuizCodeFullScreenAssembly.swift b/...es/Modules/StepQuizSubmodules/StepQuizCodeFullScreen/StepQuizCodeFullScreenAssembly.swift
@@ -50,6 +50,7 @@ extension StepQuizCodeFullScreenAssembly {
             codeQuizViewData: StepQuizCodeViewData(
                 language: .kotlin,
                 languageStringValue: "kotlin",
+                languageHumanReadableName: CodeLanguage.kotlin.humanReadableName,
                 code: "fun main() {\n    // put your code here\n}",
                 codeTemplate: "fun main() {\n    // put your code here\n}",
                 samples: [

diff --git a/...yperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizPyCharm/StepQuizPyCharmView.swift b/...yperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizPyCharm/StepQuizPyCharmView.swift
@@ -16,6 +16,7 @@ struct StepQuizPyCharmView: View {
                 ),
                 codeTemplate: viewData.codeTemplate,
                 language: viewData.language,
+                languageHumanReadableName: viewData.languageHumanReadableName,
                 onExpandButtonTap: viewModel.doFullScreenCodeEditorPresentation,
                 onInputAccessoryButtonTap: viewModel.logClickedInputAccessoryButton(symbol:)
             )

diff --git a/...pp/Sources/Modules/StepQuizSubmodules/StepQuizPyCharm/StepQuizPyCharmViewDataMapper.swift b/...pp/Sources/Modules/StepQuizSubmodules/StepQuizPyCharm/StepQuizPyCharmViewDataMapper.swift
@@ -12,6 +12,7 @@ final class StepQuizPyCharmViewDataMapper: StepQuizCodeViewDataMapper {
             }
             return nil
         }()
+        let languageHumanReadableName = step.displayLanguage ?? language?.humanReadableName
 
         let codeTemplate = blockOptions.files?.first(where: { $0.isVisible })?.text
         let code: String? = {
@@ -24,6 +25,7 @@ final class StepQuizPyCharmViewDataMapper: StepQuizCodeViewDataMapper {
         return StepQuizCodeViewData(
             language: language,
             languageStringValue: languageStringValue,
+            languageHumanReadableName: languageHumanReadableName,
             code: code,
             codeTemplate: codeTemplate,
             samples: [],

diff --git a/...erskillApp/Sources/Modules/StepQuizSubmodules/StepQuizSQL/StepQuizSQLViewDataMapper.swift b/...erskillApp/Sources/Modules/StepQuizSubmodules/StepQuizSQL/StepQuizSQLViewDataMapper.swift
@@ -6,6 +6,7 @@ final class StepQuizSQLViewDataMapper: StepQuizCodeViewDataMapper {
         StepQuizCodeViewData(
             language: .sql,
             languageStringValue: CodeLanguage.sql.rawValue,
+            languageHumanReadableName: CodeLanguage.sql.humanReadableName,
             code: reply?.solveSql,
             codeTemplate: nil,
             samples: [],

diff --git a/...sHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizSQL/Views/StepQuizSQLView.swift b/...sHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizSQL/Views/StepQuizSQLView.swift
@@ -16,6 +16,7 @@ struct StepQuizSQLView: View {
                 ),
                 codeTemplate: viewData.codeTemplate,
                 language: viewData.language,
+                languageHumanReadableName: viewData.languageHumanReadableName,
                 onExpandButtonTap: viewModel.doFullScreenCodeEditorPresentation,
                 onInputAccessoryButtonTap: viewModel.logClickedInputAccessoryButton(symbol:)
             )