New page formats (#10)

* Updated AppInApp example.

* Updated UgCalculator example.

* Updated Gesture example.

* Updated map control example.

* Updated CryptoSwift example.

* Updated WebView example.

* Updated Clock application.

* Updated ModalPage.

* Updated UgSwiftFoundationDemo examples.

* Updated MasterPageDemo example.

* Updated build.yaml in MasterDemo.

* Updated UgProgrammatic example.

* Updated UgBitmap example.

* Updated SimplyE example.

* Updated settings page in SimplyE example.

Author: bulantsevajo

SimplyE/Sources/SimplyE/BookDetail.page

@@ -1,5 +1,5 @@
 <?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">
+<xmi:XMI xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmi:version="2.0" xmi:id="0.3" 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="BookDetail">
     <children xsi:type="widgets:ToolBar" name="toolbar11">
       <children xsi:type="widgets:ToolBarItem" name="item11">
@@ -386,6 +386,5 @@
     <minArea width="320" height="480"/>
     <size width="320" height="480"/>
   </widgets:Page>
-  <binding:BindingModel/>
   <navigation:Navigation page="/0"/>
 </xmi:XMI>

SimplyE/Sources/SimplyE/BookDetail.page.svg

@@ -26,7 +26,7 @@ class BookDetailPageAdapter: SCDLatticePageAdapter {
 	}
 
 	func goBack() {
-		self.navigation?.go(page: "main.page", transition : .fromRight)
+		self.navigation?.go(page: "BooksList.page", transition : .fromRight)
 	}
 
 }

SimplyE/Sources/SimplyE/BookDetail.page.swift

@@ -1,5 +1,5 @@
 <?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:widgetlayouts="http://scade.com/sdk/view/widgets/layout" xmlns:widgets="http://scade.com/sdk/view/widgets">
+<xmi:XMI xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmi:version="2.0" xmi:id="0.3" 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:widgetlayouts="http://scade.com/sdk/view/widgets/layout" xmlns:widgets="http://scade.com/sdk/view/widgets">
   <widgets:Page name="BookInformation">
     <minArea width="414" height="736"/>
     <location/>
@@ -517,6 +517,5 @@
     <maxArea width="414" height="736"/>
     <size width="414" height="736"/>
   </widgets:Page>
-  <binding:BindingModel/>
   <navigation:Navigation page="/0"/>
 </xmi:XMI>

SimplyE/Sources/SimplyE/BookInformation.page

@@ -18,11 +18,11 @@ class BookInformationPageAdapter: SCDLatticePageAdapter {
 
 
     toolBarItem3.onClick { _ in 
-    	self.navigation?.go(page: "settings.page", transition: .fromLeft) 
+    	self.navigation?.go(page: "ReaderSettings.page", transition: .fromLeft) 
     }
 
     item.onClick { _ in 
-    	self.navigation?.go(page: "main.page", transition: .fromLeft) 
+    	self.navigation?.go(page: "BooksList.page", transition: .fromLeft) 
     }
 
     // add back button event to go back to Catalog page
@@ -63,6 +63,6 @@ class BookInformationPageAdapter: SCDLatticePageAdapter {
   }
 
   func goBack() {
-    self.navigation!.go(page: "main.page", transition: .fromRight)
+    self.navigation!.go(page: "BooksList.page", transition: .fromRight)
   }
 }

SimplyE/Sources/SimplyE/BookInformation.page.svg

