[Публичный тренажер] ANDR-71: Четвертый этап CreateQuizScreen. Навигация + EntryPoint

app/build.gradle.kts

@@ -115,6 +115,8 @@ dependencies {
     implementation(project(":feature:questions-or-collections:impl"))
     implementation(project(":feature:public-collections:impl"))
     implementation(project(":feature:selection-specializations:impl"))
+    implementation(project(":feature:interview-trainer:api"))
+    implementation(project(":feature:interview-trainer:impl"))
 }
 
 tasks.withType<Test> {

app/src/main/java/ru/yeahub/Application.kt

@@ -7,6 +7,7 @@ import ru.yeahub.detail_question.impl.di.detailQuestionFeatureModule
 import ru.yeahub.example_details.impl.detailsFeatureModule
 import ru.yeahub.example_home.impl.data.di.questionsMainFeatureModule
 import ru.yeahub.example_profile.impl.profileFeatureModule
+import ru.yeahub.interview_trainer.impl.createQuiz.di.createQuizModule
 import ru.yeahub.navigation_impl.navigationPathModule
 import ru.yeahub.network_impl.networkModule
 import ru.yeahub.public_collections.impl.di.CollectionsFeatureModule
@@ -53,7 +54,8 @@ class Application : Application() {
                 CollectionsFeatureModule,
                 detailQuestionFeatureModule,
                 collectionsAndQuestionsFeatureModule,
-                specializationFeatureModule
+                specializationFeatureModule,
+                createQuizModule
             )
         }
         // проверка, что модули загружены

core/navigation-api/src/main/java/ru/yeahub/navigation_api/FeatureRoute.kt

@@ -65,5 +65,9 @@ object FeatureRoute {
 
     object InterviewTrainerFeature {
         const val FEATURE_NAME = "interview_trainer"
+
+        const val CREATE_QUIZ_SCREEN_NAME = "create_quiz"
+        const val INTERVIEW_QUIZ_SCREEN_NAME = "interview_quiz"
+        const val INTERVIEW_QUIZ_RESULT_SCREEN_NAME = "interview_quiz_result"
     }
 }

core/ui/src/main/res/values/strings.xml

@@ -24,4 +24,7 @@
     <string name="error_screen_title_text">УПС!</string>
     <string name="on_back_button_text">Назад</string>
     <string name="unknown_error_screen_text">Не удалось загрузить данные</string>
+
+    <string name="interview_trainer_title">Интервью тренажер</string>
+    <string name="interview_trainer_description">Улучшите свои знания перед собеседованием</string>
 </resources>

feature/example-home/impl/src/main/java/ru/yeahub/example_home/impl/QuestionMainFeatureImpl.kt

@@ -28,7 +28,7 @@ class QuestionMainFeatureImpl : FeatureApi {
         navGraphBuilder: NavGraphBuilder,
         navController: NavHostController,
         pathManager: NavigationPathManager,
-        modifier: Modifier
+        modifier: Modifier,
     ) {
         val currentPath = pathManager.getCurrentPath()
         Timber.d("HomeFeatureImpl registerGraph: currentPath: $currentPath")
@@ -50,6 +50,9 @@ class QuestionMainFeatureImpl : FeatureApi {
                 },
                 onNavigateToCollections = {
                     handleCollectionsNavigation(pathManager, navController)
+                },
+                onNavigateToInterviewTrainer = {
+                    handleInterviewTrainerNavigation(pathManager, navController)
                 }
             )
         }
