present content on intro

Author: pablobaldez

Diff for: app/src/main/kotlin/br/com/mob1st/bet/features/launch/presentation/LauncherActivity.kt

@@ -14,6 +14,7 @@ import br.com.mob1st.features.finances.publicapi.domain.ui.BudgetBuilderNavGraph
 import br.com.mob1st.features.finances.publicapi.domain.ui.FinancesNavGraph
 import br.com.mob1st.features.utils.observability.LocalAnalyticsReporter
 import org.koin.android.ext.android.inject
+import org.koin.compose.KoinContext
 import org.koin.compose.koinInject
 
 class LauncherActivity : ComponentActivity() {
@@ -22,10 +23,12 @@ class LauncherActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
-            CompositionLocalProvider(LocalAnalyticsReporter provides analyticsReporter) {
-                UiContrast {
-                    TwoCentsTheme {
-                        NavigationGraph(this)
+            KoinContext {
+                CompositionLocalProvider(LocalAnalyticsReporter provides analyticsReporter) {
+                    UiContrast {
+                        TwoCentsTheme {
+                            NavigationGraph(this)
+                        }
                     }
                 }
             }
@@ -36,14 +39,11 @@ class LauncherActivity : ComponentActivity() {
 @Composable
 internal fun NavigationGraph(activity: ComponentActivity) {
     val navController = rememberNavController()
-    navController.addOnDestinationChangedListener { _, destination, _ ->
-        activity.title = destination.label?.toString() ?: ""
-    }
     val financesNavGraph = koinInject<FinancesNavGraph>()
     val budgetBuilderNavGraph = koinInject<BudgetBuilderNavGraph>()
     NavHost(
         navController = navController,
-        startDestination = budgetBuilderNavGraph.root,
+        startDestination = BudgetBuilderNavGraph.Root,
     ) {
         financesNavGraph.graph(
             navController = navController,

Diff for: core/design/src/main/kotlin/br/com/mob1st/core/design/molecules/buttons/IconButton.kt

@@ -1,7 +1,10 @@
 package br.com.mob1st.core.design.molecules.buttons
 
+import androidx.compose.foundation.layout.size
 import androidx.compose.material3.IconButton
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
 import br.com.mob1st.core.design.atoms.icons.BackIcon
 import br.com.mob1st.core.design.atoms.theme.TwoCentsTheme
 import br.com.mob1st.core.design.utils.ThemedPreview
@@ -13,7 +16,7 @@ fun TopBackButton(
     IconButton(
         onClick = onBackClicked,
     ) {
-        BackIcon()
+        BackIcon(modifier = Modifier.size(24.dp))
     }
 }
 

Diff for: core/design/src/main/kotlin/br/com/mob1st/core/design/templates/FeatureStepScaffold.kt

@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExtendedFloatingActionButton
 import androidx.compose.material3.FabPosition
@@ -20,6 +21,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
 import br.com.mob1st.core.design.R
 import br.com.mob1st.core.design.atoms.icons.CheckIcon
 import br.com.mob1st.core.design.atoms.spacing.Spacings
@@ -72,6 +74,7 @@ fun FeatureStepScaffold(
                 text = { buttonContent() },
                 icon = {
                     CheckIcon(
+                        modifier = Modifier.size(16.dp),
                         contentDescription = stringResource(R.string.core_design_back_button_content_description),
                     )
                 },

Diff for: features/finances/impl/src/main/kotlin/br/com/mob1st/features/finances/impl/dependencies/DomainModule.kt

@@ -1,14 +1,16 @@
 package br.com.mob1st.features.finances.impl.dependencies
 
+import br.com.mob1st.features.finances.impl.domain.entities.Category
 import br.com.mob1st.features.finances.impl.domain.usecases.GetBudgetBuilderForStepUseCase
 import br.com.mob1st.features.finances.impl.domain.usecases.ProceedBuilderUseCase
 import br.com.mob1st.features.finances.impl.domain.usecases.StartBuilderStepUseCase
 import org.koin.core.module.dsl.factoryOf
+import org.koin.dsl.bind
 import org.koin.dsl.module
 
-internal val domainModule
-    get() = module {
-        factoryOf(::GetBudgetBuilderForStepUseCase)
-        factoryOf(::StartBuilderStepUseCase)
-        factoryOf(::ProceedBuilderUseCase)
-    }
+internal val domainModule = module {
+    single { Category } bind Category.Factory::class
+    factoryOf(::GetBudgetBuilderForStepUseCase)
+    factoryOf(::StartBuilderStepUseCase)
+    factoryOf(::ProceedBuilderUseCase)
+}

Diff for: features/finances/impl/src/main/kotlin/br/com/mob1st/features/finances/impl/dependencies/InfraModule.kt

@@ -23,7 +23,7 @@ private val repositoriesModule = module {
         DatabaseFactory.create(get())
     }
     factory { SuggestionListPerStep() }
-    single { CategoriesDataMap }
+    single { CategoriesDataMap } bind CategoriesDataMap::class
     factoryOf(::CategoryRepositoryImpl) bind CategoriesRepository::class
     factoryOf(::CategorySuggestionsRepositoryImpl) bind CategorySuggestionRepository::class
 }

Diff for: features/finances/impl/src/main/kotlin/br/com/mob1st/features/finances/impl/dependencies/UiModule.kt

@@ -11,10 +11,11 @@ import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.bind
 import org.koin.dsl.module
 
-internal val uiModule = module {
-    single { FinancesNavGraphImpl } bind FinancesNavGraph::class
-    includes(builderModule)
-}
+internal val uiModule
+    get() = module {
+        single { FinancesNavGraphImpl } bind FinancesNavGraph::class
+        includes(builderModule)
+    }
 
 internal val builderModule = module {
     single { BudgetBuilderNavGraphImpl } bind BudgetBuilderNavGraph::class

Diff for: features/finances/impl/src/main/kotlin/br/com/mob1st/features/finances/impl/domain/entities/BudgetBuilder.kt

@@ -51,6 +51,6 @@ data class BudgetBuilder(
         /**
          * Returns the first step of the category builder.
          */
-        fun firstStep(): BuilderNextAction.Step = FixedExpensesStep
+        fun firstStep(): BuilderNextAction.Step = VariableExpensesStep
     }
 }

Diff for: features/finances/impl/src/main/kotlin/br/com/mob1st/features/finances/impl/domain/entities/BuilderNextAction.kt

@@ -42,7 +42,7 @@ sealed interface BuilderNextAction {
 data object FixedExpensesStep : BuilderNextAction.Step {
     private const val REQUIRED_INPUTS = 3
     override val minimumRequiredToProceed: Int = REQUIRED_INPUTS
-    override val next: BuilderNextAction = VariableExpensesStep
+    override val next: BuilderNextAction = SeasonalExpensesStep
     override val type: RecurrenceType = RecurrenceType.Fixed
     override val isExpense: Boolean = true
 }
@@ -52,9 +52,9 @@ data object FixedExpensesStep : BuilderNextAction.Step {
  * It is used to add variable expenses.
  */
 data object VariableExpensesStep : BuilderNextAction.Step {
-    private const val REQUIRED_INPUTS = 3
+    private const val REQUIRED_INPUTS = 2
     override val minimumRequiredToProceed: Int = REQUIRED_INPUTS
-    override val next: BuilderNextAction = FixedIncomesStep
+    override val next: BuilderNextAction = FixedExpensesStep
     override val type: RecurrenceType = RecurrenceType.Variable
     override val isExpense: Boolean = true
 }
@@ -75,7 +75,7 @@ data object SeasonalExpensesStep : BuilderNextAction.Step {
  * It is used to add fixed incomes.
  */
 data object FixedIncomesStep : BuilderNextAction.Step {
-    override val minimumRequiredToProceed: Int = 1
+    override val minimumRequiredToProceed: Int = 0
     override val next: BuilderNextAction = BuilderNextAction.Complete
     override val type: RecurrenceType = RecurrenceType.Fixed
     override val isExpense: Boolean = false

Diff for: features/finances/impl/src/main/kotlin/br/com/mob1st/features/finances/impl/ui/navgraph/BudgetBuilderNavGraphImpl.kt

@@ -12,19 +12,16 @@ import br.com.mob1st.features.finances.impl.ui.builder.navigation.BuilderRouter
 import br.com.mob1st.features.finances.impl.ui.builder.navigation.BuilderStepNavType
 import br.com.mob1st.features.finances.impl.ui.builder.steps.BudgetBuilderStepPage
 import br.com.mob1st.features.finances.publicapi.domain.ui.BudgetBuilderNavGraph
-import kotlinx.serialization.Serializable
 import org.koin.compose.koinInject
 import kotlin.reflect.typeOf
 
 object BudgetBuilderNavGraphImpl : BudgetBuilderNavGraph {
-    override val root: BudgetBuilderNavGraph.Root = Root
-
     context(NavGraphBuilder)
     override fun graph(
         navController: NavController,
         onComplete: () -> Unit,
     ) {
-        navigation<Root>(
+        navigation<BudgetBuilderNavGraph.Root>(
             startDestination = BuilderRoute.Intro,
         ) {
             composable<BuilderRoute.Intro> {
@@ -47,7 +44,4 @@ object BudgetBuilderNavGraphImpl : BudgetBuilderNavGraph {
             }
         }
     }
-
-    @Serializable
-    object Root : BudgetBuilderNavGraph.Root
 }

Diff for: features/finances/impl/src/main/kotlin/br/com/mob1st/features/finances/impl/ui/navgraph/FinancesNavGraphImpl.kt

@@ -9,22 +9,20 @@ import br.com.mob1st.features.finances.publicapi.domain.ui.FinancesNavGraph
 import kotlinx.serialization.Serializable
 
 internal object FinancesNavGraphImpl : FinancesNavGraph {
-    override val root: FinancesNavGraph.Root = Root
-
     context(NavGraphBuilder)
     override fun graph(
         navController: NavController,
         onClickClose: () -> Unit,
     ) {
-        navigation<Root>(
-            startDestination = "main",
+        navigation<FinancesNavGraph.Root>(
+            startDestination = Main,
         ) {
-            composable("main") {
+            composable<Main> {
                 Text(text = "Main")
             }
         }
     }
 
     @Serializable
-    data object Root : FinancesNavGraph.Root
+    data object Main
 }

Diff for: features/finances/impl/src/test/kotlin/br/com/mob1st/features/finances/impl/domain/entities/BudgetBuilderTest.kt

@@ -57,7 +57,7 @@ class BudgetBuilderTest {
     @Test
     fun `WHEN get the first step THEN assert it is fixed expense`() {
         val actual = BudgetBuilder.firstStep()
-        assertEquals(FixedExpensesStep, actual)
+        assertEquals(VariableExpensesStep, actual)
     }
 
     @Test

Diff for: features/finances/impl/src/test/kotlin/br/com/mob1st/features/finances/impl/domain/entities/RootNextActionStepTest.kt

@@ -0,0 +1,69 @@
+package br.com.mob1st.features.finances.impl.domain.entities
+
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.Arguments.arguments
+import org.junit.jupiter.params.provider.MethodSource
+import kotlin.test.assertEquals
+
+class RootNextActionStepTest {
+    @ParameterizedTest
+    @MethodSource("stepSource")
+    fun `GIVEN a step WHEN get next THEN assert is expected`(
+        step: BuilderNextAction.Step,
+        expectedIsExpense: Boolean,
+        expectedMinimumRequiredToProceed: Int,
+        expectedType: RecurrenceType,
+        expectedNext: BuilderNextAction,
+    ) {
+        assertEquals(
+            expectedIsExpense,
+            step.isExpense,
+        )
+        assertEquals(
+            expectedMinimumRequiredToProceed,
+            step.minimumRequiredToProceed,
+        )
+        assertEquals(
+            expectedType,
+            step.type,
+        )
+        assertEquals(
+            expectedNext,
+            step.next,
+        )
+    }
+
+    companion object {
+        @JvmStatic
+        fun stepSource() = listOf(
+            arguments(
+                VariableExpensesStep,
+                true,
+                2,
+                RecurrenceType.Variable,
+                FixedExpensesStep,
+            ),
+            arguments(
+                FixedExpensesStep,
+                true,
+                3,
+                RecurrenceType.Fixed,
+                SeasonalExpensesStep,
+            ),
+            arguments(
+                SeasonalExpensesStep,
+                true,
+                0,
+                RecurrenceType.Seasonal,
+                FixedIncomesStep,
+            ),
+            arguments(
+                FixedIncomesStep,
+                false,
+                0,
+                RecurrenceType.Fixed,
+                BuilderNextAction.Complete,
+            ),
+        )
+    }
+}

Diff for: features/finances/impl/src/test/kotlin/br/com/mob1st/features/finances/impl/ui/builder/BudgetBuilderStepViewModelTest.kt renamed to features/finances/impl/src/test/kotlin/br/com/mob1st/features/finances/impl/ui/builder/BudgetRootStepViewModelTest.kt

@@ -45,7 +45,7 @@ import org.junit.jupiter.api.extension.ExtendWith
 
 @OptIn(ExperimentalCoroutinesApi::class)
 @ExtendWith(MainDispatcherTestExtension::class)
-class BudgetBuilderStepViewModelTest {
+class BudgetRootStepViewModelTest {
     private lateinit var getCategoryBuilder: GetBudgetBuilderForStepUseCase
     private lateinit var proceedBuilder: ProceedBuilderUseCase
     private lateinit var router: BuilderRouter

Diff for: features/finances/impl/src/test/kotlin/br/com/mob1st/features/finances/impl/ui/builder/navigation/BuilderRouterTest.kt renamed to features/finances/impl/src/test/kotlin/br/com/mob1st/features/finances/impl/ui/builder/navigation/RootRouterTest.kt

@@ -14,7 +14,7 @@ import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.Arguments.arguments
 import org.junit.jupiter.params.provider.MethodSource
 
-class BuilderRouterTest {
+class RootRouterTest {
     @ParameterizedTest
     @MethodSource("sendActionSource")
     fun `GIVEN a action WHEN send THEN return the next route`(

Diff for: features/finances/public-api/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
     id("org.jetbrains.kotlin.android")
     id("kotlin-parcelize")
     id("commonSetup")
+    alias(libs.plugins.kotlin.serialization)
 }
 
 android {

Diff for: features/finances/public-api/src/main/kotlin/br/com/mob1st/features/finances/publicapi/domain/ui/BudgetBuilderNavGraph.kt

@@ -2,12 +2,12 @@ package br.com.mob1st.features.finances.publicapi.domain.ui
 
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
-import br.com.mob1st.core.androidx.navigation.FeatureNavGraph
+import kotlinx.serialization.Serializable
 
 /**
  * Builds the navigation graph for the category builder flow.
  */
-interface BudgetBuilderNavGraph : FeatureNavGraph<BudgetBuilderNavGraph.Root> {
+interface BudgetBuilderNavGraph {
     /**
      * Builds the navigation graph for the finances feature.
      * @param navController The navigation controller.
@@ -22,5 +22,6 @@ interface BudgetBuilderNavGraph : FeatureNavGraph<BudgetBuilderNavGraph.Root> {
     /**
      * The root of the navigation graph.
      */
-    interface Root
+    @Serializable
+    data object Root
 }

Diff for: features/finances/public-api/src/main/kotlin/br/com/mob1st/features/finances/publicapi/domain/ui/FinancesNavGraph.kt

@@ -2,18 +2,13 @@ package br.com.mob1st.features.finances.publicapi.domain.ui
 
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
-import br.com.mob1st.core.androidx.navigation.FeatureNavGraph
+import kotlinx.serialization.Serializable
 
 /**
  * Builds the navigation graph for the finances feature.
  * It's the entry point for the feature navigation.
  */
-interface FinancesNavGraph : FeatureNavGraph<FinancesNavGraph.Root> {
-    /**
-     * The root of the navigation graph.
-     */
-    override val root: Root
-
+interface FinancesNavGraph {
     /**
      * Builds the navigation graph for the finances feature.
      * @param onClickClose Callback to be called when the close button is clicked.
@@ -27,5 +22,6 @@ interface FinancesNavGraph : FeatureNavGraph<FinancesNavGraph.Root> {
     /**
      * The root of the navigation graph.
      */
-    interface Root
+    @Serializable
+    data object Root
 }