mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-02 21:32:34 +00:00
fontSize -> style
This commit is contained in:
committed by
Benoit Marty
parent
4d2780cdcb
commit
18f1d080c3
+4
-4
@@ -27,10 +27,10 @@ import androidx.compose.ui.Alignment
|
|||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.tooling.preview.Preview
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.compose.ui.unit.sp
|
|
||||||
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
|
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
|
||||||
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
|
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
|
||||||
import io.element.android.libraries.designsystem.theme.components.Text
|
import io.element.android.libraries.designsystem.theme.components.Text
|
||||||
|
import io.element.android.libraries.theme.ElementTheme
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param modifier Classical modifier.
|
* @param modifier Classical modifier.
|
||||||
@@ -87,7 +87,7 @@ private fun ContentToPreview() {
|
|||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
text = "Content",
|
text = "Content",
|
||||||
fontSize = 40.sp
|
style = ElementTheme.typography.fontHeadingXlBold
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -99,7 +99,7 @@ private fun ContentToPreview() {
|
|||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
text = "Header",
|
text = "Header",
|
||||||
fontSize = 40.sp
|
style = ElementTheme.typography.fontHeadingXlBold
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -111,7 +111,7 @@ private fun ContentToPreview() {
|
|||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
text = "Footer",
|
text = "Footer",
|
||||||
fontSize = 40.sp
|
style = ElementTheme.typography.fontHeadingXlBold
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -30,11 +30,11 @@ import androidx.compose.ui.layout.ContentScale
|
|||||||
import androidx.compose.ui.res.painterResource
|
import androidx.compose.ui.res.painterResource
|
||||||
import androidx.compose.ui.tooling.preview.Preview
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.compose.ui.unit.sp
|
|
||||||
import io.element.android.libraries.designsystem.R
|
import io.element.android.libraries.designsystem.R
|
||||||
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
|
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
|
||||||
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
|
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
|
||||||
import io.element.android.libraries.designsystem.theme.components.Text
|
import io.element.android.libraries.designsystem.theme.components.Text
|
||||||
|
import io.element.android.libraries.theme.ElementTheme
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Page for onboarding screens, with content and optional footer.
|
* Page for onboarding screens, with content and optional footer.
|
||||||
@@ -106,7 +106,7 @@ private fun ContentToPreview() {
|
|||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
text = "Content",
|
text = "Content",
|
||||||
fontSize = 40.sp
|
style = ElementTheme.typography.fontHeadingXlBold
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -118,7 +118,7 @@ private fun ContentToPreview() {
|
|||||||
) {
|
) {
|
||||||
Text(
|
Text(
|
||||||
text = "Footer",
|
text = "Footer",
|
||||||
fontSize = 40.sp
|
style = ElementTheme.typography.fontHeadingXlBold
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user