ALTAPPS-1340: Shared, iOS code blanks if statement

config/detekt/baseline.xml

@@ -55,6 +55,7 @@
     <ID>ImplicitDefaultLocale:TimeIntervalUtil.kt$TimeIntervalUtil$String.format("%02d:00 \u2014 %02d:00", i, i + 1)</ID>
     <ID>InvalidPackageDeclaration:HandleActions.kt$package org.hyperskill.app.core.view</ID>
     <ID>LambdaParameterInRestartableEffect:OnComposableShownFirstTime.kt$block</ID>
+    <ID>LargeClass:StepQuizCodeBlanksReducer.kt$StepQuizCodeBlanksReducer : StateReducer</ID>
     <ID>LargeClass:StepQuizReducer.kt$StepQuizReducer : StateReducer</ID>
     <ID>LongMethod:AppReducer.kt$AppReducer$private fun handleFetchAppStartupConfigSuccess( state: State, message: Message.FetchAppStartupConfigSuccess ): ReducerResult</ID>
     <ID>LongMethod:ChallengeCard.kt$@Composable fun ChallengeCard( viewState: ChallengeWidgetViewState, onNewMessage: (Message) -&gt; Unit )</ID>
@@ -67,6 +68,7 @@
     <ID>LongMethod:ProblemOfDayCardFormDelegate.kt$ProblemOfDayCardFormDelegate$fun render( dateFormatter: SharedDateFormatter, binding: LayoutProblemOfTheDayCardBinding, state: HomeFeature.ProblemOfDayState, areProblemsLimited: Boolean )</ID>
     <ID>LongMethod:ProfileBadges.kt$@Composable fun ProfileBadges( viewState: BadgesViewState, windowWidthSizeClass: WindowWidthSizeClass, onBadgeClick: (BadgeKind) -&gt; Unit, onExpandButtonClick: (ProfileFeature.Message.BadgesVisibilityButton) -&gt; Unit, modifier: Modifier = Modifier )</ID>
     <ID>LongMethod:ProfileSettingsDialogFragment.kt$ProfileSettingsDialogFragment$override fun onViewCreated(view: View, savedInstanceState: Bundle?)</ID>
+    <ID>LongMethod:StepQuizCodeBlanksReducer.kt$StepQuizCodeBlanksReducer$private fun createInitialCodeBlocks(step: Step): List&lt;CodeBlock&gt;</ID>
     <ID>LongMethod:StepQuizCodeBlanksReducer.kt$StepQuizCodeBlanksReducer$private fun handleDeleteButtonClicked( state: State ): StepQuizCodeBlanksReducerResult?</ID>
     <ID>LongMethod:StepQuizCodeBlanksReducer.kt$StepQuizCodeBlanksReducer$private fun handleSpaceButtonClicked( state: State ): StepQuizCodeBlanksReducerResult?</ID>
     <ID>LongMethod:StepQuizCodeBlanksReducer.kt$StepQuizCodeBlanksReducer$private fun handleSuggestionClicked( state: State, message: Message.SuggestionClicked ): StepQuizCodeBlanksReducerResult?</ID>
@@ -204,6 +206,7 @@
     <ID>ModifierWithoutDefault:BadgeImage.kt$modifier</ID>
     <ID>NestedBlockDepth:AuthSocialWebViewClient.kt$AuthSocialWebViewClient$override fun shouldOverrideUrlLoading( view: WebView?, request: WebResourceRequest? ): Boolean</ID>
     <ID>NestedBlockDepth:StepQuizCodeBlanksReducer.kt$StepQuizCodeBlanksReducer$private fun setCodeBlockIsActive(codeBlock: CodeBlock, isActive: Boolean): CodeBlock</ID>
+    <ID>NestedBlockDepth:StepQuizCodeBlanksViewStateMapper.kt$StepQuizCodeBlanksViewStateMapper$private fun mapContentState( state: StepQuizCodeBlanksFeature.State.Content ): StepQuizCodeBlanksViewState.Content</ID>
     <ID>PreviewPublic:BadgeCard.kt$BadgeCardPreview</ID>
     <ID>PreviewPublic:BadgeCard.kt$LastLevelBadgeCardPreview</ID>
     <ID>PreviewPublic:BadgeGrid.kt$PhoneBadgeGridPreview</ID>
