From 98c9351d8f48539e46e07eb4a8e8548b4156eeed Mon Sep 17 00:00:00 2001 From: avalin Date: Fri, 7 Jun 2024 08:07:25 +0200 Subject: [PATCH] Profile picture in participations --- .../ui/betStatus/vo/BetStatusBottomSheetBetDisplayer.kt | 4 ++-- .../java/fr/iut/alldev/allin/ui/main/MainViewModel.kt | 2 +- .../alldev/allin/ui/preview/BetDetailPreviewProvider.kt | 8 ++++---- .../java/fr/iut/alldev/allin/data/api/MockAllInApi.kt | 7 +++++++ .../iut/alldev/allin/data/api/model/ApiParticipation.kt | 3 ++- .../fr/iut/alldev/allin/data/model/bet/Participation.kt | 2 +- 6 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/app/src/main/java/fr/iut/alldev/allin/ui/betStatus/vo/BetStatusBottomSheetBetDisplayer.kt b/src/app/src/main/java/fr/iut/alldev/allin/ui/betStatus/vo/BetStatusBottomSheetBetDisplayer.kt index c2478cc..d8f44f8 100644 --- a/src/app/src/main/java/fr/iut/alldev/allin/ui/betStatus/vo/BetStatusBottomSheetBetDisplayer.kt +++ b/src/app/src/main/java/fr/iut/alldev/allin/ui/betStatus/vo/BetStatusBottomSheetBetDisplayer.kt @@ -155,7 +155,7 @@ class BetStatusBottomSheetBetDisplayer( BetStatusParticipant( username = it.username, allCoinsAmount = it.stake, - image = getImageUrl(it.id) + image = getImageUrl(it.userId) ) HorizontalDivider( color = AllInTheme.colors.border, @@ -168,7 +168,7 @@ class BetStatusBottomSheetBetDisplayer( BetStatusParticipant( username = it.username, allCoinsAmount = it.stake, - image = getImageUrl(it.id) + image = getImageUrl(it.userId) ) Spacer(modifier = Modifier.height(8.dp)) } diff --git a/src/app/src/main/java/fr/iut/alldev/allin/ui/main/MainViewModel.kt b/src/app/src/main/java/fr/iut/alldev/allin/ui/main/MainViewModel.kt index 91fa74f..176c751 100644 --- a/src/app/src/main/java/fr/iut/alldev/allin/ui/main/MainViewModel.kt +++ b/src/app/src/main/java/fr/iut/alldev/allin/ui/main/MainViewModel.kt @@ -129,7 +129,7 @@ class MainViewModel @Inject constructor( selectedBet.value?.let { val participation = Participation( betId = it.bet.id, - id = user.id, + userId = user.id, username = user.username, response = response, stake = stake diff --git a/src/app/src/main/java/fr/iut/alldev/allin/ui/preview/BetDetailPreviewProvider.kt b/src/app/src/main/java/fr/iut/alldev/allin/ui/preview/BetDetailPreviewProvider.kt index a076571..a3b834d 100644 --- a/src/app/src/main/java/fr/iut/alldev/allin/ui/preview/BetDetailPreviewProvider.kt +++ b/src/app/src/main/java/fr/iut/alldev/allin/ui/preview/BetDetailPreviewProvider.kt @@ -86,14 +86,14 @@ class BetDetailPreviewProvider : PreviewParameterProvider { participations = listOf( Participation( betId = it.id, - id = "1", + userId = "1", username = "User1", response = answers.first().response, stake = 100 ), Participation( betId = it.id, - id = "2", + userId = "2", username = "User 2", response = answers.last().response, stake = 150 @@ -101,14 +101,14 @@ class BetDetailPreviewProvider : PreviewParameterProvider { ), userParticipation = Participation( betId = it.id, - id = "1", + userId = "1", username = "User1", response = answers.first().response, stake = 100 ), wonParticipation = Participation( betId = it.id, - id = "1", + userId = "1", username = "User1", response = answers.first().response, stake = 100 diff --git a/src/data/src/main/java/fr/iut/alldev/allin/data/api/MockAllInApi.kt b/src/data/src/main/java/fr/iut/alldev/allin/data/api/MockAllInApi.kt index 132a636..687c4fb 100644 --- a/src/data/src/main/java/fr/iut/alldev/allin/data/api/MockAllInApi.kt +++ b/src/data/src/main/java/fr/iut/alldev/allin/data/api/MockAllInApi.kt @@ -359,6 +359,7 @@ class MockAllInApi : AllInApi { mockParticipations.add( ResponseParticipation( id = "", + userId = "", betId = body.betId, username = it.first.username, answer = body.answer, @@ -446,6 +447,7 @@ class MockAllInApi : AllInApi { private val mockParticipations = mutableListOf( ResponseParticipation( id = "", + userId = "", betId = "UUID1", username = mockUsers[1].first.username, answer = NO_VALUE, @@ -453,6 +455,7 @@ class MockAllInApi : AllInApi { ), ResponseParticipation( id = "", + userId = "", betId = "UUID1", username = mockUsers[6].first.username, answer = YES_VALUE, @@ -460,6 +463,7 @@ class MockAllInApi : AllInApi { ), ResponseParticipation( id = "", + userId = "", betId = "UUID2", username = mockUsers[0].first.username, answer = "Answer 1", @@ -467,6 +471,7 @@ class MockAllInApi : AllInApi { ), ResponseParticipation( id = "", + userId = "", betId = "UUID2", username = mockUsers[2].first.username, answer = "Answer 1", @@ -474,6 +479,7 @@ class MockAllInApi : AllInApi { ), ResponseParticipation( id = "", + userId = "", betId = "UUID2", username = mockUsers[6].first.username, answer = "Answer 1", @@ -481,6 +487,7 @@ class MockAllInApi : AllInApi { ), ResponseParticipation( id = "", + userId = "", betId = "UUID3", username = mockUsers[1].first.username, answer = "The Monarchs", diff --git a/src/data/src/main/java/fr/iut/alldev/allin/data/api/model/ApiParticipation.kt b/src/data/src/main/java/fr/iut/alldev/allin/data/api/model/ApiParticipation.kt index 6aa93a4..c352ee4 100644 --- a/src/data/src/main/java/fr/iut/alldev/allin/data/api/model/ApiParticipation.kt +++ b/src/data/src/main/java/fr/iut/alldev/allin/data/api/model/ApiParticipation.kt @@ -9,6 +9,7 @@ import kotlinx.serialization.Serializable data class ResponseParticipation( val id: String, val betId: String, + val userId: String, val username: String, val answer: String, val stake: Int @@ -16,7 +17,7 @@ data class ResponseParticipation( fun toParticipation() = Participation( betId = betId, - id = id, + userId = userId, username = username, response = answer, stake = stake diff --git a/src/data/src/main/java/fr/iut/alldev/allin/data/model/bet/Participation.kt b/src/data/src/main/java/fr/iut/alldev/allin/data/model/bet/Participation.kt index ebee8e4..bd85cd8 100644 --- a/src/data/src/main/java/fr/iut/alldev/allin/data/model/bet/Participation.kt +++ b/src/data/src/main/java/fr/iut/alldev/allin/data/model/bet/Participation.kt @@ -4,7 +4,7 @@ import fr.iut.alldev.allin.data.api.model.RequestParticipation data class Participation( val betId: String, - val id: String, + val userId: String, val username: String, val response: String, val stake: Int