Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ALTAPPS-1030: [Shared, iOS] Fill blanks problem onboarding modal #740

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,18 @@ abstract class DefaultStepQuizFragment :
ProblemsLimitReachedBottomSheet.newInstance(action.modalText)
.showIfNotExists(childFragmentManager, ProblemsLimitReachedBottomSheet.TAG)
}
StepQuizFeature.Action.ViewAction.ShowParsonsProblemOnboardingModal -> {
ParsonsStepQuizOnboardingBottomSheetDialogFragment.newInstance()
.showIfNotExists(childFragmentManager, ParsonsStepQuizOnboardingBottomSheetDialogFragment.TAG)
is StepQuizFeature.Action.ViewAction.ShowProblemOnboardingModal -> {
when (action.modalType) {
StepQuizFeature.ProblemOnboardingModal.Parsons ->
ParsonsStepQuizOnboardingBottomSheetDialogFragment.newInstance()
.showIfNotExists(
childFragmentManager,
ParsonsStepQuizOnboardingBottomSheetDialogFragment.TAG
)
is StepQuizFeature.ProblemOnboardingModal.FillBlanks -> {
// TODO: ALTAPPS-1031 Implement FillBlanks onboarding modal
}
}
}
is StepQuizFeature.Action.ViewAction.StepQuizHintsViewAction -> {
stepQuizHintsDelegate?.onAction(action.viewAction)
Expand Down Expand Up @@ -415,11 +424,19 @@ abstract class DefaultStepQuizFragment :
}

override fun parsonsProblemOnboardingShown() {
stepQuizViewModel.onNewMessage(StepQuizFeature.Message.ParsonsProblemOnboardingModalShownMessage)
stepQuizViewModel.onNewMessage(
StepQuizFeature.Message.ProblemOnboardingModalShownMessage(
modalType = StepQuizFeature.ProblemOnboardingModal.Parsons
)
)
}

override fun parsonsProblemOnboardingHidden() {
stepQuizViewModel.onNewMessage(StepQuizFeature.Message.ParsonsProblemOnboardingModalHiddenEventMessage)
stepQuizViewModel.onNewMessage(
StepQuizFeature.Message.ProblemOnboardingModalHiddenMessage(
modalType = StepQuizFeature.ProblemOnboardingModal.Parsons
)
)
}

protected fun syncReplyState(reply: Reply) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppTheme.Headline6"
android:text="@string/step_quiz_parsons_onboarding_header"
android:text="@string/step_quiz_problem_onboarding_modal_header"
android:layout_marginTop="16dp"
android:layout_marginHorizontal="20dp"/>

Expand All @@ -41,7 +41,7 @@
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppTheme.Headline6"
android:textSize="18sp"
android:text="@string/step_quiz_parsons_onboarding_title"
android:text="@string/step_quiz_problem_onboarding_modal_title"
android:layout_marginHorizontal="20dp"
android:layout_marginTop="32dp"/>

Expand All @@ -51,7 +51,7 @@
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/color_on_surface_alpha_60"
android:text="@string/step_quiz_parsons_onboarding_description"
android:text="@string/step_quiz_problem_onboarding_modal_parsons_description"
android:layout_marginHorizontal="20dp"
android:layout_marginTop="12dp"/>

Expand Down
38 changes: 27 additions & 11 deletions iosHyperskillApp/iosHyperskillApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,8 @@
2CAA3C672AA9C4EB004F6CE6 /* parsons-problem-onboarding-animation-light.json in Resources */ = {isa = PBXBuildFile; fileRef = 2CAA3C652AA9C4EB004F6CE6 /* parsons-problem-onboarding-animation-light.json */; };
2CAA3C682AA9C4EB004F6CE6 /* parsons-problem-onboarding-animation-dark.json in Resources */ = {isa = PBXBuildFile; fileRef = 2CAA3C662AA9C4EB004F6CE6 /* parsons-problem-onboarding-animation-dark.json */; };
2CAA3C6A2AA9C7B6004F6CE6 /* LottieAnimations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CAA3C692AA9C7B6004F6CE6 /* LottieAnimations.swift */; };
2CAA3C6D2AA9CA9D004F6CE6 /* StepQuizParsonsOnboardingModalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CAA3C6C2AA9CA9D004F6CE6 /* StepQuizParsonsOnboardingModalViewController.swift */; };
2CAA3C6F2AA9CAB1004F6CE6 /* StepQuizParsonsOnboardingModalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CAA3C6E2AA9CAB1004F6CE6 /* StepQuizParsonsOnboardingModalView.swift */; };
2CAA3C6D2AA9CA9D004F6CE6 /* StepQuizProblemOnboardingModalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CAA3C6C2AA9CA9D004F6CE6 /* StepQuizProblemOnboardingModalViewController.swift */; };
2CAA3C6F2AA9CAB1004F6CE6 /* StepQuizProblemOnboardingModalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CAA3C6E2AA9CAB1004F6CE6 /* StepQuizProblemOnboardingModalView.swift */; };
2CAE8CF0280525BE00E6C83D /* StepViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CAE8CEF280525BE00E6C83D /* StepViewModel.swift */; };
2CAE8CF2280525C900E6C83D /* StepView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CAE8CF1280525C900E6C83D /* StepView.swift */; };
2CAE8CF4280525D400E6C83D /* StepAssembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CAE8CF3280525D400E6C83D /* StepAssembly.swift */; };
Expand Down Expand Up @@ -442,6 +442,10 @@
2CEEE03528916A6800282849 /* ProblemOfDayOutputProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CEEE03428916A6800282849 /* ProblemOfDayOutputProtocol.swift */; };
2CEEE03728917F1100282849 /* TimeIntervalExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CEEE03628917F1100282849 /* TimeIntervalExtensions.swift */; };
2CF0B4E629F9CEAF009C2A2D /* StudyPlanSectionActivitiesList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CF0B4E529F9CEAF009C2A2D /* StudyPlanSectionActivitiesList.swift */; };
2CF270862AFE689400D696EC /* fill-blanks-input-problem-onboarding-animation-dark.json in Resources */ = {isa = PBXBuildFile; fileRef = 2CF270842AFE689400D696EC /* fill-blanks-input-problem-onboarding-animation-dark.json */; };
2CF270872AFE689500D696EC /* fill-blanks-input-problem-onboarding-animation-light.json in Resources */ = {isa = PBXBuildFile; fileRef = 2CF270852AFE689400D696EC /* fill-blanks-input-problem-onboarding-animation-light.json */; };
2CF2708A2AFE690900D696EC /* fill-blanks-select-problem-onboarding-animation-dark.json in Resources */ = {isa = PBXBuildFile; fileRef = 2CF270882AFE690900D696EC /* fill-blanks-select-problem-onboarding-animation-dark.json */; };
2CF2708B2AFE690900D696EC /* fill-blanks-select-problem-onboarding-animation-light.json in Resources */ = {isa = PBXBuildFile; fileRef = 2CF270892AFE690900D696EC /* fill-blanks-select-problem-onboarding-animation-light.json */; };
2CF2DA3A27EC5B2D0055426D /* Assembly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CF2DA3927EC5B2D0055426D /* Assembly.swift */; };
2CF41A8E28505D2C000736D6 /* LatexView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CF41A8D28505D2C000736D6 /* LatexView.swift */; };
2CF4341228126C79002893CD /* View+EndEditing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CF4341128126C79002893CD /* View+EndEditing.swift */; };
Expand Down Expand Up @@ -983,8 +987,8 @@
2CAA3C652AA9C4EB004F6CE6 /* parsons-problem-onboarding-animation-light.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "parsons-problem-onboarding-animation-light.json"; sourceTree = "<group>"; };
2CAA3C662AA9C4EB004F6CE6 /* parsons-problem-onboarding-animation-dark.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "parsons-problem-onboarding-animation-dark.json"; sourceTree = "<group>"; };
2CAA3C692AA9C7B6004F6CE6 /* LottieAnimations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LottieAnimations.swift; sourceTree = "<group>"; };
2CAA3C6C2AA9CA9D004F6CE6 /* StepQuizParsonsOnboardingModalViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepQuizParsonsOnboardingModalViewController.swift; sourceTree = "<group>"; };
2CAA3C6E2AA9CAB1004F6CE6 /* StepQuizParsonsOnboardingModalView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepQuizParsonsOnboardingModalView.swift; sourceTree = "<group>"; };
2CAA3C6C2AA9CA9D004F6CE6 /* StepQuizProblemOnboardingModalViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepQuizProblemOnboardingModalViewController.swift; sourceTree = "<group>"; };
2CAA3C6E2AA9CAB1004F6CE6 /* StepQuizProblemOnboardingModalView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepQuizProblemOnboardingModalView.swift; sourceTree = "<group>"; };
2CAE8CEF280525BE00E6C83D /* StepViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepViewModel.swift; sourceTree = "<group>"; };
2CAE8CF1280525C900E6C83D /* StepView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepView.swift; sourceTree = "<group>"; };
2CAE8CF3280525D400E6C83D /* StepAssembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepAssembly.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1079,6 +1083,10 @@
2CEEE03428916A6800282849 /* ProblemOfDayOutputProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProblemOfDayOutputProtocol.swift; sourceTree = "<group>"; };
2CEEE03628917F1100282849 /* TimeIntervalExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimeIntervalExtensions.swift; sourceTree = "<group>"; };
2CF0B4E529F9CEAF009C2A2D /* StudyPlanSectionActivitiesList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StudyPlanSectionActivitiesList.swift; sourceTree = "<group>"; };
2CF270842AFE689400D696EC /* fill-blanks-input-problem-onboarding-animation-dark.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "fill-blanks-input-problem-onboarding-animation-dark.json"; sourceTree = "<group>"; };
2CF270852AFE689400D696EC /* fill-blanks-input-problem-onboarding-animation-light.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "fill-blanks-input-problem-onboarding-animation-light.json"; sourceTree = "<group>"; };
2CF270882AFE690900D696EC /* fill-blanks-select-problem-onboarding-animation-dark.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "fill-blanks-select-problem-onboarding-animation-dark.json"; sourceTree = "<group>"; };
2CF270892AFE690900D696EC /* fill-blanks-select-problem-onboarding-animation-light.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "fill-blanks-select-problem-onboarding-animation-light.json"; sourceTree = "<group>"; };
2CF2DA3927EC5B2D0055426D /* Assembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Assembly.swift; sourceTree = "<group>"; };
2CF41A8D28505D2C000736D6 /* LatexView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LatexView.swift; sourceTree = "<group>"; };
2CF4341128126C79002893CD /* View+EndEditing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+EndEditing.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2776,20 +2784,24 @@
2CAA3C642AA9C40C004F6CE6 /* LottieAnimations */ = {
isa = PBXGroup;
children = (
2CF270842AFE689400D696EC /* fill-blanks-input-problem-onboarding-animation-dark.json */,
2CF270852AFE689400D696EC /* fill-blanks-input-problem-onboarding-animation-light.json */,
2CF270882AFE690900D696EC /* fill-blanks-select-problem-onboarding-animation-dark.json */,
2CF270892AFE690900D696EC /* fill-blanks-select-problem-onboarding-animation-light.json */,
2CAA3C662AA9C4EB004F6CE6 /* parsons-problem-onboarding-animation-dark.json */,
2CAA3C652AA9C4EB004F6CE6 /* parsons-problem-onboarding-animation-light.json */,
2CAA3C692AA9C7B6004F6CE6 /* LottieAnimations.swift */,
);
path = LottieAnimations;
sourceTree = "<group>";
};
2CAA3C6B2AA9CA6F004F6CE6 /* OnboardingModal */ = {
2CAA3C6B2AA9CA6F004F6CE6 /* ProblemOnboarding */ = {
isa = PBXGroup;
children = (
2CAA3C6E2AA9CAB1004F6CE6 /* StepQuizParsonsOnboardingModalView.swift */,
2CAA3C6C2AA9CA9D004F6CE6 /* StepQuizParsonsOnboardingModalViewController.swift */,
2CAA3C6E2AA9CAB1004F6CE6 /* StepQuizProblemOnboardingModalView.swift */,
2CAA3C6C2AA9CA9D004F6CE6 /* StepQuizProblemOnboardingModalViewController.swift */,
);
path = OnboardingModal;
path = ProblemOnboarding;
sourceTree = "<group>";
};
2CAE8CEE280525A100E6C83D /* Step */ = {
Expand Down Expand Up @@ -3484,7 +3496,6 @@
E96D493A2A9CCF3600BD78FE /* StepQuizParsonsItemView.swift */,
E94BB0432A9DEEFC00736B7C /* StepQuizParsonsSkeletonView.swift */,
E94BB0472A9DF9DD00736B7C /* StepQuizParsonsView.swift */,
2CAA3C6B2AA9CA6F004F6CE6 /* OnboardingModal */,
);
path = Views;
sourceTree = "<group>";
Expand Down Expand Up @@ -3636,6 +3647,7 @@
children = (
E9ACD3402937342F0005E05B /* ProblemOfDaySolvedModalViewController.swift */,
E9B55A5C29C978E40066900E /* ProblemsLimitReachedModalViewController.swift */,
2CAA3C6B2AA9CA6F004F6CE6 /* ProblemOnboarding */,
2C8DD40A2AFB7E3100FD5359 /* ShareStreak */,
);
path = Modals;
Expand Down Expand Up @@ -3971,8 +3983,10 @@
2C98C7A62850B93100857783 /* alt.css in Resources */,
E9954647288EC11000013FA6 /* LaunchScreen.storyboard in Resources */,
058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */,
2CF2708A2AFE690900D696EC /* fill-blanks-select-problem-onboarding-animation-dark.json in Resources */,
2C20FBBC284F647C006D879E /* wysiwyg.css in Resources */,
2C98C7AD2850B93100857783 /* icons.css in Resources */,
2CF270862AFE689400D696EC /* fill-blanks-input-problem-onboarding-animation-dark.json in Resources */,
2C98C7A72850B93100857783 /* fonts.css in Resources */,
2C20FBB2284F4FEA006D879E /* highlight.js in Resources */,
2C20B28C286C4426000F458A /* code-language-samples.plist in Resources */,
Expand All @@ -3988,6 +4002,8 @@
2C2FD62028191FFE004E7AF6 /* Sentry-Info.plist in Resources */,
2C20FBB8284F630C006D879E /* MathJax.js in Resources */,
2C0DB91E2864617E001EA35E /* code-completion-keywords.plist in Resources */,
2CF2708B2AFE690900D696EC /* fill-blanks-select-problem-onboarding-animation-light.json in Resources */,
2CF270872AFE689500D696EC /* fill-blanks-input-problem-onboarding-animation-light.json in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -4276,7 +4292,7 @@
2C27C77E28773042006A641A /* NukeManager.swift in Sources */,
2C0DB91028645332001EA35E /* CodeEditorTheme.swift in Sources */,
2CBD1919291D399500F5FB0B /* UIKitBounceButton.swift in Sources */,
2CAA3C6D2AA9CA9D004F6CE6 /* StepQuizParsonsOnboardingModalViewController.swift in Sources */,
2CAA3C6D2AA9CA9D004F6CE6 /* StepQuizProblemOnboardingModalViewController.swift in Sources */,
E9523BF029DA933C0013A661 /* StudyPlanViewModel.swift in Sources */,
2CCF3B5828004FC40075D12C /* UserAgentBuilder.swift in Sources */,
2C963BC52812D1A70036DD53 /* HomeView.swift in Sources */,
Expand Down Expand Up @@ -4505,7 +4521,7 @@
E99B21832887E996006A6154 /* StepQuizChoiceSkeletonView.swift in Sources */,
2C9EB95D2861BABC007DDE44 /* ProfileView.swift in Sources */,
2CF41A8E28505D2C000736D6 /* LatexView.swift in Sources */,
2CAA3C6F2AA9CAB1004F6CE6 /* StepQuizParsonsOnboardingModalView.swift in Sources */,
2CAA3C6F2AA9CAB1004F6CE6 /* StepQuizProblemOnboardingModalView.swift in Sources */,
2CF72AA32847757300E1C192 /* StepQuizTableViewData.swift in Sources */,
E93B3745283E527000968DF0 /* PlaceholderView.swift in Sources */,
2C93AF2129B34C5A004639E0 /* StepQuizPyCharmViewDataMapper.swift in Sources */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,14 @@ enum LottieAnimations {
light: "parsons-problem-onboarding-animation-light",
dark: "parsons-problem-onboarding-animation-dark"
)

static let fillBlanksInputProblemOnboarding = LottieAnimationFileName(
light: "fill-blanks-input-problem-onboarding-animation-light",
dark: "fill-blanks-input-problem-onboarding-animation-dark"
)

static let fillBlanksSelectProblemOnboarding = LottieAnimationFileName(
light: "fill-blanks-select-problem-onboarding-animation-light",
dark: "fill-blanks-select-problem-onboarding-animation-dark"
)
}

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,16 @@ enum Strings {
static let sharingText = sharedStrings.share_streak_sharing_text.localized()
static let sharingURL = sharedStrings.share_streak_sharing_url.localized()
}

