17
17
package com.example.jetnews.ui.theme
18
18
19
19
import androidx.compose.material3.Typography
20
- import androidx.compose.ui.text.ExperimentalTextApi
21
20
import androidx.compose.ui.text.PlatformTextStyle
22
21
import androidx.compose.ui.text.TextStyle
23
22
import androidx.compose.ui.text.font.Font
24
23
import androidx.compose.ui.text.font.FontFamily
25
24
import androidx.compose.ui.text.font.FontWeight
25
+ import androidx.compose.ui.text.style.LineBreak
26
26
import androidx.compose.ui.text.style.LineHeightStyle
27
27
import androidx.compose.ui.unit.sp
28
28
import com.example.jetnews.R
@@ -33,7 +33,6 @@ private val Montserrat = FontFamily(
33
33
)
34
34
35
35
@Suppress(" DEPRECATION" )
36
- @OptIn(ExperimentalTextApi ::class )
37
36
val defaultTextStyle = TextStyle (
38
37
fontFamily = Montserrat ,
39
38
platformStyle = PlatformTextStyle (
@@ -56,25 +55,30 @@ val JetnewsTypography = Typography(
56
55
fontSize = 36 .sp, lineHeight = 44 .sp, letterSpacing = 0 .sp
57
56
),
58
57
headlineLarge = defaultTextStyle.copy(
59
- fontSize = 32 .sp, lineHeight = 40 .sp, letterSpacing = 0 .sp
58
+ fontSize = 32 .sp, lineHeight = 40 .sp, letterSpacing = 0 .sp, lineBreak = LineBreak . Heading
60
59
),
61
60
headlineMedium = defaultTextStyle.copy(
62
- fontSize = 28 .sp, lineHeight = 36 .sp, letterSpacing = 0 .sp
61
+ fontSize = 28 .sp, lineHeight = 36 .sp, letterSpacing = 0 .sp, lineBreak = LineBreak . Heading
63
62
),
64
63
headlineSmall = defaultTextStyle.copy(
65
- fontSize = 24 .sp, lineHeight = 32 .sp, letterSpacing = 0 .sp
64
+ fontSize = 24 .sp, lineHeight = 32 .sp, letterSpacing = 0 .sp, lineBreak = LineBreak . Heading
66
65
),
67
66
titleLarge = defaultTextStyle.copy(
68
- fontSize = 22 .sp, lineHeight = 28 .sp, letterSpacing = 0 .sp
67
+ fontSize = 22 .sp, lineHeight = 28 .sp, letterSpacing = 0 .sp, lineBreak = LineBreak . Heading
69
68
),
70
69
titleMedium = defaultTextStyle.copy(
71
70
fontSize = 16 .sp,
72
71
lineHeight = 24 .sp,
73
72
letterSpacing = 0.15 .sp,
74
- fontWeight = FontWeight .Medium
73
+ fontWeight = FontWeight .Medium ,
74
+ lineBreak = LineBreak .Heading
75
75
),
76
76
titleSmall = defaultTextStyle.copy(
77
- fontSize = 14 .sp, lineHeight = 20 .sp, letterSpacing = 0.1 .sp, fontWeight = FontWeight .Medium
77
+ fontSize = 14 .sp,
78
+ lineHeight = 20 .sp,
79
+ letterSpacing = 0.1 .sp,
80
+ fontWeight = FontWeight .Medium ,
81
+ lineBreak = LineBreak .Heading
78
82
),
79
83
labelLarge = defaultTextStyle.copy(
80
84
fontSize = 14 .sp, lineHeight = 20 .sp, letterSpacing = 0.1 .sp, fontWeight = FontWeight .Medium
@@ -86,12 +90,21 @@ val JetnewsTypography = Typography(
86
90
fontSize = 11 .sp, lineHeight = 16 .sp, letterSpacing = 0.5 .sp, fontWeight = FontWeight .Medium
87
91
),
88
92
bodyLarge = defaultTextStyle.copy(
89
- fontSize = 16 .sp, lineHeight = 24 .sp, letterSpacing = 0.5 .sp
93
+ fontSize = 16 .sp,
94
+ lineHeight = 24 .sp,
95
+ letterSpacing = 0.5 .sp,
96
+ lineBreak = LineBreak .Paragraph
90
97
),
91
98
bodyMedium = defaultTextStyle.copy(
92
- fontSize = 14 .sp, lineHeight = 20 .sp, letterSpacing = 0.25 .sp
99
+ fontSize = 14 .sp,
100
+ lineHeight = 20 .sp,
101
+ letterSpacing = 0.25 .sp,
102
+ lineBreak = LineBreak .Paragraph
93
103
),
94
104
bodySmall = defaultTextStyle.copy(
95
- fontSize = 12 .sp, lineHeight = 16 .sp, letterSpacing = 0.4 .sp
105
+ fontSize = 12 .sp,
106
+ lineHeight = 16 .sp,
107
+ letterSpacing = 0.4 .sp,
108
+ lineBreak = LineBreak .Paragraph
96
109
),
97
110
)
0 commit comments