Releases/v1.5.0 (#88)

## Updates

* Add incubating `playbackModeChange` API  (#87)
* Update to Kotlin 2.2.10

Co-authored-by: Emily Dixon <edixon@mux.com>
Co-authored-by: GitHub <noreply@github.com>

Author: daytime-em

app/build.gradle.kts

@@ -5,12 +5,12 @@ plugins {
 
 android {
   namespace = "com.mux.app"
-  compileSdk = 35
+  compileSdk = 36
 
   defaultConfig {
     applicationId = "com.mux.app"
     minSdk = 24
-    targetSdk = 35
+    targetSdk = 36
     versionCode = 1
     versionName = "1.0"
 

build.gradle

@@ -1,6 +1,6 @@
 plugins {
-  id 'com.android.application' version '8.8.1' apply false
-  id 'com.android.library' version '8.8.1' apply false
-  id 'org.jetbrains.kotlin.android' version '1.9.24' apply false
+  id 'com.android.application' version '8.8.2' apply false
+  id 'com.android.library' version '8.8.2' apply false
+  id 'org.jetbrains.kotlin.android' version '2.2.10' apply false
   id 'com.mux.gradle.android.mux-android-distribution' version '1.3.0' apply false
 }

library/build.gradle

@@ -5,14 +5,12 @@ plugins {
 }
 
 android {
-  compileSdk 35
+  compileSdk 36
 
   namespace "com.mux.core_android"
 
   defaultConfig {
     minSdk 16
-    //noinspection EditedTargetSdkVersion
-    targetSdk 35
 
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     consumerProguardFiles "consumer-rules.pro"
@@ -75,6 +73,7 @@ muxDistribution {
 
 dependencies {
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
+  implementation 'androidx.annotation:annotation-jvm:1.9.1'
 
   // dynamic version/compileOnly so the player SDKs on top of this can update core independently
   //noinspection GradleDynamicVersion

library/src/main/java/com/mux/android/util/Weak.kt

@@ -25,17 +25,12 @@ fun <T> weak(): ReadWriteProperty<Any, T?> = Weak(null)
  */
 private class Weak<T>(referent: T?) : ReadWriteProperty<Any, T?> {
   private var weakT = WeakReference(referent)
-  private var onSet: ((T?) -> Unit)? = null
 
-  fun onSet(block: (T?) -> Unit): Weak<T> {
-    onSet = block
-    return this
+  override fun getValue(thisRef: Any, property: KProperty<*>): T? {
+    return weakT.get()
   }
 
-  override fun getValue(thisRef: Any, property: KProperty<*>): T? = weakT.get()
-
   override fun setValue(thisRef: Any, property: KProperty<*>, value: T?) {
-    onSet?.invoke(value)
     weakT = WeakReference(value)
   }
 }

library/src/main/java/com/mux/stats/sdk/muxstats/MuxDataSdk.kt

@@ -12,6 +12,7 @@ import android.os.Build
 import android.os.SystemClock
 import android.util.Log
 import android.view.View
+import androidx.annotation.RequiresApi
 import com.mux.android.util.convertPxToDp
 import com.mux.android.util.oneOf
 import com.mux.android.util.weak
@@ -25,6 +26,7 @@ import com.mux.stats.sdk.core.util.MuxLogger
 import com.mux.stats.sdk.muxstats.MuxDataSdk.AndroidDevice
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import org.json.JSONObject
 import java.util.*
 import java.util.concurrent.atomic.AtomicInteger
 
@@ -184,6 +186,56 @@ abstract class MuxDataSdk<Player, PlayerView : View> @JvmOverloads protected con
   open fun orientationChange(orientation: MuxSDKViewOrientation) =
     muxStats.orientationChange(orientation)
 
+  /**
+   * Call when the video is presented in a particular way, eg, fullscreen, or picture-in-picture
+   *
+   * You can call this method immediately after starting a view, or wait until a relevant change.
+   * If you do the latter, the mode will be [PlaybackMode.STANDARD] until you change it.
+   *
+   * @param mode The playback mode being entered
+   */
+  open fun playbackModeChange(mode: PlaybackMode) {
+    muxStats.playbackModeChange(mode, null as JSONObject?)
+  }
+
+  /**
+   * Call when the video is presented in a particular way, eg, fullscreen, or picture-in-picture
+   *
+   * You can call this method immediately after starting a view, or wait until a relevant change.
+   * If you do the latter, the mode will be [PlaybackMode.STANDARD] until you change it.
+   *
+   * @param mode The playback mode being entered
+   * @param extraData Extra data to accompany this event. Will appear in the event timeline for your view
+   */
+  open fun playbackModeChange(mode: PlaybackMode, extraData: JSONObject) {
+    muxStats.playbackModeChange(mode, extraData)
+  }
+
+  /**
+   * Call when the video is presented in a particular way, eg, fullscreen, or picture-in-picture
+   *
+   * You can call this method immediately after starting a view, or wait until a relevant change.
+   * If you do the latter, the mode will be [PlaybackMode.STANDARD] until you change it.
+   *
+   * @param customMode The playback mode being entered
+   */
+  open fun playbackModeChange(customMode: String) {
+    muxStats.playbackModeChange(customMode, null as JSONObject?)
+  }
+
+  /**
+   * Call when the video is presented in a particular way, eg, fullscreen, or picture-in-picture
+   *
+   * You can call this method immediately after starting a view, or wait until a relevant change.
+   * If you do the latter, the mode will be [PlaybackMode.STANDARD] until you change it.
+   *
+   * @param customMode The playback mode being entered
+   * @param extraData Extra data to accompany this event. Will appear in the event timeline for your view
+   */
+  open fun playbackModeChange(customMode: String, extraData: JSONObject) {
+    muxStats.playbackModeChange(customMode, extraData)
+  }
+
   /**
    * Call when the presentation of the video changes, ie Fullscreen vs Normal, etc
    */
@@ -459,47 +511,43 @@ abstract class MuxDataSdk<Player, PlayerView : View> @JvmOverloads protected con
         connectionTypeApi16()
       }
 
-    @TargetApi(Build.VERSION_CODES.M)
+    @RequiresApi(Build.VERSION_CODES.M)
     private fun connectionTypeApi23(): String? {
-      contextRef?.let { context ->
+      // use let{} so we get both a null-check and a hard ref
+      return contextRef?.let { context ->
         val connectivityManager = context.getSystemService(ConnectivityManager::class.java)
         val nc: NetworkCapabilities? =
           connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)
 
-        return when {
+        when {
           nc == null -> {
             MuxLogger.w(TAG, "Could not get network capabilities")
             null
           }
 
-          nc.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> {
+          nc.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) ->
             CONNECTION_TYPE_WIRED
-          }
 
-          nc.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> {
+          nc.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) ->
             CONNECTION_TYPE_WIFI
-          }
 
-          nc.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> {
+          nc.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) ->
             CONNECTION_TYPE_CELLULAR
-          }
 
-          else -> {
-            CONNECTION_TYPE_OTHER
-          }
+          else -> CONNECTION_TYPE_OTHER
         }
-      } ?: return null
+      }
     }
 
     @Suppress("DEPRECATION") // Uses deprecated APIs for backward compat
     private fun connectionTypeApi16(): String? {
-      // use let{} so we get both a null-check and a hard ref for the check
-      contextRef?.let { context ->
+      // use let{} so we get both a null-check and a hard ref
+      return contextRef?.let { context ->
         val connectivityMgr = context
           .getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
         val activeNetwork: NetworkInfo? = connectivityMgr.activeNetworkInfo
 
-        return if (activeNetwork == null) {
+        if (activeNetwork == null) {
           MuxLogger.w(TAG, "Couldn't obtain network info")
           null
         } else {
@@ -526,7 +574,7 @@ abstract class MuxDataSdk<Player, PlayerView : View> @JvmOverloads protected con
             }
           }
         }
-      } ?: return null // contextRef?.let {...
+      } // contextRef?.let {...
     }
 
     override fun getElapsedRealtime(): Long {