refactor: unify some code styles

Author: alpha0010

android/src/main/java/com/alpha0010/pdf/PdfView.kt

@@ -45,7 +45,7 @@ class PdfView(context: Context, private val pdfMutex: Lock) : View(context) {
   private var mSource = ""
   private val mViewRects = List(SLICES) { Rect() }
 
-  fun setAnnotation(source: String, file: Boolean = false) {
+  fun setAnnotation(source: String, file: Boolean) {
     if (source.isEmpty()) {
       if (mAnnotation.isNotEmpty()) {
         mAnnotation = emptyList()
@@ -55,10 +55,10 @@ class PdfView(context: Context, private val pdfMutex: Lock) : View(context) {
     }
 
     try {
-      if (file) {
-        mAnnotation = Json.decodeFromString(File(source).readText())
+      mAnnotation = if (file) {
+        Json.decodeFromString(File(source).readText())
       } else {
-        mAnnotation = Json.decodeFromString(source);
+        Json.decodeFromString(source)
       }
       mDirty = true
     } catch (e: Exception) {

android/src/main/java/com/alpha0010/pdf/PdfViewManager.kt

@@ -42,13 +42,15 @@ class PdfViewManager(private val pdfMutex: Lock) : BaseViewManager<PdfView, PdfV
    * Set annotation from a PAS v1 JSON string
    */
   @ReactProp(name = "annotationStr")
-  fun setAnnotation(view: PdfView, source: String?) = view.setAnnotation(source ?: "")
+  fun setAnnotationStr(view: PdfView, source: String?) =
+    view.setAnnotation(source ?: "", file = false)
 
   /**
    * Set annotation from file containing a PAS v1 JSON string
    */
   @ReactProp(name = "annotation")
-  fun setAnnotationWithPath(view: PdfView, source: String?) = view.setAnnotation(source ?: "", true)
+  fun setAnnotation(view: PdfView, source: String?) =
+    view.setAnnotation(source ?: "", file = true)
 
   /**
    * Page (0-indexed) of document to display.

ios/PdfView.swift

@@ -4,7 +4,7 @@ enum ResizeMode: String {
 }
 
 class PdfView: UIView {
-    @objc var annotationStr = "" { didSet { loadAnnotation() } }
+    @objc var annotationStr = "" { didSet { loadAnnotation(file: false) } }
     @objc var annotation = "" { didSet { loadAnnotation(file: true) } }
     @objc var page: NSNumber = 0 { didSet { renderPdf() } }
     @objc var resizeMode = ResizeMode.CONTAIN.rawValue { didSet { validateResizeMode() } }
@@ -24,7 +24,7 @@ class PdfView: UIView {
         super.layoutSubviews()
     }
 
-    private func loadAnnotation(file: Bool = false) {
+    private func loadAnnotation(file: Bool) {
         guard !annotation.isEmpty || !annotationStr.isEmpty else {
             if !annotationData.isEmpty {
                 annotationData.removeAll()
@@ -35,7 +35,7 @@ class PdfView: UIView {
 
         let decoder = JSONDecoder()
         do {
-            var data:Data;
+            let data: Data;
             if (file) {
                 data = try Data(contentsOf: URL(fileURLWithPath: annotation))
             }

src/PdfView.tsx

@@ -35,6 +35,7 @@ export type PdfViewProps = {
    * Path to annotation data.
    */
   annotation?: string;
+
   /**
    * Callback to handle errors.
    */