@sency/react-native-smkit-ui 2.0.5 → 2.0.6

package/android/build.gradle

@@ -95,7 +95,7 @@ dependencies {
   implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-  implementation("com.sency.smkitui:smkitui:1.4.5") {
+  implementation("com.sency.smkitui:smkitui:1.4.7") {
     exclude group: 'com.facebook.fbjni', module: 'fbjni-java-only'
     // // Don't exclude native libraries
     // exclude group: 'com.facebook.react', module: 'react-native'
@@ -111,4 +111,3 @@ dependencies {
   implementation "com.squareup.moshi:moshi-kotlin:$moshi"
   kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi"
 }
-

package/android/src/main/java/com/smkituilibrary/SmkitUiLibraryModule.kt

@@ -1,5 +1,7 @@
 package com.smkituilibrary
 
+import android.os.Handler
+import android.os.Looper
 import android.util.Log
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
@@ -30,6 +32,7 @@ import com.sency.smkitui.model.workoutConfig.EndExercisePreference
 import com.sency.smkitui.model.workoutConfig.SMLanguage
 import com.sency.smkitui.model.workoutConfig.WorkoutConfigModel
 import com.smkituilibrary.mapper.toSMWorkout
+import com.smkituilibrary.mapper.toSMWorkoutWithoutScoringParams
 import com.smkituilibrary.mapper.toWFPSummary
 import com.smkituilibrary.mapper.toWorkoutConfig
 import com.smkituilibrary.model.SMKitWorkout
@@ -91,6 +94,14 @@ class SmkitUiLibraryModule(reactContext: ReactApplicationContext) :
       }
       resultPromise?.resolve(result)
       sendEvent(reactApplicationContext, "workoutDidFinish", params)
+      // Dismiss the SDK UI on the main thread
+      Handler(Looper.getMainLooper()).post {
+        try {
+          smKitUI?.exitSDK()
+        } catch (e: Exception) {
+          Log.e(TAG, "Error exiting SDK: ${e.message}", e)
+        }
+      }
     }
 
     override fun didExitWorkout(summary: WorkoutSummaryData) {
@@ -113,6 +124,14 @@ class SmkitUiLibraryModule(reactContext: ReactApplicationContext) :
       }
       resultPromise?.resolve(result)
       sendEvent(reactApplicationContext, "didExitWorkout", params)
+      // Dismiss the SDK UI on the main thread
+      Handler(Looper.getMainLooper()).post {
+        try {
+          smKitUI?.exitSDK()
+        } catch (e: Exception) {
+          Log.e(TAG, "Error exiting SDK: ${e.message}", e)
+        }
+      }
     }
 
 
