Scade2 (#5)

* Removed all examples.

* Added AppInApp example.

* Added Gesture example.

* Added CryptoSwift example.

* Added UgTiles example.

* Added Map example.

* Added modal window example.

* Added swift foundation example.

* Added Clock example.

* Added ProgrammaticUI example.

* Added Master Pages demo.

* Added Kyle1 example.

* Added text example.

* Added logging example.

* Added Calculator example.

* Added SQLite example.

* Added Bitmap example.

* Updated SQLite package.swift.

* Updated UgCalculator package.swift.

* Added proxies.

* Added ListControl example.

* UgCalculator: removed Expression library from list of libraries for IOS (NM-876)

We don't need it in the list of libraries after switching build to SPM

* UgSqlLiteSwift: removed SQLite library from list of libraries for IOS in build file (NM-875)

We don't need it after switching IOS build to SPM

* Updated Package.swift file.

* Updated Package.swift files and fixed CryptoSwift example.

* Fixed URL to download dependent library without problem

* Fixed UgMasterPageDemo. Removed explicit references and used onClick short code

* Removed binding for result value.

* Updated UgBitmap example.

* Updated UgListControl example.

* Updated UgMap example.

* Updated Text example.

* Updated ModalDialogDemo example.

* Updated SwiftFoundation example.

* Updated AppInApp application.

* Updated Kyle1 example.

* Updated Calculator example.

* Updated CryptoSwift example.

* Updated gesture example.

* Updated page container example.

* Updated programmatic creation example.

* Updated SQLite example.

* Added new UgSlider demo

* Polished List Control demo

* Updated UgTilesMenu example.

* Small fix for UgTilesMenu example.

* Updated spacings in UgTilesMenu example.

* Small changes UgTiles example.

* Updates UgSwissClock example.

* Updated UgMasterPages example.

* Uodated gesture example.

* Updated gesture example.

* Updated CryptoSwift example.

* Updated matchParent function name

Co-authored-by: Alexander Esilevich <[email protected]>
Co-authored-by: flangel <[email protected]>

Author: 3 people

Kyle1/.project

@@ -0,0 +1,36 @@
+// swift-tools-version:5.3
+
+import PackageDescription
+import Foundation
+
+let SCADE_SDK = ProcessInfo.processInfo.environment["SCADE_SDK"] ?? ""
+
+let package = Package(
+    name: "Kyle1",
+    platforms: [
+        .macOS(.v10_14)
+    ],
+    products: [
+        .library(
+            name: "Kyle1",
+            type: .static,
+            targets: [
+                "Kyle1"
+            ]
+        )
+    ],
+    dependencies: [
+      
+    ],
+    targets: [
+        .target(
+            name: "Kyle1",
+            dependencies: [],
+            exclude: ["main.page"],
+            swiftSettings: [
+                .unsafeFlags(["-F", SCADE_SDK], .when(platforms: [.macOS, .iOS])),
+                .unsafeFlags(["-I", "\(SCADE_SDK)/include"], .when(platforms: [.android])),
+            ]
+        )
+    ]
+)

Kyle1/.settings/com.scade.sdk.core.prefs

@@ -0,0 +1,7 @@
+import ScadeKit
+
+extension MainPageAdapter {
+  var grid1: SCDWidgetsGridView {
+    return self.page?.getWidgetByName("grid1") as! SCDWidgetsGridView
+  }
+}

Kyle1/CMakeLists.txt

@@ -0,0 +1,20 @@
+<?xml  version="1.0" encoding="UTF-8" standalone="no"?>
+<xmi:XMI xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmi:version="2.0" xmlns:binding="http://scade.com/sdk/data/binding" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:graphics="http://scade.com/sdk/view/graphics" xmlns:layout="http://scade.com/sdk/layout" xmlns:navigation="http://scade.com/lattice/navigation" xmlns:widgets="http://scade.com/sdk/view/widgets">
+  <widgets:Page name="main">
+    <children xsi:type="widgets:GridView" name="grid1">
+      <layout xsi:type="layout:GridLayout" marginTop="5" marginBottom="5" marginLeft="5" marginRight="5"/>
+      <maxArea xsi:type="graphics:Dimension" width="-1" height="-1"/>
+      <size xsi:type="graphics:Dimension" width="320" height="480"/>
+      <location xsi:type="graphics:Point"/>
+      <minArea xsi:type="graphics:Dimension"/>
+      <layoutData xsi:type="layout:GridData" grabHorizontalSpace="true" widthConstraint="MATCH_PARENT" grabVerticalSpace="true" heightConstraint="MATCH_PARENT"/>
+    </children>
+    <layout xsi:type="layout:GridLayout"/>
+    <maxArea xsi:type="graphics:Dimension" width="320" height="480"/>
+    <location xsi:type="graphics:Point"/>
+    <minArea xsi:type="graphics:Dimension" width="320" height="480"/>
+    <size xsi:type="graphics:Dimension" width="320" height="480"/>
+  </widgets:Page>
+  <binding:BindingModel/>
+  <navigation:Navigation page="/0"/>
+</xmi:XMI>

Kyle1/Package.swift

@@ -7,21 +7,16 @@ let whiteColor = SCDGraphicsRGB(red:241,green:241,blue:241)
 let orangeColor = SCDGraphicsRGB(red:255,green:127,blue:80)
 
 class MainPageAdapter: SCDLatticePageAdapter {
-
-	var grid : SCDWidgetsGridView?
 
 	// page adapter initialization
 	override func load(_ path: String) {		
 		super.load(path)
 
-		// get grid
-		self.grid =  self.page!.getWidgetByName("grid1") as? SCDWidgetsGridView
-		
 		// set matrix size
 		let (columns,rows) = (UInt(20),UInt(4))
 
 		// set grid size
-		self.grid!.setGridSize(to:(columns,rows))
+		grid1.setGridSize(to:(columns,rows))
 
 		// populate grid
 		self.populateGrid(columns:columns,rows:rows)
@@ -31,7 +26,7 @@ class MainPageAdapter: SCDLatticePageAdapter {
 		for c in (0..<columns) {
 			for r in (0..<rows) {
 				let button = createButton(label:"X", action:{ e in print(e) })
-				 self.grid!.insert(button,at:(c,r))
+				 grid1.insert(button,at:(c,r))
 			}
 		}
 	}
@@ -44,10 +39,10 @@ class MainPageAdapter: SCDLatticePageAdapter {
 	  button.text = "x"
 
 	  // on click, call callback with name of button
-	  button.onClick.append( SCDWidgetsEventHandler{ (e:SCDWidgetsEvent?) in 
-		  let button = e!.target as! SCDWidgetsButton
-		  action(button.name) 
-		})
+	  button.onClick{ (e:SCDWidgetsEvent?) in 
+		 let button = e!.target as! SCDWidgetsButton
+		 action(button.name) 
+	 }
 
 	  // set colors
 	  button.font!.color = whiteColor

Kyle1/Sources/Kyle1/Extensions/Pages/main.page.ext.swift

@@ -7,6 +7,6 @@ class Kyle1: SCDApplication {
 
 	override func onFinishLaunching() {
 		mainAdapter.load("main.page")
-		mainAdapter.show(window)
+		mainAdapter.show(view: window)
 	}
 }

Kyle1/src/ProgrammticUIHelper.swift renamed to Kyle1/Sources/Kyle1/ProgrammticUIHelper.swift

@@ -22,24 +22,27 @@ ios:
   simulator:
     os: 12.1
     output: Kyle1/.build/ios-simulator
+    product-path: Kyle1/Product/ios-simulator
     extra-args:
     search-paths: []
     linked-libs: []
   device: 
     os: 12.1
     output: Kyle1/.build/ios-device
+    product-path: Kyle1/Product/ios-device
     extra-args: 
     search-paths: []
     linked-libs: []
   mac:
     os: 10.11
     output: Kyle1/.build/scade-simulator
+    product-path: Kyle1/Product/scade-simulator
     extra-args: 
     search-paths: []
     linked-libs: []
   sign:
-    provision-profile: /Users/juliawork/ScadeTools/certificates/Scade_Adhoc.mobileprovision
-    certificate: /Users/juliawork/ScadeTools/certificates/Certificates.p12
+    provision-profile:
+    certificate:
     beta-reports-active: false
   icons: 
     iphone: # or ipad, sizes: 20X20, 29X29, 40X40, 60X60, 76X76, 83.5X83.5
@@ -78,21 +81,25 @@ android:
   permissions: []
   armeabi-v7a:
     output: Kyle1/.build/android-armeabi-v7a
+    product-path: Kyle1/Product/android-armeabi-v7a
     extra-args:
     search-paths: []
     linked-libs: []
   arm64-v8a:
     output: Kyle1/.build/android-arm64-v8a
+    product-path: Kyle1/Product/android-arm64-v8a
     extra-args:
     search-paths: []
     linked-libs: []
   x86:
     output: Kyle1/.build/android-x86
+    product-path: Kyle1/Product/android-x86
     extra-args:
     search-paths: []
     linked-libs: []
   x86_64:
     output: Kyle1/.build/android-x86_64
+    product-path: Kyle1/Product/android-x86_64
     extra-args:
     search-paths: []
     linked-libs: []