@@ -0,0 +1,98 @@
+import ScadeKit
+#if os(Android)
+    import FoundationNetworking
+#endif
+  
+class BooksListPageAdapter: SCDLatticePageAdapter {
+  
+  var categories: [Category] = []
+
+  // page adapter initialization
+  override func load(_ path: String) {
+    super.load(path)
+    // Get data from REST endpoint instead of local dummy data
+
+    if let rsp = EReaderService.getOverview() {
+      self.categories = rsp.data.map { CatalogServiceManager.fromBookCategory(bc: $0) }
+      // listen to click event
+      print("loaded data \(self.categories.count)")
+    }
+
+    // setup toolbar events
+    let item = self.page!.getWidgetByName("itmMore") as! SCDWidgetsContainer
+    item.onClick.append(SCDWidgetsEventHandler { _ in self.gotoMore() })
+
+    // onEnter
+    self.page!.onEnter.append(SCDWidgetsEnterEventHandler { _ in self.enterPage() })
+
+    populateBitmaps()
+  }
+
+  func enterPage() {
+
+  }
+
+  func gotoMore() {
+    self.navigation!.go(page: "ReaderSettings.page", transition: .fromLeft)
+  }
+
+  func populateBitmaps() {
+
+    // get a reference to the name of the list control
+
+    //let ctrlLst = self.page!.getWidgetByName("ctrlListBookCatalog") as! SCDWidgetsList
+    // Iterate across the elements in the list (the categories)
+    //for (num,e) in ctrlLst.elements.enumerated() {
+      // get bitmaps based on categories
+      //let booksPerCategory = category.books
+
+      if let ctrlLst = page?.getWidgetByName("ctrlListBookCatalog") as? SCDWidgetsList {
+
+        ctrlLst.elementProvider = SCDWidgetsElementProvider { (category: Category, listElement) in
+
+          // get the horizontal grid layout control that contains the bitmaps
+          guard let row = listElement.getWidgetByName("rowviewbooks") as? SCDWidgetsRowView else {
+            return
+          }
+
+          // iterate through list of books and set the respective URLS
+          // if the list of books is greater than the number of bitmaps,
+          // the respective books will be ignored
+          guard let viewCategory = listElement.getWidgetByName("viewCategory") as? SCDWidgetsRowView else {
+            return
+          }
+          
+          if let lbCategory = viewCategory.getWidgetByName("lbCategory") as? SCDWidgetsLabel {
+          	lbCategory.text = category.label
+          }
+
+          for (index, book) in category.books.enumerated() {
+            let bitmapname = "bmpbook\(index+1)"
+            print("bitmapname \(bitmapname)")
+            if let bitmap = row.getWidgetByName(bitmapname) as? SCDWidgetsImage {
+
+              NetworkUtils.loadDataAsync(from: book.bookCoverUrl, queue: .main) { [weak bitmap] data in
+                bitmap?.content = data
+              }
+
+              // add onClickEvent
+              bitmap.onClick { _ in
+                self.displayBookDetails(bookId: book.id)
+              }
+
+            }
+          }
+
+        }
+
+        ctrlLst.items = self.categories
+
+    }
+
+  }
+
+  func displayBookDetails(bookId: String) {
+    print("BookId : \(bookId)")
+    self.navigation?.goWith(page: "BookInformation.page", data: bookId, transition: .fromLeft)
+  }
+}

SimplyE/Sources/SimplyE/BookInformation.page.swift

