Myzel394/NumberHub
1
0
Fork 0
mirror of https://github.com/Myzel394/NumberHub.git synced 2025-06-19 08:45:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate text style

Browse Source
This commit is contained in:
Sad Ellie 2023-10-07 00:37:23 +03:00
parent 4fc9fc6b0c
commit 943ceb0c64
4 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/ui/src/main/java/com/sadellie/unitto/core/ui/common/textfield/InputTextField.kt
View File

@ -59,7 +59,7 @@ import androidx.compose.ui.text.input.VisualTransformation
import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.Constraints
import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.TextUnit
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import com.sadellie.unitto.core.ui.theme.numbersDisplayLarge import com.sadellie.unitto.core.ui.theme.numberDisplayLarge
import kotlin.math.ceil import kotlin.math.ceil
import kotlin.math.roundToInt import kotlin.math.roundToInt
@ -105,7 +105,7 @@ fun ExpressionTextField(
modifier = modifier, modifier = modifier,
value = value, value = value,
formattedValue = value.text.formatExpression(formatterSymbols), formattedValue = value.text.formatExpression(formatterSymbols),
textStyle = MaterialTheme.typography.numbersDisplayLarge.copy(color = textColor), textStyle = MaterialTheme.typography.numberDisplayLarge.copy(color = textColor),
minRatio = minRatio, minRatio = minRatio,
onValueChange = { onCursorChange(it.selection) }, onValueChange = { onCursorChange(it.selection) },
readOnly = readOnly, readOnly = readOnly,
@ -157,7 +157,7 @@ fun UnformattedTextField(
AutoSizableTextField( AutoSizableTextField(
modifier = modifier, modifier = modifier,
value = value, value = value,
textStyle = MaterialTheme.typography.numbersDisplayLarge.copy(color = textColor), textStyle = MaterialTheme.typography.numberDisplayLarge.copy(color = textColor),
minRatio = minRatio, minRatio = minRatio,
onValueChange = { onCursorChange(it.selection) }, onValueChange = { onCursorChange(it.selection) },
readOnly = readOnly, readOnly = readOnly,

38
core/ui/src/main/java/com/sadellie/unitto/core/ui/theme/Type.kt
View File

@ -35,18 +35,18 @@ import androidx.compose.ui.unit.sp
import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.base.R
// This text style is used for text field // This text style is used for text field
val Typography.numbersDisplayLarge by lazy { val Typography.numberDisplayLarge by lazy {
TextStyle( TextStyle(
fontFamily = latoFamily, fontFamily = latoFamily,
fontWeight = FontWeight.W400, fontWeight = FontWeight.Normal,
fontSize = 57.sp, fontSize = 57.sp,
lineHeight = (1.4).em, lineHeight = (1.25).em,
letterSpacing = (-0.25).sp, letterSpacing = (-0.25).sp,
) )
} }
// This text style is used for secondary text field // This text style is used for secondary text field
val Typography.numbersDisplayMedium by lazy { val Typography.numberDisplayMedium by lazy {
TextStyle( TextStyle(
fontFamily = latoFamily, fontFamily = latoFamily,
fontWeight = FontWeight.W400, fontWeight = FontWeight.W400,
@ -56,26 +56,6 @@ val Typography.numbersDisplayMedium by lazy {
) )
} }
val Typography.numberBodyLarge: TextStyle by lazy {
TextStyle(
fontFamily = latoFamily,
fontWeight = FontWeight.Normal,
fontSize = 16.sp,
lineHeight = 1.5.em,
letterSpacing = 0.5.sp,
)
}
val Typography.numberDisplayLarge: TextStyle by lazy {
TextStyle(
fontFamily = latoFamily,
fontWeight = FontWeight.Normal,
fontSize = 57.sp,
lineHeight = 1.25.em,
letterSpacing = (-0.25).sp,
)
}
val Typography.numberHeadlineSmall: TextStyle by lazy { val Typography.numberHeadlineSmall: TextStyle by lazy {
TextStyle( TextStyle(
fontFamily = latoFamily, fontFamily = latoFamily,
@ -86,6 +66,16 @@ val Typography.numberHeadlineSmall: TextStyle by lazy {
) )
} }
val Typography.numberBodyLarge: TextStyle by lazy {
TextStyle(
fontFamily = latoFamily,
fontWeight = FontWeight.Normal,
fontSize = 16.sp,
lineHeight = 1.5.em,
letterSpacing = 0.5.sp,
)
}
val Typography.numberHeadlineMedium: TextStyle by lazy { val Typography.numberHeadlineMedium: TextStyle by lazy {
TextStyle( TextStyle(
fontFamily = latoFamily, fontFamily = latoFamily,

6
feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt
View File

@ -64,7 +64,7 @@ import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
import com.sadellie.unitto.core.ui.common.textfield.UnittoTextToolbar import com.sadellie.unitto.core.ui.common.textfield.UnittoTextToolbar
import com.sadellie.unitto.core.ui.common.textfield.clearAndFilterExpression import com.sadellie.unitto.core.ui.common.textfield.clearAndFilterExpression
import com.sadellie.unitto.core.ui.common.textfield.copyWithoutGrouping import com.sadellie.unitto.core.ui.common.textfield.copyWithoutGrouping
import com.sadellie.unitto.core.ui.theme.numbersDisplayMedium import com.sadellie.unitto.core.ui.theme.numberDisplayMedium
import com.sadellie.unitto.data.model.HistoryItem import com.sadellie.unitto.data.model.HistoryItem
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.Locale import java.util.Locale
@ -190,7 +190,7 @@ private fun HistoryListItem(
.fillMaxWidth() .fillMaxWidth()
.padding(horizontal = 8.dp) .padding(horizontal = 8.dp)
.horizontalScroll(rememberScrollState(), reverseScrolling = true), .horizontalScroll(rememberScrollState(), reverseScrolling = true),
textStyle = MaterialTheme.typography.numbersDisplayMedium.copy(color = MaterialTheme.colorScheme.onSurfaceVariant, textAlign = TextAlign.End), textStyle = MaterialTheme.typography.numberDisplayMedium.copy(color = MaterialTheme.colorScheme.onSurfaceVariant, textAlign = TextAlign.End),
readOnly = true, readOnly = true,
visualTransformation = ExpressionTransformer(formatterSymbols), visualTransformation = ExpressionTransformer(formatterSymbols),
interactionSource = expressionInteractionSource interactionSource = expressionInteractionSource
@ -215,7 +215,7 @@ private fun HistoryListItem(
.fillMaxWidth() .fillMaxWidth()
.padding(horizontal = 8.dp) .padding(horizontal = 8.dp)
.horizontalScroll(rememberScrollState(), reverseScrolling = true), .horizontalScroll(rememberScrollState(), reverseScrolling = true),
textStyle = MaterialTheme.typography.numbersDisplayMedium.copy(color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f), textAlign = TextAlign.End), textStyle = MaterialTheme.typography.numberDisplayMedium.copy(color = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.5f), textAlign = TextAlign.End),
readOnly = true, readOnly = true,
visualTransformation = ExpressionTransformer(formatterSymbols), visualTransformation = ExpressionTransformer(formatterSymbols),
interactionSource = resultInteractionSource interactionSource = resultInteractionSource

4
feature/settings/src/main/java/com/sadellie/unitto/feature/settings/formatting/FormattingScreen.kt
View File

@ -63,7 +63,7 @@ import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar
import com.sadellie.unitto.core.ui.common.UnittoSlider import com.sadellie.unitto.core.ui.common.UnittoSlider
import com.sadellie.unitto.core.ui.common.squashable import com.sadellie.unitto.core.ui.common.squashable
import com.sadellie.unitto.core.ui.common.textfield.formatExpression import com.sadellie.unitto.core.ui.common.textfield.formatExpression
import com.sadellie.unitto.core.ui.theme.numbersDisplayMedium import com.sadellie.unitto.core.ui.theme.numberDisplayMedium
import kotlin.math.roundToInt import kotlin.math.roundToInt
@Composable @Composable
@ -139,7 +139,7 @@ fun FormattingScreen(
) )
Text( Text(
text = uiState.preview, text = uiState.preview,
style = MaterialTheme.typography.numbersDisplayMedium, style = MaterialTheme.typography.numberDisplayMedium,
maxLines = 1, maxLines = 1,
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()