Merge pull request #316 from SwEnt-Group13/style/profile-edition-ui

Style/profile edition UI
SwEnt-Group13 · Dec 18, 2024 · c7a0fd7 · c7a0fd7
2 parents df69226 + 81ba5d5
commit c7a0fd7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/app/src/main/java/com/android/unio/ui/components/UserEditionComponents.kt b/app/src/main/java/com/android/unio/ui/components/UserEditionComponents.kt
@@ -145,11 +145,12 @@ fun InterestInputChip(pair: Pair<Interest, MutableState<Boolean>>, testTag: Stri
       label = { Text(context.getString(pair.first.title)) },
       onClick = {},
       selected = pair.second.value,
-      modifier = Modifier.padding(3.dp).testTag(testTag),
+      modifier = Modifier.padding(horizontal = 3.dp).testTag(testTag),
       avatar = {
         Icon(
             Icons.Default.Close,
-            contentDescription = "Add",
+            contentDescription =
+                context.getString(R.string.account_details_content_description_add),
             modifier = Modifier.clickable { pair.second.value = !pair.second.value })
       })
 }
@@ -169,7 +170,7 @@ fun SocialInputChip(userSocial: UserSocial, onRemove: () -> Unit, testTag: Strin
       label = { Text(userSocial.social.title) },
       onClick = {},
       selected = true,
-      modifier = Modifier.testTag(testTag + userSocial.social.title),
+      modifier = Modifier.padding(horizontal = 3.dp).testTag(testTag + userSocial.social.title),
       avatar = {
         Image(
             modifier = Modifier.size(24.dp),

diff --git a/app/src/main/java/com/android/unio/ui/event/EventCard.kt b/app/src/main/java/com/android/unio/ui/event/EventCard.kt
@@ -129,7 +129,7 @@ fun EventCardScaffold(
   Column(
       modifier =
           Modifier.fillMaxWidth()
-              .padding(vertical = 8.dp)
+              .padding(vertical = 10.dp)
               .testTag(EventCardTestTags.EVENT_ITEM)
               .clip(RoundedCornerShape(10.dp))
               .background(MaterialTheme.colorScheme.primaryContainer)

diff --git a/app/src/main/java/com/android/unio/ui/home/Home.kt b/app/src/main/java/com/android/unio/ui/home/Home.kt
@@ -3,7 +3,6 @@ package com.android.unio.ui.home
 import android.util.Log
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -203,7 +202,6 @@ fun EventList(
     eventViewModel: EventViewModel
 ) {
   LazyColumn(
-      contentPadding = PaddingValues(vertical = 8.dp),
       modifier =
           Modifier.fillMaxSize().padding(horizontal = 32.dp).testTag(HomeTestTags.EVENT_LIST)) {
         items(events) { event -> EventCard(navigationAction, event, userViewModel, eventViewModel) }

diff --git a/app/src/main/java/com/android/unio/ui/user/UserProfileEdition.kt b/app/src/main/java/com/android/unio/ui/user/UserProfileEdition.kt
@@ -375,7 +375,8 @@ private fun EditUserTextFields(
   val isLastNameError = isErrors.contains(AccountDetailsError.EMPTY_LAST_NAME)
 
   OutlinedTextField(
-      modifier = Modifier.padding(4.dp).testTag(UserEditionTestTags.FIRST_NAME_TEXT_FIELD),
+      modifier =
+          Modifier.padding(4.dp).fillMaxWidth().testTag(UserEditionTestTags.FIRST_NAME_TEXT_FIELD),
       label = {
         Row(
             horizontalArrangement = Arrangement.SpaceEvenly,
@@ -408,7 +409,8 @@ private fun EditUserTextFields(
       value = firstName)
 
   OutlinedTextField(
-      modifier = Modifier.padding(4.dp).testTag(UserEditionTestTags.LAST_NAME_TEXT_FIELD),
+      modifier =
+          Modifier.padding(4.dp).fillMaxWidth().testTag(UserEditionTestTags.LAST_NAME_TEXT_FIELD),
       label = {
         Row(
             horizontalArrangement = Arrangement.SpaceEvenly,
@@ -493,7 +495,7 @@ private fun InterestButtonAndFlowRow(
                 context.getString(R.string.account_details_content_description_add))
         Text(context.getString(R.string.user_edition_edit_interests))
       }
-  FlowRow {
+  FlowRow(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) {
     interests.forEach { pair ->
       if (pair.second.value) {
         InterestInputChip(pair, testTag = UserEditionTestTags.INTERESTS_CHIP + pair.first.name)
@@ -529,7 +531,7 @@ private fun SocialButtonAndFlowRow(
         Text(context.getString(R.string.user_edition_edit_socials))
       }
 
-  FlowRow(modifier = Modifier.fillMaxWidth().padding(3.dp)) {
+  FlowRow(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center) {
     socials.forEachIndexed { index, userSocial ->
       SocialInputChip(
           userSocial,