diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/lexicon/list/LexiconItem.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/lexicon/list/LexiconItem.kt
index 9f926fa..af389cd 100644
--- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/lexicon/list/LexiconItem.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/lexicon/list/LexiconItem.kt
@@ -26,6 +26,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
import androidx.compose.ui.unit.dp
import com.pixelized.rplexicon.R
import com.pixelized.rplexicon.ui.theme.LexiconTheme
+import com.pixelized.rplexicon.utilitary.LOS_HOLLOW
import com.pixelized.rplexicon.utilitary.extentions.cell
import com.pixelized.rplexicon.utilitary.extentions.lexicon
import com.pixelized.rplexicon.utilitary.extentions.placeholder
@@ -75,8 +76,10 @@ fun LexiconItem(
horizontalArrangement = Arrangement.spacedBy(8.dp),
) {
Text(
- modifier = Modifier.alignByBaseline(),
- text = "◊",
+ modifier = Modifier
+ .alignByBaseline()
+ .placeholder { item.placeholder },
+ text = LOS_HOLLOW,
)
FlowRow(
diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/quest/detail/QuestDetailScreen.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/quest/detail/QuestDetailScreen.kt
index 83b6af6..7a7777f 100644
--- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/quest/detail/QuestDetailScreen.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/quest/detail/QuestDetailScreen.kt
@@ -50,6 +50,8 @@ import com.pixelized.rplexicon.ui.composable.BackgroundImage
import com.pixelized.rplexicon.ui.navigation.LocalScreenNavHost
import com.pixelized.rplexicon.ui.navigation.screens.navigateToLexiconDetail
import com.pixelized.rplexicon.ui.theme.LexiconTheme
+import com.pixelized.rplexicon.utilitary.LOS_FULL
+import com.pixelized.rplexicon.utilitary.LOS_HOLLOW
import com.pixelized.rplexicon.utilitary.extentions.lexicon
import com.pixelized.rplexicon.utilitary.extentions.scrollOffset
import java.lang.Integer.min
@@ -267,15 +269,15 @@ private fun QuestDetailContent(
)
) {
Text(
- style = MaterialTheme.typography.bodyMedium,
+ style = MaterialTheme.typography.titleMedium,
fontWeight = FontWeight.Bold,
text = stringResource(id = R.string.quest_detail_giver),
)
Text(
style = MaterialTheme.typography.bodyMedium,
text = when (quest.giverId) {
- null -> "◊ $it"
- else -> "⧫ $it"
+ null -> "$LOS_HOLLOW $it"
+ else -> "$LOS_FULL $it"
},
)
}
@@ -283,7 +285,7 @@ private fun QuestDetailContent(
quest.place?.let {
Column {
Text(
- style = MaterialTheme.typography.bodyMedium,
+ style = MaterialTheme.typography.titleMedium,
fontWeight = FontWeight.Bold,
text = stringResource(id = R.string.quest_detail_area),
)
@@ -296,7 +298,7 @@ private fun QuestDetailContent(
quest.globalReward?.let {
Column {
Text(
- style = MaterialTheme.typography.bodyMedium,
+ style = MaterialTheme.typography.titleMedium,
fontWeight = FontWeight.Bold,
text = stringResource(id = R.string.quest_detail_individual_reward),
)
@@ -309,7 +311,7 @@ private fun QuestDetailContent(
quest.individualReward?.let {
Column {
Text(
- style = MaterialTheme.typography.bodyMedium,
+ style = MaterialTheme.typography.titleMedium,
fontWeight = FontWeight.Bold,
text = stringResource(id = R.string.quest_detail_group_rewars),
)
diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/quest/list/QuestItem.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/quest/list/QuestItem.kt
index de8e124..df0adf0 100644
--- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/quest/list/QuestItem.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/quest/list/QuestItem.kt
@@ -18,6 +18,8 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.tooling.preview.PreviewParameterProvider
import androidx.compose.ui.unit.dp
import com.pixelized.rplexicon.ui.theme.LexiconTheme
+import com.pixelized.rplexicon.utilitary.LOS_FULL
+import com.pixelized.rplexicon.utilitary.LOS_HOLLOW
import com.pixelized.rplexicon.utilitary.extentions.cell
import com.pixelized.rplexicon.utilitary.extentions.lexicon
import com.pixelized.rplexicon.utilitary.extentions.placeholder
@@ -65,7 +67,7 @@ fun QuestItem(
true -> Modifier.placeholder { true }
else -> Modifier.alignByBaseline()
},
- text = if (item.complete) "⧫" else "◊",
+ text = if (item.complete) LOS_FULL else LOS_HOLLOW,
)
Text(
modifier = when (item.placeholder) {
diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/theme/Theme.kt b/app/src/main/java/com/pixelized/rplexicon/ui/theme/Theme.kt
index e268f70..d631604 100644
--- a/app/src/main/java/com/pixelized/rplexicon/ui/theme/Theme.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/theme/Theme.kt
@@ -10,7 +10,6 @@ import androidx.compose.runtime.Stable
import androidx.compose.runtime.compositionLocalOf
import androidx.compose.runtime.remember
import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalView
import androidx.core.view.WindowCompat
import com.pixelized.rplexicon.ui.theme.animation.LexiconAnimation
@@ -43,11 +42,9 @@ fun LexiconTheme(
darkTheme: Boolean = isSystemInDarkTheme(),
content: @Composable () -> Unit
) {
- val density = LocalDensity.current
-
val lexiconTheme = remember {
LexiconTheme(
- animation = lexiconAnimation(density = density),
+ animation = lexiconAnimation(),
colorScheme = when (darkTheme) {
true -> darkColorScheme()
else -> lightColorScheme()
diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/theme/animation/LexiconAnimation.kt b/app/src/main/java/com/pixelized/rplexicon/ui/theme/animation/LexiconAnimation.kt
index 69eea4f..98b759e 100644
--- a/app/src/main/java/com/pixelized/rplexicon/ui/theme/animation/LexiconAnimation.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/ui/theme/animation/LexiconAnimation.kt
@@ -5,12 +5,8 @@ import androidx.compose.animation.ContentTransform
import androidx.compose.animation.ExperimentalAnimationApi
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
-import androidx.compose.animation.slideInHorizontally
-import androidx.compose.animation.slideOutHorizontally
import androidx.compose.animation.with
import androidx.compose.runtime.Stable
-import androidx.compose.ui.unit.Density
-import androidx.compose.ui.unit.dp
@Stable
@OptIn(ExperimentalAnimationApi::class)
@@ -19,14 +15,6 @@ data class LexiconAnimation constructor(
)
@OptIn(ExperimentalAnimationApi::class)
-fun lexiconAnimation(
- density: Density,
-): LexiconAnimation = LexiconAnimation(
- itemList = with(density) {
- {
- val enter = fadeIn() + slideInHorizontally { 8.dp.roundToPx() }
- val exit = fadeOut() + slideOutHorizontally { 8.dp.roundToPx() }
- enter with exit
- }
- },
+fun lexiconAnimation(): LexiconAnimation = LexiconAnimation(
+ itemList = { fadeIn() with fadeOut() },
)
\ No newline at end of file
diff --git a/app/src/main/java/com/pixelized/rplexicon/utilitary/Const.kt b/app/src/main/java/com/pixelized/rplexicon/utilitary/Const.kt
new file mode 100644
index 0000000..9c92c2e
--- /dev/null
+++ b/app/src/main/java/com/pixelized/rplexicon/utilitary/Const.kt
@@ -0,0 +1,4 @@
+package com.pixelized.rplexicon.utilitary
+
+const val LOS_FULL = "⬧"
+const val LOS_HOLLOW = "⬨"
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index f43dae7..7c41da6 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -34,9 +34,9 @@
Rechercher
Détails du personnage
- Description
- Histoire
- Portrait
+ Description :
+ Histoire :
+ Portrait :
Rechercher
Rechercher
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9c859de..c5e663d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,9 +34,9 @@
Search
Character\'s details
- Description
- History
- Portrait
+ Description:
+ History:
+ Portrait:
Search
Search