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

Change other masteries & languages layout.

Browse source
This commit is contained in:
Thomas Andres Gomez 2023-12-11 14:00:05 +01:00
parent 717aa996d1
commit dbd282a42a
4 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/pixelized/rplexicon/ui/screens/character/composable/character/Mastery.kt
View file

@ -36,7 +36,7 @@ data class MasteriesUio(
@Composable
fun Masteries(
modifier: Modifier = Modifier,
paddingValues: PaddingValues = PaddingValues(vertical = 8.dp, horizontal = 12.dp),
paddingValues: PaddingValues = PaddingValues(),
masteries: MasteriesUio,
) {
Column(
@ -73,7 +73,7 @@ fun Masteries(
}
Text(
modifier = Modifier.padding(top = 4.dp),
modifier = Modifier.padding(top = 8.dp),
style = MaterialTheme.typography.labelMedium,
fontWeight = FontWeight.Bold,
text = stringResource(id = R.string.character_sheet_languages_masteries),
@ -102,7 +102,7 @@ fun Masteries(
}
Text(
modifier = Modifier.padding(top = 4.dp),
modifier = Modifier.padding(top = 8.dp),
style = MaterialTheme.typography.labelMedium,
fontWeight = FontWeight.Bold,
text = stringResource(id = R.string.character_sheet_others_masteries),

10
app/src/main/java/com/pixelized/rplexicon/ui/screens/character/pages/proficiency/ProficiencyPage.kt
View file

@ -156,14 +156,8 @@ fun ProficiencyPageContent(
},
masteries = {
Masteries(
modifier = Modifier.padding(vertical = 4.dp),
masteries = sheet.masteries,
)
Text(
modifier = Modifier.padding(vertical = 4.dp),
style = MaterialTheme.typography.labelSmall,
text = stringResource(id = R.string.character_sheet_title_masteries)
)
},
)
}
@ -203,9 +197,7 @@ private fun ProficiencyLayout(
content = proficiencies,
)
Column(
modifier = Modifier
.layoutId("Masteries")
.ddBorder(inner = inner, outline = outline),
modifier = Modifier.layoutId("Masteries"),
horizontalAlignment = Alignment.CenterHorizontally,
content = masteries,
)

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

@ -91,7 +91,6 @@
<string name="character_sheet_title_initiative">Initiative</string>
<string name="character_sheet_title_saving_throws">Jet de sauvegarde</string>
<string name="character_sheet_title_proficiencies">Talents</string>
<string name="character_sheet_title_masteries">Maîtrises &amp; Langues</string>
<string name="character_sheet_martial_masteries">Maîtrises martiales :</string>
<string name="character_sheet_languages_masteries">Maîtrises de langues :</string>
<string name="character_sheet_others_masteries">Autres maîtrises :</string>

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

@ -99,7 +99,6 @@
<string name="character_sheet_title_initiative">Initiative</string>
<string name="character_sheet_title_saving_throws">Saving Throws</string>
<string name="character_sheet_title_proficiencies">Proficiencies</string>
<string name="character_sheet_title_masteries">Masteries &amp; Languages</string>
<string name="character_sheet_martial_masteries">Martial masteries:</string>
<string name="character_sheet_languages_masteries">Languages masteries:</string>
<string name="character_sheet_others_masteries">Others masteries:</string>