@sency/react-native-smkit-ui 0.1.8 → 0.2.0

package/android/build.gradle

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

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

@@ -9,6 +9,7 @@ import com.sency.smkitui.SMKitUI
 import com.sency.smkitui.listener.SMKitUIConfigurationListener
 import com.sency.smkitui.listener.SMKitUIWorkoutListener
 import com.sency.smkitui.model.ExerciseData
+import com.sency.smkitui.model.SMWorkout
 import com.sency.smkitui.model.WorkoutSummaryData
 import com.sency.smkitui.model.smkitui.Body360
 import com.sency.smkitui.model.smkitui.Custom
@@ -68,7 +69,7 @@ class SmkitUiLibraryModule(reactContext: ReactApplicationContext) :
   fun startAssessment(type: String, showSummary: Boolean, customAssessmentId: String, promise: Promise) {
     this.resultPromise = promise
     try {
-      val assessmentType = when(type) {
+      val assessmentType = when (type) {
         "fitness" -> Fitness
         "body360" -> Body360
         else -> Custom(customAssessmentId)
@@ -82,13 +83,9 @@ class SmkitUiLibraryModule(reactContext: ReactApplicationContext) :
   @ReactMethod
   fun startCustomWorkout(jsonArguments: String, promise: Promise) {
     try {
-      Log.d(TAG, "startCustomWorkout rawJson: $jsonArguments")
-      val adapter = moshi.adapter(SMKitWorkout::class.java)
-      val smKitWorkout = adapter.fromJson(jsonArguments) ?: return
-
-      val workout = smKitWorkout.toSMWorkout()
-      Log.d(TAG, "startCustomWorkout : $workout")
-      smKitUI?.startWorkout(workout = workout, listener = listener)
+      serializeWorkout(jsonArguments)?.let {
+        smKitUI?.startCustomizedWorkout(workout = it, listener = listener)
+      }
     } catch (e: Exception) {
       promise.reject("Starting Custom Workout Failed", e)
     }
@@ -97,18 +94,18 @@ class SmkitUiLibraryModule(reactContext: ReactApplicationContext) :
   @ReactMethod
   fun startCustomAssessment(jsonArguments: String, promise: Promise) {
     try {
-      Log.d(TAG, "startCustomAssessment: $jsonArguments")
-      val adapter = moshi.adapter(SMKitWorkout::class.java)
-      val smKitWorkout = adapter.fromJson(jsonArguments) ?: return
-
-      val workout = smKitWorkout.toSMWorkout()
-      Log.d(TAG, "startCustomAssessment: $workout")
-      smKitUI?.startWorkout(workout = workout, listener = listener)
+      serializeWorkout(jsonArguments)?.let {
+        smKitUI?.startCustomizedAssessment(workout = it, listener = listener)
+      }
     } catch (e: Exception) {
       promise.reject("Starting Custom Assessment Failed", e)
     }
   }
 
+  private fun serializeWorkout(jsonArguments: String) =
+    moshi.adapter(SMKitWorkout::class.java).fromJson(jsonArguments)?.toSMWorkout()
+
+
   @ReactMethod
   fun startWorkoutProgram(jsonArguments: String, promise: Promise) {
     try {

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

@@ -1,8 +1,8 @@
 package com.smkituilibrary.mapper
 
+import com.sency.smkitui.data.entity.ScoringParams
 import com.sency.smkitui.model.SMExercise
 import com.sency.smkitui.model.SMWorkout
-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
@@ -43,14 +43,10 @@ private fun SMKitExercise.toSMExercise(): SMExercise = SMExercise(
   detector = detector ?: "",
   repBased = repBased ?: false,
   exerciseClosure = exerciseClosure ?: "",
-  scoringParams = scoringParams?.toParams() ?: ScoringParams(
-    type = "",
-    scoreFactor = 0f,
-    targetTime = 0,
-    targetReps = 0,
-    targetRom = "",
-    passCriteria = null
-  )
+  scoringParams = scoringParams?.toParams(),
+  summaryTitle = "",
+  summarySubTitle = "",
+  summaryTitleMainMetric = ""
 )
 
 private fun SMKitScoringParams.toParams(): ScoringParams {

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

@@ -1,8 +1,7 @@
 package com.smkituilibrary.model
 
 import androidx.annotation.Keep
-import com.sency.smkitui.model.ScoringParams
-import com.sency.smkitui.model.UiElement
+import com.sency.smkitui.data.entity.UiElement
 
 @Keep
 internal data class SMKitExercise(

package/ios/SMKitUIManager.swift

@@ -50,7 +50,7 @@ class SMKitUIManager: RCTViewManager {
             self.onWorkoutFailed = onWorkoutFailed
             do{
                 if let type = AssessmentTypes(rawValue: "\(type)"){
-                    try SMKitUIModel.startAssessmet(viewController: smkitUIViewController, type: type, customAssessmentID:customAssessmentID, showSummary: showSummary, delegate: self){error in
+                    try SMKitUIModel.startAssessmet(viewController: smkitUIViewController, type: type, customAssessmentID:customAssessmentID == "" ? nil : customAssessmentID, showSummary: showSummary, delegate: self){error in
                         onWorkoutFailed("StartAssessment Failed", error.localizedDescription, error)
                     }
                 }else{

package/package.json

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