chore: lint project

.github/workflows/check-android.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: |
-          curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.0.0/ktlint && chmod a+x ktlint && sudo mv ktlint /usr/local/bin/
+          curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.0.1/ktlint && chmod a+x ktlint && sudo mv ktlint /usr/local/bin/
       - name: run ktlint
         working-directory: ./android/
         run: |

android/.editorconfig

@@ -1,6 +1,6 @@
 [*.{kt,kts}]
 indent_style=space
-indent_size=2
+indent_size=4
 continuation_indent_size=4
 insert_final_newline=true
 max_line_length=160

android/src/main/java/com/brentvatne/common/API/ResizeMode.kt → android/src/main/java/com/brentvatne/common/api/ResizeMode.kt

@@ -1,4 +1,4 @@
-package com.brentvatne.common.API
+package com.brentvatne.common.api
 
 import androidx.annotation.IntDef
 import java.lang.annotation.Retention
@@ -29,18 +29,18 @@ internal object ResizeMode {
      * Keeps the aspect ratio but takes up the view's size.
      */
     const val RESIZE_MODE_CENTER_CROP = 4
+
     @JvmStatic
     @Mode
-    fun toResizeMode(ordinal: Int): Int {
-        return when (ordinal) {
+    fun toResizeMode(ordinal: Int): Int =
+        when (ordinal) {
             RESIZE_MODE_FIXED_WIDTH -> RESIZE_MODE_FIXED_WIDTH
             RESIZE_MODE_FIXED_HEIGHT -> RESIZE_MODE_FIXED_HEIGHT
             RESIZE_MODE_FILL -> RESIZE_MODE_FILL
             RESIZE_MODE_CENTER_CROP -> RESIZE_MODE_CENTER_CROP
             RESIZE_MODE_FIT -> RESIZE_MODE_FIT
             else -> RESIZE_MODE_FIT
         }
-    }
 
     @Retention(RetentionPolicy.SOURCE)
     @IntDef(
@@ -51,4 +51,4 @@ internal object ResizeMode {
         RESIZE_MODE_CENTER_CROP
     )
     annotation class Mode
-}
+}

android/src/main/java/com/brentvatne/common/API/SubtitleStyle.kt → android/src/main/java/com/brentvatne/common/api/SubtitleStyle.kt

@@ -1,4 +1,4 @@
-package com.brentvatne.common.API
+package com.brentvatne.common.api
 
 import com.brentvatne.common.toolbox.ReactBridgeUtils
 import com.facebook.react.bridge.ReadableMap
@@ -24,6 +24,7 @@ class SubtitleStyle private constructor() {
         private const val PROP_PADDING_TOP = "paddingTop"
         private const val PROP_PADDING_LEFT = "paddingLeft"
         private const val PROP_PADDING_RIGHT = "paddingRight"
+
         @JvmStatic
         fun parse(src: ReadableMap?): SubtitleStyle {
             val subtitleStyle = SubtitleStyle()
@@ -35,4 +36,4 @@ class SubtitleStyle private constructor() {
             return subtitleStyle
         }
     }
-}
+}

android/src/main/java/com/brentvatne/common/API/TimedMetadata.kt → android/src/main/java/com/brentvatne/common/api/TimedMetadata.kt

