@sency/react-native-smkit-ui 0.2.2 → 0.2.3

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.2.0") {
+  implementation("com.sency.smkitui:smkitui:0.2.1") {
     exclude group: 'com.facebook.fbjni', module: 'fbjni-java-only'
   }
 

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

@@ -70,10 +70,11 @@ class SmkitUiLibraryModule(reactContext: ReactApplicationContext) :
   fun startAssessment(
     type: String,
     showSummary: Boolean,
-    userData: String,
+    userData: String?,
     forceShowUserDataScreen: Boolean,
     customAssessmentId: String,
-    promise: Promise) {
+    promise: Promise,
+  ) {
     this.resultPromise = promise
 
     try {
@@ -82,14 +83,14 @@ class SmkitUiLibraryModule(reactContext: ReactApplicationContext) :
         "body360" -> Body360
         else -> Custom(customAssessmentId)
       }
-
-      val user = if(forceShowUserDataScreen) null else {
+      val user = if(userData == null) null else if (forceShowUserDataScreen) null else {
         serializeUserData(userData)
       }
       smKitUI?.startAssessment(
         listener = listener,
         assessmentType = assessmentType,
-        userData = user
+        userData = user,
+        showSummary = showSummary
       )
     } catch (e: Exception) {
       promise.reject("Starting Assessment Failed", e)
@@ -108,10 +109,16 @@ class SmkitUiLibraryModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun startCustomAssessment(jsonArguments: String, promise: Promise) {
+  fun startCustomAssessment(
+    assessmentJson: String,
+    userDataJson: String?,
+    forceShowUserDataScreen: Boolean,
+    showSummary: Boolean,
+    promise: Promise
+  ) {
     try {
-      serializeWorkout(jsonArguments)?.let {
-        smKitUI?.startCustomizedAssessment(workout = it, listener = listener)
+      serializeWorkout(assessmentJson)?.let {
+        smKitUI?.startCustomizedAssessment(workout = it, showSummary = showSummary, listener = listener)
       }
     } catch (e: Exception) {
       promise.reject("Starting Custom Assessment Failed", e)

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

@@ -44,11 +44,11 @@ private fun SMKitExercise.toSMExercise(): SMExercise = SMExercise(
   repBased = repBased ?: false,
   exerciseClosure = exerciseClosure ?: "",
   scoringParams = scoringParams?.toParams(),
-  summaryTitle = "",
-  summarySubTitle = "",
-  summaryTitleMainMetric = "",
-  summarySubTitleMainMetric = "",
-  side = null
+  summaryTitle = summaryTitle ?: "",
+  summarySubTitle = summarySubTitle ?: "",
+  summaryTitleMainMetric = summaryTitleMainMetric ?: "",
+  summarySubTitleMainMetric = summarySubTitleMainMetric ?: "",
+  side = side
 )
 
 private fun SMKitScoringParams.toParams(): ScoringParams {

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

@@ -1,6 +1,7 @@
 package com.smkituilibrary.model
 
 import androidx.annotation.Keep
+import com.sency.smkitui.data.entity.ScoringParams
 import com.sency.smkitui.data.entity.UiElement
 
 @Keep
@@ -15,6 +16,11 @@ internal data class SMKitExercise(
   val prettyName: String? = null,
   val exerciseIntro: String? = null,
   val exerciseClosure: String? = null,
+  val summaryTitle: String? = null,
+  val summarySubTitle: String? = null,
+  val summaryTitleMainMetric: String? = null,
+  val summarySubTitleMainMetric: String? = null,
+  val side: String? = null,
 )
 
 @Keep

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

@@ -1 +1 @@
-{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../../../example/src/App.tsx"],"names":[],"mappings":"AAIM,OAAO,KAA8B,MAAM,OAAO,CAAC;AAkBzD,QAAA,MAAM,GAAG,yBAmPR,CAAA;AA4BD,eAAe,GAAG,CAAC"}
+{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../../../example/src/App.tsx"],"names":[],"mappings":"AAIM,OAAO,KAA8B,MAAM,OAAO,CAAC;AAgBzD,QAAA,MAAM,GAAG,yBA8NN,CAAA;AAwIH,eAAe,GAAG,CAAC"}

package/package.json

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