summaryrefslogtreecommitdiff
path: root/PermissionController
diff options
context:
space:
mode:
author Anvesh Renikindi (xWF) <renikindi@google.com> 2025-03-10 14:11:03 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2025-03-10 14:11:03 -0700
commit76b46fd1c857a39be1b244fac9ba43014af374d4 (patch)
tree5e475ace3127e24414c3b7b4ed40bf5e46c04ebe /PermissionController
parent2868ba604db1e67d83f88163b34ba4365cb726b3 (diff)
parentb2f75f1fcdac6ae563d28a47ce569f698a59b315 (diff)
Merge "Updating Textsytle to CurvedTextStyle" into main
Diffstat (limited to 'PermissionController')
-rw-r--r--PermissionController/wear-permission-components/src/wear.permission.components/theme/WearComposeMaterial3Typography.kt13
1 files changed, 13 insertions, 0 deletions
diff --git a/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearComposeMaterial3Typography.kt b/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearComposeMaterial3Typography.kt
index e44a24981..c85381c1b 100644
--- a/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearComposeMaterial3Typography.kt
+++ b/PermissionController/wear-permission-components/src/wear.permission.components/theme/WearComposeMaterial3Typography.kt
@@ -24,6 +24,7 @@ import androidx.compose.ui.text.font.Font
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontVariation
import androidx.compose.ui.unit.sp
+import androidx.wear.compose.foundation.CurvedTextStyle
import androidx.wear.compose.material3.Typography
import com.android.permissioncontroller.wear.permission.components.R
@@ -50,6 +51,18 @@ internal object WearComposeMaterial3Typography {
return FontFamily(font)
}
+ private fun CurvedTextStyle.updatedTextStyle(
+ context: Context,
+ @StringRes fontRes: Int,
+ variationSettings: FontVariation.Settings? = null,
+ @DimenRes fontSizeRes: Int,
+ ): CurvedTextStyle {
+ val fontFamily =
+ fontFamily(context = context, id = fontRes, variationSettings = variationSettings)
+ val fontSize = ResourceHelper.getDimen(context = context, id = fontSizeRes)?.sp ?: fontSize
+ return copy(fontFamily = fontFamily, fontSize = fontSize)
+ }
+
private fun TextStyle.updatedTextStyle(
context: Context,
@StringRes fontRes: Int,