Minor improvements in iOS codebase

Expensify · Dec 9, 2024 · f25fe00 · f25fe00
1 parent c35696d
commit f25fe00
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 10 deletions.
diff --git a/apple/MarkdownFormatter.h b/apple/MarkdownFormatter.h
@@ -9,7 +9,7 @@ const NSAttributedStringKey RCTLiveMarkdownBlockquoteDepthAttributeName = @"RCTL
 @interface MarkdownFormatter : NSObject
 
 - (nonnull NSAttributedString *)format:(nonnull NSString *)text
-                        withAttributes:(nullable NSDictionary<NSAttributedStringKey, id>*)attributes
+             withDefaultTextAttributes:(nonnull NSDictionary<NSAttributedStringKey, id> *)defaultTextAttributes
                     withMarkdownRanges:(nonnull NSArray<MarkdownRange *> *)markdownRanges
                      withMarkdownStyle:(nonnull RCTMarkdownStyle *)markdownStyle;
 

diff --git a/apple/MarkdownFormatter.mm b/apple/MarkdownFormatter.mm
@@ -4,7 +4,7 @@
 @implementation MarkdownFormatter
 
 - (nonnull NSAttributedString *)format:(nonnull NSString *)text
-                        withAttributes:(nullable NSDictionary<NSAttributedStringKey, id> *)attributes
+             withDefaultTextAttributes:(nonnull NSDictionary<NSAttributedStringKey, id> *)defaultTextAttributes
                     withMarkdownRanges:(nonnull NSArray<MarkdownRange *> *)markdownRanges
                      withMarkdownStyle:(nonnull RCTMarkdownStyle *)markdownStyle
 {

diff --git a/apple/MarkdownParser.h b/apple/MarkdownParser.h
@@ -5,7 +5,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface MarkdownParser : NSObject
 
-- (NSArray<MarkdownRange *> *)parse:(NSString *)text withParserId:(NSNumber *)parserId;
+- (NSArray<MarkdownRange *> *)parse:(nonnull NSString *)text
+                       withParserId:(nonnull NSNumber *)parserId;
 
 NS_ASSUME_NONNULL_END
 

diff --git a/apple/MarkdownParser.mm b/apple/MarkdownParser.mm
@@ -9,7 +9,9 @@ @implementation MarkdownParser {
   NSArray<MarkdownRange *> *_prevMarkdownRanges;
 }
 
-- (NSArray<MarkdownRange *> *)parse:(NSString *)text withParserId:(nonnull NSNumber *)parserId {
+- (NSArray<MarkdownRange *> *)parse:(nonnull NSString *)text
+                       withParserId:(nonnull NSNumber *)parserId
+{
   @synchronized (self) {
     if ([text isEqualToString:_prevText] && [parserId isEqualToNumber:_prevParserId]) {
       return _prevMarkdownRanges;

diff --git a/apple/RCTMarkdownUtils.h b/apple/RCTMarkdownUtils.h
@@ -8,7 +8,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic) RCTMarkdownStyle *markdownStyle;
 @property (nonatomic) NSNumber *parserId;
 
-- (NSAttributedString *)parseMarkdown:(nullable NSAttributedString *)input withAttributes:(nullable NSDictionary<NSAttributedStringKey, id>*)attributes;
+- (NSAttributedString *)parseMarkdown:(nullable NSAttributedString *)input
+            withDefaultTextAttributes:(nonnull NSDictionary<NSAttributedStringKey, id> *)defaultTextAttributes;
 
 @end
 

diff --git a/apple/RCTMarkdownUtils.mm b/apple/RCTMarkdownUtils.mm
@@ -22,7 +22,8 @@ - (instancetype)init
   return self;
 }
 
-- (NSAttributedString *)parseMarkdown:(nullable NSAttributedString *)input withAttributes:(nullable NSDictionary<NSAttributedStringKey,id> *)attributes
+- (NSAttributedString *)parseMarkdown:(nullable NSAttributedString *)input
+            withDefaultTextAttributes:(nonnull NSDictionary<NSAttributedStringKey, id> *)defaultTextAttributes
 {
   @synchronized (self) {
     if (input == nil) {

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1497,7 +1497,7 @@ PODS:
     - React-logger (= 0.75.3)
     - React-perflogger (= 0.75.3)
     - React-utils (= 0.75.3)
-  - RNLiveMarkdown (0.1.199):
+  - RNLiveMarkdown (0.1.203):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1517,10 +1517,10 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNLiveMarkdown/newarch (= 0.1.199)
+    - RNLiveMarkdown/newarch (= 0.1.203)
     - RNReanimated/worklets
     - Yoga
-  - RNLiveMarkdown/newarch (0.1.199):
+  - RNLiveMarkdown/newarch (0.1.203):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1897,7 +1897,7 @@ SPEC CHECKSUMS:
   React-utils: f2afa6acd905ca2ce7bb8ffb4a22f7f8a12534e8
   ReactCodegen: e35c23cdd36922f6d2990c6c1f1b022ade7ad74d
   ReactCommon: 289214026502e6a93484f4a46bcc0efa4f3f2864
-  RNLiveMarkdown: 18dd4ceada29d66a6b7c29b1b0df589e2fc82183
+  RNLiveMarkdown: ed779eaf35a346f5254079b825a13f0a032ba64a
   RNReanimated: ab6c33a61e90c4cbe5dbcbe65bd6c7cb3be167e6
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
   Yoga: 1354c027ab07c7736f99a3bef16172d6f1b12b47