@@ -248,6 +251,7 @@
     <ID>ReturnCount:SearchReducer.kt$SearchReducer$private fun handleSearchResultsItemClickedMessage( state: State, message: Message.SearchResultsItemClicked ): SearchReducerResult?</ID>
     <ID>ReturnCount:SharedDateFormatter.kt$SharedDateFormatter$fun formatTimeDistance(millis: Long): String</ID>
     <ID>ReturnCount:StateExtentions.kt$internal fun ChallengeWidgetFeature.State.Content.setCurrentChallengeIntervalProgressAsCompleted(): Challenge?</ID>
+    <ID>ReturnCount:StepQuizCodeBlanksReducer.kt$StepQuizCodeBlanksReducer$private fun handleDecreaseIndentLevelButtonClicked( state: State ): StepQuizCodeBlanksReducerResult?</ID>
     <ID>ReturnCount:StepQuizCodeBlanksReducer.kt$StepQuizCodeBlanksReducer$private fun handleDeleteButtonClicked( state: State ): StepQuizCodeBlanksReducerResult?</ID>
     <ID>ReturnCount:StepQuizCodeBlanksReducer.kt$StepQuizCodeBlanksReducer$private fun handleSpaceButtonClicked( state: State ): StepQuizCodeBlanksReducerResult?</ID>
     <ID>ReturnCount:StepQuizCodeBlanksReducer.kt$StepQuizCodeBlanksReducer$private fun handleSuggestionClicked( state: State, message: Message.SuggestionClicked ): StepQuizCodeBlanksReducerResult?</ID>

iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuiz/StepQuizViewModel.swift

@@ -285,6 +285,14 @@ extension StepQuizViewModel: StepQuizCodeBlanksOutputProtocol {
             )
         )
     }
+
+    func handleStepQuizCodeBlanksDidTapDecreaseIndentLevel() {
+        onNewMessage(
+            StepQuizFeatureMessageStepQuizCodeBlanksMessage(
+                message: StepQuizCodeBlanksFeatureMessageDecreaseIndentLevelButtonClicked()
+            )
+        )
+    }
 }
 
 // MARK: - StepQuizViewModel: StepQuizProblemOnboardingModalViewControllerDelegate -

iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizCodeBlanks/StepQuizCodeBlanksOutputProtocol.swift

@@ -11,4 +11,5 @@ protocol StepQuizCodeBlanksOutputProtocol: AnyObject {
     func handleStepQuizCodeBlanksDidTapDelete()
     func handleStepQuizCodeBlanksDidTapEnter()
     func handleStepQuizCodeBlanksDidTapSpace()
+    func handleStepQuizCodeBlanksDidTapDecreaseIndentLevel()
 }

iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizCodeBlanks/StepQuizCodeBlanksViewModel.swift

@@ -48,4 +48,10 @@ final class StepQuizCodeBlanksViewModel {
         impactFeedbackGenerator.triggerFeedback()
         moduleOutput?.handleStepQuizCodeBlanksDidTapSpace()
     }
+
+    @MainActor
+    func doDecreaseIndentLevelAction() {
+        impactFeedbackGenerator.triggerFeedback()
+        moduleOutput?.handleStepQuizCodeBlanksDidTapDecreaseIndentLevel()
+    }
 }

iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizCodeBlanks/Views/StepQuizCodeBlanksActionButton.swift → iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizCodeBlanks/Views/CodeBlocks/ActionButtons/StepQuizCodeBlanksActionButton.swift

@@ -62,6 +62,19 @@ extension StepQuizCodeBlanksActionButton {
             action: action
         )
     }
+
+    static func decreaseIndentLevel(action: @escaping () -> Void) -> StepQuizCodeBlanksActionButton {
+        StepQuizCodeBlanksActionButton(
+            appearance: .init(
+                padding: LayoutInsets(
+                    horizontal: LayoutInsets.smallInset,
+                    vertical: 5.5
+                )
+            ),
+            imageSystemName: "arrow.left.to.line",
+            action: action
+        )
+    }
 }
 
 #if DEBUG
