From 0df14fb03f77810bef3a4937724d288c361482d5 Mon Sep 17 00:00:00 2001
From: Shana CASCARRA <Shana.CASCARRA@etu.uca.fr>
Date: Sun, 31 Mar 2024 21:56:35 +0200
Subject: [PATCH] Ca remarche mais pas avec l'API

---
 .../example/veraxapplication/MainActivity.kt  | 42 +++++--------------
 .../veraxapplication/ui/article/Article.kt    | 34 ++++++++++-----
 2 files changed, 33 insertions(+), 43 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 7554fe2..8680395 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
@@ -1,14 +1,8 @@
 package com.example.veraxapplication
 
-import ArticlesViewModel
 import android.os.Bundle
-import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
-import androidx.lifecycle.viewmodel.compose.viewModel
 import com.example.veraxapplication.articles.IArticlesDataManager
 import com.example.veraxapplication.articles.StubArticles
 import com.example.veraxapplication.ui.topBar.TopBarVerax
@@ -22,38 +16,22 @@ import com.example.veraxapplication.ui.topBar.TopBarVerax
 
 class MainActivity : ComponentActivity() {
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContent {
-
-
-            VeraxContent()
-        }
-    }
-}
-
-@Composable
-fun VeraxContent() {
-
-
-    // Initialiser les données ou observer les données du ViewModel
     var dataManager: IArticlesDataManager = StubArticles()
     var articles = dataManager.getDerniersArticles(4)
 
-    // Observer les données du ViewModel
-    val articlesViewModel: ArticlesViewModel = viewModel()
-
-    // Observez les articles du ViewModel
-    val articlesApi by articlesViewModel.articles.observeAsState(initial = articles)
-
 
     var theme = listOf("Economique", "Culture", "Politique", "Faits divers")
 
-    for(a in articlesApi){
-        Log.d("Articles : ", a.contenus.toString())
-    }
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+
 
-    TopBarVerax(articles = articlesApi, theme = theme)
+            // TopBarVerax(theme = theme, articles = articlesApi)
+            TopBarVerax(theme = theme, articles = articles)
 
+            // VeraxNavHost()
 
-}
+        }
+    }
+}
\ No newline at end of file
diff --git a/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/ui/article/Article.kt b/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/ui/article/Article.kt
index fbcbaca..1108213 100644
--- a/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/ui/article/Article.kt
+++ b/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/ui/article/Article.kt
@@ -1,7 +1,6 @@
 package com.example.veraxapplication.ui.article
 
 import VideoPlayer
-import android.util.Log
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
@@ -51,17 +50,30 @@ fun AffichageUnArticleInfo(e : Article, goToArticle: (Article) -> Unit){
         .padding(7.dp)
         .border(width = 1.dp, color = Color.Black, shape = RoundedCornerShape(10.dp))
         .padding(5.dp)) {
+        /*DisplayTitle(title = e.Title)
+        DisplayHeader(author = e.Author, description = e.Description, lectureTime = e.LectureTime)
+        DisplayImage(image = e.Image)
+        DisplayContentArticle(content = e.Content)*/
 
 
-        Text(text = e.titre, fontFamily = FontFamily.Serif, fontSize = 30.sp)
-
 
-        var imageURl = e.note
-        Log.d("ImageLoad", "URL de l'image reçue de l'API : $imageURl")
+        Text(text = e.titre, fontFamily = FontFamily.Serif, fontSize = 30.sp)
 
+        Box(modifier = Modifier
+            .padding(15.dp)
+            .border(width = 1.dp, color = Color.Black, shape = RoundedCornerShape(10.dp))
+            .clip(RoundedCornerShape(10.dp))
+            .background(Salmon)
+        ) {
+            Column (modifier = Modifier.padding(15.dp)) {
+                Text(text = "Auteur : "+e.auteur, fontSize = 17.sp)
+                Text(text = "Description : "+e.description, fontSize = 17.sp)
+                Text(text = "Temps de lecture : "+e.temps+" minutes", fontSize = 17.sp)
+            }
+        }
         Image(
             painter = rememberImagePainter(
-                data = imageURl
+                data = e.imagePrincipale
             ),
             contentScale = ContentScale.Crop,
             contentDescription = null,
@@ -73,12 +85,12 @@ fun AffichageUnArticleInfo(e : Article, goToArticle: (Article) -> Unit){
 
         Button(onClick = { goToArticle(e) },
             colors = ButtonDefaults.buttonColors(
-            containerColor = Salmon,
-            contentColor = Color.Black
-        ),
+                containerColor = Salmon,
+                contentColor = Color.Black
+            ),
             border = BorderStroke(1.dp, Color.Black),
-                    modifier = Modifier
-            .align(Alignment.CenterHorizontally)
+            modifier = Modifier
+                .align(Alignment.CenterHorizontally)
         ) {
             Text(text = "Voir plus")
         }