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

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.4") {
     exclude group: 'com.facebook.fbjni', module: 'fbjni-java-only'
   }
 

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

@@ -1,13 +1,12 @@
 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.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.SMKitWorkout
 import com.smkituilibrary.model.SMKitWorkoutConfig
@@ -15,9 +14,9 @@ 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,
 )
 

package/ios/SMKitUIManager.swift

@@ -4,13 +4,19 @@ 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:)
@@ -24,13 +30,17 @@ class SMKitUIManager: RCTViewManager {
     
     @objc(startAssessment:showSummary:onWorkoutDidFinish:onWorkoutFailed:)
     func startAssessment(type:NSString, showSummary:Bool, 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, showSummary: showSummary, delegate: self){error in
                         onWorkoutFailed("StartAssessment Failed", error.localizedDescription, error)
                     }
                 }else{
@@ -44,12 +54,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 +75,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 +101,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sency/react-native-smkit-ui",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "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.1.9'
 
   # 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/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');