@@ -265,7 +284,16 @@ class SmkitUiLibraryModule(reactContext: ReactApplicationContext) :
       val assessmentType = when (type) {
         "fitness" -> Fitness
         "body360" -> Body360
-        else -> Custom(customAssessmentId)
+        else -> {
+          // Validate customAssessmentId is not empty for custom assessments
+          if (customAssessmentId.isNullOrBlank()) {
+            Log.e(TAG, "Custom assessment ID is empty or blank")
+            promise.reject("Starting Assessment Failed", "Custom assessment ID is required for custom assessment type")
+            return
+          }
+          Log.d(TAG, "Creating Custom assessment with ID: $customAssessmentId")
+          Custom(customAssessmentId)
+        }
       }
       val user = if(userData == null) null else if (forceShowUserDataScreen) null else {
         serializeUserData(userData)
@@ -294,12 +322,20 @@ class SmkitUiLibraryModule(reactContext: ReactApplicationContext) :
     try {
       Log.d(TAG, "startCustomWorkout called with modifications: $modifications")
       resultPromise = promise
-      val workout = serializeWorkout(jsonArguments)
+      // Use mapper without scoring params for workouts
+      val workout = serializeWorkoutWithoutScoringParams(jsonArguments)
       if (workout == null) {
         Log.e(TAG, "Failed to serialize workout from JSON")
         promise.reject("Starting Custom Workout Failed", "Failed to parse workout JSON")
         return
       }
+      // Verify no scoring params exist in the workout
+      val hasScoringParams = workout.exercises.any { it.scoringParams != null }
+      if (hasScoringParams) {
+        Log.w(TAG, "Warning: Workout still contains scoring params after removal attempt")
+      } else {
+        Log.d(TAG, "Verified: Workout has no scoring params")
+      }
       val (finalModifications, showPhoneCalibration) = processModifications(modifications)
       smKitUI?.startCustomizedWorkout(
           workout = workout, 
@@ -354,6 +390,44 @@ class SmkitUiLibraryModule(reactContext: ReactApplicationContext) :
 
   private fun serializeWorkout(jsonArguments: String) =
     moshi.adapter(SMKitWorkout::class.java).fromJson(jsonArguments)?.toSMWorkout()
+  
+  private fun serializeWorkoutWithoutScoringParams(jsonArguments: String): com.sency.smkitui.model.SMWorkout? {
+    // Remove scoring params from JSON before deserializing to ensure they're completely excluded
+    val jsonWithoutScoringParams = removeScoringParamsFromJson(jsonArguments)
+    return moshi.adapter(SMKitWorkout::class.java).fromJson(jsonWithoutScoringParams)?.toSMWorkoutWithoutScoringParams()
+  }
+  
+  private fun removeScoringParamsFromJson(json: String): String {
+    return try {
+      val jsonObject = gson.fromJson(json, Map::class.java) as? Map<*, *> ?: return json
+      val mutableMap = jsonObject.toMutableMap()
+      
+      // Get exercises array
+      val exercises = mutableMap["exercises"] as? List<*> ?: return json
+      val updatedExercises = exercises.mapIndexed { index, exercise ->
+        if (exercise is Map<*, *>) {
+          val exerciseMap = exercise.toMutableMap()
+          // Remove scoringParams field (check both camelCase and snake_case variants)
+          val removed = exerciseMap.remove("scoringParams")
+          exerciseMap.remove("scoring_params")
+          if (removed != null) {
+            Log.d(TAG, "Removed scoringParams from exercise at index $index")
+          }
+          exerciseMap
+        } else {
+          exercise
+        }
+      }
+      
+      mutableMap["exercises"] = updatedExercises
+      val result = gson.toJson(mutableMap)
+      Log.d(TAG, "Removed scoring params from workout JSON")
+      result
+    } catch (e: Exception) {
+      Log.e(TAG, "Error removing scoring params from JSON: ${e.message}", e)
+      json // Return original JSON if parsing fails
+    }
+  }
 
   private fun serializeUserData(jsonArguments: String) =
     moshi.adapter(SMUserData::class.java).fromJson(jsonArguments)?.toUserData()

package/android/src/main/java/com/smkituilibrary/mapper/SMMapper.kt

@@ -40,6 +40,17 @@ internal fun SMKitWorkout.toSMWorkout(): SMWorkout = SMWorkout(
   bodycalFinished = bodycalFinished ?: ""
 )
 
+internal fun SMKitWorkout.toSMWorkoutWithoutScoringParams(): SMWorkout = SMWorkout(
+  id = id ?: "",
+  name = name ?: "",
+  workoutIntro = workoutIntro ?: "",
+  soundtrack = soundtrack ?: "",
+  exercises = exercises.map(SMKitExercise::toSMExerciseWithoutScoringParams),
+  workoutClosure = workoutClosure ?: "",
+  getInFrame = getInFrame ?: "",
+  bodycalFinished = bodycalFinished ?: ""
+)
+
 private fun SMKitExercise.toSMExercise(): SMExercise = SMExercise(
   prettyName = prettyName ?: "",
   exerciseIntro = exerciseIntro ?: "",
@@ -57,6 +68,23 @@ private fun SMKitExercise.toSMExercise(): SMExercise = SMExercise(
   side = side
 )
 
+private fun SMKitExercise.toSMExerciseWithoutScoringParams(): SMExercise = SMExercise(
+  prettyName = prettyName ?: "",
+  exerciseIntro = exerciseIntro ?: "",
+  totalSeconds = totalSeconds ?: 0,
+  videoInstruction = videoInstruction ?: "",
+  uiElements = uiElements ?: emptySet(),
+  detector = detector ?: "",
+  exerciseClosure = exerciseClosure ?: "",
+  closureFailedSound = closureFailedSound ?: "",
+  scoringParams = null, // Exclude scoring params for workouts
+  summaryTitle = summaryTitle ?: "",
+  summarySubTitle = summarySubTitle ?: "",
+  summaryMainMetricTitle = summaryTitleMainMetric ?: "",
+  summarySubTitleMainMetric = summarySubTitleMainMetric ?: "",
+  side = side
+)
+
 private fun SMKitScoringParams.toParams(): ScoringParams {
   return ScoringParams(
     type = type ?: "",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sency/react-native-smkit-ui",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "React Native library for SMKit UI - Advanced fitness assessments and workout programs with AI-powered motion detection and real-time performance tracking",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",