diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/profile/domain/model/FeatureKeys.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/profile/domain/model/FeatureKeys.kt index 61f09905b6..b12ff24082 100644 --- a/shared/src/commonMain/kotlin/org/hyperskill/app/profile/domain/model/FeatureKeys.kt +++ b/shared/src/commonMain/kotlin/org/hyperskill/app/profile/domain/model/FeatureKeys.kt @@ -11,5 +11,4 @@ internal object FeatureKeys { const val MOBILE_ONLY_SUBSCRIPTION = "mobile.mobile_only_subscription" const val MOBILE_USERS_INTERVIEW_WIDGET = "mobile.users_interview_widget" const val MOBILE_CONTENT_TRIAL = "mobile.content_trial" - const val MOBILE_PYTHON_ADOPTED_COURSE = "mobile.python_adopted_course" } \ No newline at end of file diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/profile/domain/model/FeaturesMap.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/profile/domain/model/FeaturesMap.kt index e06709f594..2009058866 100644 --- a/shared/src/commonMain/kotlin/org/hyperskill/app/profile/domain/model/FeaturesMap.kt +++ b/shared/src/commonMain/kotlin/org/hyperskill/app/profile/domain/model/FeaturesMap.kt @@ -39,7 +39,4 @@ val FeaturesMap.isMobileUsersInterviewWidgetEnabled: Boolean get() = get(FeatureKeys.MOBILE_USERS_INTERVIEW_WIDGET) ?: false val FeaturesMap.isMobileContentTrialEnabled: Boolean - get() = get(FeatureKeys.MOBILE_CONTENT_TRIAL) ?: false - -val FeaturesMap.isMobilePythonAdoptedCourseEnabled: Boolean - get() = get(FeatureKeys.MOBILE_PYTHON_ADOPTED_COURSE) ?: false \ No newline at end of file + get() = get(FeatureKeys.MOBILE_CONTENT_TRIAL) ?: false \ No newline at end of file diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/welcome_onboarding/root/presentation/WelcomeOnboardingReducer.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/welcome_onboarding/root/presentation/WelcomeOnboardingReducer.kt index ecd772243a..2fe4aadbd3 100644 --- a/shared/src/commonMain/kotlin/org/hyperskill/app/welcome_onboarding/root/presentation/WelcomeOnboardingReducer.kt +++ b/shared/src/commonMain/kotlin/org/hyperskill/app/welcome_onboarding/root/presentation/WelcomeOnboardingReducer.kt @@ -83,9 +83,7 @@ internal class WelcomeOnboardingReducer : StateReducer { WelcomeQuestionnaireType.LEARNING_REASON -> NavigateTo.WelcomeOnboardingQuestionnaire(WelcomeQuestionnaireType.CODING_EXPERIENCE) WelcomeQuestionnaireType.CODING_EXPERIENCE -> - // NavigateTo.ChooseProgrammingLanguage - // ALTAPPS-1356: Redirect to Python track directly - NavigateTo.TrackDetails(WelcomeOnboardingTrack.PYTHON) + NavigateTo.ChooseProgrammingLanguage } ) diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/welcome_onboarding/track_details/injection/WelcomeOnboardingTrackDetailsComponentImpl.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/welcome_onboarding/track_details/injection/WelcomeOnboardingTrackDetailsComponentImpl.kt index 2f451d7efb..a42c5d5042 100644 --- a/shared/src/commonMain/kotlin/org/hyperskill/app/welcome_onboarding/track_details/injection/WelcomeOnboardingTrackDetailsComponentImpl.kt +++ b/shared/src/commonMain/kotlin/org/hyperskill/app/welcome_onboarding/track_details/injection/WelcomeOnboardingTrackDetailsComponentImpl.kt @@ -17,10 +17,8 @@ internal class WelcomeOnboardingTrackDetailsComponentImpl( currentProfileStateRepository = appGraph.profileDataComponent.currentProfileStateRepository, profileRepository = appGraph.profileDataComponent.profileRepository, analyticInteractor = appGraph.analyticComponent.analyticInteractor, - featuresDataSource = appGraph.profileDataComponent.featuresDataSource, logger = appGraph.loggerComponent.logger, buildVariant = appGraph.commonComponent.buildKonfig.buildVariant, - resourceProvider = appGraph.commonComponent.resourceProvider, - platformType = appGraph.commonComponent.platform.platformType + resourceProvider = appGraph.commonComponent.resourceProvider ) } \ No newline at end of file diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/welcome_onboarding/track_details/injection/WelcomeOnboardingTrackDetailsFeatureBuilder.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/welcome_onboarding/track_details/injection/WelcomeOnboardingTrackDetailsFeatureBuilder.kt index 334f8bf3c2..0ec5712f3f 100644 --- a/shared/src/commonMain/kotlin/org/hyperskill/app/welcome_onboarding/track_details/injection/WelcomeOnboardingTrackDetailsFeatureBuilder.kt +++ b/shared/src/commonMain/kotlin/org/hyperskill/app/welcome_onboarding/track_details/injection/WelcomeOnboardingTrackDetailsFeatureBuilder.kt @@ -4,13 +4,10 @@ import co.touchlab.kermit.Logger import org.hyperskill.app.analytic.domain.interactor.AnalyticInteractor import org.hyperskill.app.analytic.presentation.wrapWithAnalyticLogger import org.hyperskill.app.core.domain.BuildVariant -import org.hyperskill.app.core.domain.platform.PlatformType import org.hyperskill.app.core.presentation.ActionDispatcherOptions import org.hyperskill.app.core.presentation.transformState import org.hyperskill.app.core.view.mapper.ResourceProvider -import org.hyperskill.app.features.data.source.FeaturesDataSource import org.hyperskill.app.logging.presentation.wrapWithLogger -import org.hyperskill.app.profile.domain.model.isMobilePythonAdoptedCourseEnabled import org.hyperskill.app.profile.domain.repository.CurrentProfileStateRepository import org.hyperskill.app.profile.domain.repository.ProfileRepository import org.hyperskill.app.welcome_onboarding.model.WelcomeOnboardingTrack @@ -34,15 +31,10 @@ internal object WelcomeOnboardingTrackDetailsFeatureBuilder { currentProfileStateRepository: CurrentProfileStateRepository, profileRepository: ProfileRepository, analyticInteractor: AnalyticInteractor, - featuresDataSource: FeaturesDataSource, resourceProvider: ResourceProvider, logger: Logger, - buildVariant: BuildVariant, - platformType: PlatformType + buildVariant: BuildVariant ): Feature { - val isMobilePythonAdoptedCourseEnabled = platformType == PlatformType.IOS && - featuresDataSource.getFeaturesMap().isMobilePythonAdoptedCourseEnabled - val welcomeOnboardingTrackDetailsReducer = WelcomeOnboardingTrackDetailsReducer() .wrapWithLogger(buildVariant, logger, LOG_TAG) @@ -57,10 +49,7 @@ internal object WelcomeOnboardingTrackDetailsFeatureBuilder { val viewStateMapper = WelcomeOnboardingTrackDetailsViewStateMapper(resourceProvider) return ReduxFeature( - initialState = WelcomeOnboardingTrackDetailsFeature.initialState( - track = track, - isMobilePythonAdoptedCourseEnabled = isMobilePythonAdoptedCourseEnabled - ), + initialState = WelcomeOnboardingTrackDetailsFeature.initialState(track), reducer = welcomeOnboardingTrackDetailsReducer ) .wrapWithActionDispatcher(welcomeOnboardingTrackDetailsActionDispatcher) diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/welcome_onboarding/track_details/presentation/WelcomeOnboardingTrackDetailsFeature.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/welcome_onboarding/track_details/presentation/WelcomeOnboardingTrackDetailsFeature.kt index f6d7d3d47e..6b58a3e510 100644 --- a/shared/src/commonMain/kotlin/org/hyperskill/app/welcome_onboarding/track_details/presentation/WelcomeOnboardingTrackDetailsFeature.kt +++ b/shared/src/commonMain/kotlin/org/hyperskill/app/welcome_onboarding/track_details/presentation/WelcomeOnboardingTrackDetailsFeature.kt @@ -6,18 +6,13 @@ import org.hyperskill.app.welcome_onboarding.model.WelcomeOnboardingTrack object WelcomeOnboardingTrackDetailsFeature { internal data class State( val track: WelcomeOnboardingTrack, - val isLoadingShowed: Boolean, - val isMobilePythonAdoptedCourseEnabled: Boolean + val isLoadingShowed: Boolean ) - internal fun initialState( - track: WelcomeOnboardingTrack, - isMobilePythonAdoptedCourseEnabled: Boolean - ) = + internal fun initialState(track: WelcomeOnboardingTrack) = State( track = track, - isLoadingShowed = false, - isMobilePythonAdoptedCourseEnabled = isMobilePythonAdoptedCourseEnabled + isLoadingShowed = false ) /** diff --git a/shared/src/commonMain/kotlin/org/hyperskill/app/welcome_onboarding/track_details/presentation/WelcomeOnboardingTrackDetailsReducer.kt b/shared/src/commonMain/kotlin/org/hyperskill/app/welcome_onboarding/track_details/presentation/WelcomeOnboardingTrackDetailsReducer.kt index d069c81e26..9355802a5c 100644 --- a/shared/src/commonMain/kotlin/org/hyperskill/app/welcome_onboarding/track_details/presentation/WelcomeOnboardingTrackDetailsReducer.kt +++ b/shared/src/commonMain/kotlin/org/hyperskill/app/welcome_onboarding/track_details/presentation/WelcomeOnboardingTrackDetailsReducer.kt @@ -20,7 +20,6 @@ internal class WelcomeOnboardingTrackDetailsReducer : StateReducer JAVA_TRACK_ID WelcomeOnboardingTrack.JAVA_SCRIPT -> JS_TRACK_ID WelcomeOnboardingTrack.KOTLIN -> KOTLIN_TRACK_ID - WelcomeOnboardingTrack.PYTHON -> - if (state.isMobilePythonAdoptedCourseEnabled) PYTHON_TRACK_MOBILE_ADOPTED_ID else PYTHON_TRACK_ID + WelcomeOnboardingTrack.PYTHON -> PYTHON_TRACK_ID WelcomeOnboardingTrack.SQL -> SQL_TRACK_ID } } \ No newline at end of file