@@ -71,12 +84,14 @@ extension StepQuizCodeBlanksActionButton {
             StepQuizCodeBlanksActionButton.delete(action: {})
             StepQuizCodeBlanksActionButton.enter(action: {})
             StepQuizCodeBlanksActionButton.space(action: {})
+            StepQuizCodeBlanksActionButton.decreaseIndentLevel(action: {})
         }
 
         HStack {
             StepQuizCodeBlanksActionButton.delete(action: {})
             StepQuizCodeBlanksActionButton.enter(action: {})
             StepQuizCodeBlanksActionButton.space(action: {})
+            StepQuizCodeBlanksActionButton.decreaseIndentLevel(action: {})
         }
         .disabled(true)
     }

iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizCodeBlanks/Views/CodeBlocks/ActionButtons/StepQuizCodeBlanksActionButtonsView.swift

@@ -0,0 +1,63 @@
+import SwiftUI
+
+struct StepQuizCodeBlanksActionButtonsView: View {
+    let isDeleteButtonEnabled: Bool
+    let isSpaceButtonHidden: Bool
+    let isDecreaseIndentLevelButtonHidden: Bool
+
+    let onSpaceTap: () -> Void
+    let onDeleteTap: () -> Void
+    let onEnterTap: () -> Void
+    let onDecreaseIndentLevelTap: () -> Void
+
+    var body: some View {
+        HStack(spacing: LayoutInsets.defaultInset) {
+            Spacer()
+
+            if !isDecreaseIndentLevelButtonHidden {
+                StepQuizCodeBlanksActionButton
+                    .decreaseIndentLevel(action: onDecreaseIndentLevelTap)
+            }
+
+            if !isSpaceButtonHidden {
+                StepQuizCodeBlanksActionButton
+                    .space(action: onSpaceTap)
+            }
+
+            StepQuizCodeBlanksActionButton
+                .delete(action: onDeleteTap)
+                .disabled(!isDeleteButtonEnabled)
+
+            StepQuizCodeBlanksActionButton
+                .enter(action: onEnterTap)
+        }
+        .padding(.horizontal)
+    }
+}
+
+#if DEBUG
+#Preview {
+    VStack {
+        StepQuizCodeBlanksActionButtonsView(
+            isDeleteButtonEnabled: false,
+            isSpaceButtonHidden: false,
+            isDecreaseIndentLevelButtonHidden: false,
+            onSpaceTap: {},
+            onDeleteTap: {},
+            onEnterTap: {},
+            onDecreaseIndentLevelTap: {}
+        )
+
+        StepQuizCodeBlanksActionButtonsView(
+            isDeleteButtonEnabled: true,
+            isSpaceButtonHidden: true,
+            isDecreaseIndentLevelButtonHidden: true,
+            onSpaceTap: {},
+            onDeleteTap: {},
+            onEnterTap: {},
+            onDecreaseIndentLevelTap: {}
+        )
+    }
+    .padding()
+}
+#endif

iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizCodeBlanks/Views/StepQuizCodeBlanksBlankView.swift → iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizCodeBlanks/Views/CodeBlocks/Children/StepQuizCodeBlanksCodeBlockChildBlankView.swift

@@ -1,6 +1,6 @@
 import SwiftUI
 
