From f874d363aad545a261fa092af1efcc6586601078 Mon Sep 17 00:00:00 2001 From: Shana CASCARRA Date: Thu, 21 Mar 2024 23:55:21 +0100 Subject: [PATCH] Re arangement du visu --- .../veraxapplication/ui/article/Article.kt | 36 ++++++++++++------- .../veraxapplication/ui/theme/Color.kt | 2 +- .../veraxapplication/ui/theme/Theme.kt | 2 +- .../veraxapplication/ui/topBar/TopBarVerax.kt | 6 +++- 4 files changed, 30 insertions(+), 16 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 794e9f2..e9fca3a 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 @@ -3,6 +3,7 @@ package com.example.veraxapplication.ui.article import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.border +import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth @@ -13,9 +14,11 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp @@ -28,14 +31,20 @@ import com.example.veraxapplication.ui.theme.Salmon fun AffichageLesArticles(articles : List
){ Column(modifier = Modifier.verticalScroll(rememberScrollState())){ for(article in articles){ - AffichageUnArticle(e = article) + Box (Modifier.clickable { /*faut je regarde la doc*/ }){ + AffichageUnArticle(e = article) + } + } } } @Composable fun AffichageUnArticle(e : Article){ - Column() { + Column(modifier = Modifier + .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) @@ -46,26 +55,27 @@ fun AffichageUnArticle(e : Article){ Text(text = e.titre, fontFamily = FontFamily.Serif, fontSize = 30.sp) Box(modifier = Modifier - .fillMaxWidth() + .padding(15.dp) .border(width = 1.dp, color = Color.Black, shape = RoundedCornerShape(10.dp)) .clip(RoundedCornerShape(10.dp)) .background(Salmon) - .padding(10.dp)) { - Column () { - Text(text = e.auteur) - Text(text = e.description) - Text(text = "Lecture Time: " + e.temps + " minutes") + ) { + Column (modifier = Modifier.padding(15.dp)) { + Text(text = e.auteur, fontSize = 17.sp) + Text(text = e.description, fontSize = 17.sp) + Text(text = "Lecture Time: " + e.temps + " minutes", fontSize = 17.sp) } } Image( painter = rememberImagePainter( - data = e.imagePrincipale, - builder = { - scale(Scale.FILL) - } + data = e.imagePrincipale ), + contentScale = ContentScale.Crop, contentDescription = null, - modifier = Modifier.size(250.dp), + modifier = Modifier + .size(350.dp) + .align(Alignment.CenterHorizontally) + .padding(5.dp, 35.dp) ) /* diff --git a/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/ui/theme/Color.kt b/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/ui/theme/Color.kt index a2952b8..cbf700e 100644 --- a/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/ui/theme/Color.kt +++ b/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/ui/theme/Color.kt @@ -8,5 +8,5 @@ val Pink80 = Color(0xFFEFB8C8) val Purple40 = Color(0xFF6650a4) val PurpleGrey40 = Color(0xFF625b71) -val Pink40 = Color(0xFF7D5260) +val Orange = Color(0xFFFADCD1) val Salmon = Color(0xFFE9967A) \ No newline at end of file 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 903147c..53df8c9 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 @@ -24,7 +24,7 @@ private val DarkColorScheme = darkColorScheme( private val LightColorScheme = lightColorScheme( primary = Purple40, secondary = PurpleGrey40, - tertiary = Pink40 + tertiary = Salmon /* Other default colors to override background = Color(0xFFFFFBFE), diff --git a/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/ui/topBar/TopBarVerax.kt b/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/ui/topBar/TopBarVerax.kt index e210370..e8b2d7b 100644 --- a/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/ui/topBar/TopBarVerax.kt +++ b/Android/VeraxApplication/app/src/main/java/com/example/veraxapplication/ui/topBar/TopBarVerax.kt @@ -1,12 +1,14 @@ package com.example.veraxapplication.ui.topBar import androidx.compose.foundation.background +import androidx.compose.foundation.border import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material.icons.filled.Menu @@ -33,6 +35,7 @@ import androidx.compose.ui.unit.sp import com.example.veraxapplication.R import com.example.veraxapplication.modele.articles.Article import com.example.veraxapplication.ui.article.AffichageLesArticles +import com.example.veraxapplication.ui.theme.Orange @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -75,7 +78,8 @@ fun TopBarVerax(theme: List, articles: List
) { DropdownMenu( expanded = leMenu, onDismissRequest = { leMenu = false }, modifier = Modifier - .background(Color.hsl(0.08F, 1F, 0.96F)) + .border(width = 1.dp, color = Color.Black, shape = RoundedCornerShape(10.dp)) + .background(Orange) ) { theme.sorted().forEach { DropdownMenuItem(