@@ -60,7 +63,7 @@ class QuestionMainFeatureImpl : FeatureApi {
      */
     private fun handleQuestionsNavigation(
         pathManager: NavigationPathManager,
-        navController: NavHostController
+        navController: NavHostController,
     ) {
         // Сбрасываем текущий путь на корневую фичу
         pathManager.setCurrentPath(FeatureRoute.QuestionsFeature.FEATURE_NAME)
@@ -83,7 +86,7 @@ class QuestionMainFeatureImpl : FeatureApi {
      */
     private fun handleCollectionsNavigation(
         pathManager: NavigationPathManager,
-        navController: NavHostController
+        navController: NavHostController,
     ) {
         // Сбрасываем текущий путь на корневую фичу
         pathManager.setCurrentPath(FeatureRoute.CollectionsFeature.FEATURE_NAME)
@@ -100,4 +103,31 @@ class QuestionMainFeatureImpl : FeatureApi {
             restoreState = true
         }
     }
+
+    /**
+     * Обработка навигации к интервью тренажеру.
+     */
+    private fun handleInterviewTrainerNavigation(
+        pathManager: NavigationPathManager,
+        navController: NavHostController,
+    ) {
+        val titleTopAppBar = "Test TitleTopAppBar"
+
+        // Сбрасываем текущий путь на корневую фичу
+        pathManager.setCurrentPath(FeatureRoute.InterviewTrainerFeature.FEATURE_NAME)
+
+        val createQuizPath = pathManager.createChildPath(
+            featureName = FeatureRoute.InterviewTrainerFeature.CREATE_QUIZ_SCREEN_NAME
+        ) + "/" + titleTopAppBar
+
+        Timber.d("HomeFeatureImpl handleInterviewTrainerNavigation: Navigating to: $createQuizPath")
+
+        navController.navigate(createQuizPath) {
+            popUpTo(navController.graph.startDestinationId) {
+                saveState = true
+            }
+            launchSingleTop = true
+            restoreState = true
+        }
+    }
 }

feature/example-home/impl/src/main/java/ru/yeahub/example_home/impl/presentation/intents/QuestionMainScreenCommand.kt

@@ -3,4 +3,5 @@ package ru.yeahub.example_home.impl.presentation.intents
 sealed class QuestionMainScreenCommand {
     object NavigateToBaseQuestions : QuestionMainScreenCommand()
     object NavigateToCollections : QuestionMainScreenCommand()
+    object NavigateToInterviewTrainer : QuestionMainScreenCommand()
 }

feature/example-home/impl/src/main/java/ru/yeahub/example_home/impl/presentation/mapper/QuestionMainScreenMapper.kt

@@ -14,6 +14,13 @@ class QuestionMainScreenMapper {
                 description = TextOrResource.Resource(R.string.base_questions_description),
                 imageRes = R.drawable.icon_base_question
             ),
+            //imageRes тренажера потом изменить на нормальный
+            QuestionMainUiModel(
+                type = QuestionMainItemType.InterviewTrainer,
+                title = TextOrResource.Resource(R.string.interview_trainer_title),
+                description = TextOrResource.Resource(R.string.interview_trainer_description),
+                imageRes = R.drawable.question_square
+            ),
             QuestionMainUiModel(
                 type = QuestionMainItemType.Collections,
                 title = TextOrResource.Resource(R.string.collections_title),

feature/example-home/impl/src/main/java/ru/yeahub/example_home/impl/presentation/model/QuestionMainItemType.kt

@@ -3,4 +3,5 @@ package ru.yeahub.example_home.impl.presentation.model
 sealed class QuestionMainItemType {
     object BaseQuestions : QuestionMainItemType()
     object Collections : QuestionMainItemType()
+    object InterviewTrainer : QuestionMainItemType()
 }

feature/example-home/impl/src/main/java/ru/yeahub/example_home/impl/presentation/view/QuestionsMainScreen.kt

@@ -37,7 +37,8 @@ import ru.yeahub.ui.R
 fun QuestionsMainScreen(
     onBackClick: () -> Unit,
     onNavigateToBaseQuestions: () -> Unit,
-    onNavigateToCollections: () -> Unit
+    onNavigateToCollections: () -> Unit,
+    onNavigateToInterviewTrainer: () -> Unit,
 ) {
     val viewModel: QuestionMainViewModel = koinViewModel()
     val state by viewModel.state.collectAsStateWithLifecycle()
@@ -46,6 +47,7 @@ fun QuestionsMainScreen(
         when (command) {
             is QuestionMainScreenCommand.NavigateToBaseQuestions -> onNavigateToBaseQuestions()
             is QuestionMainScreenCommand.NavigateToCollections -> onNavigateToCollections()
+            is QuestionMainScreenCommand.NavigateToInterviewTrainer -> onNavigateToInterviewTrainer()
         }
     }
 
@@ -60,7 +62,7 @@ fun QuestionsMainScreen(
 fun QuestionsMainScreenContent(
     state: QuestionMainScreenState,
     onItemClick: (QuestionMainUiModel) -> Unit,
-    onBackClick: () -> Unit
+    onBackClick: () -> Unit,
 ) {
     val context = LocalContext.current
     val scrollState = rememberScrollState()
@@ -193,6 +195,13 @@ val stateWithContent = QuestionMainScreenState.Content(
             description = TextOrResource.Resource(R.string.base_questions_description),
             imageRes = R.drawable.icon_base_question
         ),
+        //imageRes тренажера потом изменить на нормальный
+        QuestionMainUiModel(
+            type = QuestionMainItemType.InterviewTrainer,
+            title = TextOrResource.Resource(R.string.interview_trainer_title),
+            description = TextOrResource.Resource(R.string.interview_trainer_description),
+            imageRes = R.drawable.question_square
+        ),
         QuestionMainUiModel(
             type = QuestionMainItemType.Collections,
             title = TextOrResource.Resource(R.string.collections_title),

feature/example-home/impl/src/main/java/ru/yeahub/example_home/impl/presentation/viewmodel/QuestionMainViewModel.kt

@@ -45,6 +45,10 @@ class QuestionMainViewModel(
                         )
                         QuestionMainItemType.Collections ->
                             _command.emit(QuestionMainScreenCommand.NavigateToCollections)
+
+                        QuestionMainItemType.InterviewTrainer -> {
+                            _command.emit(QuestionMainScreenCommand.NavigateToInterviewTrainer)
+                        }
                     }
                 }
             }

feature/interview-trainer/api/src/main/java/ru/yeahub/interview_trainer/api/InterviewTrainerApi.kt

@@ -10,12 +10,16 @@ import androidx.compose.runtime.Composable
  */
 interface InterviewTrainerApi {
     /**
-     * Экран тренажера собеседований.
+     * Главный/первый экран тренажера собеседований (CreateQuizScreen).
+     * Является entry-point'ом в фичу
+     * С него начинается вся внутренняя навигация
      *
      * @param onBackClick Действие при нажатии кнопки "Назад"
+     * @param onStartTrainingClick Действие при нажатии на старт тренировки в тренажере
      */
     @Composable
-    fun InterviewTrainerScreen(
+    fun CreateQuizScreen(
         onBackClick: () -> Unit,
+        onStartTrainingClick: (specializationId: String, questionsCount: String) -> Unit,
     )
 }

feature/interview-trainer/impl/src/main/java/ru/yeahub/interview_trainer/impl/InterviewTrainerFeatureImpl.kt

@@ -3,11 +3,19 @@ package ru.yeahub.interview_trainer.impl
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
+import androidx.navigation.NavType
+import androidx.navigation.compose.composable
+import androidx.navigation.navArgument
+import ru.yeahub.interview_trainer.impl.createQuiz.presentation.CreateQuizResult
+import ru.yeahub.interview_trainer.impl.createQuiz.ui.CreateQuizScreen
 import ru.yeahub.navigation_api.FeatureApi
 import ru.yeahub.navigation_api.FeatureRoute
 import ru.yeahub.navigation_api.NavigationPathManager
+import timber.log.Timber
 
-class InterviewTrainerFeatureImpl : FeatureApi {
+private const val TITLE_TOP_APP_BAR = "title"
+
+class InterviewTrainerFeatureImpl() : FeatureApi {
     override fun getFeatureName(): String = FeatureRoute.InterviewTrainerFeature.FEATURE_NAME
 
     override fun registerGraph(
@@ -16,6 +24,88 @@ class InterviewTrainerFeatureImpl : FeatureApi {
         pathManager: NavigationPathManager,
         modifier: Modifier,
     ) {
-        TODO("Not yet implemented")
+        //Регистрируем базовый путь фичи (interview_trainer)
+        pathManager.registerFeaturePath(featureName = getFeatureName(), basePath = getFeatureName())
+
+        val featurePath = pathManager.getFeaturePath(getFeatureName()) ?: getFeatureName()
+
+        //Создаем путь экрана создания тренировки (interview_trainer/create_quiz/{title}
+        val createQuizRoute =
+            "$featurePath/${FeatureRoute.InterviewTrainerFeature.CREATE_QUIZ_SCREEN_NAME}/{$TITLE_TOP_APP_BAR}"
+
+        Timber.d("InterviewTrainerFeatureImpl registerGraph: currentPath: $createQuizRoute")
+
+        navGraphBuilder.composable(
+            route = createQuizRoute,
+            arguments = listOf(
+                navArgument(TITLE_TOP_APP_BAR) {
+                    type = NavType.StringType
+                }
+            )
+        ) { backStackEntry ->
+            val titleTopAppBar = backStackEntry.arguments?.getString(TITLE_TOP_APP_BAR) ?: ""
+
+            CreateQuizScreen(
+                onResult = { result ->
+                    when (result) {
+                        is CreateQuizResult.NavigateBack -> handleBackNavigation(
+                            pathManager,
+                            navController
+                        )
+
+                        is CreateQuizResult.NavigateToInterviewQuizScreen -> handleQuizNavigation(
+                            pathManager = pathManager,
+                            navController = navController,
+                            titleTopAppBar = titleTopAppBar,
+                            specializationId = result.specializationId.toString(),
+                            questionsCount = result.questionCount.toString()
+                        )
+                    }
+                },
+                titleTopAppBar = titleTopAppBar
+            )
+        }
+    }
+
+    /**
+     * Обработка навигации назад.
+     */
+    private fun handleBackNavigation(
+        pathManager: NavigationPathManager,
+        navController: NavHostController,
+    ) {
+        val parentPath = pathManager.getParentPath()
+        Timber.d("InterviewTrainerFeatureImpl handleBackNavigation: Navigating to parent: $parentPath")
+
+        pathManager.setCurrentPath(parentPath)
+
+        if (parentPath.isEmpty()) {
+            navController.navigateUp()
+        } else {
+            navController.navigate(parentPath) {
+                popUpTo(parentPath) {
+                    inclusive = true
+                }
+            }
+        }
+    }
+
+    /**
+     * Обработка навигации к экрану тренировки (InterviewQuizScreen).
+     */
+    private fun handleQuizNavigation(
+        pathManager: NavigationPathManager,
+        navController: NavHostController,
+        titleTopAppBar: String,
+        specializationId: String,
+        questionsCount: String,
+    ) {
+        val interviewQuizRoute = getFeatureName() + "/" +
+                FeatureRoute.InterviewTrainerFeature.INTERVIEW_QUIZ_SCREEN_NAME + "/" +
+                "$titleTopAppBar/$specializationId/$questionsCount"
+
+        Timber.d("InterviewTrainerFeatureImpl registerGraph: $interviewQuizRoute")
+
+        navController.navigate(interviewQuizRoute)
     }
 }

feature/interview-trainer/impl/src/main/java/ru/yeahub/interview_trainer/impl/createQuiz/di/CreateQuizMapperModule.kt

@@ -0,0 +1,13 @@
+package ru.yeahub.interview_trainer.impl.createQuiz.di
+
+import org.koin.dsl.module
+import ru.yeahub.interview_trainer.impl.createQuiz.data.CreateQuizDataToDomainMapper
+import ru.yeahub.interview_trainer.impl.createQuiz.presentation.CreateQuizScreenMapper
+
+val createQuizScreenMapperModule = module {
+    single { CreateQuizScreenMapper() }
+}
+
+val createQuizDataToDomainMapperModule = module {
+    factory { CreateQuizDataToDomainMapper() }
+}

feature/interview-trainer/impl/src/main/java/ru/yeahub/interview_trainer/impl/createQuiz/di/CreateQuizModule.kt

@@ -0,0 +1,17 @@
+package ru.yeahub.interview_trainer.impl.createQuiz.di
+
+import org.koin.dsl.bind
+import org.koin.dsl.module
+import ru.yeahub.interview_trainer.impl.InterviewTrainerFeatureImpl
+import ru.yeahub.navigation_api.FeatureApi
+
+val createQuizModule = module {
+    includes(
+        createQuizScreenMapperModule,
+        createQuizDataToDomainMapperModule,
+        createQuizRepositoryModule,
+        createQuizUseCaseModule,
+        createQuizViewModelModule
+    )
+    single { InterviewTrainerFeatureImpl() } bind FeatureApi::class
+}

feature/interview-trainer/impl/src/main/java/ru/yeahub/interview_trainer/impl/createQuiz/di/CreateQuizRepositoryModule.kt

@@ -0,0 +1,14 @@
+package ru.yeahub.interview_trainer.impl.createQuiz.di
+
+import org.koin.dsl.module
+import ru.yeahub.interview_trainer.impl.createQuiz.data.CreateQuizRepositoryImpl
+import ru.yeahub.interview_trainer.impl.createQuiz.domain.CreateQuizRepositoryApi
+
+val createQuizRepositoryModule = module {
+    single<CreateQuizRepositoryApi> {
+        CreateQuizRepositoryImpl(
+            apiService = get(),
+            mapper = get()
+        )
+    }
+}

feature/interview-trainer/impl/src/main/java/ru/yeahub/interview_trainer/impl/createQuiz/di/CreateQuizUseCaseModule.kt

@@ -0,0 +1,13 @@
+package ru.yeahub.interview_trainer.impl.createQuiz.di
+
+import org.koin.dsl.module
+import ru.yeahub.interview_trainer.impl.createQuiz.domain.GetSpecializationsListUseCaseImpl
+import ru.yeahub.interview_trainer.impl.createQuiz.domain.GetSpecializationsUseCase
+
+val createQuizUseCaseModule = module {
+    factory<GetSpecializationsUseCase> {
+        GetSpecializationsListUseCaseImpl(
+            repository = get()
+        )
+    }
+}