using string for accessibilityHours

Author: fabOnReact

ReactCommon/react/renderer/attributedstring/TextAttributes.cpp

@@ -100,9 +100,9 @@ void TextAttributes::apply(TextAttributes textAttributes) {
       : accessibilityRole;
   accessibilityUnit = !textAttributes.accessibilityUnit.empty() ? textAttributes.accessibilityUnit
                                                   : accessibilityUnit;
-  accessibilityHours = !(textAttributes.accessibilityHours == 0) ? textAttributes.accessibilityHours
+  accessibilityHours = !textAttributes.accessibilityHours.empty() ? textAttributes.accessibilityHours
                                                   : accessibilityHours;
-  accessibilityMinutes = !(textAttributes.accessibilityMinutes == 0) ? textAttributes.accessibilityMinutes
+  accessibilityMinutes = !textAttributes.accessibilityMinutes.empty() ? textAttributes.accessibilityMinutes
                                                   : accessibilityMinutes;
 }
 
@@ -222,6 +222,8 @@ SharedDebugStringConvertibleList TextAttributes::getDebugProps() const {
       debugStringConvertibleItem("layoutDirection", layoutDirection),
       debugStringConvertibleItem("accessibilityRole", accessibilityRole),
       debugStringConvertibleItem("accessibilityUnit", accessibilityUnit),
+      debugStringConvertibleItem("accessibilityHours", accessibilityHours),
+      debugStringConvertibleItem("accessibilityMinutes", accessibilityMinutes),
   };
 }
 #endif

ReactCommon/react/renderer/attributedstring/TextAttributes.h

@@ -80,8 +80,8 @@ class TextAttributes : public DebugStringConvertible {
   std::optional<LayoutDirection> layoutDirection{};
   std::optional<AccessibilityRole> accessibilityRole{};
   std::string accessibilityUnit{};
-  int accessibilityHours{};
-  int accessibilityMinutes{};
+  std::string accessibilityHours{};
+  std::string accessibilityMinutes{};
 
 #pragma mark - Operations
 

ReactCommon/react/renderer/attributedstring/conversions.h

@@ -1013,11 +1013,11 @@ inline folly::dynamic toDynamic(const TextAttributes &textAttributes) {
     _textAttributes(
         "accessibilityUnit", textAttributes.accessibilityUnit);
   }
-  if (!(textAttributes.accessibilityHours == 0)) {
+  if (!textAttributes.accessibilityHours.empty()) {
     _textAttributes(
         "accessibilityHours", textAttributes.accessibilityHours);
   }
-  if (!(textAttributes.accessibilityMinutes == 0)) {
+  if (!textAttributes.accessibilityMinutes.empty()) {
     _textAttributes(
         "accessibilityMinutes", textAttributes.accessibilityMinutes);
   }
@@ -1250,14 +1250,14 @@ inline MapBuffer toMapBuffer(const TextAttributes &textAttributes) {
     builder.putString(
         TA_KEY_ACCESSIBILITY_UNIT, textAttributes.accessibilityUnit);
   }
-  if (!(textAttributes.accessibilityHours == 0)) {
+  if (!textAttributes.accessibilityHours.empty()) {
 
-    builder.putInt(
+    builder.putString(
         TA_KEY_ACCESSIBILITY_HOURS, textAttributes.accessibilityHours);
   }
-  if (!(textAttributes.accessibilityMinutes == 0)) {
+  if (!textAttributes.accessibilityMinutes.empty()) {
 
-    builder.putInt(
+    builder.putString(
         TA_KEY_ACCESSIBILITY_MINUTES, textAttributes.accessibilityMinutes);
   }
   return builder.build();

ReactCommon/react/renderer/components/view/AccessibilityProps.h

@@ -40,8 +40,8 @@ class AccessibilityProps {
   bool accessible{false};
   AccessibilityState accessibilityState;
   AccessibilityUnit accessibilityUnit;
-  int accessibilityHours;
-  int accessibilityMinutes;
+  AccessibilityUnit accessibilityHours;
+  AccessibilityUnit accessibilityMinutes;
   std::string accessibilityLabel{""};
   AccessibilityLabelledBy accessibilityLabelledBy{};
   AccessibilityLiveRegion accessibilityLiveRegion{