android update

happyx_native.nimble

@@ -2,7 +2,7 @@
 
 description = "Macro-oriented web-framework compiles to native written with ♥"
 author = "HapticX"
-version = "0.3.1"
+version = "0.3.2"
 license = "MIT"
 srcDir = "src"
 installExt = @["nim", "gradle", "properties"]

src/happyx_native/app/app.nim

@@ -7,10 +7,13 @@ import
     macros, os, sequtils, strformat,
     osproc, json, threadpool, browsers,
     uri, tables, terminal, parsecfg,
-    jsonutils
+    jsonutils, sugar
   ],
   happyx,
-  ../cli/utils,
+  ../cli/utils
+
+
+when defined(webview):
   webview
 
 when defined(export2android):
@@ -175,20 +178,21 @@ macro fetchFiles*(directory: static[string]): untyped =
     ))
   result.add(ident"_files")
 
-proc createHpxWebview*(w, h: int, port: int, resizeable: bool) = 
-  let 
-    wv = newWebview()
-    hint =
-      if resizeable: WebviewHintNone
-      else: WebviewHintFixed
+when defined(webview):
+  proc createHpxWebview*(w, h: int, port: int, resizeable: bool) = 
+    let 
+      wv = newWebview()
+      hint =
+        if resizeable: WebviewHintNone
+        else: WebviewHintFixed
 
-  wv.setSize(w, h, hint)
-  wv.setTitle(cfgName())
-  # no positioning?
-  wv.navigate(cstring("http://127.0.0.1:" & $port))
+    wv.setSize(w, h, hint)
+    wv.setTitle(cfgName())
+    # no positioning?
+    wv.navigate(cstring("http://127.0.0.1:" & $port))
 
-  wv.run()
-  wv.destroy()
+    wv.run()
+    wv.destroy()
 
 template nativeAppImpl*(appDirectory: string = "/assets", port: int = 5123,
                         x: int = 512, y: int = 128, w: int = 720, h: int = 320,
@@ -320,8 +324,6 @@ template nativeAppImpl*(appDirectory: string = "/assets", port: int = 5123,
             window[func].apply(null, arr);
           },
           callNim: function (func, ...args) {
-            console.log(typeof(func), func);
-            console.log(typeof([...args]), [...args]);
             if (!connected) {
               function check(func, ...args) {
                 if (ws.readyState === 1) {
@@ -332,10 +334,6 @@ template nativeAppImpl*(appDirectory: string = "/assets", port: int = 5123,
               }
               var myInterval = setInterval(check, 15, func, ...args);
             } else {
-              console.log(JSON.stringify({
-                "procedure": func,
-                "params": [...args]
-              }));
               ws.send(JSON.stringify({
                 "procedure": func,
                 "params": [...args]

src/happyx_native/core/constants.nim

@@ -1,7 +1,7 @@
 import os
 
 const
-  HpxNativeVersion* = "0.3.0"
+  HpxNativeVersion* = "0.3.2"
   OS* =
     when defined(windows) or hostOS == "windows":
       "win"

tests/hpx_tests/assets/native.nim

@@ -2,3 +2,5 @@ import jsffi
 export jsffi
 
 var hpxNative* {.importc, nodecl.}: JsObject
+
+hpxNative.callNim("helloWorld")

tests/test/app.nim

@@ -1,11 +1,17 @@
 # Main native file
 import happyx_native
 
+var
+  lastPage = "/"
+  readedStories: JsonNode = newJArray()
 
 callback:
   # HappyX Native helloWorld callback
   proc helloWorld() =
-    echo "Hello from Nim"
-
+    echo 1
+    lastPage = loadString("hapticx.ktc_hpx.lastPage")
+    echo 1
+    readedStories = loadJson("hapticx.ktc_hpx.readedStories")
+    echo 1
 
 nativeApp("/assets", resizeable = false, title = "test")

tests/test/assets/main.nim

@@ -20,8 +20,10 @@ appRoutes "app":
           "increase"
           @click:
             # Call HappyX Native callback named helloWorld without arguments
+            echo 1
             hpxNative.callNim("helloWorld")
             x->inc()
+            echo x
     tStyle: """
       body {
         padding: 0;