@sency/react-native-smkit-ui 0.1.9 → 0.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/android/src/main/java/com/smkituilibrary/SmkitUiLibraryModule.kt +12 -15
- package/android/src/main/java/com/smkituilibrary/mapper/SMMapper.kt +1 -8
- package/ios/SMKitUIManager.swift +3 -3
- package/lib/commonjs/index.js.map +1 -1
- package/lib/module/index.js.map +1 -1
- package/package.json +1 -1
- package/lib/typescript/example/src/App.d.ts +0 -4
- package/lib/typescript/example/src/App.d.ts.map +0 -1
|
@@ -9,6 +9,7 @@ import com.sency.smkitui.SMKitUI
|
|
|
9
9
|
import com.sency.smkitui.listener.SMKitUIConfigurationListener
|
|
10
10
|
import com.sency.smkitui.listener.SMKitUIWorkoutListener
|
|
11
11
|
import com.sency.smkitui.model.ExerciseData
|
|
12
|
+
import com.sency.smkitui.model.SMWorkout
|
|
12
13
|
import com.sency.smkitui.model.WorkoutSummaryData
|
|
13
14
|
import com.sency.smkitui.model.smkitui.Body360
|
|
14
15
|
import com.sency.smkitui.model.smkitui.Custom
|
|
@@ -68,7 +69,7 @@ class SmkitUiLibraryModule(reactContext: ReactApplicationContext) :
|
|
|
68
69
|
fun startAssessment(type: String, showSummary: Boolean, customAssessmentId: String, promise: Promise) {
|
|
69
70
|
this.resultPromise = promise
|
|
70
71
|
try {
|
|
71
|
-
val assessmentType = when(type) {
|
|
72
|
+
val assessmentType = when (type) {
|
|
72
73
|
"fitness" -> Fitness
|
|
73
74
|
"body360" -> Body360
|
|
74
75
|
else -> Custom(customAssessmentId)
|
|
@@ -82,13 +83,9 @@ class SmkitUiLibraryModule(reactContext: ReactApplicationContext) :
|
|
|
82
83
|
@ReactMethod
|
|
83
84
|
fun startCustomWorkout(jsonArguments: String, promise: Promise) {
|
|
84
85
|
try {
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
val workout = smKitWorkout.toSMWorkout()
|
|
90
|
-
Log.d(TAG, "startCustomWorkout : $workout")
|
|
91
|
-
smKitUI?.startCustomizedAssessment(workout = workout, listener = listener)
|
|
86
|
+
serializeWorkout(jsonArguments)?.let {
|
|
87
|
+
smKitUI?.startCustomizedWorkout(workout = it, listener = listener)
|
|
88
|
+
}
|
|
92
89
|
} catch (e: Exception) {
|
|
93
90
|
promise.reject("Starting Custom Workout Failed", e)
|
|
94
91
|
}
|
|
@@ -97,18 +94,18 @@ class SmkitUiLibraryModule(reactContext: ReactApplicationContext) :
|
|
|
97
94
|
@ReactMethod
|
|
98
95
|
fun startCustomAssessment(jsonArguments: String, promise: Promise) {
|
|
99
96
|
try {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
val workout = smKitWorkout.toSMWorkout()
|
|
105
|
-
Log.d(TAG, "startCustomAssessment: $workout")
|
|
106
|
-
smKitUI?.startCustomizedWorkout(workout = workout, listener = listener)
|
|
97
|
+
serializeWorkout(jsonArguments)?.let {
|
|
98
|
+
smKitUI?.startCustomizedAssessment(workout = it, listener = listener)
|
|
99
|
+
}
|
|
107
100
|
} catch (e: Exception) {
|
|
108
101
|
promise.reject("Starting Custom Assessment Failed", e)
|
|
109
102
|
}
|
|
110
103
|
}
|
|
111
104
|
|
|
105
|
+
private fun serializeWorkout(jsonArguments: String) =
|
|
106
|
+
moshi.adapter(SMKitWorkout::class.java).fromJson(jsonArguments)?.toSMWorkout()
|
|
107
|
+
|
|
108
|
+
|
|
112
109
|
@ReactMethod
|
|
113
110
|
fun startWorkoutProgram(jsonArguments: String, promise: Promise) {
|
|
114
111
|
try {
|
|
@@ -43,14 +43,7 @@ private fun SMKitExercise.toSMExercise(): SMExercise = SMExercise(
|
|
|
43
43
|
detector = detector ?: "",
|
|
44
44
|
repBased = repBased ?: false,
|
|
45
45
|
exerciseClosure = exerciseClosure ?: "",
|
|
46
|
-
scoringParams = scoringParams?.toParams()
|
|
47
|
-
type = "",
|
|
48
|
-
scoreFactor = 0f,
|
|
49
|
-
targetTime = 0,
|
|
50
|
-
targetReps = 0,
|
|
51
|
-
targetRom = "",
|
|
52
|
-
passCriteria = null
|
|
53
|
-
),
|
|
46
|
+
scoringParams = scoringParams?.toParams(),
|
|
54
47
|
summaryTitle = "",
|
|
55
48
|
summarySubTitle = "",
|
|
56
49
|
summaryTitleMainMetric = ""
|
package/ios/SMKitUIManager.swift
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import Foundation
|
|
2
|
-
import
|
|
3
|
-
import
|
|
2
|
+
import SMKitUI
|
|
3
|
+
import SMBase
|
|
4
4
|
|
|
5
5
|
@objc(SMKitUIManager)
|
|
6
6
|
class SMKitUIManager: RCTViewManager {
|
|
@@ -50,7 +50,7 @@ class SMKitUIManager: RCTViewManager {
|
|
|
50
50
|
self.onWorkoutFailed = onWorkoutFailed
|
|
51
51
|
do{
|
|
52
52
|
if let type = AssessmentTypes(rawValue: "\(type)"){
|
|
53
|
-
try SMKitUIModel.startAssessmet(viewController: smkitUIViewController, type: type, customAssessmentID:customAssessmentID, showSummary: showSummary, delegate: self){error in
|
|
53
|
+
try SMKitUIModel.startAssessmet(viewController: smkitUIViewController, type: type, customAssessmentID:customAssessmentID == "" ? nil : customAssessmentID, showSummary: showSummary, delegate: self){error in
|
|
54
54
|
onWorkoutFailed("StartAssessment Failed", error.localizedDescription, error)
|
|
55
55
|
}
|
|
56
56
|
}else{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactNative","require","LINKING_ERROR","Platform","select","ios","default","SMKitUIManager","NativeModules","Proxy","get","Error","configure","key","startAssessment","type","showSummary","customAssessmentID","startCustomWorkout","workout","toJson","startCustomAssessment","assessment","startWorkoutProgram","workoutConfig"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAGA,MAAMC,aAAa,
|
|
1
|
+
{"version":3,"names":["_reactNative","require","LINKING_ERROR","Platform","select","ios","default","SMKitUIManager","NativeModules","Proxy","get","Error","configure","key","startAssessment","type","showSummary","customAssessmentID","startCustomWorkout","workout","toJson","startCustomAssessment","assessment","startWorkoutProgram","workoutConfig"],"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,CAACC,MAAM,CAAC,CAAC,CAAC;AAC5D;AAEO,SAASC,qBAAqBA,CAACC,UAAqC,EAAgD;EACzH,OAAOf,cAAc,CAACc,qBAAqB,CAACC,UAAU,CAACF,MAAM,CAAC,CAAC,CAAC;AAClE;AAEO,SAASG,mBAAmBA,CAACC,aAA4C,EAAgD;EAC9H,OAAOjB,cAAc,CAACgB,mBAAmB,CAACC,aAAa,CAACJ,MAAM,CAAC,CAAC,CAAC;AACnE","ignoreList":[]}
|
package/lib/module/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["NativeModules","Platform","LINKING_ERROR","select","ios","default","SMKitUIManager","Proxy","get","Error","configure","key","startAssessment","type","showSummary","customAssessmentID","startCustomWorkout","workout","toJson","startCustomAssessment","assessment","startWorkoutProgram","workoutConfig"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"AAAA,SAASA,aAAa,EAAEC,QAAQ,QAAQ,cAAc;AAGtD,MAAMC,aAAa,
|
|
1
|
+
{"version":3,"names":["NativeModules","Platform","LINKING_ERROR","select","ios","default","SMKitUIManager","Proxy","get","Error","configure","key","startAssessment","type","showSummary","customAssessmentID","startCustomWorkout","workout","toJson","startCustomAssessment","assessment","startWorkoutProgram","workoutConfig"],"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,CAACC,MAAM,CAAC,CAAC,CAAC;AAC5D;AAEA,OAAO,SAASC,qBAAqBA,CAACC,UAAqC,EAAgD;EACzH,OAAOd,cAAc,CAACa,qBAAqB,CAACC,UAAU,CAACF,MAAM,CAAC,CAAC,CAAC;AAClE;AAEA,OAAO,SAASG,mBAAmBA,CAACC,aAA4C,EAAgD;EAC9H,OAAOhB,cAAc,CAACe,mBAAmB,CAACC,aAAa,CAACJ,MAAM,CAAC,CAAC,CAAC;AACnE","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../../../example/src/App.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAC;AAMxC,QAAA,MAAM,GAAG,yBAsOR,CAAA;AA4BD,eAAe,GAAG,CAAC"}
|