VIDSOL-651: Release 1.1.0 (#110)

Author: VZaphod

.github/workflows/android.yml

@@ -59,11 +59,12 @@ jobs:
         run: |
           ./gradlew clean koverXmlReportDebug detekt --info
 
-      - name: Send report to sonar
-        env:
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: |
-          ./gradlew sonar
+# Disabled temporally because some enterprise issues
+#      - name: Send report to sonar
+#        env:
+#          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+#        run: |
+#          ./gradlew sonar
 
       - name: Upload test reports
         uses: actions/upload-artifact@v4

.github/workflows/publish-play-store.yml

@@ -63,8 +63,8 @@ jobs:
 
       - name: Set version from GitHub run number
         run: |
-          VERSION_CODE=$((1000000 + $GITHUB_RUN_NUMBER))
-          VERSION_NAME="1.0.0-build${GITHUB_RUN_NUMBER}"
+          VERSION_CODE=$((1000100 + $GITHUB_RUN_NUMBER))
+          VERSION_NAME="1.1.0-build${GITHUB_RUN_NUMBER}"
           sed -i "s/versionCode = [0-9]\+/versionCode = $VERSION_CODE/" app/build.gradle.kts
           sed -i "s/versionName = \".*\"/versionName = \"$VERSION_NAME\"/" app/build.gradle.kts
 

.github/workflows/release-notification.yml

@@ -0,0 +1,35 @@
+name: Notify Slack on Release
+
+on:
+  release:
+    types: [published]
+
+permissions:
+  contents: read
+
+jobs:
+  notify-release:
+    runs-on: ubuntu-latest
+    name: Notify Release
+    steps:
+      - name: Send to slack channels
+        uses: slackapi/slack-github-action@v2.0.0
+        with:
+          webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
+          webhook-type: incoming-webhook
+          errors: true
+          payload: |
+            blocks:
+              - type: "header"
+                text:
+                  type: "plain_text"
+                  text: ":tada: Version ${{ github.event.release.name }} of the Vonage Native Android Video Reference App Just Released!"
+              - type: "section"
+                text:
+                  type: "mrkdwn"
+                  text: "${{ github.event.release.body }}"
+              - type: "divider"
+              - type: "section"
+                text:
+                  type: "mrkdwn"
+                  text: "You can view the full change log <${{ github.event.release.html_url }}|here>"

.vonage/catalog-info.yaml

@@ -23,4 +23,7 @@ spec:
   type: library
   owner: group:orgdata/vdk
   system: video-android-ref-app
-  lifecycle: production
+  lifecycle: production
+  dependsOn:
+    - component:default/video-react-ref-app
+    - component:default/video-native-sdks

app/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
     alias(libs.plugins.dagger.hilt)
     alias(libs.plugins.sonarqube)
     alias(libs.plugins.kover)
-    kotlin("plugin.serialization") version "2.0.21"
+    alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.play.publisher)
     alias(libs.plugins.stability.analyzer)
     id("com.vonage.json-config")
