Skip to content
Open
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
@@ -1,14 +1,22 @@
package eu.indiewalkabout.mathbrainer.core.presentation.navigation

import android.util.Log
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.navigation.NavHostController
import androidx.navigation.NavType
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.navArgument
import eu.indiewalkabout.mathbrainer.R
import eu.indiewalkabout.mathbrainer.feat_ads.presentation.AdMobBannerView
import eu.indiewalkabout.mathbrainer.feat_credits.presentation.ui.GameCreditsScreen
import eu.indiewalkabout.mathbrainer.feat_games.feat_count_items.presentation.ui.CountObjectsGameScreen
import eu.indiewalkabout.mathbrainer.feat_games.feat_enigma.presentation.ui.EnigmaGameScreen
Expand Down Expand Up @@ -47,10 +55,12 @@ fun NavGraph(
// --- Home ---
composable(ScreenRoutes.Home.route) {
val viewModel = hiltViewModel<HomeViewModel>()
HomeScreen(
navController = navController,
homeViewModel = viewModel
)
ScreenWithBottomBanner {
HomeScreen(
navController = navController,
homeViewModel = viewModel
)
}
}

// --- MathWrite Game ---
Expand All @@ -63,10 +73,12 @@ fun NavGraph(
val encodedOperation = backStackEntry.arguments?.getString("operation") ?: "+"
val operation = URLDecoder.decode(encodedOperation, "UTF-8")

MathWriteGameScreen(
operation = operation,
onBack = { navController.popBackStack() }
)
ScreenWithBottomBanner {
MathWriteGameScreen(
operation = operation,
onBack = { navController.popBackStack() }
)
}
}

// --- MathChoose Game ---
Expand All @@ -79,83 +91,120 @@ fun NavGraph(
val encodedOperation = backStackEntry.arguments?.getString("operation") ?: "+"
val operation = java.net.URLDecoder.decode(encodedOperation, "UTF-8")

MathChooseGameScreen(
operation = operation,
onBack = { navController.popBackStack() }
)
ScreenWithBottomBanner {
MathChooseGameScreen(
operation = operation,
onBack = { navController.popBackStack() }
)
}
}

// --- Double Number Game ---
composable(route = ScreenRoutes.DoubleNumberGame.route) {
DoubleNumberGameScreen(
onBack = { navController.popBackStack() }
)
ScreenWithBottomBanner {
DoubleNumberGameScreen(
onBack = { navController.popBackStack() }
)
}
}

// --- Random Operation Game ---
composable(route = ScreenRoutes.RandomOperationGame.route) {
RandomOperationGameScreen(
onBack = { navController.popBackStack() }
)
ScreenWithBottomBanner {
RandomOperationGameScreen(
onBack = { navController.popBackStack() }
)
}
}

// --- Memory Flash Game ---
composable(route = ScreenRoutes.MemoryFlashGame.route) {
MemoryFlashGameScreen(
onBack = { navController.popBackStack() }
)
ScreenWithBottomBanner {
MemoryFlashGameScreen(
onBack = { navController.popBackStack() }
)
}
}

// --- Number Order Game ---
composable(route = ScreenRoutes.NumberOrderGame.route) {
NumberOrderGameScreen(
onBack = { navController.popBackStack() }
)
ScreenWithBottomBanner {
NumberOrderGameScreen(
onBack = { navController.popBackStack() }
)
}
}

// --- Count Objects Game ---
composable(route = ScreenRoutes.CountObjectsGame.route) {
CountObjectsGameScreen(onBack = { navController.popBackStack() })
ScreenWithBottomBanner {
CountObjectsGameScreen(onBack = { navController.popBackStack() })
}
}

// --- Sequence Completion Game ---
composable(route = ScreenRoutes.SequenceCompleteGame.route) {
SequenceCompleteGameScreen(
onBack = { navController.popBackStack() }
)
ScreenWithBottomBanner {
SequenceCompleteGameScreen(
onBack = { navController.popBackStack() }
)
}
}

// --- Falling Operations Game ---
composable(route = ScreenRoutes.FallingOpsGame.route) {
FallingOpsGameScreen(
onBack = { navController.popBackStack() }
)
ScreenWithBottomBanner {
FallingOpsGameScreen(
onBack = { navController.popBackStack() }
)
}
}

// --- Enigma Game ---
composable(route = ScreenRoutes.EnigmaGame.route) {
EnigmaGameScreen(
onBack = { navController.popBackStack() }
)
ScreenWithBottomBanner {
EnigmaGameScreen(
onBack = { navController.popBackStack() }
)
}
}

// --- Settings ---
composable(ScreenRoutes.GameSettings.route) {
GameSettingsScreen(
onBack = { navController.popBackStack() },
onCreditsClick = { navController.navigate(ScreenRoutes.GameCredits.route) }
)
ScreenWithBottomBanner {
GameSettingsScreen(
onBack = { navController.popBackStack() },
onCreditsClick = { navController.navigate(ScreenRoutes.GameCredits.route) }
)
}
}

// --- Credits ---
composable(ScreenRoutes.GameCredits.route) {
GameCreditsScreen(onBack = { navController.popBackStack() })
ScreenWithBottomBanner {
GameCreditsScreen(onBack = { navController.popBackStack() })
}
}

// --- Statistics ---
composable(ScreenRoutes.Statistics.route) {
val viewModel = hiltViewModel<StatisticViewModel>()
StatisticScreen(navController = navController, statisticViewModel = viewModel)
ScreenWithBottomBanner {
StatisticScreen(navController = navController, statisticViewModel = viewModel)
}
}
}
}

@Composable
private fun ScreenWithBottomBanner(content: @Composable () -> Unit) {
Column(modifier = Modifier.fillMaxSize()) {
Box(modifier = Modifier.weight(1f, fill = true)) {
content()
}
AdMobBannerView(
adUnitId = stringResource(R.string.admob_key_bottom_banner),
modifier = Modifier.fillMaxWidth()
)
}
}

This file was deleted.

This file was deleted.