Browse Source
* Fix mentions font weight and horizontal padding --------- Co-authored-by: ElementBot <benoitm+elementbot@element.io>pull/2029/head
Jorge Martin Espinosa
9 months ago
committed by
GitHub
6 changed files with 85 additions and 8 deletions
@ -0,0 +1 @@
@@ -0,0 +1 @@
|
||||
Adjust mention pills font weight and horizontal padding |
@ -0,0 +1,42 @@
@@ -0,0 +1,42 @@
|
||||
/* |
||||
* 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. |
||||
*/ |
||||
|
||||
package io.element.android.libraries.designsystem.text |
||||
|
||||
import android.graphics.Typeface |
||||
import androidx.compose.runtime.Composable |
||||
import androidx.compose.runtime.State |
||||
import androidx.compose.runtime.remember |
||||
import androidx.compose.ui.platform.LocalFontFamilyResolver |
||||
import androidx.compose.ui.text.TextStyle |
||||
import androidx.compose.ui.text.font.FontFamily |
||||
import androidx.compose.ui.text.font.FontStyle |
||||
import androidx.compose.ui.text.font.FontSynthesis |
||||
import androidx.compose.ui.text.font.FontWeight |
||||
|
||||
@Composable |
||||
fun TextStyle.rememberTypeface(): State<Typeface> { |
||||
val resolver: FontFamily.Resolver = LocalFontFamilyResolver.current |
||||
@Suppress("UNCHECKED_CAST") |
||||
return remember(resolver, this) { |
||||
resolver.resolve( |
||||
fontFamily = fontFamily, |
||||
fontWeight = fontWeight ?: FontWeight.Normal, |
||||
fontStyle = fontStyle ?: FontStyle.Normal, |
||||
fontSynthesis = fontSynthesis ?: FontSynthesis.All, |
||||
) |
||||
} as State<Typeface> |
||||
} |
Binary file not shown.
Loading…
Reference in new issue