From eabea369539cd5c64afc74aebc6b88f181e94e14 Mon Sep 17 00:00:00 2001 From: Andrew n marshall Date: Wed, 19 Sep 2018 21:27:35 -0700 Subject: [PATCH] Adding mobile HTML demo. * Adds ln_resources script to generate Blockly symbolic links. * Moves toolbox_standard.js into this directory. Relatedly, updates Android and iOS copy scripts and .gitignore files. * Corrects HTML viewport scale and disallows zoom. --- demos/mobile/android/.gitignore | 2 +- demos/mobile/android/app/build.gradle | 2 +- demos/mobile/html/.gitignore | 4 + demos/mobile/html/index.html | 4 +- demos/mobile/html/ln_resources.sh | 22 ++ .../blockly => html}/toolbox_standard.js | 0 demos/mobile/ios/.gitignore | 6 +- .../Non-Localized/Blockly/toolbox_standard.js | 333 ------------------ demos/mobile/ios/cp_resources.sh | 1 + 9 files changed, 33 insertions(+), 341 deletions(-) create mode 100644 demos/mobile/html/.gitignore create mode 100755 demos/mobile/html/ln_resources.sh rename demos/mobile/{android/app/src/main/assets/blockly => html}/toolbox_standard.js (100%) delete mode 100644 demos/mobile/ios/Resources/Non-Localized/Blockly/toolbox_standard.js diff --git a/demos/mobile/android/.gitignore b/demos/mobile/android/.gitignore index 0d7a3d8a8..3ba2b2b61 100644 --- a/demos/mobile/android/.gitignore +++ b/demos/mobile/android/.gitignore @@ -1,6 +1,6 @@ /build /captures -/app/src/main/assets/blockly/msg +/app/src/main/assets/blockly .settings .project diff --git a/demos/mobile/android/app/build.gradle b/demos/mobile/android/app/build.gradle index 5a843e070..98508e954 100644 --- a/demos/mobile/android/app/build.gradle +++ b/demos/mobile/android/app/build.gradle @@ -22,7 +22,7 @@ android { task copyBlocklyHtmlFile(type: Copy) { from('../../html') { - include 'index.html' + include 'index.html', 'toolbox_standard.js' } into project(':app').file('./src/main/assets/blockly') rename('index.html', 'webview.html') diff --git a/demos/mobile/html/.gitignore b/demos/mobile/html/.gitignore new file mode 100644 index 000000000..72077a6d6 --- /dev/null +++ b/demos/mobile/html/.gitignore @@ -0,0 +1,4 @@ +/blockly_compressed.js +/blocks_compressed.js +/media +/msg diff --git a/demos/mobile/html/index.html b/demos/mobile/html/index.html index 0ecbea2f1..55906503d 100644 --- a/demos/mobile/html/index.html +++ b/demos/mobile/html/index.html @@ -2,6 +2,7 @@ +