Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Upgrade compose-material3 to 1.2.0-alpha05 version (#1011)

Browse source 
Co-authored-by: ElementBot <benoitm+elementbot@element.io>

Also upgrade compileSdk to 34.
This commit is contained in:
Jorge Martin Espinosa 2023-08-17 14:20:54 +02:00 • committed by GitHub
parent 814c8edc4f
commit e3cfbc113b
791 changed files with 1657 additions and 1578 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libraries/theme/build.gradle.kts
View file

@ -23,6 +23,8 @@ android {
namespace = "io.element.android.libraries.theme"
dependencies {
api(libs.androidx.compose.material3)
ksp(libs.showkase.processor)
kspTest(libs.showkase.processor)

2
libraries/theme/src/main/kotlin/io/element/android/libraries/theme/ElementTheme.kt
View file

@ -74,7 +74,7 @@ object ElementTheme {
val materialTypography: Typography
@Composable
@ReadOnlyComposable
get()= MaterialTheme.typography
get() = MaterialTheme.typography
/**
* Returns whether the theme version used is the light or the dark one.

4
libraries/theme/src/main/kotlin/io/element/android/libraries/theme/compound/CompoundTypography.kt
View file

@ -17,9 +17,11 @@
package io.element.android.libraries.theme.compound
import androidx.compose.material3.Typography
import androidx.compose.ui.text.PlatformTextStyle
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.LineHeightStyle
import androidx.compose.ui.unit.em
import androidx.compose.ui.unit.sp
import io.element.android.libraries.theme.compound.generated.TypographyTokens
@ -41,6 +43,8 @@ internal val defaultHeadlineSmall = TextStyle(
lineHeight = 32.sp,
fontSize = 24.sp,
letterSpacing = 0.em,
platformStyle = PlatformTextStyle(includeFontPadding = false),
lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
)
// 22px (Material) vs 20px, it's the closest one

52
libraries/theme/src/main/kotlin/io/element/android/libraries/theme/compound/generated/TypographyTokens.kt
View file

@ -1,21 +1,7 @@
/*
* Copyright (c) 2023 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Do not edit directly
// Generated on Tue, 27 Jun 2023 13:31:52 GMT
// Generated on Fri, 28 Jul 2023 10:11:16 GMT
@ -27,6 +13,8 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.unit.em
import androidx.compose.ui.unit.sp
import androidx.compose.ui.text.PlatformTextStyle
import androidx.compose.ui.text.style.LineHeightStyle
object TypographyTokens {
val fontBodyLgMedium = TextStyle(
@ -35,6 +23,8 @@ object TypographyTokens {
lineHeight = 22.sp,
fontSize = 16.sp,
letterSpacing = 0.015629999999999998.em,
platformStyle = PlatformTextStyle(includeFontPadding = false),
lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
)
val fontBodyLgRegular = TextStyle(
fontFamily = FontFamily.Default,
@ -42,6 +32,8 @@ object TypographyTokens {
lineHeight = 22.sp,
fontSize = 16.sp,
letterSpacing = 0.015629999999999998.em,
platformStyle = PlatformTextStyle(includeFontPadding = false),
lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
)
val fontBodyMdMedium = TextStyle(
fontFamily = FontFamily.Default,
@ -49,6 +41,8 @@ object TypographyTokens {
lineHeight = 20.sp,
fontSize = 14.sp,
letterSpacing = 0.01786.em,
platformStyle = PlatformTextStyle(includeFontPadding = false),
lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
)
val fontBodyMdRegular = TextStyle(
fontFamily = FontFamily.Default,
@ -56,6 +50,8 @@ object TypographyTokens {
lineHeight = 20.sp,
fontSize = 14.sp,
letterSpacing = 0.01786.em,
platformStyle = PlatformTextStyle(includeFontPadding = false),
lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
)
val fontBodySmMedium = TextStyle(
fontFamily = FontFamily.Default,
@ -63,6 +59,8 @@ object TypographyTokens {
lineHeight = 17.sp,
fontSize = 12.sp,
letterSpacing = 0.03333.em,
platformStyle = PlatformTextStyle(includeFontPadding = false),
lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
)
val fontBodySmRegular = TextStyle(
fontFamily = FontFamily.Default,
@ -70,6 +68,8 @@ object TypographyTokens {
lineHeight = 17.sp,
fontSize = 12.sp,
letterSpacing = 0.03333.em,
platformStyle = PlatformTextStyle(includeFontPadding = false),
lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
)
val fontBodyXsMedium = TextStyle(
fontFamily = FontFamily.Default,
@ -77,6 +77,8 @@ object TypographyTokens {
lineHeight = 15.sp,
fontSize = 11.sp,
letterSpacing = 0.04545.em,
platformStyle = PlatformTextStyle(includeFontPadding = false),
lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
)
val fontBodyXsRegular = TextStyle(
fontFamily = FontFamily.Default,
@ -84,6 +86,8 @@ object TypographyTokens {
lineHeight = 15.sp,
fontSize = 11.sp,
letterSpacing = 0.04545.em,
platformStyle = PlatformTextStyle(includeFontPadding = false),
lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
)
val fontHeadingLgBold = TextStyle(
fontFamily = FontFamily.Default,
@ -91,6 +95,8 @@ object TypographyTokens {
lineHeight = 34.sp,
fontSize = 28.sp,
letterSpacing = 0.em,
platformStyle = PlatformTextStyle(includeFontPadding = false),
lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
)
val fontHeadingLgRegular = TextStyle(
fontFamily = FontFamily.Default,
@ -98,6 +104,8 @@ object TypographyTokens {
lineHeight = 34.sp,
fontSize = 28.sp,
letterSpacing = 0.em,
platformStyle = PlatformTextStyle(includeFontPadding = false),
lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
)
val fontHeadingMdBold = TextStyle(
fontFamily = FontFamily.Default,
@ -105,6 +113,8 @@ object TypographyTokens {
lineHeight = 27.sp,
fontSize = 22.sp,
letterSpacing = 0.em,
platformStyle = PlatformTextStyle(includeFontPadding = false),
lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
)
val fontHeadingMdRegular = TextStyle(
fontFamily = FontFamily.Default,
@ -112,6 +122,8 @@ object TypographyTokens {
lineHeight = 27.sp,
fontSize = 22.sp,
letterSpacing = 0.em,
platformStyle = PlatformTextStyle(includeFontPadding = false),
lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
)
val fontHeadingSmMedium = TextStyle(
fontFamily = FontFamily.Default,
@ -119,6 +131,8 @@ object TypographyTokens {
lineHeight = 25.sp,
fontSize = 20.sp,
letterSpacing = 0.em,
platformStyle = PlatformTextStyle(includeFontPadding = false),
lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
)
val fontHeadingSmRegular = TextStyle(
fontFamily = FontFamily.Default,
@ -126,6 +140,8 @@ object TypographyTokens {
lineHeight = 25.sp,
fontSize = 20.sp,
letterSpacing = 0.em,
platformStyle = PlatformTextStyle(includeFontPadding = false),
lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
)
val fontHeadingXlBold = TextStyle(
fontFamily = FontFamily.Default,
@ -133,6 +149,8 @@ object TypographyTokens {
lineHeight = 41.sp,
fontSize = 34.sp,
letterSpacing = 0.em,
platformStyle = PlatformTextStyle(includeFontPadding = false),
lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
)
val fontHeadingXlRegular = TextStyle(
fontFamily = FontFamily.Default,
@ -140,5 +158,7 @@ object TypographyTokens {
lineHeight = 41.sp,
fontSize = 34.sp,
letterSpacing = 0.em,
platformStyle = PlatformTextStyle(includeFontPadding = false),
lineHeightStyle = LineHeightStyle(LineHeightStyle.Alignment.Center, LineHeightStyle.Trim.None)
)
}