Feature [Event Creation/Edition] Add possibility to add types to events

app/src/androidTest/java/com/android/unio/components/event/EventCardTest.kt

@@ -17,7 +17,6 @@ import com.android.unio.mocks.user.MockUser
 import com.android.unio.model.association.AssociationRepositoryFirestore
 import com.android.unio.model.event.Event
 import com.android.unio.model.event.EventRepositoryFirestore
-import com.android.unio.model.event.EventType
 import com.android.unio.model.event.EventUserPictureRepositoryFirestore
 import com.android.unio.model.event.EventViewModel
 import com.android.unio.model.image.ImageRepositoryFirebaseStorage
@@ -142,7 +141,7 @@ class EventCardTest : TearDown() {
     composeTestRule
         .onNodeWithTag(EventCardTestTags.EVENT_MAIN_TYPE, useUnmergedTree = true)
         .assertExists()
-        .assertTextEquals(EventType.TRIP.text)
+        .assertTextEquals("Trip")
 
     composeTestRule
         .onNodeWithTag(EventCardTestTags.EVENT_LOCATION, useUnmergedTree = true)

app/src/androidTest/java/com/android/unio/components/event/EventCreationTest.kt

@@ -2,6 +2,7 @@ package com.android.unio.components.event
 
 import androidx.compose.ui.test.assert
 import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsNotEnabled
 import androidx.compose.ui.test.assertTextEquals
 import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.isDisplayed
@@ -32,6 +33,8 @@ import com.android.unio.model.search.SearchViewModel
 import com.android.unio.model.strings.TextLengthSamples
 import com.android.unio.model.strings.test_tags.event.EventCreationOverlayTestTags
 import com.android.unio.model.strings.test_tags.event.EventCreationTestTags
+import com.android.unio.model.strings.test_tags.event.EventDetailsTestTags
+import com.android.unio.model.strings.test_tags.event.EventTypeOverlayTestTags
 import com.android.unio.model.usecase.FollowUseCaseFirestore
 import com.android.unio.model.usecase.SaveUseCaseFirestore
 import com.android.unio.ui.event.EventCreationScreen
@@ -283,6 +286,77 @@ class EventCreationTest : TearDown() {
     composeTestRule.onNodeWithTag(EventCreationTestTags.DESCRIPTION).performTextClearance()
   }
 
+  @Test
+  fun testCorrectlyAddEvenTypes() {
+    nominatimLocationSearchViewModel =
+        NominatimLocationSearchViewModel(nominatimLocationRepositoryWithoutFunctionality)
+    composeTestRule.setContent {
+      EventCreationScreen(
+          navigationAction,
+          searchViewModel,
+          associationViewModel,
+          eventViewModel,
+          nominatimLocationSearchViewModel)
+    }
+
+    composeTestRule.onNodeWithTag(EventCreationTestTags.EVENT_TYPE).performScrollTo().performClick()
+
+    composeTestRule.onNodeWithTag(EventTypeOverlayTestTags.CARD).assertExists()
+
+    composeTestRule
+        .onNodeWithTag(EventTypeOverlayTestTags.CLICKABLE_ROW + "FESTIVAL")
+        .performScrollTo()
+        .performClick()
+    composeTestRule
+        .onNodeWithTag(EventTypeOverlayTestTags.CLICKABLE_ROW + "APERITIF")
+        .performScrollTo()
+        .performClick()
+
+    composeTestRule.onNodeWithTag(EventTypeOverlayTestTags.SAVE_BUTTON).performClick()
+
+    composeTestRule.onNodeWithTag(EventCreationTestTags.SCREEN).assertIsDisplayed()
+
+    composeTestRule.onNodeWithTag(EventDetailsTestTags.CHIPS + "Festival").assertExists()
+    composeTestRule.onNodeWithTag(EventDetailsTestTags.CHIPS + "Aperitif").assertExists()
+  }
+
+  @Test
+  fun testNotPossibleToAddMoreThan3EventTypes() {
+    nominatimLocationSearchViewModel =
+        NominatimLocationSearchViewModel(nominatimLocationRepositoryWithoutFunctionality)
+    composeTestRule.setContent {
+      EventCreationScreen(
+          navigationAction,
+          searchViewModel,
+          associationViewModel,
+          eventViewModel,
+          nominatimLocationSearchViewModel)
+    }
+
+    composeTestRule.onNodeWithTag(EventCreationTestTags.EVENT_TYPE).performScrollTo().performClick()
+
+    composeTestRule.onNodeWithTag(EventTypeOverlayTestTags.CARD).assertExists()
+
+    composeTestRule
+        .onNodeWithTag(EventTypeOverlayTestTags.CLICKABLE_ROW + "FESTIVAL")
+        .performScrollTo()
+        .performClick()
+    composeTestRule
+        .onNodeWithTag(EventTypeOverlayTestTags.CLICKABLE_ROW + "APERITIF")
+        .performScrollTo()
+        .performClick()
+    composeTestRule
+        .onNodeWithTag(EventTypeOverlayTestTags.CLICKABLE_ROW + "JAM")
+        .performScrollTo()
+        .performClick()
+    composeTestRule
+        .onNodeWithTag(EventTypeOverlayTestTags.CLICKABLE_ROW + "TRIP")
+        .performScrollTo()
+        .performClick()
+
+    composeTestRule.onNodeWithTag(EventTypeOverlayTestTags.SAVE_BUTTON).assertIsNotEnabled()
+  }
+
   @Test
   fun testClearButtonFunctionality() {
     nominatimLocationSearchViewModel =

app/src/androidTest/java/com/android/unio/components/event/EventEditTests.kt

@@ -29,7 +29,9 @@ import com.android.unio.model.map.nominatim.NominatimLocationRepository
 import com.android.unio.model.map.nominatim.NominatimLocationSearchViewModel
 import com.android.unio.model.search.SearchRepository
 import com.android.unio.model.search.SearchViewModel
+import com.android.unio.model.strings.test_tags.event.EventDetailsTestTags
 import com.android.unio.model.strings.test_tags.event.EventEditTestTags
+import com.android.unio.model.strings.test_tags.event.EventTypeOverlayTestTags
 import com.android.unio.model.usecase.FollowUseCaseFirestore
 import com.android.unio.model.usecase.SaveUseCaseFirestore
 import com.android.unio.ui.event.EventEditScreen
@@ -231,6 +233,73 @@ class EventEditTests : TearDown() {
     composeTestRule.waitForIdle()
   }
 
+  @Test
+  fun testCorrectlyAddEvenTypes() {
+    nominatimLocationSearchViewModel =
+        NominatimLocationSearchViewModel(nominatimLocationRepositoryWithoutFunctionality)
+    composeTestRule.setContent {
+      EventEditScreen(
+          navigationAction,
+          searchViewModel,
+          associationViewModel,
+          eventViewModel,
+          nominatimLocationSearchViewModel)
+    }
+
+    composeTestRule.onNodeWithTag(EventEditTestTags.EVENT_TYPE).performScrollTo().performClick()
+
+    composeTestRule.onNodeWithTag(EventTypeOverlayTestTags.CARD).assertExists()
+
+    composeTestRule
+        .onNodeWithTag(EventTypeOverlayTestTags.CLICKABLE_ROW + "FESTIVAL")
+        .performScrollTo()
+        .performClick()
+    composeTestRule
+        .onNodeWithTag(EventTypeOverlayTestTags.CLICKABLE_ROW + "APERITIF")
+        .performScrollTo()
+        .performClick()
+
+    composeTestRule.onNodeWithTag(EventTypeOverlayTestTags.SAVE_BUTTON).performClick()
+
+    composeTestRule.onNodeWithTag(EventEditTestTags.SCREEN).assertIsDisplayed()
+
+    composeTestRule.onNodeWithTag(EventDetailsTestTags.CHIPS + "Festival").assertExists()
+    composeTestRule.onNodeWithTag(EventDetailsTestTags.CHIPS + "Aperitif").assertExists()
+  }
+
+  @Test
+  fun testNotPossibleToAddMoreThan3EventTypes() {
+    nominatimLocationSearchViewModel =
+        NominatimLocationSearchViewModel(nominatimLocationRepositoryWithoutFunctionality)
+    composeTestRule.setContent {
+      EventEditScreen(
+          navigationAction,
+          searchViewModel,
+          associationViewModel,
+          eventViewModel,
+          nominatimLocationSearchViewModel)
+    }
+
+    composeTestRule.onNodeWithTag(EventEditTestTags.EVENT_TYPE).performScrollTo().performClick()
+
+    composeTestRule.onNodeWithTag(EventTypeOverlayTestTags.CARD).assertExists()
+
+    composeTestRule
+        .onNodeWithTag(EventTypeOverlayTestTags.CLICKABLE_ROW + "LAN")
+        .performScrollTo()
+        .performClick()
+    composeTestRule
+        .onNodeWithTag(EventTypeOverlayTestTags.CLICKABLE_ROW + "FOOD_DISTRIBUTION")
+        .performScrollTo()
+        .performClick()
+    composeTestRule
+        .onNodeWithTag(EventTypeOverlayTestTags.CLICKABLE_ROW + "MANIFESTATION")
+        .performScrollTo()
+        .performClick()
+
+    composeTestRule.onNodeWithTag(EventTypeOverlayTestTags.SAVE_BUTTON).assertIsNotEnabled()
+  }
+
   @Test
   fun testDeleteButtonWorksCorrectly() {
     nominatimLocationSearchViewModel =

app/src/main/java/com/android/unio/model/event/Event.kt

@@ -6,18 +6,12 @@ import androidx.appsearch.annotation.Document.Namespace
 import androidx.appsearch.annotation.Document.StringProperty
 import androidx.appsearch.app.AppSearchSchema.StringPropertyConfig
 import androidx.compose.ui.graphics.Color
+import com.android.unio.R
 import com.android.unio.model.association.Association
 import com.android.unio.model.firestore.ReferenceList
 import com.android.unio.model.firestore.UniquelyIdentifiable
 import com.android.unio.model.map.Location
-import com.android.unio.ui.theme.eventTypeAperitif
-import com.android.unio.ui.theme.eventTypeFestival
-import com.android.unio.ui.theme.eventTypeJam
-import com.android.unio.ui.theme.eventTypeNetworking
-import com.android.unio.ui.theme.eventTypeNightParty
-import com.android.unio.ui.theme.eventTypeOther
-import com.android.unio.ui.theme.eventTypeSport
-import com.android.unio.ui.theme.eventTypeTrip
+import com.android.unio.ui.theme.EventColors
 import com.google.firebase.Timestamp
 import java.util.Date
 
@@ -53,7 +47,7 @@ data class Event(
     val startDate: Timestamp = Timestamp(Date()),
     val endDate: Timestamp = Timestamp(Date()),
     val location: Location = Location(),
-    val types: List<EventType> = mutableListOf(EventType.OTHER),
+    val types: List<EventType>,
     val maxNumberOfPlaces: Int = -1,
     val numberOfSaved: Int = 0,
     val eventPictures: ReferenceList<EventUserPicture>,
@@ -81,15 +75,33 @@ data class Event(
  * @property color event type color
  * @property text event type text
  */
-enum class EventType(val color: Color, val text: String) {
-  FESTIVAL(eventTypeFestival, "festival"),
-  APERITIF(eventTypeAperitif, "aperitif"),
-  NIGHT_PARTY(eventTypeNightParty, "night party"),
-  JAM(eventTypeJam, "jam"),
-  NETWORKING(eventTypeNetworking, "networking"),
-  SPORT(eventTypeSport, "sport"),
-  TRIP(eventTypeTrip, "trip"),
-  OTHER(eventTypeOther, "other")
+enum class EventType(val color: Color, val text: Int) {
+  FESTIVAL(EventColors.Festival, R.string.event_type_festival), // + Music and Festivals
+  APERITIF(EventColors.Aperitif, R.string.event_type_aperitif), // + Food and Apéro
+  NIGHT_PARTY(EventColors.NightParty, R.string.event_type_night_party), // + Music and Festivals
+  JAM(EventColors.Jam, R.string.event_type_jam), // + Music and Art
+  NETWORKING(EventColors.Networking, R.string.event_type_networking), // + Apéro and Networking
+  SPORT_TOURNAMENT(EventColors.SportTournament, R.string.event_type_sport_tournament), // + Sports
+  SPORT_DISCOVERY(
+      EventColors.SportDiscovery, R.string.event_type_sport_discovery), // + Sports, Socialising
+  TRIP(EventColors.Trip, R.string.event_type_trip), // + Travel, Culture
+  LAN(EventColors.Lan, R.string.event_type_lan), // + Gaming
+  FILM_PROJECTION(
+      EventColors.FilmProjection, R.string.event_type_film_projection), // + Art, Culture
+  FOREIGN_CULTURE_DISCOVERY(
+      EventColors.ForeignCultureDiscovery,
+      R.string.event_type_foreign_culture_discovery), // + Culture, Literature
+  TECH_PRESENTATION(
+      EventColors.TechPresentation, R.string.event_type_tech_presentation), // + Tech, Science
+  SCIENCE_FARE(EventColors.ScienceFare, R.string.event_type_science_fare), // + Science, Tech
+  FOOD_DISTRIBUTION(EventColors.FoodDistribution, R.string.event_type_food_distribuition), // + Food
+  ART_CONVENTION(
+      EventColors.ArtConvention, R.string.event_type_art_convention), // + Art, Literature
+  MANIFESTATION(
+      EventColors.Manifestation, R.string.event_type_manifestation), // + Culture, Socialising
+  BOARD_GAMES(EventColors.BoardGames, R.string.event_type_board_games), // + Gaming, Socialising
+  GROUP_STUDY(EventColors.GroupStudy, R.string.event_type_group_study), // + Science, Tech
+  OTHER(EventColors.Other, R.string.event_type_other)
 }
 
 /**

app/src/main/java/com/android/unio/model/strings/test_tags/event/EventTestTags.kt

@@ -22,6 +22,7 @@ object EventCreationTestTags {
   const val EVENT_SHORT_DESCRIPTION_CLEAR_BUTTON = "eventCreationShortDescriptionClearButton"
   const val COAUTHORS = "eventCreationCoauthors"
   const val TAGGED_ASSOCIATIONS = "eventCreationTaggedAssociations"
+  const val EVENT_TYPE = "eventCreationEventType"
   const val DESCRIPTION = "eventCreationDescription"
   const val LOCATION = "eventCreationLocation"
   const val SAVE_BUTTON = "eventCreationSaveButton"
@@ -63,6 +64,7 @@ object EventEditTestTags {
   const val SHORT_DESCRIPTION_CLEAR_BUTTON = "eventEditShortDescriptionClearButton"
   const val COAUTHORS = "eventEditCoauthors"
   const val TAGGED_ASSOCIATIONS = "eventEditTaggedAssociations"
+  const val EVENT_TYPE = "eventEditEventType"
   const val DESCRIPTION = "eventEditDescription"
   const val LOCATION = "eventEditLocation"
   const val LOCATION_SUGGESTION_ITEM = "eventCreationSuggestionItem: "
@@ -118,4 +120,18 @@ object EventDetailsTestTags {
   const val EVENT_PICTURES_ARROW_LEFT = "picturesArrowLeft"
   const val EVENT_PICTURES_ARROW_RIGHT = "picturesArrowRight"
   const val PICTURE_FULL_SCREEN = "pictureFullScreen"
+  const val CHIPS = "eventChips"
+}
+
+object EventTypeOverlayTestTags {
+  const val CARD = "eventOverlayCard"
+  const val COLUMN = "eventOverlayColumn"
+  const val TITLE_TEXT = "eventOverlayTitleText"
+  const val SUBTITLE_TEXT = "eventOverlaySubtitleText"
+  const val DIVIDER = "eventOverlayDivider"
+  const val CANCEL_BUTTON = "eventOverlayCancelButton"
+  const val SAVE_BUTTON = "eventOverlaySaveButton"
+  const val CLICKABLE_ROW = "eventOverlayClickableRow"
+  const val TEXT = "eventOverlayRowText"
+  const val CHECK_BOX = "eventOverlayRowCheckBox"
 }

app/src/main/java/com/android/unio/model/user/User.kt

@@ -21,6 +21,9 @@ enum class Interest(val title: Int) {
   FOOD(R.string.interest_food),
   GAMING(R.string.interest_gaming),
   FESTIVALS(R.string.interest_festivals),
+  APEROS(R.string.interest_apero),
+  NETWORKING(R.string.interest_networking),
+  CULTURE(R.string.interest_culture)
 }
 
 enum class Social(val title: String, val icon: Int, val url: String) {

app/src/main/java/com/android/unio/ui/components/EventEditComponents.kt

@@ -58,11 +58,11 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.PopupProperties
 import com.android.unio.R
-import com.android.unio.model.association.Association
 import com.android.unio.model.map.Location
 import com.android.unio.model.map.nominatim.NominatimLocationSearchViewModel
 import com.android.unio.model.strings.FormatStrings.DAY_MONTH_YEAR_FORMAT
 import com.android.unio.model.strings.FormatStrings.HOUR_MINUTE_FORMAT
+import com.android.unio.model.strings.test_tags.event.EventDetailsTestTags
 import com.android.unio.ui.image.AsyncImageWrapper
 import com.android.unio.ui.utils.ToastUtils
 import com.google.firebase.Timestamp
@@ -172,24 +172,26 @@ fun NominatimLocationPicker(
 }
 
 /**
- * Composable for the association chips that show the selected associations.
+ * Composable for the different chips used that must be displayed in a flowRow
  *
- * @param associations List<Pair<Association, MutableState<Boolean>>> : List of associations and
- *   their selected state.
+ * @param items a generic list of items that can have their elements selected or not
  */
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
-fun AssociationChips(
-    associations: List<Pair<Association, MutableState<Boolean>>>,
+fun <T> Chips(
+    items: List<Pair<T, MutableState<Boolean>>>,
+    getName: (T) -> String,
 ) {
   val context = LocalContext.current
+
   FlowRow {
-    associations.forEach { (association, selected) ->
+    items.forEach { (item, selected) ->
       if (selected.value) {
         InputChip(
-            label = { Text(association.name) },
+            label = { Text(getName(item)) },
             onClick = {},
             selected = selected.value,
+            modifier = Modifier.testTag(EventDetailsTestTags.CHIPS + getName(item)),
             avatar = {
               Icon(
                   Icons.Default.Close,

app/src/main/java/com/android/unio/ui/event/EventCard.kt

@@ -232,7 +232,7 @@ fun EventCardScaffold(
                                   .background(addAlphaToColor(type.color, 200))
                                   .wrapContentWidth()) {
                             Text(
-                                text = type.text,
+                                text = context.getString(type.text),
                                 modifier =
                                     Modifier.padding(horizontal = 4.dp, vertical = 4.dp)
                                         .testTag(EventCardTestTags.EVENT_MAIN_TYPE),