-struct StepQuizCodeBlanksBlankView: View {
+struct StepQuizCodeBlanksCodeBlockChildBlankView: View {
     var width: CGFloat = 208
     var height: CGFloat = 48
 
@@ -17,7 +17,7 @@ struct StepQuizCodeBlanksBlankView: View {
     }
 }
 
-extension StepQuizCodeBlanksBlankView {
+extension StepQuizCodeBlanksCodeBlockChildBlankView {
     init(style: Style, isActive: Bool) {
         let size = style.size
         self.init(width: size.width, height: size.height, isActive: isActive)
@@ -41,8 +41,8 @@ extension StepQuizCodeBlanksBlankView {
 #if DEBUG
 #Preview {
     VStack {
-        StepQuizCodeBlanksBlankView(style: .small, isActive: true)
-        StepQuizCodeBlanksBlankView(style: .large, isActive: false)
+        StepQuizCodeBlanksCodeBlockChildBlankView(style: .small, isActive: true)
+        StepQuizCodeBlanksCodeBlockChildBlankView(style: .large, isActive: false)
     }
 }
 #endif

iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizCodeBlanks/Views/StepQuizCodeBlanksOptionView.swift → iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizCodeBlanks/Views/CodeBlocks/Children/StepQuizCodeBlanksCodeBlockChildTextView.swift

@@ -1,6 +1,6 @@
 import SwiftUI
 
-extension StepQuizCodeBlanksOptionView {
+extension StepQuizCodeBlanksCodeBlockChildTextView {
     enum Appearance {
         static let insets = LayoutInsets(horizontal: 12, vertical: LayoutInsets.smallInset)
         static let minWidth: CGFloat = 48
@@ -9,7 +9,7 @@ extension StepQuizCodeBlanksOptionView {
     }
 }
 
-struct StepQuizCodeBlanksOptionView: View {
+struct StepQuizCodeBlanksCodeBlockChildTextView: View {
     let text: String
 
     let isActive: Bool
@@ -31,9 +31,9 @@ struct StepQuizCodeBlanksOptionView: View {
 #if DEBUG
 #Preview {
     VStack {
-        StepQuizCodeBlanksOptionView(text: "print", isActive: false)
-        StepQuizCodeBlanksOptionView(text: "There is a cat on the keyboard, it is true", isActive: true)
-        StepQuizCodeBlanksOptionView(text: "Typing messages out of the blue", isActive: true)
+        StepQuizCodeBlanksCodeBlockChildTextView(text: "print", isActive: false)
+        StepQuizCodeBlanksCodeBlockChildTextView(text: "There is a cat on the keyboard, it is true", isActive: true)
+        StepQuizCodeBlanksCodeBlockChildTextView(text: "Typing messages out of the blue", isActive: true)
     }
 }
 #endif

iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizCodeBlanks/Views/StepQuizCodeBlanksCodeBlockChildView.swift → iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizCodeBlanks/Views/CodeBlocks/Children/StepQuizCodeBlanksCodeBlockChildView.swift

@@ -18,9 +18,9 @@ struct StepQuizCodeBlanksCodeBlockChildView: View {
         child: StepQuizCodeBlanksViewStateCodeBlockChildItem
     ) -> some View {
         if let value = child.value {
-            StepQuizCodeBlanksOptionView(text: value, isActive: child.isActive)
+            StepQuizCodeBlanksCodeBlockChildTextView(text: value, isActive: child.isActive)
         } else {
-            StepQuizCodeBlanksBlankView(style: .small, isActive: child.isActive)
+            StepQuizCodeBlanksCodeBlockChildBlankView(style: .small, isActive: child.isActive)
         }
     }
 }

iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizCodeBlanks/Views/CodeBlocks/Conditions/StepQuizCodeBlanksIfStatementView.swift

@@ -0,0 +1,73 @@
+import shared
+import SwiftUI
+
+struct StepQuizCodeBlanksIfStatementView: View {
+    let ifStatementItem: StepQuizCodeBlanksViewStateCodeBlockItemIfStatement
+
+    let onChildTap: (StepQuizCodeBlanksViewStateCodeBlockChildItem) -> Void
+
+    var body: some View {
+        ScrollView(.horizontal, showsIndicators: false) {
+            HStack(alignment: .center, spacing: LayoutInsets.smallInset) {
+                Text("if")
+                    .font(StepQuizCodeBlanksAppearance.blankFont)
+                    .foregroundColor(StepQuizCodeBlanksAppearance.blankTextColor)
+
+                ForEach(ifStatementItem.children, id: \.id) { child in
+                    StepQuizCodeBlanksCodeBlockChildView(child: child, action: onChildTap)
+                }
+
+                Text(":")
+                    .font(StepQuizCodeBlanksAppearance.blankFont)
+                    .foregroundColor(StepQuizCodeBlanksAppearance.blankTextColor)
+            }
+            .padding(.horizontal, LayoutInsets.defaultInset)
+            .padding(.vertical, LayoutInsets.smallInset)
+            .background(Color(ColorPalette.violet400Alpha7))
+            .cornerRadius(StepQuizCodeBlanksAppearance.cornerRadius)
+            .padding(.horizontal)
+        }
+        .scrollBounceBehaviorBasedOnSize(axes: .horizontal)
+    }
+}
+
+#if DEBUG
+#Preview {
+    VStack {
+        StepQuizCodeBlanksIfStatementView(
+            ifStatementItem: StepQuizCodeBlanksViewStateCodeBlockItemIfStatement(
+                id: 0,
+                indentLevel: 0,
+                children: [
+                    StepQuizCodeBlanksViewStateCodeBlockChildItem(id: 0, isActive: true, value: nil)
+                ]
+            ),
+            onChildTap: { _ in }
+        )
+
+        StepQuizCodeBlanksIfStatementView(
+            ifStatementItem: StepQuizCodeBlanksViewStateCodeBlockItemIfStatement(
+                id: 0,
+                indentLevel: 0,
+                children: [
+                    StepQuizCodeBlanksViewStateCodeBlockChildItem(id: 0, isActive: true, value: "x")
+                ]
+            ),
+            onChildTap: { _ in }
+        )
+
+        StepQuizCodeBlanksIfStatementView(
+            ifStatementItem: StepQuizCodeBlanksViewStateCodeBlockItemIfStatement(
+                id: 0,
+                indentLevel: 0,
+                children: [
+                    StepQuizCodeBlanksViewStateCodeBlockChildItem(id: 0, isActive: false, value: "x"),
+                    StepQuizCodeBlanksViewStateCodeBlockChildItem(id: 1, isActive: true, value: nil)
+                ]
+            ),
+            onChildTap: { _ in }
+        )
+    }
+    .padding()
+}
+#endif

iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizCodeBlanks/Views/StepQuizCodeBlanksPrintInstructionView.swift → iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizCodeBlanks/Views/CodeBlocks/Print/StepQuizCodeBlanksPrintInstructionView.swift

@@ -37,27 +37,31 @@ struct StepQuizCodeBlanksPrintInstructionView: View {
         StepQuizCodeBlanksPrintInstructionView(
             printItem: StepQuizCodeBlanksViewStateCodeBlockItemPrint(
                 id: 0,
+                indentLevel: 0,
                 children: [.init(id: 0, isActive: false, value: "")]
             ),
             onChildTap: { _ in }
         )
         StepQuizCodeBlanksPrintInstructionView(
             printItem: StepQuizCodeBlanksViewStateCodeBlockItemPrint(
                 id: 0,
+                indentLevel: 0,
                 children: [.init(id: 0, isActive: true, value: "")]
             ),
             onChildTap: { _ in }
         )
         StepQuizCodeBlanksPrintInstructionView(
             printItem: StepQuizCodeBlanksViewStateCodeBlockItemPrint(
                 id: 0,
+                indentLevel: 0,
                 children: [.init(id: 0, isActive: true, value: "There is a cat on the keyboard, it is true")]
             ),
             onChildTap: { _ in }
         )
         StepQuizCodeBlanksPrintInstructionView(
             printItem: StepQuizCodeBlanksViewStateCodeBlockItemPrint(
                 id: 0,
+                indentLevel: 0,
                 children: [.init(id: 0, isActive: false, value: "There is a cat on the keyboard, it is true")]
             ),
             onChildTap: { _ in }
@@ -66,6 +70,7 @@ struct StepQuizCodeBlanksPrintInstructionView: View {
         StepQuizCodeBlanksPrintInstructionView(
             printItem: StepQuizCodeBlanksViewStateCodeBlockItemPrint(
                 id: 0,
+                indentLevel: 0,
                 children: [
                     .init(id: 0, isActive: false, value: "x"),
                     .init(id: 1, isActive: true, value: "")