6ac1193 · reflex-dom · git.iko.soy

git.iko.soy/reflex-dom

WIP: Initial Android support

commit6ac1193cd6ce9f6e8946069a81d84b713c57eee7 authorRyan Trinkle <ryan.trinkle@gmail.com> dateSat 23 Sep 2017, 21:19 (9 years ago) parent06656e2

6 files changed+111−5

compare with develop

unifiedsplit

reflex-dom/cbits/MainWidget.c+26 reflex-dom/default.nix+8−3 reflex-dom/java/org/reflexfrp/reflexdom/MainWidget.java+33 reflex-dom/reflex-dom.cabal+17−2 reflex-dom/src-android/Reflex/Dom/Android/MainWidget.hs+13 reflex-dom/src/Reflex/Dom/Internal.hs+14

reflex-dom/cbits/MainWidget.cnew file+26

@@ -0,0 +1,26 @@

1+#include <jni.h>

2+#include <assert.h>

3+#include <android/log.h>

4+#include <HaskellActivity.h>

6+void Reflex_Dom_Android_MainWidget_start(jobject activity, const char *url) {

7+ assert(activity);

8+ assert(url);

10+ JNIEnv *env;

11+ jint attachResult = (*HaskellActivity_jvm)->AttachCurrentThread(HaskellActivity_jvm, &env, NULL);

12+ assert(attachResult == JNI_OK);

13+

14+ jclass cls = (*env)->FindClass(env, "org/reflexfrp/reflexdom/MainWidget");

15+ assert(cls);

16+ jmethodID startMainWidget = (*env)->GetStaticMethodID(env, cls, "startMainWidget", "(Landroid/app/Activity;Ljava/lang/String;)V");

17+ assert(startMainWidget);

18+

19+ jstring jurl = (*env)->NewStringUTF(env, url);

20+ assert(jurl);

21+ (*env)->CallStaticVoidMethod(env, cls, startMainWidget, activity, jurl);

22+ if((*env)->ExceptionOccurred(env)) {

23+ __android_log_write(ANDROID_LOG_DEBUG, "MainWidget", "startMainWidget exception");

24+ (*env)->ExceptionDescribe(env);

25+ }

26+}

reflex-dom/default.nix+8−3

@@ -1,18 +1,23 @@

11{ mkDerivation, base, bytestring, jsaddle-webkit2gtk, jsaddle-wkwebview, reflex

2−, reflex-dom-core, stdenv, text, ghc

2+, reflex-dom-core, stdenv, text, ghc, hostPlatform, jsaddle-clib, android-activity ? null

33}:

4−mkDerivation {

4+let isAndroid = hostPlatform.libc == "bionic";

5+in mkDerivation {

56 pname = "reflex-dom";

67 version = "0.4";

78 src = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [ ".git" "dist" ])) ./.;

89 libraryHaskellDepends = [

910 base bytestring reflex reflex-dom-core text

1011 ] ++ (if ghc.isGhcjs or false then [

11− ] else if stdenv.isDarwin then [

12+ ] else if hostPlatform.isDarwin then [

1213 jsaddle-wkwebview

14+ ] else if isAndroid then [

15+ jsaddle-clib

16+ android-activity

1317 ] else [

1418 jsaddle-webkit2gtk

1519 ]);

20+ configureFlags = if isAndroid then [ "-fandroid" ] else [];

1621 description = "Functional Reactive Web Apps with Reflex";

1722 license = stdenv.lib.licenses.bsd3;

1823}

reflex-dom/java/org/reflexfrp/reflexdom/MainWidget.javanew file+33

@@ -0,0 +1,33 @@

1+package org.reflexfrp.reflexdom;

3+import android.app.Activity;

4+import android.content.Context;

5+import android.view.ViewGroup.LayoutParams;

6+import android.view.Window;

7+import android.webkit.CookieManager;

8+import android.webkit.WebSettings;

9+import android.webkit.WebView;

10+import java.util.concurrent.SynchronousQueue;

11+

12+

