@expensify/react-native-live-markdown 0.1.200 → 0.1.202

package/android/src/main/java/com/expensify/livemarkdown/MarkdownFormatter.java

@@ -20,7 +20,7 @@ public class MarkdownFormatter {
     mAssetManager = assetManager;
   }
 
-  public void format(SpannableStringBuilder ssb, List<MarkdownRange> markdownRanges, @NonNull MarkdownStyle markdownStyle) {
+  public void format(@NonNull SpannableStringBuilder ssb, @NonNull List<MarkdownRange> markdownRanges, @NonNull MarkdownStyle markdownStyle) {
     try {
       Systrace.beginSection(0, "format");
       Objects.requireNonNull(markdownStyle, "mMarkdownStyle is null");
@@ -31,7 +31,7 @@ public class MarkdownFormatter {
     }
   }
 
-  private void removeSpans(SpannableStringBuilder ssb) {
+  private void removeSpans(@NonNull SpannableStringBuilder ssb) {
     try {
       Systrace.beginSection(0, "removeSpans");
       // We shouldn't use `removeSpans()` because it also removes SpellcheckSpan, SuggestionSpan etc.
@@ -44,7 +44,7 @@ public class MarkdownFormatter {
     }
   }
 
-  private void applyRanges(SpannableStringBuilder ssb, List<MarkdownRange> markdownRanges, @NonNull MarkdownStyle markdownStyle) {
+  private void applyRanges(@NonNull SpannableStringBuilder ssb, @NonNull List<MarkdownRange> markdownRanges, @NonNull MarkdownStyle markdownStyle) {
     try {
       Systrace.beginSection(0, "applyRanges");
       for (MarkdownRange markdownRange : markdownRanges) {
@@ -55,10 +55,10 @@ public class MarkdownFormatter {
     }
   }
 
-  private void applyRange(SpannableStringBuilder ssb, MarkdownRange markdownRange, MarkdownStyle markdownStyle) {
+  private void applyRange(@NonNull SpannableStringBuilder ssb, @NonNull MarkdownRange markdownRange, @NonNull MarkdownStyle markdownStyle) {
     String type = markdownRange.getType();
     int start = markdownRange.getStart();
-    int end = start + markdownRange.getLength();
+    int end = markdownRange.getEnd();
     switch (type) {
       case "bold":
         setSpan(ssb, new MarkdownBoldSpan(), start, end);
@@ -126,7 +126,7 @@ public class MarkdownFormatter {
     }
   }
 
-  private void setSpan(SpannableStringBuilder ssb, MarkdownSpan span, int start, int end) {
+  private void setSpan(@NonNull SpannableStringBuilder ssb, @NonNull MarkdownSpan span, int start, int end) {
     ssb.setSpan(span, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
   }
 }

package/android/src/main/java/com/expensify/livemarkdown/MarkdownParser.java

@@ -29,9 +29,9 @@ public class MarkdownParser {
     mReactContext = reactContext;
   }
 
-  private native String nativeParse(String text, int parserId);
+  private native String nativeParse(@NonNull String text, int parserId);
 
-  public synchronized List<MarkdownRange> parse(String text, int parserId) {
+  public synchronized List<MarkdownRange> parse(@NonNull String text, int parserId) {
     try {
       Systrace.beginSection(0, "parse");
 

package/android/src/main/java/com/expensify/livemarkdown/MarkdownRange.java

@@ -1,14 +1,18 @@
 package com.expensify.livemarkdown;
 
+import androidx.annotation.NonNull;
+
 public class MarkdownRange {
-  private final String mType;
+  private final @NonNull String mType;
   private final int mStart;
+  private final int mEnd;
   private final int mLength;
   private final int mDepth;
 
-  public MarkdownRange(String type, int start, int length, int depth) {
+  public MarkdownRange(@NonNull String type, int start, int length, int depth) {
     mType = type;
     mStart = start;
+    mEnd = start + length;
     mLength = length;
     mDepth = depth;
   }
@@ -21,6 +25,10 @@ public class MarkdownRange {
     return mStart;
   }
 
+  public int getEnd() {
+    return mEnd;
+  }
+
   public int getLength() {
     return mLength;
   }

package/android/src/main/java/com/expensify/livemarkdown/MarkdownStyle.java

@@ -32,6 +32,7 @@ public class MarkdownStyle {
 
   private final float mBlockquotePaddingLeft;
 
+  @NonNull
   private final String mCodeFontFamily;
 
   private final float mCodeFontSize;
@@ -42,6 +43,7 @@ public class MarkdownStyle {
   @ColorInt
   private final int mCodeBackgroundColor;
 
+  @NonNull
   private final String mPreFontFamily;
 
   private final float mPreFontSize;

package/android/src/main/java/com/expensify/livemarkdown/MarkdownTextWatcher.java

@@ -7,7 +7,7 @@ import android.text.TextWatcher;
 import androidx.annotation.NonNull;
 
 public class MarkdownTextWatcher implements TextWatcher {
-  private final MarkdownUtils mMarkdownUtils;
+  private final @NonNull MarkdownUtils mMarkdownUtils;
 
   public MarkdownTextWatcher(@NonNull MarkdownUtils markdownUtils) {
     mMarkdownUtils = markdownUtils;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expensify/react-native-live-markdown",
-  "version": "0.1.200",
+  "version": "0.1.202",
   "description": "Drop-in replacement for React Native's TextInput component with Markdown formatting.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",