Change the highligh typography
This commit is contained in:
parent
75644aad91
commit
d256ba70ac
3 changed files with 11 additions and 11 deletions
|
|
@ -15,8 +15,8 @@ import com.pixelized.rplexicon.R
|
|||
import com.pixelized.rplexicon.ui.theme.colors.LexiconColors
|
||||
|
||||
@Stable
|
||||
val zallFontFamily = FontFamily(
|
||||
Font(resId = R.font.zallman_caps, weight = FontWeight.Normal)
|
||||
val angloText = FontFamily(
|
||||
Font(resId = R.font.anglo_text, weight = FontWeight.Normal)
|
||||
)
|
||||
|
||||
@Stable
|
||||
|
|
@ -61,27 +61,27 @@ fun lexiconTypography(
|
|||
fontFamily = stampFontFamily,
|
||||
),
|
||||
bodyMediumDropCap: SpanStyle = base.bodyMedium.toDropCapSpan(
|
||||
sizeRatio = 1.8f,
|
||||
sizeRatio = 2f,
|
||||
antiLetterSpacing = 1.sp,
|
||||
baselineShift = BaselineShift(-0.08f),
|
||||
baselineShift = BaselineShift(-0.1f),
|
||||
),
|
||||
titleMediumDropCap: SpanStyle = base.titleMedium.toDropCapSpan(
|
||||
sizeRatio = 1.7f,
|
||||
sizeRatio = 2f,
|
||||
antiLetterSpacing = 2.sp,
|
||||
baselineShift = BaselineShift(-0.04f),
|
||||
baselineShift = BaselineShift(-0.05f),
|
||||
),
|
||||
titleLargeDropCap: SpanStyle = base.titleLarge.toDropCapSpan(
|
||||
sizeRatio = 1.6f,
|
||||
sizeRatio = 2f,
|
||||
antiLetterSpacing = 2.sp,
|
||||
baselineShift = BaselineShift(-0.04f),
|
||||
baselineShift = BaselineShift(-0.05f),
|
||||
),
|
||||
headlineSmallDropCap: SpanStyle = base.headlineSmall.toDropCapSpan(
|
||||
sizeRatio = 1.8f,
|
||||
antiLetterSpacing = 4.sp,
|
||||
sizeRatio = 1.5f,
|
||||
),
|
||||
headlineLargeDropCap: SpanStyle = base.headlineLarge.toDropCapSpan(
|
||||
sizeRatio = 1.6f,
|
||||
antiLetterSpacing = 4.sp,
|
||||
sizeRatio = 1.4f,
|
||||
),
|
||||
detail: LexiconTypography.Detail = LexiconTypography.Detail(
|
||||
highlightStyle = SpanStyle(color = colorScheme.search.highlight),
|
||||
|
|
@ -129,7 +129,7 @@ private fun TextStyle.toDropCapSpan(
|
|||
baselineShift: BaselineShift? = null,
|
||||
): SpanStyle {
|
||||
return copy(
|
||||
fontFamily = zallFontFamily,
|
||||
fontFamily = angloText,
|
||||
fontSize = fontSize * sizeRatio,
|
||||
letterSpacing = antiLetterSpacing?.let { -it } ?: this.letterSpacing,
|
||||
baselineShift = baselineShift ?: this.baselineShift
|
||||
|
|
|
|||
BIN
app/src/main/res/font/anglo_text.ttf
Normal file
BIN
app/src/main/res/font/anglo_text.ttf
Normal file
Binary file not shown.
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue