|
|
@ -5,6 +5,7 @@ import androidx.compose.foundation.Image
|
|
|
|
import androidx.compose.foundation.background
|
|
|
|
import androidx.compose.foundation.background
|
|
|
|
import androidx.compose.foundation.border
|
|
|
|
import androidx.compose.foundation.border
|
|
|
|
import androidx.compose.foundation.clickable
|
|
|
|
import androidx.compose.foundation.clickable
|
|
|
|
|
|
|
|
import androidx.compose.foundation.clipScrollableContainer
|
|
|
|
import androidx.compose.foundation.layout.Box
|
|
|
|
import androidx.compose.foundation.layout.Box
|
|
|
|
import androidx.compose.foundation.layout.Column
|
|
|
|
import androidx.compose.foundation.layout.Column
|
|
|
|
import androidx.compose.foundation.layout.padding
|
|
|
|
import androidx.compose.foundation.layout.padding
|
|
|
@ -37,7 +38,8 @@ fun AffichageLesArticles(articles : List<Article>, goToArticle: (Article) -> Uni
|
|
|
|
){
|
|
|
|
){
|
|
|
|
Column(modifier = Modifier.verticalScroll(rememberScrollState())){
|
|
|
|
Column(modifier = Modifier.verticalScroll(rememberScrollState())){
|
|
|
|
for(article in articles){
|
|
|
|
for(article in articles){
|
|
|
|
Box (Modifier.clickable { /*faut je regarde la doc*/ }){
|
|
|
|
Box (Modifier.clickable { /*faut je regarde la doc*/ }
|
|
|
|
|
|
|
|
.background(color = Color(android.graphics.Color.parseColor("#e7dfd8")))){
|
|
|
|
AffichageUnArticleInfo(e = article, goToArticle)
|
|
|
|
AffichageUnArticleInfo(e = article, goToArticle)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -48,8 +50,10 @@ fun AffichageLesArticles(articles : List<Article>, goToArticle: (Article) -> Uni
|
|
|
|
@Composable
|
|
|
|
@Composable
|
|
|
|
fun AffichageUnArticleInfo(e : Article, goToArticle: (Article) -> Unit){
|
|
|
|
fun AffichageUnArticleInfo(e : Article, goToArticle: (Article) -> Unit){
|
|
|
|
Column(modifier = Modifier
|
|
|
|
Column(modifier = Modifier
|
|
|
|
.padding(7.dp)
|
|
|
|
.padding(12.dp,12.dp,12.dp,20.dp)
|
|
|
|
.border(width = 1.dp, color = Color.Black, shape = RoundedCornerShape(10.dp))
|
|
|
|
.background(Color.White)
|
|
|
|
|
|
|
|
//.border(width = 1.dp, color = Color.Black, shape = RoundedCornerShape(10.dp))
|
|
|
|
|
|
|
|
//.clip(RoundedCornerShape(50.dp)) //ca marche mais il y a comme un rectange blanc derriere
|
|
|
|
.padding(5.dp)) {
|
|
|
|
.padding(5.dp)) {
|
|
|
|
/*DisplayTitle(title = e.Title)
|
|
|
|
/*DisplayTitle(title = e.Title)
|
|
|
|
DisplayHeader(author = e.Author, description = e.Description, lectureTime = e.LectureTime)
|
|
|
|
DisplayHeader(author = e.Author, description = e.Description, lectureTime = e.LectureTime)
|
|
|
@ -106,6 +110,8 @@ fun AfficherArticle(e : Article){
|
|
|
|
.padding(7.dp)
|
|
|
|
.padding(7.dp)
|
|
|
|
.padding(5.dp)) {
|
|
|
|
.padding(5.dp)) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Text(text = e.titre, fontFamily = FontFamily.Serif, fontSize = 30.sp)
|
|
|
|
Text(text = e.titre, fontFamily = FontFamily.Serif, fontSize = 30.sp)
|
|
|
|
|
|
|
|
|
|
|
|
Box(
|
|
|
|
Box(
|
|
|
|