From 7eb061fc9d63aeca4d52e8d241bc5c2defe690f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Mur=C3=A7a?= Date: Thu, 17 Jul 2025 18:46:10 -0300 Subject: [PATCH] refactor: define initial folders structure --- .../xyz/leomurca/csgomatches/MainActivity.kt | 2 +- .../csgomatches/navigation/MainRoute.kt | 13 ------------ .../csgomatches/ui/navigation/DetailsRoute.kt | 13 ++++++++++++ .../csgomatches/ui/navigation/MatchesRoute.kt | 13 ++++++++++++ .../{ => ui}/navigation/RootNavHost.kt | 7 ++++--- .../ui/screens/details/DetailsScreen.kt | 21 +++++++++++++++++++ .../matches/MatchesScreen.kt} | 4 ++-- 7 files changed, 54 insertions(+), 19 deletions(-) delete mode 100644 app/src/main/java/xyz/leomurca/csgomatches/navigation/MainRoute.kt create mode 100644 app/src/main/java/xyz/leomurca/csgomatches/ui/navigation/DetailsRoute.kt create mode 100644 app/src/main/java/xyz/leomurca/csgomatches/ui/navigation/MatchesRoute.kt rename app/src/main/java/xyz/leomurca/csgomatches/{ => ui}/navigation/RootNavHost.kt (67%) create mode 100644 app/src/main/java/xyz/leomurca/csgomatches/ui/screens/details/DetailsScreen.kt rename app/src/main/java/xyz/leomurca/csgomatches/ui/{main/MainScreen.kt => screens/matches/MatchesScreen.kt} (88%) diff --git a/app/src/main/java/xyz/leomurca/csgomatches/MainActivity.kt b/app/src/main/java/xyz/leomurca/csgomatches/MainActivity.kt index df5c0d8..7387cb1 100644 --- a/app/src/main/java/xyz/leomurca/csgomatches/MainActivity.kt +++ b/app/src/main/java/xyz/leomurca/csgomatches/MainActivity.kt @@ -6,7 +6,7 @@ import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import dagger.hilt.android.AndroidEntryPoint -import xyz.leomurca.csgomatches.navigation.RootNavHost +import xyz.leomurca.csgomatches.ui.navigation.RootNavHost import xyz.leomurca.csgomatches.ui.theme.CSGOMatchesTheme @AndroidEntryPoint diff --git a/app/src/main/java/xyz/leomurca/csgomatches/navigation/MainRoute.kt b/app/src/main/java/xyz/leomurca/csgomatches/navigation/MainRoute.kt deleted file mode 100644 index 6b2fb12..0000000 --- a/app/src/main/java/xyz/leomurca/csgomatches/navigation/MainRoute.kt +++ /dev/null @@ -1,13 +0,0 @@ -package xyz.leomurca.csgomatches.navigation - -import androidx.navigation.NavGraphBuilder -import androidx.navigation.compose.composable -import xyz.leomurca.csgomatches.ui.main.MainScreen - -const val MAIN_ROUTE = "main" - -fun NavGraphBuilder.mainScreen() { - composable(MAIN_ROUTE) { - MainScreen() - } -} \ No newline at end of file diff --git a/app/src/main/java/xyz/leomurca/csgomatches/ui/navigation/DetailsRoute.kt b/app/src/main/java/xyz/leomurca/csgomatches/ui/navigation/DetailsRoute.kt new file mode 100644 index 0000000..27b319e --- /dev/null +++ b/app/src/main/java/xyz/leomurca/csgomatches/ui/navigation/DetailsRoute.kt @@ -0,0 +1,13 @@ +package xyz.leomurca.csgomatches.ui.navigation + +import androidx.navigation.NavGraphBuilder +import androidx.navigation.compose.composable +import xyz.leomurca.csgomatches.ui.screens.details.DetailsScreen + +const val DETAILS_ROUTE = "details" + +fun NavGraphBuilder.detailsScreen() { + composable(DETAILS_ROUTE) { + DetailsScreen() + } +} diff --git a/app/src/main/java/xyz/leomurca/csgomatches/ui/navigation/MatchesRoute.kt b/app/src/main/java/xyz/leomurca/csgomatches/ui/navigation/MatchesRoute.kt new file mode 100644 index 0000000..7094c74 --- /dev/null +++ b/app/src/main/java/xyz/leomurca/csgomatches/ui/navigation/MatchesRoute.kt @@ -0,0 +1,13 @@ +package xyz.leomurca.csgomatches.ui.navigation + +import androidx.navigation.NavGraphBuilder +import androidx.navigation.compose.composable +import xyz.leomurca.csgomatches.ui.screens.matches.MatchesScreen + +const val MATCHES_ROUTE = "matches" + +fun NavGraphBuilder.matchesScreen() { + composable(MATCHES_ROUTE) { + MatchesScreen() + } +} \ No newline at end of file diff --git a/app/src/main/java/xyz/leomurca/csgomatches/navigation/RootNavHost.kt b/app/src/main/java/xyz/leomurca/csgomatches/ui/navigation/RootNavHost.kt similarity index 67% rename from app/src/main/java/xyz/leomurca/csgomatches/navigation/RootNavHost.kt rename to app/src/main/java/xyz/leomurca/csgomatches/ui/navigation/RootNavHost.kt index 4ebed4d..974e14c 100644 --- a/app/src/main/java/xyz/leomurca/csgomatches/navigation/RootNavHost.kt +++ b/app/src/main/java/xyz/leomurca/csgomatches/ui/navigation/RootNavHost.kt @@ -1,4 +1,4 @@ -package xyz.leomurca.csgomatches.navigation +package xyz.leomurca.csgomatches.ui.navigation import androidx.compose.runtime.Composable import androidx.navigation.compose.NavHost @@ -9,8 +9,9 @@ fun RootNavHost() { val navController = rememberNavController() NavHost( navController = navController, - startDestination = MAIN_ROUTE + startDestination = MATCHES_ROUTE ) { - mainScreen() + matchesScreen() + detailsScreen() } } \ No newline at end of file diff --git a/app/src/main/java/xyz/leomurca/csgomatches/ui/screens/details/DetailsScreen.kt b/app/src/main/java/xyz/leomurca/csgomatches/ui/screens/details/DetailsScreen.kt new file mode 100644 index 0000000..83e23ba --- /dev/null +++ b/app/src/main/java/xyz/leomurca/csgomatches/ui/screens/details/DetailsScreen.kt @@ -0,0 +1,21 @@ +package xyz.leomurca.csgomatches.ui.screens.details + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.sp + +@Composable +fun DetailsScreen() { + Box( + modifier = Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background), + contentAlignment = Alignment.Center + ) { + Text("Details Screen", fontSize = 24.sp) + } +} diff --git a/app/src/main/java/xyz/leomurca/csgomatches/ui/main/MainScreen.kt b/app/src/main/java/xyz/leomurca/csgomatches/ui/screens/matches/MatchesScreen.kt similarity index 88% rename from app/src/main/java/xyz/leomurca/csgomatches/ui/main/MainScreen.kt rename to app/src/main/java/xyz/leomurca/csgomatches/ui/screens/matches/MatchesScreen.kt index 9221c98..4ae33f5 100644 --- a/app/src/main/java/xyz/leomurca/csgomatches/ui/main/MainScreen.kt +++ b/app/src/main/java/xyz/leomurca/csgomatches/ui/screens/matches/MatchesScreen.kt @@ -1,4 +1,4 @@ -package xyz.leomurca.csgomatches.ui.main +package xyz.leomurca.csgomatches.ui.screens.matches import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -11,7 +11,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.sp @Composable -fun MainScreen() { +fun MatchesScreen() { Box( modifier = Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background), contentAlignment = Alignment.Center