@@ -1,4 +1,4 @@
-package com.brentvatne.common.API
+package com.brentvatne.common.api
 
 /*
 * class to handle timedEvent retrieved from the stream
@@ -7,4 +7,4 @@ package com.brentvatne.common.API
 class TimedMetadata(_identifier: String? = null, _value: String? = null) {
     var identifier: String? = _identifier
     var value: String? = _value
-}
+}

android/src/main/java/com/brentvatne/common/API/Track.kt → android/src/main/java/com/brentvatne/common/api/Track.kt

@@ -1,4 +1,4 @@
-package com.brentvatne.common.API
+package com.brentvatne.common.api
 
 /*
 * internal representation of audio & text tracks
@@ -8,7 +8,8 @@ class Track {
     var mimeType: String? = null
     var language: String? = null
     var isSelected = false
+
     // in bps available only on audio tracks
     var bitrate = 0
     var index = 0
-}
+}

android/src/main/java/com/brentvatne/common/API/VideoTrack.kt → android/src/main/java/com/brentvatne/common/api/VideoTrack.kt

@@ -1,4 +1,4 @@
-package com.brentvatne.common.API
+package com.brentvatne.common.api
 
 /*
 * internal representation of audio & text tracks
@@ -12,4 +12,4 @@ class VideoTrack {
     var id = -1
     var trackId = ""
     var isSelected = false
-}
+}

android/src/main/java/com/brentvatne/common/react/VideoEventEmitter.java

@@ -4,9 +4,9 @@
 
 import android.view.View;
 
-import com.brentvatne.common.API.TimedMetadata;
-import com.brentvatne.common.API.Track;
-import com.brentvatne.common.API.VideoTrack;
+import com.brentvatne.common.api.TimedMetadata;
+import com.brentvatne.common.api.Track;
+import com.brentvatne.common.api.VideoTrack;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableArray;

android/src/main/java/com/brentvatne/common/toolbox/DebugLog.kt

@@ -12,8 +12,10 @@ import java.lang.Exception
 object DebugLog {
     // log level to display
     private var level = Log.WARN
+
     // enable thread display in logs
     private var displayThread = true
+
     // add a common prefix for easy filtering
     private const val TAG_PREFIX = "RNV"
 
@@ -24,16 +26,15 @@ object DebugLog {
     }
 
     @JvmStatic
-    private fun getTag(tag: String): String {
-        return TAG_PREFIX + tag
-    }
+    private fun getTag(tag: String): String = TAG_PREFIX + tag
 
     @JvmStatic
-    private fun getMsg(msg: String): String {
-        return if (displayThread) {
+    private fun getMsg(msg: String): String =
+        if (displayThread) {
             "[" + Thread.currentThread().name + "] " + msg
-        } else msg
-    }
+        } else {
+            msg
+        }
 
     @JvmStatic
     fun v(tag: String, msg: String) {
@@ -92,4 +93,4 @@ object DebugLog {
             wtf(tag, "------------------------>" + getMsg(msg))
         }
     }
-}
+}

android/src/main/java/com/brentvatne/common/toolbox/ReactBridgeUtils.kt

@@ -1,8 +1,8 @@
 package com.brentvatne.common.toolbox
 
 import com.facebook.react.bridge.Dynamic
-import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.ReadableMap
 import java.util.HashMap
 
 /*
@@ -53,17 +53,19 @@ object ReactBridgeUtils {
 
     @JvmStatic
     fun safeGetInt(map: ReadableMap?, key: String?): Int {
-        return safeGetInt(map, key, 0);
+        return safeGetInt(map, key, 0)
     }
 
     @JvmStatic
     fun safeGetDouble(map: ReadableMap?, key: String?, fallback: Double): Double {
         return if (map != null && map.hasKey(key!!) && !map.isNull(key)) map.getDouble(key) else fallback
     }
+
     @JvmStatic
     fun safeGetDouble(map: ReadableMap?, key: String?): Double {
-        return safeGetDouble(map, key, 0.0);
+        return safeGetDouble(map, key, 0.0)
     }
+
     /**
      * toStringMap converts a [ReadableMap] into a HashMap.
      *
@@ -116,17 +118,16 @@ object ReactBridgeUtils {
         if (str1 == null || str2 == null) return false // only 1 is null
         if (str1.size != str2.size) return false // only 1 is null
         for (i in str1.indices) {
-            if (str1[i] == str2[i]) // standard check
+            if (str1[i] == str2[i]) {
+                // standard check
                 return false
+            }
         }
         return true
     }
 
     @JvmStatic
-    fun safeStringMapEquals(
-        first: Map<String?, String?>?,
-        second: Map<String?, String?>?
-    ): Boolean {
+    fun safeStringMapEquals(first: Map<String?, String?>?, second: Map<String?, String?>?): Boolean {
         if (first == null && second == null) return true // both are null
         if (first == null || second == null) return false // only 1 is null
         if (first.size != second.size) {

android/src/main/java/com/brentvatne/exoplayer/AspectRatioFrameLayout.java

@@ -19,7 +19,7 @@
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 
-import com.brentvatne.common.API.ResizeMode;
+import com.brentvatne.common.api.ResizeMode;
 
 /**
  * A {@link FrameLayout} that resizes itself to match a specified aspect ratio.

android/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java

@@ -25,8 +25,8 @@
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-import com.brentvatne.common.API.ResizeMode;
-import com.brentvatne.common.API.SubtitleStyle;
+import com.brentvatne.common.api.ResizeMode;
+import com.brentvatne.common.api.SubtitleStyle;
 
 import java.util.List;
 

android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java

@@ -91,11 +91,11 @@
 import androidx.media3.extractor.metadata.id3.TextInformationFrame;
 import androidx.media3.ui.LegacyPlayerControlView;
 
-import com.brentvatne.common.API.ResizeMode;
-import com.brentvatne.common.API.SubtitleStyle;
-import com.brentvatne.common.API.TimedMetadata;
-import com.brentvatne.common.API.Track;
-import com.brentvatne.common.API.VideoTrack;
+import com.brentvatne.common.api.ResizeMode;
+import com.brentvatne.common.api.SubtitleStyle;
+import com.brentvatne.common.api.TimedMetadata;
+import com.brentvatne.common.api.Track;
+import com.brentvatne.common.api.VideoTrack;
 import com.brentvatne.common.react.VideoEventEmitter;
 import com.brentvatne.common.toolbox.DebugLog;
 import com.brentvatne.react.R;

android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java

@@ -10,8 +10,8 @@
 import androidx.media3.datasource.RawResourceDataSource;
 import androidx.media3.exoplayer.DefaultLoadControl;
 
-import com.brentvatne.common.API.ResizeMode;
-import com.brentvatne.common.API.SubtitleStyle;
+import com.brentvatne.common.api.ResizeMode;
+import com.brentvatne.common.api.SubtitleStyle;
 import com.brentvatne.common.react.VideoEventEmitter;
 import com.brentvatne.common.toolbox.DebugLog;
 import com.brentvatne.common.toolbox.ReactBridgeUtils;

ios/.swiftformat

@@ -1,5 +1,5 @@
 --allman false
---indent 2
+--indent 4
 --exclude Pods,Generated
 
 --disable andOperator
@@ -10,4 +10,7 @@
 
 --enable markTypes
 
---enable isEmpty
+--enable isEmpty
+
+--funcattributes "prev-line"
+--maxwidth 160

ios/.swiftlint.yml

@@ -6,14 +6,18 @@ disabled_rules:
   - file_length
   - cyclomatic_complexity
   - function_body_length
+  - function_parameter_count
+  - empty_string
+  # TODO: Remove this once all force casts are removed
+  - force_cast
+
 opt_in_rules:
   - contains_over_filter_count
   - contains_over_filter_is_empty
   - contains_over_first_not_nil
   - contains_over_range_nil_comparison
   - empty_collection_literal
   - empty_count
-  - empty_string
   - first_where
   - flatmap_over_map_reduce
   - last_where

ios/Video/DataStructures/Chapter.swift

@@ -1,12 +1,11 @@
-
 struct Chapter {
     let title: String
     let uri: String?
     let startTime: Double
     let endTime: Double
-    
+
     let json: NSDictionary?
-    
+
     init(_ json: NSDictionary!) {
         guard json != nil else {
             self.json = nil

ios/Video/DataStructures/DRMParams.swift

@@ -1,13 +1,13 @@
 struct DRMParams {
     let type: String?
     let licenseServer: String?
-    let headers: Dictionary<String,Any>?
+    let headers: [String: Any]?
     let contentId: String?
     let certificateUrl: String?
     let base64Certificate: Bool?
-    
+
     let json: NSDictionary?
-    
+
     init(_ json: NSDictionary!) {
         guard json != nil else {
             self.json = nil
@@ -25,6 +25,6 @@ struct DRMParams {
         self.contentId = json["contentId"] as? String
         self.certificateUrl = json["certificateUrl"] as? String
         self.base64Certificate = json["base64Certificate"] as? Bool
-        self.headers = json["headers"] as? Dictionary<String,Any>
+        self.headers = json["headers"] as? [String: Any]
     }
 }

ios/Video/DataStructures/SelectedTrackCriteria.swift

@@ -1,9 +1,9 @@
 struct SelectedTrackCriteria {
     let type: String
     let value: Any?
-    
+
     let json: NSDictionary?
-    
+
     init(_ json: NSDictionary!) {
         guard json != nil else {
             self.json = nil

ios/Video/DataStructures/TextTrack.swift

@@ -1,12 +1,11 @@
-
 struct TextTrack {
     let type: String
     let language: String
     let title: String
     let uri: String
-    
+
     let json: NSDictionary?
-    
+
     init(_ json: NSDictionary!) {
         guard json != nil else {
             self.json = nil