feat(modif): add modifs

Theo-lbg · Theo-lbg · commit 01b5557a0cf2 · 2025-03-31T16:50:09.000+02:00
diff --git a/app/src/main/java/com/xpeho/xpeapp/ui/components/agenda/AgendaCard.kt b/app/src/main/java/com/xpeho/xpeapp/ui/components/agenda/AgendaCard.kt
@@ -16,6 +16,7 @@ import com.xpeho.xpeho_ui_android.TagPill
 import com.xpeho.xpeho_ui_android.foundations.Colors as XpehoColors
 import com.xpeho.xpeapp.R
 import androidx.core.graphics.toColorInt
+import com.xpeho.xpeapp.ui.components.layout.TagPillCustom
 import java.text.SimpleDateFormat
 import java.util.Locale
 
@@ -50,22 +51,20 @@ fun AgendaCard(
 @Composable
 private fun getTagsList(event: AgendaEvent, eventType: List<AgendaEventType>, color: Color): @Composable () -> Unit {
     val dateFormat = SimpleDateFormat("dd/MM", Locale.FRENCH)
+    val timeInfo = listOfNotNull(
+        event.startTime?.let { "De: $it" },
+        event.endTime?.let { "à: $it" }
+    ).joinToString(separator = " ")
+
     return {
         TagPill(
             label = dateFormat.format(event.date),
             backgroundColor = color,
             size = 9.sp
         )
-        event.startTime?.let {
+        if (timeInfo.isNotEmpty()) {
             TagPill(
-                label = event.startTime.toString(),
-                backgroundColor = color,
-                size = 9.sp
-            )
-        }
-        event.endTime?.let {
-            TagPill(
-                label = event.endTime.toString(),
+                label = timeInfo,
                 backgroundColor = color,
                 size = 9.sp
             )
@@ -78,7 +77,8 @@ private fun getTagsList(event: AgendaEvent, eventType: List<AgendaEventType>, co
             )
         }
         event.location?.takeIf { it.isNotEmpty() }?.let {
-            TagPill(
+            TagPillCustom(
+                iconResId = R.drawable.location,
                 label = it,
                 backgroundColor = color,
                 size = 9.sp
@@ -112,13 +112,13 @@ private fun getTagColor(baseColor: Color): Color {
 }
 
 private fun getEventTypeIcon(event: AgendaEvent, eventType: List<AgendaEventType>): Int {
-     return when (eventType.firstOrNull { it.id == event.typeId.toInt() }?.label) {
-         "XpeUp" -> R.drawable.birthday
-         "Event interne" -> R.drawable.building
-         "Formation" -> R.drawable.study
-         "RSE" -> R.drawable.leaf
-         "Activité" -> R.drawable.gamepad
-         "Event externe" -> R.drawable.outside
-         else -> R.drawable.building
+    return when (eventType.firstOrNull { it.id == event.typeId.toInt() }?.label) {
+        "XpeUp" -> R.drawable.birthday
+        "Event interne" -> R.drawable.building
+        "Formation" -> R.drawable.study
+        "RSE" -> R.drawable.leaf
+        "Activité" -> R.drawable.gamepad
+        "Event externe" -> R.drawable.outside
+        else -> R.drawable.building
     }
 }
diff --git a/app/src/main/java/com/xpeho/xpeapp/ui/components/layout/TagPillCustom.kt b/app/src/main/java/com/xpeho/xpeapp/ui/components/layout/TagPillCustom.kt
@@ -0,0 +1,64 @@
+package com.xpeho.xpeapp.ui.components.layout
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.TextUnit
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.xpeho.xpeho_ui_android.foundations.Colors
+import com.xpeho.xpeho_ui_android.foundations.Fonts
+
+@Composable
+fun TagPillCustom(
+    label: String,
+    size: TextUnit = 10.sp,
+    backgroundColor: Color = Colors.GREEN_DARK_COLOR,
+    labelColor: Color = Color.White,
+    iconResId: Int? = null
+) {
+    Card(
+        shape = RoundedCornerShape(6.dp),
+        colors = CardDefaults.cardColors(
+            containerColor = backgroundColor,
+        ),
+    ) {
+        Row(
+            modifier = Modifier.padding(vertical = 1.dp, horizontal = 4.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            iconResId?.let {
+                Icon(
+                    painter = painterResource(id = it),
+                    contentDescription = null,
+                    tint = labelColor,
+                    modifier = Modifier.size(12.dp)
+                )
+                Spacer(modifier = Modifier.width(4.dp))
+            }
+            Text(
+                text = label.uppercase(),
+                fontSize = size,
+                fontFamily = Fonts.rubik,
+                fontWeight = FontWeight.Medium,
+                color = labelColor,
+                softWrap = false,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/com/xpeho/xpeapp/ui/page/AgendaPage.kt b/app/src/main/java/com/xpeho/xpeapp/ui/page/AgendaPage.kt
@@ -59,7 +59,7 @@ fun AgendaPage() {
                 item {
                     CustomDialog(
                         title = stringResource(id = R.string.login_page_error_title),
-                        message = (agendaViewModel.state as QvstUiState.ERROR).error,
+                        message = (agendaViewModel.state as AgendaUiState.ERROR).error,
                     ) {
                         agendaViewModel.resetState()
                     }
diff --git a/app/src/main/java/com/xpeho/xpeapp/ui/page/HomePage.kt b/app/src/main/java/com/xpeho/xpeapp/ui/page/HomePage.kt
@@ -18,9 +18,6 @@ import com.xpeho.xpeapp.R
 import com.xpeho.xpeapp.XpeApp
 import com.xpeho.xpeapp.data.FeatureFlippingEnum
 import com.xpeho.xpeapp.data.entity.QvstCampaignEntity
-import com.xpeho.xpeapp.data.model.agenda.AgendaBirthday
-import com.xpeho.xpeapp.data.model.agenda.AgendaEvent
-import com.xpeho.xpeapp.data.model.agenda.AgendaEventType
 import com.xpeho.xpeapp.domain.FeatureFlippingState
 import com.xpeho.xpeapp.ui.components.CustomDialog
 import com.xpeho.xpeapp.ui.components.agenda.AgendaBirthdayItem
@@ -31,10 +28,10 @@ import com.xpeho.xpeapp.ui.components.layout.Title
 import com.xpeho.xpeapp.ui.components.newsletter.NewsletterPreview
 import com.xpeho.xpeapp.ui.components.qvst.QvstCardList
 import com.xpeho.xpeapp.ui.sendAnalyticsEvent
+import com.xpeho.xpeapp.ui.uiState.AgendaUiState
 import com.xpeho.xpeapp.ui.uiState.QvstActiveUiState
 import com.xpeho.xpeapp.ui.viewModel.FeatureFlippingViewModel
 import com.xpeho.xpeapp.ui.viewModel.agenda.AgendaViewModel
-import com.xpeho.xpeapp.ui.viewModel.agenda.AgendaViewModelState
 import com.xpeho.xpeapp.ui.viewModel.newsletter.NewsletterViewModel
 import com.xpeho.xpeapp.ui.viewModel.qvst.QvstActiveCampaignsViewModel
 import com.xpeho.xpeapp.ui.viewModel.viewModelFactory
@@ -163,9 +160,9 @@ fun HomePage(navigationController: NavController) {
                     when (agendaViewModel.state) {
 
                         // If we successfully loaded the events
-                        is AgendaViewModelState.SUCCESS -> {
+                        is AgendaUiState.SUCCESS -> {
                             item {
-                                val state = agendaViewModel.state as AgendaViewModelState.SUCCESS
+                                val state = agendaViewModel.state as AgendaUiState.SUCCESS
                                 val events = state.agendaEvent.map { AgendaEventItem(it) }
                                 val birthdays = state.agendaBirthday.map { AgendaBirthdayItem(it) }
                                 val items = (events + birthdays).sortedBy { it.date }
@@ -179,11 +176,11 @@ fun HomePage(navigationController: NavController) {
                         }
 
                         // If there was an error loading the events
-                        is AgendaViewModelState.ERROR -> {
+                        is AgendaUiState.ERROR -> {
                             item {
                                 CustomDialog(
                                     title = stringResource(id = R.string.login_page_error_title),
-                                    message = (agendaViewModel.state as AgendaViewModelState.ERROR).error,
+                                    message = (agendaViewModel.state as AgendaUiState.ERROR).error,
                                 ) {
                                     agendaViewModel.resetState()
                                 }
diff --git a/app/src/main/res/drawable/location.xml b/app/src/main/res/drawable/location.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="384dp"
+    android:height="512dp"
+    android:viewportWidth="384"
+    android:viewportHeight="512">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M215.7,499.2C267,435 384,279.4 384,192C384,86 298,0 192,0S0,86 0,192c0,87.4 117,243 168.3,307.2c12.3,15.3 35.1,15.3 47.4,0zM192,128a64,64 0,1 1,0 128,64 64,0 1,1 0,-128z"/>
+</vector>

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ fun AgendaPage() {`
`59`	`59`	`item {`
`60`	`60`	`CustomDialog(`
`61`	`61`	`title = stringResource(id = R.string.login_page_error_title),`
`62`		`- message = (agendaViewModel.state as QvstUiState.ERROR).error,`
	`62`	`+ message = (agendaViewModel.state as AgendaUiState.ERROR).error,`
`63`	`63`	`) {`
`64`	`64`	`agendaViewModel.resetState()`
`65`	`65`	`}`