@@ -0,0 +1,183 @@
+import ScadeKit
+
+extension BookDetailPageAdapter {
+  var toolbar11: SCDWidgetsToolBar {
+    return self.page?.getWidgetByName("toolbar11") as! SCDWidgetsToolBar
+  }
+
+  var item11: SCDWidgetsToolBarItem {
+    return self.page?.getWidgetByName("item11") as! SCDWidgetsToolBarItem
+  }
+
+  var icon11: SCDWidgetsImage {
+    return self.page?.getWidgetByName("icon11") as! SCDWidgetsImage
+  }
+
+  var caption11: SCDWidgetsLabel {
+    return self.page?.getWidgetByName("caption11") as! SCDWidgetsLabel
+  }
+
+  var item21: SCDWidgetsToolBarItem {
+    return self.page?.getWidgetByName("item21") as! SCDWidgetsToolBarItem
+  }
+
+  var icon21: SCDWidgetsImage {
+    return self.page?.getWidgetByName("icon21") as! SCDWidgetsImage
+  }
+
+  var caption21: SCDWidgetsLabel {
+    return self.page?.getWidgetByName("caption21") as! SCDWidgetsLabel
+  }
+
+  var item31: SCDWidgetsToolBarItem {
+    return self.page?.getWidgetByName("item31") as! SCDWidgetsToolBarItem
+  }
+
+  var icon31: SCDWidgetsImage {
+    return self.page?.getWidgetByName("icon31") as! SCDWidgetsImage
+  }
+
+  var caption31: SCDWidgetsLabel {
+    return self.page?.getWidgetByName("caption31") as! SCDWidgetsLabel
+  }
+
+  var item41: SCDWidgetsToolBarItem {
+    return self.page?.getWidgetByName("item41") as! SCDWidgetsToolBarItem
+  }
+
+  var icon41: SCDWidgetsImage {
+    return self.page?.getWidgetByName("icon41") as! SCDWidgetsImage
+  }
+
+  var caption41: SCDWidgetsLabel {
+    return self.page?.getWidgetByName("caption41") as! SCDWidgetsLabel
+  }
+
+  var viewNavbar: SCDWidgetsRowView {
+    return self.page?.getWidgetByName("viewNavbar") as! SCDWidgetsRowView
+  }
+
+  var label1: SCDWidgetsLabel {
+    return self.page?.getWidgetByName("label1") as! SCDWidgetsLabel
+  }
+
+  var viewBackButton: SCDWidgetsRowView {
+    return self.page?.getWidgetByName("viewBackButton") as! SCDWidgetsRowView
+  }
+
+  var bitmap1: SCDWidgetsImage {
+    return self.page?.getWidgetByName("bitmap1") as! SCDWidgetsImage
+  }
+
+  var label2: SCDWidgetsLabel {
+    return self.page?.getWidgetByName("label2") as! SCDWidgetsLabel
+  }
+
+  var horizontalview3: SCDWidgetsRowView {
+    return self.page?.getWidgetByName("horizontalview3") as! SCDWidgetsRowView
+  }
+
+  var gridBookDetails: SCDWidgetsGridView {
+    return self.page?.getWidgetByName("gridBookDetails") as! SCDWidgetsGridView
+  }
+
+  var viewBookInfo: SCDWidgetsListView {
+    return self.page?.getWidgetByName("viewBookInfo") as! SCDWidgetsListView
+  }
+
+  var lbBooktitel: SCDWidgetsLabel {
+    return self.page?.getWidgetByName("lbBooktitel") as! SCDWidgetsLabel
+  }
+
+  var lbAuthorName: SCDWidgetsLabel {
+    return self.page?.getWidgetByName("lbAuthorName") as! SCDWidgetsLabel
+  }
+
+  var viewBookPublisherInfo: SCDWidgetsGridView {
+    return self.page?.getWidgetByName("viewBookPublisherInfo") as! SCDWidgetsGridView
+  }
+
+  var lb: SCDWidgetsLabel {
+    return self.page?.getWidgetByName("lb") as! SCDWidgetsLabel
+  }
+
+  var lbPublished: SCDWidgetsLabel {
+    return self.page?.getWidgetByName("lbPublished") as! SCDWidgetsLabel
+  }
+
+  var lb1: SCDWidgetsLabel {
+    return self.page?.getWidgetByName("lb1") as! SCDWidgetsLabel
+  }
+
+  var lbpublisher: SCDWidgetsLabel {
+    return self.page?.getWidgetByName("lbpublisher") as! SCDWidgetsLabel
+  }
+
+  var lb11: SCDWidgetsLabel {
+    return self.page?.getWidgetByName("lb11") as! SCDWidgetsLabel
+  }
+
+  var lbcategory: SCDWidgetsLabel {
+    return self.page?.getWidgetByName("lbcategory") as! SCDWidgetsLabel
+  }
+
+  var horizontalview5: SCDWidgetsRowView {
+    return self.page?.getWidgetByName("horizontalview5") as! SCDWidgetsRowView
+  }
+
+  var bmpDetail: SCDWidgetsImage {
+    return self.page?.getWidgetByName("bmpDetail") as! SCDWidgetsImage
+  }
+
+  var viewBookDescription: SCDWidgetsListView {
+    return self.page?.getWidgetByName("viewBookDescription") as! SCDWidgetsListView
+  }
+
+  var lbdescription2: SCDWidgetsLabel {
+    return self.page?.getWidgetByName("lbdescription2") as! SCDWidgetsLabel
+  }
+
+  var lbDescription1: SCDWidgetsLabel {
+    return self.page?.getWidgetByName("lbDescription1") as! SCDWidgetsLabel
+  }
+
+  var verticalview1: SCDWidgetsListView {
+    return self.page?.getWidgetByName("verticalview1") as! SCDWidgetsListView
+  }
+
+  var viewBorrowStatus: SCDWidgetsRowView {
+    return self.page?.getWidgetByName("viewBorrowStatus") as! SCDWidgetsRowView
+  }
+
+  var label4: SCDWidgetsLabel {
+    return self.page?.getWidgetByName("label4") as! SCDWidgetsLabel
+  }
+
+  var viewGetBook: SCDWidgetsGridView {
+    return self.page?.getWidgetByName("viewGetBook") as! SCDWidgetsGridView
+  }
+
+  var horizontalview8: SCDWidgetsRowView {
+    return self.page?.getWidgetByName("horizontalview8") as! SCDWidgetsRowView
+  }
+
+  var horizontalview9: SCDWidgetsRowView {
+    return self.page?.getWidgetByName("horizontalview9") as! SCDWidgetsRowView
+  }
+
+  var label5: SCDWidgetsLabel {
+    return self.page?.getWidgetByName("label5") as! SCDWidgetsLabel
+  }
+
+  var horizontalview10: SCDWidgetsRowView {
+    return self.page?.getWidgetByName("horizontalview10") as! SCDWidgetsRowView
+  }
+
+  var label6: SCDWidgetsLabel {
+    return self.page?.getWidgetByName("label6") as! SCDWidgetsLabel
+  }
+
+  var customwidget1: SCDWidgetsCustomWidget {
+    return self.page?.getWidgetByName("customwidget1") as! SCDWidgetsCustomWidget
+  }
+}