curiosite/DnDApplication
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix confusion between groupe & individual reward.

Browse source
This commit is contained in:
Thomas Andres Gomez 2023-09-18 19:01:32 +02:00
parent cd085c3700
commit 1ec6c06974
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/pixelized/rplexicon/ui/screens/quest/detail/QuestDetailScreen.kt
View file

@ -74,8 +74,8 @@ data class QuestDetailUio(
val giver: String?, val giver: String?,
val placeId: Int? = null, val placeId: Int? = null,
val place: String?, val place: String?,
val individualReward: String?,
val globalReward: String?, val globalReward: String?,
val individualReward: String?,
val description: String, val description: String,
) )
} }
@ -126,8 +126,8 @@ private fun QuestDetailUio.QuestStep.annotate(): AnnotatedQuestDetailUio.Annotat
giver = giver, giver = giver,
placeId = placeId, placeId = placeId,
place = place, place = place,
individualReward = individualReward,
globalReward = globalReward, globalReward = globalReward,
individualReward = individualReward,
description = AnnotatedString( description = AnnotatedString(
text = description, text = description,
spanStyles = listOf( spanStyles = listOf(
@ -331,7 +331,7 @@ private fun QuestDetailContent(
Text( Text(
style = MaterialTheme.typography.titleMedium, style = MaterialTheme.typography.titleMedium,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
text = stringResource(id = R.string.quest_detail_individual_reward), text = stringResource(id = R.string.quest_detail_group_reward),
) )
Text( Text(
style = MaterialTheme.typography.bodyMedium, style = MaterialTheme.typography.bodyMedium,
@ -344,7 +344,7 @@ private fun QuestDetailContent(
Text( Text(
style = MaterialTheme.typography.titleMedium, style = MaterialTheme.typography.titleMedium,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
text = stringResource(id = R.string.quest_detail_group_rewars), text = stringResource(id = R.string.quest_detail_individual_reward),
) )
Text( Text(
style = MaterialTheme.typography.bodyMedium, style = MaterialTheme.typography.bodyMedium,

2
app/src/main/java/com/pixelized/rplexicon/ui/screens/quest/detail/QuestDetailViewModel.kt
View file

@ -37,8 +37,8 @@ class QuestDetailViewModel @Inject constructor(
giver = entry.questGiver, giver = entry.questGiver,
placeId = locationRepository.findId(entry.area), placeId = locationRepository.findId(entry.area),
place = entry.area, place = entry.area,
individualReward = entry.individualReward,
globalReward = entry.groupReward, globalReward = entry.groupReward,
individualReward = entry.individualReward,
description = entry.description, description = entry.description,
) )
}, },

2
app/src/main/res/values-fr/strings.xml
View file

@ -55,7 +55,7 @@
<string name="quest_detail_giver">Commanditaire :</string> <string name="quest_detail_giver">Commanditaire :</string>
<string name="quest_detail_area">Lieu :</string> <string name="quest_detail_area">Lieu :</string>
<string name="quest_detail_individual_reward">Récompense individuelle :</string> <string name="quest_detail_individual_reward">Récompense individuelle :</string>
<string name="quest_detail_group_rewars">Récompense de groupe :</string> <string name="quest_detail_group_reward">Récompense de groupe :</string>
<string name="map_title">Carte</string> <string name="map_title">Carte</string>
<string name="map_label">Coordonnées</string> <string name="map_label">Coordonnées</string>

2
app/src/main/res/values/strings.xml
View file

@ -55,7 +55,7 @@
<string name="quest_detail_giver">Quest giver:</string> <string name="quest_detail_giver">Quest giver:</string>
<string name="quest_detail_area">Area:</string> <string name="quest_detail_area">Area:</string>
<string name="quest_detail_individual_reward">Individual reward:</string> <string name="quest_detail_individual_reward">Individual reward:</string>
<string name="quest_detail_group_rewars">Group reward:</string> <string name="quest_detail_group_reward">Group reward:</string>
<string name="map_title">Map</string> <string name="map_title">Map</string>
<string name="map_label">Coordinates</string> <string name="map_label">Coordinates</string>