@sency/react-native-smkit-ui 0.1.3 → 0.1.5

package/LICENSE

@@ -1,5 +1,5 @@
 Sency
-Terms of Use
+Terms of Use.  
 
 Last updated: [Sep 11th 2022]
 

package/android/build.gradle

@@ -93,7 +93,7 @@ dependencies {
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-  compileOnly("com.sency.smkitui:smkitui:0.1.2") {
+  compileOnly("com.sency.smkitui:smkitui:0.1.6") {
     exclude group: 'com.facebook.fbjni', module: 'fbjni-java-only'
   }
 

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

@@ -10,6 +10,7 @@ import com.sency.smkitui.SMKitUI
 import com.sency.smkitui.listener.SMKitUIWorkoutListener
 import com.sency.smkitui.model.ExerciseData
 import com.sency.smkitui.model.WorkoutSummaryData
+import com.sency.smkitui.model.smkitui.Custom
 import com.smkituilibrary.mapper.toSMWorkout
 import com.smkituilibrary.mapper.toWorkoutConfig
 import com.smkituilibrary.model.SMKitWorkout
@@ -60,10 +61,10 @@ class SmkitUiLibraryModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun startAssessment(type: String, showSummary: Boolean, promise: Promise) {
+  fun startAssessment(type: String, showSummary: Boolean, customAssessmentId: String, promise: Promise) {
     this.resultPromise = promise
     try {
-      smKitUI?.startAssessment(listener = this)
+      smKitUI?.startAssessment(listener = this, assessmentType = Custom(customAssessmentId))
     } catch (e: Exception) {
       promise.reject("Configure Failed", e)
     }

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

@@ -1,23 +1,24 @@
 package com.smkituilibrary.mapper
 
-import android.net.Uri
-import com.sency.smkitui.model.BodyZone
-import com.sency.smkitui.model.DifficultyLevel
 import com.sency.smkitui.model.SMExercise
-import com.sency.smkitui.model.SMLanguage
 import com.sency.smkitui.model.SMWorkout
-import com.sency.smkitui.model.WorkoutConfig
-import com.sency.smkitui.model.WorkoutDuration
+import com.sency.smkitui.model.ScoringParams
+import com.sency.smkitui.model.workoutConfig.BodyZone
+import com.sency.smkitui.model.workoutConfig.DifficultyLevel
+import com.sency.smkitui.model.workoutConfig.SMLanguage
+import com.sency.smkitui.model.workoutConfig.WorkoutConfig
+import com.sency.smkitui.model.workoutConfig.WorkoutDuration
 import com.smkituilibrary.model.SMKitExercise
+import com.smkituilibrary.model.SMKitScoringParams
 import com.smkituilibrary.model.SMKitWorkout
 import com.smkituilibrary.model.SMKitWorkoutConfig
 
 internal fun SMKitWorkoutConfig.toWorkoutConfig(): WorkoutConfig = WorkoutConfig(
   programId = programID,
   week = week,
-  bodyZone = BodyZone.valueOf(bodyZone, BodyZone.FullBody),
-  difficultyLevel = DifficultyLevel.valueOf(difficultyLevel, DifficultyLevel.HighDifficulty),
-  workoutDuration = WorkoutDuration.valueOf(workoutDuration, WorkoutDuration.Long),
+  bodyZone = BodyZone.valueOf(bodyZone),
+  difficultyLevel = DifficultyLevel.valueOf(difficultyLevel),
+  workoutDuration = WorkoutDuration.valueOf(workoutDuration),
   language = SMLanguage.English,
 )
 
@@ -33,7 +34,7 @@ internal fun SMKitWorkout.toSMWorkout(): SMWorkout = SMWorkout(
 )
 
 private fun SMKitExercise.toSMExercise(): SMExercise = SMExercise(
-  prettyName = name ?: "",
+  prettyName = prettyName ?: "",
   exerciseIntro = exerciseIntro ?: "",
   totalSeconds = totalSeconds ?: 0,
   introSeconds = introSeconds ?: 0,
@@ -42,8 +43,23 @@ private fun SMKitExercise.toSMExercise(): SMExercise = SMExercise(
   detector = detector ?: "",
   repBased = repBased ?: false,
   exerciseClosure = exerciseClosure ?: "",
-  targetReps = 0,
-  targetTime = 0,
-  scoreFactor = 0.0,
-  passCriteria = null
+  scoringParams = scoringParams?.toParams() ?: ScoringParams(
+    type = "",
+    scoreFactor = 0f,
+    targetTime = 0,
+    targetReps = 0,
+    targetRom = "",
+    passCriteria = null
+  )
 )
+
+private fun SMKitScoringParams.toParams(): ScoringParams {
+  return ScoringParams(
+    type = type,
+    scoreFactor = scoreFactor,
+    targetTime = targetTime,
+    targetReps = targetReps,
+    targetRom = targetRom,
+    passCriteria = passCriteria
+  )
+}

package/android/src/main/java/com/smkituilibrary/model/SMKitExercise.kt

@@ -1,17 +1,29 @@
 package com.smkituilibrary.model
 
 import androidx.annotation.Keep
+import com.sency.smkitui.model.ScoringParams
 import com.sency.smkitui.model.UiElement
 
 @Keep
 internal data class SMKitExercise(
-    val name: String? = null,
-    val exerciseIntro: String? = null,
-    val totalSeconds: Int? = null,
-    val introSeconds: Int? = null,
-    val videoInstruction: String? = null,
-    val uiElements: Set<UiElement>? = null,
     val detector: String? = null,
+    val uiElements: Set<UiElement>? = null,
     val repBased: Boolean? = null,
+    val videoInstruction: String? = null,
+    val introSeconds: Int? = null,
+    val totalSeconds: Int? = null,
+    val scoringParams: SMKitScoringParams? = null,
+    val prettyName: String? = null,
+    val exerciseIntro: String? = null,
     val exerciseClosure: String? = null,
 )
+
+@Keep
+internal data class SMKitScoringParams(
+  val type: String,
+  val scoreFactor: Float,
+  val targetTime: Int,
+  val targetReps: Int,
+  val targetRom: String?,
+  val passCriteria: List<String>?
+)

package/ios/SMKitUIManager.mm

@@ -3,7 +3,7 @@
 
 @interface RCT_EXTERN_MODULE(SMKitUIManager, RCTViewManager)
 RCT_EXTERN_METHOD(configure:(NSString*)key onSuccess:(RCTPromiseResolveBlock)onSuccess onFailure:(RCTPromiseRejectBlock)onFailure)
-RCT_EXTERN_METHOD(startAssessment:(NSString*)type showSummary:(BOOL)showSummary onWorkoutDidFinish:(RCTPromiseResolveBlock)onWorkoutDidFinish onWorkoutFailed:(RCTPromiseRejectBlock)onWorkoutFailed)
+RCT_EXTERN_METHOD(startAssessment:(NSString*)type showSummary:(BOOL)showSummary customAssessmentID:(NSString*)customAssessmentID onWorkoutDidFinish:(RCTPromiseResolveBlock)onWorkoutDidFinish onWorkoutFailed:(RCTPromiseRejectBlock)onWorkoutFailed)
 RCT_EXTERN_METHOD(startCustomWorkout:(NSDictionary*)dic onWorkoutDidFinish:(RCTPromiseResolveBlock)onWorkoutDidFinish onWorkoutFailed:(RCTPromiseRejectBlock)onWorkoutFailed)
 RCT_EXTERN_METHOD(startWorkoutProgram:(NSDictionary*)dic onWorkoutDidFinish:(RCTPromiseResolveBlock)onWorkoutDidFinish onWorkoutFailed:(RCTPromiseRejectBlock)onWorkoutFailed)
 @end

package/ios/SMKitUIManager.swift

@@ -4,33 +4,51 @@ import SMBase
 
 @objc(SMKitUIManager)
 class SMKitUIManager: RCTViewManager {
-    
-    let smkitUIViewController = SMKitUIViewController()
+
     var onWorkoutDidFinish:RCTPromiseResolveBlock?
     var onWorkoutFailed:RCTPromiseRejectBlock?
     
-    override func view() -> UIView! {
-        return smkitUIViewController.view as? SMKitUIView
+    var smkitUIViewController:UIViewController?{
+        let keyWindow = UIApplication.shared.windows.filter {$0.isKeyWindow}.first
+        if var topController = keyWindow?.rootViewController {
+            while let presentedViewController = topController.presentedViewController {
+                topController = presentedViewController
+            }
+            return topController
+        }
+        return nil
     }
     
     @objc(configure:onSuccess:onFailure:)
     func configure(key:NSString, onSuccess: @escaping RCTPromiseResolveBlock,onFailure:@escaping RCTPromiseRejectBlock) -> Void {
+        var isConfigDone = false
+        var didFail = false
         SMKitUIModel.configure(authKey: "\(key)") {
-            onSuccess("")
+            if !isConfigDone{
+                isConfigDone = true
+                onSuccess("")
+            }
         } onFailure: { err in
-            onFailure("Configure Failed", err?.localizedDescription ?? "", err)
+            if !didFail{
+                didFail = true
+                onFailure("Configure Failed", err?.localizedDescription ?? "", err)
+            }
         }
     }
     
-    @objc(startAssessment:showSummary:onWorkoutDidFinish:onWorkoutFailed:)
-    func startAssessment(type:NSString, showSummary:Bool, onWorkoutDidFinish: @escaping RCTPromiseResolveBlock, onWorkoutFailed:@escaping RCTPromiseRejectBlock){
+    @objc(startAssessment:showSummary:customAssessmentID:onWorkoutDidFinish:onWorkoutFailed:)
+    func startAssessment(type:NSString, showSummary:Bool, customAssessmentID:String?, onWorkoutDidFinish: @escaping RCTPromiseResolveBlock, onWorkoutFailed:@escaping RCTPromiseRejectBlock){
+        guard let smkitUIViewController = smkitUIViewController else {
+            onWorkoutFailed("StartAssessment Failed", "Failed to present view", nil)
+            return
+        }
         
         self.onWorkoutDidFinish = onWorkoutDidFinish
         self.onWorkoutFailed = onWorkoutFailed
         DispatchQueue.main.async {
             do{
                 if let type = AssessmentTypes(rawValue: "\(type)"){
-                    try SMKitUIModel.startAssessmet(viewController: self.smkitUIViewController, type: type, showSummary: showSummary, delegate: self){error in
+                    try SMKitUIModel.startAssessmet(viewController: smkitUIViewController, type: type, customAssessmentID:customAssessmentID, showSummary: showSummary, delegate: self){error in
                         onWorkoutFailed("StartAssessment Failed", error.localizedDescription, error)
                     }
                 }else{
@@ -44,12 +62,16 @@ class SMKitUIManager: RCTViewManager {
     
     @objc(startCustomWorkout:onWorkoutDidFinish:onWorkoutFailed:)
     func startCustomWorkout(json:[String:Any], onWorkoutDidFinish: @escaping RCTPromiseResolveBlock, onWorkoutFailed:@escaping RCTPromiseRejectBlock){
+        guard let smkitUIViewController = smkitUIViewController else {
+            onWorkoutFailed("StartCustomWorkout Failed", "Failed to present view", nil)
+            return
+        }
         self.onWorkoutDidFinish = onWorkoutDidFinish
         self.onWorkoutFailed = onWorkoutFailed
         DispatchQueue.main.async {
             do{
                 let workout = try SMWorkout(FromJson: json)
-                try SMKitUIModel.startWorkout(viewController: self.smkitUIViewController, workout: workout, delegate: self)
+                try SMKitUIModel.startWorkout(viewController: smkitUIViewController, workout: workout, delegate: self)
             }catch{
                 onWorkoutFailed("StartCustomWorkout Failed", error.localizedDescription, error)
             }
@@ -61,6 +83,11 @@ class SMKitUIManager: RCTViewManager {
         self.onWorkoutDidFinish = onWorkoutDidFinish
         self.onWorkoutFailed = onWorkoutFailed
         
+        guard let smkitUIViewController = smkitUIViewController else {
+            onWorkoutFailed("StartWorkoutProgram Failed", "Failed to present view", nil)
+            return
+        }
+        
         guard let week = json["week"] as? Int,
             let zone = json["bodyZone"] as? String,
               let difficultyLevelRaw = json["difficultyLevel"] as? String,
@@ -82,7 +109,7 @@ class SMKitUIManager: RCTViewManager {
             programID: programID
         )
         
-        SMKitUIModel.startWorkoutFromProgram(viewController: self.smkitUIViewController, workoutConfig: config, delegate: self) { error in
+        SMKitUIModel.startWorkoutFromProgram(viewController: smkitUIViewController, workoutConfig: config, delegate: self) { error in
             onWorkoutFailed("StartWorkoutProgram Failed", error.localizedDescription, error)
         }
     }

package/lib/commonjs/SMWorkout.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.WorkoutDuration = exports.WorkoutDifficulty = exports.WorkoutConfig = exports.UIElement = exports.SMWorkout = exports.SMExercise = exports.BodyZone = exports.AssessmentTypes = void 0;
+exports.WorkoutDuration = exports.WorkoutDifficulty = exports.WorkoutConfig = exports.UIElement = exports.SMWorkout = exports.SMScoringParams = exports.SMExercise = exports.BodyZone = exports.AssessmentTypes = void 0;
 let AssessmentTypes = exports.AssessmentTypes = /*#__PURE__*/function (AssessmentTypes) {
   AssessmentTypes["Fitness"] = "fitness";
   return AssessmentTypes;
@@ -45,8 +45,8 @@ class SMWorkout {
 }
 exports.SMWorkout = SMWorkout;
 class SMExercise {
-  constructor(name, totalSeconds, introSeconds, videoInstruction, exerciseIntro, uiElements, detector, repBased, exerciseClosure, targetReps, targetTime, scoreFactor) {
-    this.name = name || null;
+  constructor(prettyName, totalSeconds, introSeconds, videoInstruction, exerciseIntro, uiElements, detector, repBased, exerciseClosure, scoringParams) {
+    this.prettyName = prettyName || null;
     this.totalSeconds = totalSeconds || null;
     this.introSeconds = introSeconds || null;
     this.videoInstruction = videoInstruction || null;
@@ -54,13 +54,22 @@ class SMExercise {
     this.uiElements = uiElements || null;
     this.detector = detector;
     this.repBased = repBased || null;
-    this.targetReps = targetReps || null;
-    this.targetTime = targetTime || null;
-    this.scoreFactor = scoreFactor || null;
     this.exerciseClosure = exerciseClosure || null;
+    this.scoringParams = scoringParams || null;
   }
 }
 exports.SMExercise = SMExercise;
+class SMScoringParams {
+  constructor(type, scoreFactor, targetTime, targetReps, targetRom, passCriteria) {
+    this.type = type || null;
+    this.scoreFactor = scoreFactor || null;
+    this.targetTime = targetTime || null;
+    this.targetReps = targetReps || null;
+    this.targetRom = targetRom || null;
+    this.passCriteria = passCriteria || null;
+  }
+}
+exports.SMScoringParams = SMScoringParams;
 class WorkoutConfig {
   constructor(week, bodyZone, difficultyLevel, workoutDuration, programID) {
     this.week = week;

package/lib/commonjs/SMWorkout.js.map

@@ -1 +1 @@
-{"version":3,"names":["AssessmentTypes","exports","UIElement","BodyZone","WorkoutDifficulty","WorkoutDuration","SMWorkout","constructor","id","name","workoutIntro","soundtrack","exercises","getInFrame","bodycalFinished","workoutClosure","SMExercise","totalSeconds","introSeconds","videoInstruction","exerciseIntro","uiElements","detector","repBased","exerciseClosure","targetReps","targetTime","scoreFactor","WorkoutConfig","week","bodyZone","difficultyLevel","workoutDuration","programID"],"sourceRoot":"../../src","sources":["SMWorkout.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["AssessmentTypes","exports","UIElement","BodyZone","WorkoutDifficulty","WorkoutDuration","SMWorkout","constructor","id","name","workoutIntro","soundtrack","exercises","getInFrame","bodycalFinished","workoutClosure","SMExercise","prettyName","totalSeconds","introSeconds","videoInstruction","exerciseIntro","uiElements","detector","repBased","exerciseClosure","scoringParams","SMScoringParams","type","scoreFactor","targetTime","targetReps","targetRom","passCriteria","WorkoutConfig","week","bodyZone","difficultyLevel","workoutDuration","programID"],"sourceRoot":"../../src","sources":["SMWorkout.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/index.js

@@ -21,8 +21,8 @@ const SMKitUIManager = _reactNative.NativeModules.SMKitUIManager ? _reactNative.
 function configure(key) {
   return SMKitUIManager.configure(key);
 }
-function startAssessment(type, showSummary) {
-  return SMKitUIManager.startAssessment(type, showSummary);
+function startAssessment(type, showSummary, customAssessmentID) {
+  return SMKitUIManager.startAssessment(type, showSummary, customAssessmentID);
 }
 function startCustomWorkout(workout) {
   return SMKitUIManager.startCustomWorkout(workout);

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","LINKING_ERROR","Platform","select","ios","default","SMKitUIManager","NativeModules","Proxy","get","Error","configure","key","startAssessment","type","showSummary","startCustomWorkout","workout","startWorkoutProgram","workoutConfig","AssessmentTypes","exports"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAGA,MAAMC,aAAa,GAChB,gFAA+E,GAChFC,qBAAQ,CAACC,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;AAEjC,MAAMC,cAAc,GAAGC,0BAAa,CAACD,cAAc,GAC/CC,0BAAa,CAACD,cAAc,GAC5B,IAAIE,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACT,aAAa,CAAC;EAChC;AACF,CACF,CAAC;AAEE,SAASU,SAASA,CAACC,GAAW,EAAmB;EACtD,OAAON,cAAc,CAACK,SAAS,CAACC,GAAG,CAAC;AACtC;AAEO,SAASC,eAAeA,CAACC,IAAqC,EAAEC,WAAmB,EAAgD;EACxI,OAAOT,cAAc,CAACO,eAAe,CAACC,IAAI,EAAEC,WAAW,CAAC;AAC1D;AAEO,SAASC,kBAAkBA,CAACC,OAAkC,EAAgD;EACnH,OAAOX,cAAc,CAACU,kBAAkB,CAACC,OAAO,CAAC;AACnD;AAEO,SAASC,mBAAmBA,CAACC,aAA4C,EAAgD;EAC9H,OAAOb,cAAc,CAACY,mBAAmB,CAACC,aAAa,CAAC;AAC1D;AAAC,IAEWC,eAAe,GAAAC,OAAA,CAAAD,eAAA,0BAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAA,OAAfA,eAAe;AAAA","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","LINKING_ERROR","Platform","select","ios","default","SMKitUIManager","NativeModules","Proxy","get","Error","configure","key","startAssessment","type","showSummary","customAssessmentID","startCustomWorkout","workout","startWorkoutProgram","workoutConfig","AssessmentTypes","exports"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAGA,MAAMC,aAAa,GAChB,gFAA+E,GAChFC,qBAAQ,CAACC,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;AAEjC,MAAMC,cAAc,GAAGC,0BAAa,CAACD,cAAc,GAC/CC,0BAAa,CAACD,cAAc,GAC5B,IAAIE,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACT,aAAa,CAAC;EAChC;AACF,CACF,CAAC;AAEE,SAASU,SAASA,CAACC,GAAW,EAAmB;EACtD,OAAON,cAAc,CAACK,SAAS,CAACC,GAAG,CAAC;AACtC;AAEO,SAASC,eAAeA,CAC7BC,IAAsC,EACtCC,WAAoB,EACpBC,kBAA0B,EACwB;EAClD,OAAOV,cAAc,CAACO,eAAe,CAACC,IAAI,EAAEC,WAAW,EAAEC,kBAAkB,CAAC;AAC9E;AAEO,SAASC,kBAAkBA,CAACC,OAAkC,EAAgD;EACnH,OAAOZ,cAAc,CAACW,kBAAkB,CAACC,OAAO,CAAC;AACnD;AAEO,SAASC,mBAAmBA,CAACC,aAA4C,EAAgD;EAC9H,OAAOd,cAAc,CAACa,mBAAmB,CAACC,aAAa,CAAC;AAC1D;AAAC,IAEWC,eAAe,GAAAC,OAAA,CAAAD,eAAA,0BAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAA,OAAfA,eAAe;AAAA","ignoreList":[]}

package/lib/module/SMWorkout.js

@@ -38,8 +38,8 @@ export class SMWorkout {
   }
 }
 export class SMExercise {
-  constructor(name, totalSeconds, introSeconds, videoInstruction, exerciseIntro, uiElements, detector, repBased, exerciseClosure, targetReps, targetTime, scoreFactor) {
-    this.name = name || null;
+  constructor(prettyName, totalSeconds, introSeconds, videoInstruction, exerciseIntro, uiElements, detector, repBased, exerciseClosure, scoringParams) {
+    this.prettyName = prettyName || null;
     this.totalSeconds = totalSeconds || null;
     this.introSeconds = introSeconds || null;
     this.videoInstruction = videoInstruction || null;
@@ -47,10 +47,18 @@ export class SMExercise {
     this.uiElements = uiElements || null;
     this.detector = detector;
     this.repBased = repBased || null;
-    this.targetReps = targetReps || null;
-    this.targetTime = targetTime || null;
-    this.scoreFactor = scoreFactor || null;
     this.exerciseClosure = exerciseClosure || null;
+    this.scoringParams = scoringParams || null;
+  }
+}
+export class SMScoringParams {
+  constructor(type, scoreFactor, targetTime, targetReps, targetRom, passCriteria) {
+    this.type = type || null;
+    this.scoreFactor = scoreFactor || null;
+    this.targetTime = targetTime || null;
+    this.targetReps = targetReps || null;
+    this.targetRom = targetRom || null;
+    this.passCriteria = passCriteria || null;
   }
 }
 export class WorkoutConfig {

package/lib/module/SMWorkout.js.map

@@ -1 +1 @@
-{"version":3,"names":["AssessmentTypes","UIElement","BodyZone","WorkoutDifficulty","WorkoutDuration","SMWorkout","constructor","id","name","workoutIntro","soundtrack","exercises","getInFrame","bodycalFinished","workoutClosure","SMExercise","totalSeconds","introSeconds","videoInstruction","exerciseIntro","uiElements","detector","repBased","exerciseClosure","targetReps","targetTime","scoreFactor","WorkoutConfig","week","bodyZone","difficultyLevel","workoutDuration","programID"],"sourceRoot":"../../src","sources":["SMWorkout.tsx"],"mappings":"AAAA,WAAYA,eAAe,0BAAfA,eAAe;EAAfA,eAAe;EAAA,OAAfA,eAAe;AAAA;AAI3B,WAAYC,SAAS,0BAATA,SAAS;EAATA,SAAS;EAATA,SAAS;EAATA,SAAS;EAAA,OAATA,SAAS;AAAA;AAMrB,WAAYC,QAAQ,0BAARA,QAAQ;EAARA,QAAQ;EAARA,QAAQ;EAARA,QAAQ;EAAA,OAARA,QAAQ;AAAA;AAMpB,WAAYC,iBAAiB,0BAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAjBA,iBAAiB;EAAA,OAAjBA,iBAAiB;AAAA;AAM7B,WAAYC,eAAe,0BAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAA,OAAfA,eAAe;AAAA;AAK3B,OAAO,MAAMC,SAAS;EAUrBC,WAAWA,CAACC,EAAiB,EAAEC,IAAmB,EAAEC,YAA2B,EAAEC,UAAyB,EAAEC,SAAuB,EAAEC,UAAyB,EAAEC,eAA8B,EAAEC,cAA6B,EAAE;IACxN,IAAI,CAACP,EAAE,GAAGA,EAAE,IAAI,IAAI;IACpB,IAAI,CAACC,IAAI,GAAGA,IAAI,IAAI,IAAI;IACxB,IAAI,CAACC,YAAY,GAAGA,YAAY,IAAI,IAAI;IACxC,IAAI,CAACC,UAAU,GAAGA,UAAU,IAAI,IAAI;IACpC,IAAI,CAACC,SAAS,GAAGA,SAAS;IAC1B,IAAI,CAACC,UAAU,GAAGA,UAAU,IAAI,IAAI;IACpC,IAAI,CAACC,eAAe,GAAGA,eAAe,IAAI,IAAI;IAC9C,IAAI,CAACC,cAAc,GAAGA,cAAc,IAAI,IAAI;EAChD;AACJ;AAEA,OAAO,MAAMC,UAAU;EAcrBT,WAAWA,CAACE,IAAmB,EAAEQ,YAA2B,EAAEC,YAA2B,EAAEC,gBAA+B,EAAEC,aAA4B,EAAEC,UAA8B,EAAEC,QAAgB,EAAEC,QAAwB,EAAEC,eAA8B,EAAEC,UAAyB,EAAEC,UAAyB,EAAEC,WAA0B,EAAE;IACtV,IAAI,CAAClB,IAAI,GAAGA,IAAI,IAAI,IAAI;IACxB,IAAI,CAACQ,YAAY,GAAGA,YAAY,IAAI,IAAI;IACxC,IAAI,CAACC,YAAY,GAAGA,YAAY,IAAI,IAAI;IACxC,IAAI,CAACC,gBAAgB,GAAGA,gBAAgB,IAAI,IAAI;IAChD,IAAI,CAACC,aAAa,GAAGA,aAAa,IAAI,IAAI;IAC1C,IAAI,CAACC,UAAU,GAAGA,UAAU,IAAI,IAAI;IACpC,IAAI,CAACC,QAAQ,GAAGA,QAAQ;IACxB,IAAI,CAACC,QAAQ,GAAGA,QAAQ,IAAI,IAAI;IAChC,IAAI,CAACE,UAAU,GAAGA,UAAU,IAAI,IAAI;IACpC,IAAI,CAACC,UAAU,GAAGA,UAAU,IAAI,IAAI;IACpC,IAAI,CAACC,WAAW,GAAGA,WAAW,IAAI,IAAI;IACtC,IAAI,CAACH,eAAe,GAAGA,eAAe,IAAI,IAAI;EAChD;AACF;AAEA,OAAO,MAAMI,aAAa;EAOxBrB,WAAWA,CAACsB,IAAY,EAAEC,QAAkB,EAAEC,eAAkC,EAAEC,eAAgC,EAAEC,SAAiB,EAAC;IACpI,IAAI,CAACJ,IAAI,GAAGA,IAAI;IAChB,IAAI,CAACC,QAAQ,GAAGA,QAAQ;IACxB,IAAI,CAACC,eAAe,GAAGA,eAAe;IACtC,IAAI,CAACC,eAAe,GAAGA,eAAe;IACtC,IAAI,CAACC,SAAS,GAAGA,SAAS;EAC5B;AACF","ignoreList":[]}
+{"version":3,"names":["AssessmentTypes","UIElement","BodyZone","WorkoutDifficulty","WorkoutDuration","SMWorkout","constructor","id","name","workoutIntro","soundtrack","exercises","getInFrame","bodycalFinished","workoutClosure","SMExercise","prettyName","totalSeconds","introSeconds","videoInstruction","exerciseIntro","uiElements","detector","repBased","exerciseClosure","scoringParams","SMScoringParams","type","scoreFactor","targetTime","targetReps","targetRom","passCriteria","WorkoutConfig","week","bodyZone","difficultyLevel","workoutDuration","programID"],"sourceRoot":"../../src","sources":["SMWorkout.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/index.js

@@ -11,8 +11,8 @@ const SMKitUIManager = NativeModules.SMKitUIManager ? NativeModules.SMKitUIManag
 export function configure(key) {
   return SMKitUIManager.configure(key);
 }
-export function startAssessment(type, showSummary) {
-  return SMKitUIManager.startAssessment(type, showSummary);
+export function startAssessment(type, showSummary, customAssessmentID) {
+  return SMKitUIManager.startAssessment(type, showSummary, customAssessmentID);
 }
 export function startCustomWorkout(workout) {
   return SMKitUIManager.startCustomWorkout(workout);

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeModules","Platform","LINKING_ERROR","select","ios","default","SMKitUIManager","Proxy","get","Error","configure","key","startAssessment","type","showSummary","startCustomWorkout","workout","startWorkoutProgram","workoutConfig","AssessmentTypes"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"AAAA,SAASA,aAAa,EAAEC,QAAQ,QAAQ,cAAc;AAGtD,MAAMC,aAAa,GAChB,gFAA+E,GAChFD,QAAQ,CAACE,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;AAEjC,MAAMC,cAAc,GAAGN,aAAa,CAACM,cAAc,GAC/CN,aAAa,CAACM,cAAc,GAC5B,IAAIC,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACP,aAAa,CAAC;EAChC;AACF,CACF,CAAC;AAEL,OAAO,SAASQ,SAASA,CAACC,GAAW,EAAmB;EACtD,OAAOL,cAAc,CAACI,SAAS,CAACC,GAAG,CAAC;AACtC;AAEA,OAAO,SAASC,eAAeA,CAACC,IAAqC,EAAEC,WAAmB,EAAgD;EACxI,OAAOR,cAAc,CAACM,eAAe,CAACC,IAAI,EAAEC,WAAW,CAAC;AAC1D;AAEA,OAAO,SAASC,kBAAkBA,CAACC,OAAkC,EAAgD;EACnH,OAAOV,cAAc,CAACS,kBAAkB,CAACC,OAAO,CAAC;AACnD;AAEA,OAAO,SAASC,mBAAmBA,CAACC,aAA4C,EAAgD;EAC9H,OAAOZ,cAAc,CAACW,mBAAmB,CAACC,aAAa,CAAC;AAC1D;AAEA,WAAYC,eAAe,0BAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAA,OAAfA,eAAe;AAAA","ignoreList":[]}
+{"version":3,"names":["NativeModules","Platform","LINKING_ERROR","select","ios","default","SMKitUIManager","Proxy","get","Error","configure","key","startAssessment","type","showSummary","customAssessmentID","startCustomWorkout","workout","startWorkoutProgram","workoutConfig","AssessmentTypes"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"AAAA,SAASA,aAAa,EAAEC,QAAQ,QAAQ,cAAc;AAGtD,MAAMC,aAAa,GAChB,gFAA+E,GAChFD,QAAQ,CAACE,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;AAEjC,MAAMC,cAAc,GAAGN,aAAa,CAACM,cAAc,GAC/CN,aAAa,CAACM,cAAc,GAC5B,IAAIC,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACP,aAAa,CAAC;EAChC;AACF,CACF,CAAC;AAEL,OAAO,SAASQ,SAASA,CAACC,GAAW,EAAmB;EACtD,OAAOL,cAAc,CAACI,SAAS,CAACC,GAAG,CAAC;AACtC;AAEA,OAAO,SAASC,eAAeA,CAC7BC,IAAsC,EACtCC,WAAoB,EACpBC,kBAA0B,EACwB;EAClD,OAAOT,cAAc,CAACM,eAAe,CAACC,IAAI,EAAEC,WAAW,EAAEC,kBAAkB,CAAC;AAC9E;AAEA,OAAO,SAASC,kBAAkBA,CAACC,OAAkC,EAAgD;EACnH,OAAOX,cAAc,CAACU,kBAAkB,CAACC,OAAO,CAAC;AACnD;AAEA,OAAO,SAASC,mBAAmBA,CAACC,aAA4C,EAAgD;EAC9H,OAAOb,cAAc,CAACY,mBAAmB,CAACC,aAAa,CAAC;AAC1D;AAEA,WAAYC,eAAe,0BAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;EAAA,OAAfA,eAAe;AAAA","ignoreList":[]}

package/lib/typescript/src/SMWorkout.d.ts

@@ -32,19 +32,26 @@ export declare class SMWorkout {
     constructor(id: string | null, name: string | null, workoutIntro: string | null, soundtrack: string | null, exercises: SMExercise[], getInFrame: string | null, bodycalFinished: string | null, workoutClosure: string | null);
 }
 export declare class SMExercise {
-    name: string | null;
-    totalSeconds: number | null;
-    introSeconds: number | null;
-    videoInstruction: string | null;
-    exerciseIntro: string | null;
-    uiElements: UIElement[] | null;
     detector: string;
+    uiElements: UIElement[] | null;
     repBased: boolean | null;
+    videoInstruction: string | null;
+    introSeconds: number | null;
+    totalSeconds: number | null;
+    prettyName: string | null;
+    exerciseIntro: string | null;
     exerciseClosure: string | null;
-    targetReps: number | null;
-    targetTime: number | null;
+    scoringParams: SMScoringParams | null;
+    constructor(prettyName: string | null, totalSeconds: number | null, introSeconds: number | null, videoInstruction: string | null, exerciseIntro: string | null, uiElements: UIElement[] | null, detector: string, repBased: boolean | null, exerciseClosure: string | null, scoringParams: SMScoringParams | null);
+}
+export declare class SMScoringParams {
+    type: string | null;
     scoreFactor: number | null;
-    constructor(name: string | null, totalSeconds: number | null, introSeconds: number | null, videoInstruction: string | null, exerciseIntro: string | null, uiElements: UIElement[] | null, detector: string, repBased: boolean | null, exerciseClosure: string | null, targetReps: number | null, targetTime: number | null, scoreFactor: number | null);
+    targetTime: number | null;
+    targetReps: number | null;
+    targetRom: string | null;
+    passCriteria: string[] | null;
+    constructor(type: string | null, scoreFactor: number | null, targetTime: number | null, targetReps: number | null, targetRom: string | null, passCriteria: string[] | null);
 }
 export declare class WorkoutConfig {
     week: number;

package/lib/typescript/src/SMWorkout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SMWorkout.d.ts","sourceRoot":"","sources":["../../../src/SMWorkout.tsx"],"names":[],"mappings":"AAAA,oBAAY,eAAe;IACzB,OAAO,YAAY;CACpB;AAED,oBAAY,SAAS;IACnB,WAAW,gBAAgB;IAC3B,KAAK,UAAU;IACf,aAAa,kBAAkB;CAChC;AAED,oBAAY,QAAQ;IAClB,SAAS,cAAc;IACvB,SAAS,cAAc;IACvB,QAAQ,aAAa;CACtB;AAED,oBAAY,iBAAiB;IAC3B,aAAa,kBAAkB;IAC/B,aAAa,kBAAkB;IAC/B,cAAc,mBAAmB;CAClC;AAED,oBAAY,eAAe;IACzB,KAAK,UAAU;IACf,IAAI,SAAS;CACd;AAED,qBAAa,SAAS;IACrB,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAClB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;gBAElB,EAAE,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,EAAE,eAAe,EAAE,MAAM,GAAG,IAAI,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI;CAU7N;AAED,qBAAa,UAAU;IACrB,IAAI,EAAC,MAAM,GAAG,IAAI,CAAC;IACnB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;gBAEf,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,EAAE,gBAAgB,EAAE,MAAM,GAAG,IAAI,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI,EAAE,eAAe,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;CAcvV;AAED,qBAAa,aAAa;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,QAAQ,CAAC;IACnB,eAAe,EAAE,iBAAiB,CAAC;IACnC,eAAe,EAAE,eAAe,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;gBAEN,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,iBAAiB,EAAE,eAAe,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM;CAOtI"}
+{"version":3,"file":"SMWorkout.d.ts","sourceRoot":"","sources":["../../../src/SMWorkout.tsx"],"names":[],"mappings":"AAAA,oBAAY,eAAe;IACzB,OAAO,YAAY;CACpB;AAED,oBAAY,SAAS;IACnB,WAAW,gBAAgB;IAC3B,KAAK,UAAU;IACf,aAAa,kBAAkB;CAChC;AAED,oBAAY,QAAQ;IAClB,SAAS,cAAc;IACvB,SAAS,cAAc;IACvB,QAAQ,aAAa;CACtB;AAED,oBAAY,iBAAiB;IAC3B,aAAa,kBAAkB;IAC/B,aAAa,kBAAkB;IAC/B,cAAc,mBAAmB;CAClC;AAED,oBAAY,eAAe;IACzB,KAAK,UAAU;IACf,IAAI,SAAS;CACd;AAED,qBAAa,SAAS;IACrB,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAClB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;gBAElB,EAAE,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,EAAE,eAAe,EAAE,MAAM,GAAG,IAAI,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI;CAU7N;AAED,qBAAa,UAAU;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAC/B,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAC,MAAM,GAAG,IAAI,CAAC;IACzB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,aAAa,EAAE,eAAe,GAAG,IAAI,CAAC;gBAG1B,UAAU,EAAE,MAAM,GAAG,IAAI,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,EAAE,gBAAgB,EAAE,MAAM,GAAG,IAAI,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI,EAAE,eAAe,EAAE,MAAM,GAAG,IAAI,EAAE,aAAa,EAAE,eAAe,GAAG,IAAI;CAYlT;AAED,qBAAa,eAAe;IAC1B,IAAI,EAAC,MAAM,GAAG,IAAI,CAAC;IACnB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;gBAElB,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI;CAS3K;AAED,qBAAa,aAAa;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,QAAQ,CAAC;IACnB,eAAe,EAAE,iBAAiB,CAAC;IACnC,eAAe,EAAE,eAAe,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;gBAEN,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,iBAAiB,EAAE,eAAe,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM;CAOtI"}

package/lib/typescript/src/index.d.ts

@@ -1,6 +1,6 @@
 import * as SMWorkoutLibrary from '../src/SMWorkout';
 export declare function configure(key: string): Promise<string>;
-export declare function startAssessment(type: SMWorkoutLibrary.AssessmentTypes, showSummary: boolean): Promise<{
+export declare function startAssessment(type: SMWorkoutLibrary.AssessmentTypes, showSummary: boolean, customAssessmentID: string): Promise<{
     summary: string;
     didFinish: boolean;
 }>;

package/lib/typescript/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,gBAAgB,MAAM,kBAAkB,CAAC;AAmBrD,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAEtD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAC,gBAAgB,CAAC,eAAe,EAAE,WAAW,EAAC,OAAO,GAAG,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAC,OAAO,CAAA;CAAC,CAAC,CAEzI;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAC,gBAAgB,CAAC,SAAS,GAAG,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAC,OAAO,CAAA;CAAC,CAAC,CAEpH;AAED,wBAAgB,mBAAmB,CAAC,aAAa,EAAC,gBAAgB,CAAC,aAAa,GAAG,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAC,OAAO,CAAA;CAAC,CAAC,CAE/H;AAED,oBAAY,eAAe;IACzB,OAAO,YAAY;IACnB,MAAM,WAAW;CAClB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,gBAAgB,MAAM,kBAAkB,CAAC;AAmBrD,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAEtD;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,gBAAgB,CAAC,eAAe,EACtC,WAAW,EAAE,OAAO,EACpB,kBAAkB,EAAE,MAAM,GACzB,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAE,CAAC,CAElD;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAC,gBAAgB,CAAC,SAAS,GAAG,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAC,OAAO,CAAA;CAAC,CAAC,CAEpH;AAED,wBAAgB,mBAAmB,CAAC,aAAa,EAAC,gBAAgB,CAAC,aAAa,GAAG,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAC,OAAO,CAAA;CAAC,CAAC,CAE/H;AAED,oBAAY,eAAe;IACzB,OAAO,YAAY;IACnB,MAAM,WAAW;CAClB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sency/react-native-smkit-ui",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "react-native-smkit-ui",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",

package/react-native-smkit-ui.podspec

@@ -12,10 +12,10 @@ Pod::Spec.new do |s|
   s.authors      = package["author"]
 
   s.platforms    = { :ios => min_ios_version_supported }
-  s.source       = { :git => "https://sency-motion-sdk.document360.io.git", :tag => "#{s.version}" }
+  s.source       = { :git => "https://github.com/sency-ai/smkit-ui-react-native-demo.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"
-  s.dependency "SMKitUI" ,'0.1.6'
+  s.dependency "SMKitUI" ,'0.2.1'
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.

package/src/SMWorkout.tsx

@@ -48,21 +48,20 @@ export class SMWorkout{
 }
 
 export class SMExercise{
-  name:string | null;
-  totalSeconds: number | null;
-  introSeconds: number | null;
-  videoInstruction: string | null;
-  exerciseIntro: string | null;
-  uiElements: UIElement[] | null;
   detector: string;
+  uiElements: UIElement[] | null;
   repBased: boolean | null;
+  videoInstruction: string | null;
+  introSeconds: number | null;
+  totalSeconds: number | null;
+  prettyName:string | null;
+  exerciseIntro: string | null;
   exerciseClosure: string | null;
-  targetReps: number | null;
-  targetTime: number | null;
-  scoreFactor: number | null;
+  scoringParams: SMScoringParams | null;
+  
 
-  constructor(name: string | null, totalSeconds: number | null, introSeconds: number | null, videoInstruction: string | null, exerciseIntro: string | null, uiElements: UIElement[] | null, detector: string, repBased: boolean | null, exerciseClosure: string | null, targetReps: number | null, targetTime: number | null, scoreFactor: number | null) {
-    this.name = name || null
+  constructor(prettyName: string | null, totalSeconds: number | null, introSeconds: number | null, videoInstruction: string | null, exerciseIntro: string | null, uiElements: UIElement[] | null, detector: string, repBased: boolean | null, exerciseClosure: string | null, scoringParams: SMScoringParams | null) {
+    this.prettyName = prettyName || null
     this.totalSeconds = totalSeconds || null
     this.introSeconds = introSeconds || null
     this.videoInstruction = videoInstruction || null
@@ -70,13 +69,30 @@ export class SMExercise{
     this.uiElements = uiElements || null
     this.detector = detector
     this.repBased = repBased || null
-    this.targetReps = targetReps || null
-    this.targetTime = targetTime || null
-    this.scoreFactor = scoreFactor || null
     this.exerciseClosure = exerciseClosure || null;
+    this.scoringParams = scoringParams || null;
   }
 }
 
+export class SMScoringParams {
+  type:string | null;
+  scoreFactor: number | null;
+  targetTime: number | null;
+  targetReps: number | null;
+  targetRom: string | null;
+  passCriteria: string[] | null;
+
+  constructor(type: string | null, scoreFactor: number | null, targetTime: number | null, targetReps: number | null, targetRom: string | null, passCriteria: string[] | null) {
+    this.type = type || null
+    this.scoreFactor = scoreFactor || null
+    this.targetTime = targetTime || null
+    this.targetReps = targetReps || null
+    this.targetRom = targetRom || null
+    this.passCriteria = passCriteria || null
+  }
+
+}
+
 export class WorkoutConfig{
   week: number;
   bodyZone: BodyZone;

package/src/index.tsx

@@ -22,8 +22,12 @@ export function configure(key: string): Promise<string> {
   return SMKitUIManager.configure(key);
 }
 
-export function startAssessment(type:SMWorkoutLibrary.AssessmentTypes, showSummary:boolean): Promise<{summary: string, didFinish:boolean}>{
-  return SMKitUIManager.startAssessment(type, showSummary);
+export function startAssessment(
+  type: SMWorkoutLibrary.AssessmentTypes,
+  showSummary: boolean,
+  customAssessmentID: string
+): Promise<{ summary: string; didFinish: boolean }> {
+  return SMKitUIManager.startAssessment(type, showSummary, customAssessmentID);
 }
 
 export function startCustomWorkout(workout:SMWorkoutLibrary.SMWorkout): Promise<{summary: string, didFinish:boolean}>{

package/ios/SMKitUIViewContoller.swift

@@ -1,20 +0,0 @@
-//
-//  SMKitUIViewContoller.swift
-//  smkit-ui-library
-//
-//  Created by netanel-yerushalmi on 31/03/2024.
-//
-
-import UIKit
-
-class SMKitUIViewController: UIViewController {
-    let sdkView = SMKitUIView()
-    
-    override func loadView() {
-        view = sdkView
-    }
-}
-
-class SMKitUIView:UIView{
-    
-}

package/lib/commonjs/SMKitUIView.js

@@ -1,5 +0,0 @@
-"use strict";
-
-var _reactNative = require("react-native");
-module.exports = (0, _reactNative.requireNativeComponent)('SMKitUI');
-//# sourceMappingURL=SMKitUIView.js.map

package/lib/commonjs/SMKitUIView.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_reactNative","require","module","exports","requireNativeComponent"],"sourceRoot":"../../src","sources":["SMKitUIView.tsx"],"mappings":";;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEAC,MAAM,CAACC,OAAO,GAAG,IAAAC,mCAAsB,EAAC,SAAS,CAAC","ignoreList":[]}

package/lib/module/SMKitUIView.js

@@ -1,3 +0,0 @@
-import { requireNativeComponent } from 'react-native';
-module.exports = requireNativeComponent('SMKitUI');
-//# sourceMappingURL=SMKitUIView.js.map

package/lib/module/SMKitUIView.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["requireNativeComponent","module","exports"],"sourceRoot":"../../src","sources":["SMKitUIView.tsx"],"mappings":"AAAA,SAASA,sBAAsB,QAAO,cAAc;AAEpDC,MAAM,CAACC,OAAO,GAAGF,sBAAsB,CAAC,SAAS,CAAC","ignoreList":[]}

package/lib/typescript/example/src/App.d.ts

@@ -1,4 +0,0 @@
-import React from 'react';
-declare const App: () => React.JSX.Element;
-export default App;
-//# sourceMappingURL=App.d.ts.map

package/lib/typescript/example/src/App.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../../../example/src/App.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAKxC,QAAA,MAAM,GAAG,yBAoIR,CAAA;AA4BD,eAAe,GAAG,CAAC"}

package/lib/typescript/src/SMKitUIView.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=SMKitUIView.d.ts.map

package/lib/typescript/src/SMKitUIView.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"SMKitUIView.d.ts","sourceRoot":"","sources":["../../../src/SMKitUIView.tsx"],"names":[],"mappings":""}

package/src/SMKitUIView.tsx

@@ -1,3 +0,0 @@
-import { requireNativeComponent} from 'react-native';
-
-module.exports = requireNativeComponent('SMKitUI');