Atte149/book-story
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

⚖️ Merge changes from "development"

Browse source 
Merge changes from another branch.
This commit is contained in:
Acclorite 2024-08-15 20:59:36 +03:00
commit 07904d705c
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/SliderWithTitle.kt
View file

@ -14,7 +14,6 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import ua.acclorite.book_story.presentation.components.CategoryTitle import ua.acclorite.book_story.presentation.components.CategoryTitle
@ -60,9 +59,7 @@ fun SliderWithTitle(
text = if (!showPlaceholder) "${value.first}${value.second}" text = if (!showPlaceholder) "${value.first}${value.second}"
else valuePlaceholder, else valuePlaceholder,
style = MaterialTheme.typography.bodyMedium, style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant, color = MaterialTheme.colorScheme.onSurfaceVariant
maxLines = 1,
overflow = TextOverflow.Ellipsis
) )
} }
Spacer(modifier = Modifier.width(8.dp)) Spacer(modifier = Modifier.width(8.dp))
@ -75,7 +72,7 @@ fun SliderWithTitle(
steps = toValue - fromValue - 1, steps = toValue - fromValue - 1,
colors = SliderDefaults.colors( colors = SliderDefaults.colors(
activeTickColor = MaterialTheme.colorScheme.onPrimary, activeTickColor = MaterialTheme.colorScheme.onPrimary,
inactiveTickColor = MaterialTheme.colorScheme.onSurfaceVariant, inactiveTickColor = MaterialTheme.colorScheme.onSurfaceVariant
) )
) )
} }
@ -119,9 +116,7 @@ fun SliderWithTitle(
text = if (!showPlaceholder) "${(value.first * toValue).roundToInt()}${value.second}" text = if (!showPlaceholder) "${(value.first * toValue).roundToInt()}${value.second}"
else valuePlaceholder, else valuePlaceholder,
style = MaterialTheme.typography.bodyMedium, style = MaterialTheme.typography.bodyMedium,
color = MaterialTheme.colorScheme.onSurfaceVariant, color = MaterialTheme.colorScheme.onSurfaceVariant
maxLines = 1,
overflow = TextOverflow.Ellipsis
) )
} }
Spacer(modifier = Modifier.width(8.dp)) Spacer(modifier = Modifier.width(8.dp))
@ -133,7 +128,7 @@ fun SliderWithTitle(
}, },
colors = SliderDefaults.colors( colors = SliderDefaults.colors(
activeTickColor = MaterialTheme.colorScheme.onPrimary, activeTickColor = MaterialTheme.colorScheme.onPrimary,
inactiveTickColor = MaterialTheme.colorScheme.onSurfaceVariant, inactiveTickColor = MaterialTheme.colorScheme.onSurfaceVariant
) )
) )
} }