Review Android Studio and XCODE errors

fabOnReact · Feb 8, 2023 · 235eda8 · 235eda8
1 parent 112ed6f
commit 235eda8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/Libraries/Text/Text.d.ts b/Libraries/Text/Text.d.ts
@@ -58,8 +58,10 @@ export interface TextPropsIOS {
 export interface TextPropsAndroid {
   /**
    * Used with nested Text and accessibilityRole measure, money or telephone to specify the unit to announce.
-   * Measure refer to https://developer.android.com/reference/android/text/style/TtsSpan#ARG_UNIT
-   * Telephone refer to  https://developer.android.com/reference/android/text/style/TtsSpan#ARG_NUMBER_PARTS
+   * Ordinal and Cardinal https://developer.android.com/reference/android/text/style/TtsSpan#ARG_NUMBER
+   * Measure refer to  https://developer.android.com/reference/android/text/style/TtsSpan#ARG_UNIT
+   * Telephone refer to https://developer.android.com/reference/android/text/style/TtsSpan#ARG_NUMBER_PARTS
+   * Verbatim refer to https://developer.android.com/reference/android/text/style/TtsSpan#ARG_VERBATIM
    */
   accessibilitySpan?:
     | 'none'

diff --git a/Libraries/Text/TextProps.js b/Libraries/Text/TextProps.js
@@ -202,8 +202,10 @@ export type TextProps = $ReadOnly<{|
 
   /**
    * Used with nested Text and accessibilityRole measure, money or telephone to specify the unit to announce.
-   * Measure refer to https://developer.android.com/reference/android/text/style/TtsSpan#ARG_UNIT
-   * Telephone refer to  https://developer.android.com/reference/android/text/style/TtsSpan#ARG_NUMBER_PARTS
+   * Ordinal and Cardinal https://developer.android.com/reference/android/text/style/TtsSpan#ARG_NUMBER
+   * Measure refer to  https://developer.android.com/reference/android/text/style/TtsSpan#ARG_UNIT
+   * Telephone refer to https://developer.android.com/reference/android/text/style/TtsSpan#ARG_NUMBER_PARTS
+   * Verbatim refer to https://developer.android.com/reference/android/text/style/TtsSpan#ARG_VERBATIM
    */
   accessibilitySpan?: ?(
     | 'none'

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTtsSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTtsSpan.java
@@ -76,7 +76,7 @@ public static AccessibilitySpan fromValue(@Nullable String value) {
     }
   }
 
-  public static class Builder<C extends Builder<?>> {
+  public static class Builder {
     private String mType;
     private final PersistableBundle mArgs = new PersistableBundle();
 
@@ -91,19 +91,19 @@ public Builder(AccessibilitySpan type, @Nullable String accessibilityLabel) {
         return;
       }
       try {
-        if (mType == TYPE_TEXT) {
+        if (mType.equals(TYPE_TEXT)) {
           setStringArgument(ARG_TEXT, accessibilityLabel);
         }
-        if (mType == TYPE_TELEPHONE) {
+        if (mType.equals(TYPE_TELEPHONE)) {
           warningMessage = TYPE_TELEPHONE_WARNING_MSG;
           setStringArgument(ARG_NUMBER_PARTS, accessibilityLabel);
         }
         // https://developer.android.com/reference/android/text/style/TtsSpan#ARG_UNIT
-        if (mType == TYPE_MEASURE) {
+        if (mType.equals(TYPE_MEASURE)) {
           warningMessage = TYPE_MEASURE_WARNING_MSG;
           setStringArgument(ARG_UNIT, accessibilityLabel);
         }
-        if (mType == TYPE_CARDINAL || mType == TYPE_ORDINAL) {
+        if (mType.equals(TYPE_CARDINAL) || mType.equals(TYPE_ORDINAL)) {
           setStringArgument(ARG_NUMBER, accessibilityLabel);
         }
       } catch (Exception e) {