@@ -37,12 +37,15 @@ android {
         targetSdk = 36
         // NOTE: The following versionCode and versionName are placeholders.
         // Actual values are set dynamically by the GitHub Actions workflow during CI/CD.
-        versionCode = 100
-        versionName = "1.0.0"
+        versionCode = 110
+        versionName = "1.1.0"
 
         testInstrumentationRunner = "com.vonage.android.HiltTestRunner"
         testInstrumentationRunnerArguments["clearPackageData"] = "true"
 
+        // OpenTok SDK version
+        buildConfigField("String", "OPENTOK_SDK_VERSION", "\"${libs.versions.opentokAndroidSdk.get()}\"")
+
         // Set up base API URL
         val baseApiUrl = configProps.getProperty("vonage.baseApiUrl", "")
         buildConfigField("String", "BASE_API_URL", "\"$baseApiUrl\"")
@@ -77,6 +80,11 @@ android {
         val videoFxProperty = configProps.getProperty("vonage.video.allow_background_effects", "true")
         buildConfigField("boolean", "FEATURE_VIDEO_EFFECTS_ENABLED", "$videoFxProperty")
         missingDimensionStrategy("videofx", videoFxProperty.toEnabledString())
+
+        // Settings feature
+        val settingsProperty = configProps.getProperty("vonage.meetingRoom.allow_settings", "true")
+        buildConfigField("boolean", "FEATURE_SETTINGS_ENABLED", "$settingsProperty")
+        missingDimensionStrategy("settings", settingsProperty.toEnabledString())
     }
 
     compileOptions {
@@ -188,6 +196,7 @@ dependencies {
     implementation(project(":vonage-feature-reactions"))
     implementation(project(":vonage-feature-video-effects"))
     implementation(project(":vonage-feature-captions"))
+    implementation(project(":vonage-feature-settings"))
     implementation(project(":vonage-audio-selector"))
     implementation(project(":vonage-android-logger"))
     implementation(libs.androidx.core.ktx)
@@ -202,11 +211,9 @@ dependencies {
     implementation(libs.androidx.navigation.runtime.android)
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.hilt.navigation.compose)
-    implementation(libs.androidx.hilt.navigation.fragment)
     implementation(libs.retrofit)
     implementation(libs.okhttp)
-    implementation(libs.converter.moshi)
-    implementation(libs.moshi.kotlin)
+    implementation(libs.converter.kotlinx.serialization)
     implementation(libs.logging.interceptor)
     implementation(libs.androidx.adaptive)
     implementation(libs.androidx.adaptive.layout)

app/proguard-rules.pro

@@ -22,28 +22,29 @@
 -keep class com.vonage.webrtc.** { *; }
 
 # ================================================================================================
-# Moshi (JSON Serialization)
+# kotlinx.serialization
 # ================================================================================================
 
-# Keep data classes used with Moshi
--keep class com.vonage.android.data.network.** { *; }
+-keepattributes RuntimeVisibleAnnotations,AnnotationDefault
 
-# Keep classes annotated with @JsonClass
--keep @com.squareup.moshi.JsonClass class * { *; }
--keepclassmembers @com.squareup.moshi.JsonClass class * {
-    <init>(...);
-    <fields>;
+# Keep @Serializable classes and their generated serializers
+-if @kotlinx.serialization.Serializable class **
+-keepclassmembers class <1> {
+    static <1>$Companion Companion;
 }
-
-# Keep generated JsonAdapter classes
--if @com.squareup.moshi.JsonClass class *
--keep class <1>JsonAdapter {
-    <init>(...);
-    <fields>;
+-if @kotlinx.serialization.Serializable class ** {
+    static **$* *;
+}
+-keepclassmembers class <2>$<3> {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+-if @kotlinx.serialization.Serializable class ** {
+    public static ** INSTANCE;
+}
+-keepclassmembers class <1> {
+    public static ** INSTANCE;
+    kotlinx.serialization.KSerializer serializer(...);
 }
-
-# Keep Moshi core classes
--keep class com.squareup.moshi.** { *; }
 
 # ================================================================================================
 # Retrofit (HTTP Client)

app/src/main/java/com/vonage/android/audio/AudioPlayer.kt

@@ -0,0 +1,69 @@
+package com.vonage.android.audio
+
+import android.content.Context
+import android.media.MediaPlayer
+import androidx.compose.runtime.Stable
+import com.vonage.android.R
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import javax.inject.Inject
+
+class AudioPlayer @Inject constructor(
+    @ApplicationContext context: Context
+) {
+
+    private val _audioPlayerState = MutableStateFlow<AudioPlayerState>(AudioPlayerState.Idle)
+    val audioPlayerState: StateFlow<AudioPlayerState> = _audioPlayerState.asStateFlow()
+
+    private var mediaPlayer: MediaPlayer? = MediaPlayer.create(context, R.raw.sample)
+
+    init {
+        mediaPlayer?.setOnCompletionListener { _ ->
+            stop()
+        }
+    }
+
+    fun play() {
+        mediaPlayer?.let { player ->
+            player.start()
+            _audioPlayerState.value = AudioPlayerState.Playing(
+                durationMs = player.duration
+            )
+        }
+    }
+
+    fun stop() {
+        mediaPlayer?.let { player ->
+            if (player.isPlaying) {
+                player.pause()
+            }
+            player.seekTo(0)
+        }
+        _audioPlayerState.value = AudioPlayerState.Idle
+    }
+
+    fun toggle() {
+        mediaPlayer?.let { player ->
+            when (player.isPlaying) {
+                true -> stop()
+                false -> play()
+            }
+        }
+    }
+
+    fun release() {
+        mediaPlayer?.release()
+        mediaPlayer = null
+        _audioPlayerState.value = AudioPlayerState.Idle
+    }
+}
+
+@Stable
+sealed interface AudioPlayerState {
+    data object Idle : AudioPlayerState
+    data class Playing(
+        val durationMs: Int,
+    ) : AudioPlayerState
+}

app/src/main/java/com/vonage/android/audio/AudioPlayerViewModel.kt

@@ -0,0 +1,26 @@
+package com.vonage.android.audio
+
+import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+class AudioPlayerViewModel @Inject constructor(
+    private val audioPlayer: AudioPlayer,
+) : ViewModel() {
+
+    val state = audioPlayer.audioPlayerState
+
+    fun onSpeakerTestToggle() {
+        audioPlayer.toggle()
+    }
+
+    fun stop() {
+        audioPlayer.stop()
+    }
+
+    override fun onCleared() {
+        audioPlayer.release()
+        super.onCleared()
+    }
+}

app/src/main/java/com/vonage/android/core/ActionContracts.kt

@@ -0,0 +1,61 @@
+package com.vonage.android.core
+
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.update
+
+/**
+ * A discrete, self-contained unit of business logic that can be [dispatched][BaseViewModel.dispatch]
+ * by a [BaseViewModel].
+ *
+ * Each action encapsulates a single use-case (e.g. "toggle a setting", "observe a flow").
+ * It receives the screen's [ActionDependencies] and an [ActionScope] to read/update state
+ * or emit one-time events, keeping the ViewModel thin and the logic easily unit-testable.
+ *
+ * @param D The concrete [ActionDependencies] subtype this action requires.
+ * @param S The [ViewState] type managed by the hosting ViewModel.
+ * @param E The [ViewEvent] type emitted by the hosting ViewModel.
+ */
+interface ViewAction<D : ActionDependencies, S : ViewState, E : ViewEvent> {
+    /**
+     * Executes this action.
+     *
+     * @param dependencies The screen-specific dependencies (repositories, holders, etc.).
+     * @param actionScope  A scope that provides state mutation and event emission capabilities.
+     */
+    suspend fun execute(dependencies: D, actionScope: ActionScope<S, E>)
+}
+
+/**
+ * Scoped environment passed to every [ViewAction.execute] call.
+ *
+ * Provides controlled access to the ViewModel's internal state and event channel
+ * so that actions can:
+ * - Read the latest state via [currentState].
+ * - Atomically update state via [setState].
+ * - Send one-time side-effect events via [sendEvent].
+ *
+ * @param S The [ViewState] type.
+ * @param E The [ViewEvent] type.
+ */
+class ActionScope<S : ViewState, E : ViewEvent>(
+    private val stateFlow: MutableStateFlow<S>,
+    private val eventChannel: Channel<E>
+) {
+    /** Returns the current snapshot of the UI state. */
+    val currentState: S get() = stateFlow.value
+
+    /**
+     * Atomically updates the state by applying [reducer] to the current value.
+     *
+     * @param reducer A function invoked with the current state as receiver,
+     *                returning the new state (typically via `copy()`).
+     */
+    fun setState(reducer: S.() -> S) = stateFlow.update(reducer)
+
+    /**
+     * Sends a one-time [event] to the UI layer (e.g. navigation, snackbar).
+     * Uses [Channel.trySend] so it never suspends.
+     */
+    fun sendEvent(event: E) = eventChannel.trySend(event)
+}