enum ProblemOnboardingModal {
static let header = sharedStrings.step_quiz_problem_onboarding_modal_header.localized()
static let title = sharedStrings.step_quiz_problem_onboarding_modal_title.localized()

static let parsonsDescription =
sharedStrings.step_quiz_problem_onboarding_modal_parsons_description.localized()
static let fillBlanksDescription =
sharedStrings.step_quiz_problem_onboarding_modal_fill_blanks_description.localized()
}
}

// MARK: - StepQuizChoice -
Expand Down Expand Up @@ -207,12 +217,6 @@ enum Strings {

enum StepQuizParsons {
static let tab = sharedStrings.step_quiz_parsons_tab_text.localized()

enum OnboardingModal {
static let header = sharedStrings.step_quiz_parsons_onboarding_header.localized()
static let title = sharedStrings.step_quiz_parsons_onboarding_title.localized()
static let description = sharedStrings.step_quiz_parsons_onboarding_description.localized()
}
}

// MARK: - StepQuizFillBlanks-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,18 +219,20 @@ extension StepQuizViewModel: ProblemsLimitReachedModalViewControllerDelegate {
}
}

// MARK: - StepQuizViewModel: StepQuizParsonsOnboardingModalViewControllerDelegate -
// MARK: - StepQuizViewModel: StepQuizProblemOnboardingModalViewControllerDelegate -

