Home Esplora Aiuto
Registrati Accedi
neal
/
una
mirror da https://github.com/unaio/una.git
1
0
Forka 0
File Problemi 0 Wiki
Ramo (Branch): neo-button-loading-overlay
Rami (Branch) Tag
una
/
neo
/
patches
/
@expo+ui+57.0.22.patch

@expo+ui+57.0.22.patch 4.2 KB
Permalink Cronologia Originale

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576 
  1. diff --git a/node_modules/@expo/ui/android/src/main/java/expo/modules/ui/TextView.kt b/node_modules/@expo/ui/android/src/main/java/expo/modules/ui/TextView.kt
    2. 

  2. index 66905c6..8828e7f 100644
    3. 

  3. --- a/node_modules/@expo/ui/android/src/main/java/expo/modules/ui/TextView.kt
    4. 

  4. +++ b/node_modules/@expo/ui/android/src/main/java/expo/modules/ui/TextView.kt
    5. 

  5. @@ -133,7 +133,12 @@ enum class TextLineBreakType(val value: String) : Enumerable {
    6. 

  6.    }
    7. 

  7.  }
    8. 

  8.  
    9. 

  9. -fun resolveFontFamily(name: String?, context: Context): FontFamily? {
    10. 

  10. +fun resolveFontFamily(
    11. 

  11. +  name: String?,
    12. 

  12. +  context: Context,
    13. 

  13. +  weight: FontWeight? = null,
    14. 

  14. +  italic: Boolean = false
    15. 

  15. +): FontFamily? {
    16. 

  16.    if (name == null) return null
    17. 

  17.    return when (name) {
    18. 

  18.      "default" -> FontFamily.Default
    19. 

  19. @@ -142,7 +147,11 @@ fun resolveFontFamily(name: String?, context: Context): FontFamily? {
    20. 

  20.      "monospace" -> FontFamily.Monospace
    21. 

  21.      "cursive" -> FontFamily.Cursive
    22. 

  22.      else -> {
    23. 

  23. -      val typeface = ReactFontManager.getInstance().getTypeface(name, Typeface.NORMAL, context.assets)
    24. 

  24. +      // A custom family registered as an XML font family (one file per
    25. 

  25. +      // weight) resolves to the face for this weight; with only
    26. 

  26. +      // Typeface.NORMAL it is always the regular face and `fontWeight` is lost.
    27. 

  27. +      val typeface = ReactFontManager.getInstance()
    28. 

  28. +        .getTypeface(name, weight?.weight ?: FontWeight.Normal.weight, italic, context.assets)
    29. 

  29.        FontFamily(typeface)
    30. 

  30.      }
    31. 

  31.    }
    32. 

  32. @@ -268,7 +277,14 @@ private fun AnnotatedString.Builder.appendSpans(spans: List<TextSpanRecord>, con
    33. 

  33.        fontSize = span.fontSize?.sp ?: androidx.compose.ui.unit.TextUnit.Unspecified,
    34. 

  34.        fontWeight = span.fontWeight?.toComposeFontWeight(),
    35. 

  35.        fontStyle = span.fontStyle?.toComposeFontStyle(),
    36. 

  36. -      fontFamily = context?.let { resolveFontFamily(span.fontFamily, it) },
    37. 

  37. +      fontFamily = context?.let {
    38. 

  38. +        resolveFontFamily(
    39. 

  39. +          span.fontFamily,
    40. 

  40. +          it,
    41. 

  41. +          span.fontWeight?.toComposeFontWeight(),
    42. 

  42. +          span.fontStyle?.toComposeFontStyle() == FontStyle.Italic
    43. 

  43. +        )
    44. 

  44. +      },
    45. 

  45.        textDecoration = span.textDecoration?.toComposeTextDecoration(),
    46. 

  46.        letterSpacing = span.letterSpacing?.sp ?: androidx.compose.ui.unit.TextUnit.Unspecified,
    47. 

  47.        background = colorToComposeColorOrNull(span.background) ?: androidx.compose.ui.graphics.Color.Unspecified,
    48. 

  48. @@ -298,7 +314,14 @@ fun FunctionalComposableScope.TextContent(props: TextProps) {
    49. 

  49.        fontSize = props.fontSize?.sp ?: androidx.compose.ui.unit.TextUnit.Unspecified,
    50. 

  50.        fontWeight = props.fontWeight?.toComposeFontWeight(),
    51. 

  51.        fontStyle = props.fontStyle?.toComposeFontStyle(),
    52. 

  52. -      fontFamily = appContext.reactContext?.let { resolveFontFamily(props.fontFamily, it) },
    53. 

  53. +      fontFamily = appContext.reactContext?.let {
    54. 

  54. +        resolveFontFamily(
    55. 

  55. +          props.fontFamily,
    56. 

  56. +          it,
    57. 

  57. +          props.fontWeight?.toComposeFontWeight(),
    58. 

  58. +          props.fontStyle?.toComposeFontStyle() == FontStyle.Italic
    59. 

  59. +        )
    60. 

  60. +      },
    61. 

  61.        textDecoration = props.textDecoration?.toComposeTextDecoration(),
    62. 

  62.        letterSpacing = props.letterSpacing?.sp ?: androidx.compose.ui.unit.TextUnit.Unspecified,
    63. 

  63.        lineHeight = props.lineHeight?.sp ?: androidx.compose.ui.unit.TextUnit.Unspecified,
    64. 

  64. diff --git a/node_modules/@expo/ui/android/src/main/java/expo/modules/ui/textfield/TextFieldShared.kt b/node_modules/@expo/ui/android/src/main/java/expo/modules/ui/textfield/TextFieldShared.kt
    65. 

  65. index b7808d7..716ebb8 100644
    66. 

  66. --- a/node_modules/@expo/ui/android/src/main/java/expo/modules/ui/textfield/TextFieldShared.kt
    67. 

  67. +++ b/node_modules/@expo/ui/android/src/main/java/expo/modules/ui/textfield/TextFieldShared.kt
    68. 

  68. @@ -124,7 +124,7 @@ internal fun TextFieldTextStyleRecord?.toTextStyle(context: Context?): TextStyle
    69. 

  69.      color = colorToComposeColorOrNull(color) ?: androidx.compose.ui.graphics.Color.Unspecified,
    70. 

  70.      fontSize = fontSize?.sp ?: TextUnit.Unspecified,
    71. 

  71.      fontWeight = fontWeight?.toComposeFontWeight(),
    72. 

  72. -    fontFamily = context?.let { resolveFontFamily(fontFamily, it) },
    73. 

  73. +    fontFamily = context?.let { resolveFontFamily(fontFamily, it, fontWeight?.toComposeFontWeight()) },
    74. 

  74.      letterSpacing = letterSpacing?.sp ?: TextUnit.Unspecified,
    75. 

  75.      lineHeight = lineHeight?.sp ?: TextUnit.Unspecified,
    76. 

  76.      textAlign = textAlign?.toComposeTextAlign() ?: TextAlign.Unspecified
    77.