From 5cfc57e864ef0bded6fcdd735eb51a8fe86d9602 Mon Sep 17 00:00:00 2001 From: nosillard Date: Thu, 28 Mar 2024 10:02:56 +0100 Subject: [PATCH] remove homescreen --- .../com/example/veraxapplication/MainActivity.kt | 2 +- .../java/com/example/veraxapplication/data/Stub.kt | 6 ++++-- .../example/veraxapplication/navigation/NavHost.kt | 14 +++++++++----- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/MainActivity.kt b/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/MainActivity.kt index 886ca52..ad157e9 100644 --- a/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/MainActivity.kt +++ b/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/MainActivity.kt @@ -39,7 +39,7 @@ class MainActivity : ComponentActivity() { //TopBarVerax(theme = theme, articles = articlesApi) - // TopBarVerax(theme = theme, articles = articles) + //TopBarVerax(theme = theme, articles = articles) VeraxNavHost() diff --git a/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/data/Stub.kt b/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/data/Stub.kt index bead27a..38f18dc 100644 --- a/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/data/Stub.kt +++ b/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/data/Stub.kt @@ -1,7 +1,9 @@ package com.example.veraxapplication.data -object Stub { +import com.example.veraxapplication.modele.articles.Article +object Stub { +/* val Articles: List
by lazy { createArticles() } @@ -14,5 +16,5 @@ object Stub { Article(3, "Titre3", "test du corps de l'article 3"), Article(4, "Titre4", "test du corps de l'article 4") ) - } + }*/ } diff --git a/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/navigation/NavHost.kt b/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/navigation/NavHost.kt index 94cec67..52c521a 100644 --- a/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/navigation/NavHost.kt +++ b/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/navigation/NavHost.kt @@ -9,23 +9,25 @@ import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController import androidx.navigation.navArgument +import com.example.veraxapplication.articles.IArticlesDataManager +import com.example.veraxapplication.articles.StubArticles //import com.example.veraxapplication.HomeScreen -import com.example.veraxapplication.data.Stub //https://codefirst.iut.uca.fr/git/Kotlin_Android/Android_TP_2/src/branch/master/app/src/main/java/fr/iut/tp2/navigation/TP2NavHost.kt @Composable fun NavHost(){ val navController = rememberNavController() - val articles = Stub.Articles + val dataManager : IArticlesDataManager = StubArticles() + var articles = dataManager.getDerniersArticles(4) NavHost( modifier = Modifier.fillMaxSize(), navController = navController, startDestination = "home" ) { - /* + composable(route = "home") { - HomeScreen( + /* HomeScreen( //article = , //recup l article cliqué goToArticle = { navController.navigate("articleALaUne/${it.id}") @@ -35,6 +37,8 @@ fun NavHost(){ composable( route = "articleALaUne/{articleId}", arguments = navArgument("articleALaUne") { type = NavType.LongType }) - */ +*/ + } } + } \ No newline at end of file