From c2abb90896ec49972f2e0e4cb5b64d6a54b97b2a Mon Sep 17 00:00:00 2001 From: Shana CASCARRA Date: Sun, 24 Mar 2024 23:16:45 +0100 Subject: [PATCH] Ajout du bouton, je regarde la doc pour voir comment on navigue ... --- .../veraxapplication/ui/article/Article.kt | 21 ++++++++++++------- .../veraxapplication/ui/theme/Theme.kt | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) 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 b10a322..ea6aee0 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,5 +1,6 @@ package com.example.veraxapplication.ui.article +import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -11,6 +12,8 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -76,15 +79,19 @@ fun AffichageUnArticle(e : Article){ .align(Alignment.CenterHorizontally) .padding(5.dp, 35.dp) ) - - - Column { - for(c in e.contenus){ - Text(text = c.toString(), fontSize = 15.sp, fontFamily = FontFamily.Serif, textAlign = TextAlign.Justify, modifier = Modifier.padding(10.dp)) - } + + Button(onClick = { /*TODO*/ }, + colors = ButtonDefaults.buttonColors( + containerColor = Salmon, + contentColor = Color.Black + ), + border = BorderStroke(1.dp, Color.Black), + modifier = Modifier + .align(Alignment.CenterHorizontally) + ) { + Text(text = "Voir plus") } - } } diff --git a/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/ui/theme/Theme.kt b/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/ui/theme/Theme.kt index 53df8c9..b91ef74 100644 --- a/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/ui/theme/Theme.kt +++ b/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/ui/theme/Theme.kt @@ -22,7 +22,7 @@ private val DarkColorScheme = darkColorScheme( ) private val LightColorScheme = lightColorScheme( - primary = Purple40, + primary = Salmon, secondary = PurpleGrey40, tertiary = Salmon