extension StepQuizViewModel: StepQuizParsonsOnboardingModalViewControllerDelegate {
func stepQuizParsonsOnboardingModalViewControllerDidAppear(
_ viewController: StepQuizParsonsOnboardingModalViewController
extension StepQuizViewModel: StepQuizProblemOnboardingModalViewControllerDelegate {
func stepQuizProblemOnboardingModalViewControllerDidAppear(
_ viewController: StepQuizProblemOnboardingModalViewController,
modalType: StepQuizFeatureProblemOnboardingModalKs
) {
onNewMessage(StepQuizFeatureMessageParsonsProblemOnboardingModalShownMessage())
onNewMessage(StepQuizFeatureMessageProblemOnboardingModalShownMessage(modalType: modalType.sealed))
}

func stepQuizParsonsOnboardingModalViewControllerDidDisappear(
_ viewController: StepQuizParsonsOnboardingModalViewController
func stepQuizProblemOnboardingModalViewControllerDidDisappear(
_ viewController: StepQuizProblemOnboardingModalViewController,
modalType: StepQuizFeatureProblemOnboardingModalKs
) {
onNewMessage(StepQuizFeatureMessageParsonsProblemOnboardingModalHiddenEventMessage())
onNewMessage(StepQuizFeatureMessageProblemOnboardingModalHiddenMessage(modalType: modalType.sealed))
}
}
Loading