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

package/android/build.gradle

@@ -65,6 +65,7 @@ android {
   buildTypes {
     release {
       minifyEnabled false
+      proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
     }
   }
 
@@ -92,7 +93,9 @@ dependencies {
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-  compileOnly("com.sency.smkitui:smkitui:${SMKitUI_Version}")
+  compileOnly("com.sency.smkitui:smkitui:0.1.2") {
+    exclude group: 'com.facebook.fbjni', module: 'fbjni-java-only'
+  }
 
   // Moshi JSON library
   def moshi = "1.15.0"

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

@@ -60,7 +60,7 @@ class SmkitUiLibraryModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun startAssessment(type: String, promise: Promise) {
+  fun startAssessment(type: String, showSummary: Boolean, promise: Promise) {
     this.resultPromise = promise
     try {
       smKitUI?.startAssessment(listener = this)

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

@@ -24,20 +24,26 @@ internal fun SMKitWorkoutConfig.toWorkoutConfig(): WorkoutConfig = WorkoutConfig
 internal fun SMKitWorkout.toSMWorkout(): SMWorkout = SMWorkout(
   id = id ?: "",
   name = name ?: "",
-  workoutIntro = Uri.parse(workoutIntro) ?: Uri.EMPTY,
-  soundtrack = Uri.parse(soundtrack) ?: Uri.EMPTY,
+  workoutIntro = workoutIntro ?: "",
+  soundtrack = soundtrack ?: "",
   exercises = exercises.map(SMKitExercise::toSMExercise),
-  workoutClosure = Uri.parse(workoutClosure) ?: Uri.EMPTY,
+  workoutClosure = workoutClosure ?: "",
+  getInFrame = "",
+  bodycalFinished = ""
 )
 
 private fun SMKitExercise.toSMExercise(): SMExercise = SMExercise(
-  name = name ?: "",
-  exerciseIntro = Uri.parse(exerciseIntro) ?: Uri.EMPTY,
+  prettyName = name ?: "",
+  exerciseIntro = exerciseIntro ?: "",
   totalSeconds = totalSeconds ?: 0,
   introSeconds = introSeconds ?: 0,
-  videoInstruction = Uri.parse(videoInstruction) ?: Uri.EMPTY,
+  videoInstruction = videoInstruction ?:"",
   uiElements = uiElements ?: emptySet(),
   detector = detector ?: "",
   repBased = repBased ?: false,
-  exerciseClosure = Uri.parse(exerciseClosure) ?: Uri.EMPTY,
+  exerciseClosure = exerciseClosure ?: "",
+  targetReps = 0,
+  targetTime = 0,
+  scoreFactor = 0.0,
+  passCriteria = null
 )

package/package.json

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