13+public class MainWidget {

14+ private static void startMainWidget(Activity a, String url) {

15+ CookieManager.setAcceptFileSchemeCookies(true); //TODO: Can we do this just for our own WebView?

16+

17+ // Remove title and notification bars

18+ a.requestWindowFeature(Window.FEATURE_NO_TITLE);

19+

20+ final WebView wv = new WebView(a);

21+ wv.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));

22+ a.setContentView(wv);

23+ WebSettings ws = wv.getSettings();

24+ ws.setJavaScriptEnabled(true);

25+ ws.setAllowFileAccessFromFileURLs(true);

26+ ws.setAllowUniversalAccessFromFileURLs(true);

27+ wv.setWebContentsDebuggingEnabled(true);

28+ // allow video to play without user interaction

29+ wv.getSettings().setMediaPlaybackRequiresUserGesture(false);

30+

31+ wv.loadUrl(url);

32+ }

33+}

reflex-dom/reflex-dom.cabal+17−2

@@ -15,6 +15,7 @@ extra-source-files: src/Reflex/Dom/Xhr/Foreign.hs

1515 src/Reflex/Dom/WebSocket/Foreign.hs

1616 src/Reflex/Dom/Xhr/ResponseType.hs

1717 src/Reflex/Dom/Xhr/Exception.hs

18+ java/org/reflexfrp/reflexdom/MainWidget.java

1819

1920flag webkit2gtk

2021 description: Use WebKit2 version of WebKitGTK.

@@ -35,8 +36,21 @@ flag build-examples

3536 default: False

3637 manual: True

3738

39+flag android

40+ description: Build an Android app

41+ default: False

42+ manual: True

43+

3844library

3945 hs-source-dirs: src

46+ if flag(android)

47+ hs-source-dirs: src-android

48+ build-depends:

49+ android-activity == 0.1.*,

50+ data-default == 0.7.*,

51+ jsaddle-clib

52+ c-sources: cbits/MainWidget.c

53+ cpp-options: -DANDROID

4054 build-depends:

4155 base >= 4.7 && < 4.11,

4256 bytestring == 0.10.*,

@@ -52,8 +66,9 @@ library

5266 build-depends:

5367 jsaddle-webkit2gtk

5468 else

55− build-depends:

56− jsaddle-webkitgtk

69+ if !flag(android)

70+ build-depends:

71+ jsaddle-webkitgtk

5772

5873 exposed-modules:

5974 Reflex.Dom

reflex-dom/src-android/Reflex/Dom/Android/MainWidget.hsnew file+13

@@ -0,0 +1,13 @@

1+{-# LANGUAGE ForeignFunctionInterface #-}

2+module Reflex.Dom.Android.MainWidget

3+ ( startMainWidget

4+ ) where

6+import Android.HaskellActivity

7+import Data.ByteString

8+import Foreign.C.String

10+startMainWidget :: HaskellActivity -> ByteString -> IO ()

11+startMainWidget a url = useAsCString url $ startMainWidget_ a

12+

13+foreign import ccall safe "Reflex_Dom_Android_MainWidget_start" startMainWidget_ :: HaskellActivity -> CString -> IO ()

reflex-dom/src/Reflex/Dom/Internal.hs+14

@@ -21,6 +21,20 @@ run :: a -> a

2121run = id

2222#elif defined(MIN_VERSION_jsaddle_wkwebview)

2323import Language.Javascript.JSaddle.WKWebView (run)

24+#elif defined(ANDROID)

25+import Android.HaskellActivity

26+import Control.Monad

27+import Control.Concurrent

28+import Data.Default

29+import Data.String

30+import Reflex.Dom.Android.MainWidget

31+run _ = do

32+ continueWithCallbacks $ traceActivityCallbacks $ def

33+ { _activityCallbacks_onCreate = \_ -> do

34+ a <- getHaskellActivity

35+ startMainWidget a $ fromString "data:,Hello%2C%20World!" -- "file:///android_asset/index.html"

36+ }

37+ forever $ threadDelay 1000000000

2438#else

2539import Language.Javascript.JSaddle.WebKitGTK (run)

2640#endif