From 41236749ae290dcbf7273a6e98a8439b3fb17db9 Mon Sep 17 00:00:00 2001 From: Andrew n marshall Date: Mon, 17 Sep 2018 17:23:28 -0700 Subject: [PATCH] Moving all mobile demos into demos/mobile. HTML for both demos is now checked in as demos/mobile/html/index.html. Updated android and ios scripts to copy webview.html from above. --- .../Non-Localized/Blockly/webview.html | 29 ------------------ demos/{ => mobile}/android/.gitignore | 0 demos/{ => mobile}/android/README.md | 0 demos/{ => mobile}/android/app/.gitignore | 1 + demos/{ => mobile}/android/app/build.gradle | 14 +++++++-- .../android/app/proguard-rules.pro | 0 .../ExampleInstrumentedTest.java | 0 .../android/app/src/main/AndroidManifest.xml | 0 .../main/assets/blockly/toolbox_standard.js | 0 .../webview/BlocklyWebViewFragment.java | 0 .../android/webview/demo/MainActivity.java | 0 .../drawable-v24/ic_launcher_foreground.xml | 0 .../res/drawable/ic_launcher_background.xml | 0 .../app/src/main/res/layout/activity_main.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-hdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher_round.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin .../app/src/main/res/values/colors.xml | 0 .../app/src/main/res/values/strings.xml | 0 .../app/src/main/res/values/styles.xml | 0 .../blocklywebview/ExampleUnitTest.java | 0 demos/{ => mobile}/android/build.gradle | 0 demos/{ => mobile}/android/gradle.properties | 0 .../android/gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 demos/{ => mobile}/android/gradlew | 0 demos/{ => mobile}/android/gradlew.bat | 0 demos/{ => mobile}/android/settings.gradle | 0 .../webview.html => mobile/html/index.html} | 0 demos/{ => mobile}/ios/.gitignore | 1 + .../Blockly WebView.xcodeproj/project.pbxproj | 0 .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcschemes/xcschememanagement.plist | 0 .../ios/Blockly WebView/AppDelegate.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../Assets.xcassets/Contents.json | 0 .../Base.lproj/LaunchScreen.storyboard | 0 .../Base.lproj/Main.storyboard | 0 .../ios/Blockly WebView/Info.plist | 0 .../ios/Blockly WebView/ViewController.swift | 0 .../Non-Localized/Blockly/toolbox_standard.js | 0 demos/{ => mobile}/ios/cp_resources.sh | 7 +++-- 52 files changed, 17 insertions(+), 35 deletions(-) delete mode 100644 demos/ios/Resources/Non-Localized/Blockly/webview.html rename demos/{ => mobile}/android/.gitignore (100%) rename demos/{ => mobile}/android/README.md (100%) rename demos/{ => mobile}/android/app/.gitignore (81%) rename demos/{ => mobile}/android/app/build.gradle (78%) rename demos/{ => mobile}/android/app/proguard-rules.pro (100%) rename demos/{ => mobile}/android/app/src/androidTest/java/com/example/blocklywebview/ExampleInstrumentedTest.java (100%) rename demos/{ => mobile}/android/app/src/main/AndroidManifest.xml (100%) rename demos/{ => mobile}/android/app/src/main/assets/blockly/toolbox_standard.js (100%) rename demos/{ => mobile}/android/app/src/main/java/com/google/blockly/android/webview/BlocklyWebViewFragment.java (100%) rename demos/{ => mobile}/android/app/src/main/java/com/google/blockly/android/webview/demo/MainActivity.java (100%) rename demos/{ => mobile}/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml (100%) rename demos/{ => mobile}/android/app/src/main/res/drawable/ic_launcher_background.xml (100%) rename demos/{ => mobile}/android/app/src/main/res/layout/activity_main.xml (100%) rename demos/{ => mobile}/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename demos/{ => mobile}/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename demos/{ => mobile}/android/app/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename demos/{ => mobile}/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png (100%) rename demos/{ => mobile}/android/app/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename demos/{ => mobile}/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png (100%) rename demos/{ => mobile}/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename demos/{ => mobile}/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png (100%) rename demos/{ => mobile}/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename demos/{ => mobile}/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (100%) rename demos/{ => mobile}/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename demos/{ => mobile}/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename demos/{ => mobile}/android/app/src/main/res/values/colors.xml (100%) rename demos/{ => mobile}/android/app/src/main/res/values/strings.xml (100%) rename demos/{ => mobile}/android/app/src/main/res/values/styles.xml (100%) rename demos/{ => mobile}/android/app/src/test/java/com/example/blocklywebview/ExampleUnitTest.java (100%) rename demos/{ => mobile}/android/build.gradle (100%) rename demos/{ => mobile}/android/gradle.properties (100%) rename demos/{ => mobile}/android/gradle/wrapper/gradle-wrapper.jar (100%) rename demos/{ => mobile}/android/gradle/wrapper/gradle-wrapper.properties (100%) rename demos/{ => mobile}/android/gradlew (100%) rename demos/{ => mobile}/android/gradlew.bat (100%) rename demos/{ => mobile}/android/settings.gradle (100%) rename demos/{android/app/src/main/assets/blockly/webview.html => mobile/html/index.html} (100%) rename demos/{ => mobile}/ios/.gitignore (93%) rename demos/{ => mobile}/ios/Blockly WebView.xcodeproj/project.pbxproj (100%) rename demos/{ => mobile}/ios/Blockly WebView.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename demos/{ => mobile}/ios/Blockly WebView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename demos/{ => mobile}/ios/Blockly WebView.xcodeproj/xcuserdata/marshalla.xcuserdatad/xcschemes/xcschememanagement.plist (100%) rename demos/{ => mobile}/ios/Blockly WebView/AppDelegate.swift (100%) rename demos/{ => mobile}/ios/Blockly WebView/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename demos/{ => mobile}/ios/Blockly WebView/Assets.xcassets/Contents.json (100%) rename demos/{ => mobile}/ios/Blockly WebView/Base.lproj/LaunchScreen.storyboard (100%) rename demos/{ => mobile}/ios/Blockly WebView/Base.lproj/Main.storyboard (100%) rename demos/{ => mobile}/ios/Blockly WebView/Info.plist (100%) rename demos/{ => mobile}/ios/Blockly WebView/ViewController.swift (100%) rename demos/{ => mobile}/ios/Resources/Non-Localized/Blockly/toolbox_standard.js (100%) rename demos/{ => mobile}/ios/cp_resources.sh (63%) diff --git a/demos/ios/Resources/Non-Localized/Blockly/webview.html b/demos/ios/Resources/Non-Localized/Blockly/webview.html deleted file mode 100644 index 0ecbea2f1..000000000 --- a/demos/ios/Resources/Non-Localized/Blockly/webview.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - -
- - - \ No newline at end of file diff --git a/demos/android/.gitignore b/demos/mobile/android/.gitignore similarity index 100% rename from demos/android/.gitignore rename to demos/mobile/android/.gitignore diff --git a/demos/android/README.md b/demos/mobile/android/README.md similarity index 100% rename from demos/android/README.md rename to demos/mobile/android/README.md diff --git a/demos/android/app/.gitignore b/demos/mobile/android/app/.gitignore similarity index 81% rename from demos/android/app/.gitignore rename to demos/mobile/android/app/.gitignore index d67f7b424..8a24dfadb 100644 --- a/demos/android/app/.gitignore +++ b/demos/mobile/android/app/.gitignore @@ -4,3 +4,4 @@ src/main/assets/blockly/blockly_compressed.js src/main/assets/blockly/blocks_compressed.js src/main/assets/blockly/media +src/main/assets/blockly/webview.html diff --git a/demos/android/app/build.gradle b/demos/mobile/android/app/build.gradle similarity index 78% rename from demos/android/app/build.gradle rename to demos/mobile/android/app/build.gradle index 661a3db87..5a843e070 100644 --- a/demos/android/app/build.gradle +++ b/demos/mobile/android/app/build.gradle @@ -20,8 +20,16 @@ android { } } -task copyBlocklyWebFiles(type: Copy) { - from('../../..') { +task copyBlocklyHtmlFile(type: Copy) { + from('../../html') { + include 'index.html' + } + into project(':app').file('./src/main/assets/blockly') + rename('index.html', 'webview.html') +} + +task copyBlocklyMoreFiles(type: Copy) { + from('../../../..') { include 'blockly_compressed.js', 'blocks_compressed.js', 'msg/js/**', 'media/**' exclude 'media/test_*' } @@ -29,7 +37,7 @@ task copyBlocklyWebFiles(type: Copy) { } project.afterEvaluate { - preBuild.dependsOn copyBlocklyWebFiles + preBuild.dependsOn(copyBlocklyHtmlFile, copyBlocklyMoreFiles) } dependencies { diff --git a/demos/android/app/proguard-rules.pro b/demos/mobile/android/app/proguard-rules.pro similarity index 100% rename from demos/android/app/proguard-rules.pro rename to demos/mobile/android/app/proguard-rules.pro diff --git a/demos/android/app/src/androidTest/java/com/example/blocklywebview/ExampleInstrumentedTest.java b/demos/mobile/android/app/src/androidTest/java/com/example/blocklywebview/ExampleInstrumentedTest.java similarity index 100% rename from demos/android/app/src/androidTest/java/com/example/blocklywebview/ExampleInstrumentedTest.java rename to demos/mobile/android/app/src/androidTest/java/com/example/blocklywebview/ExampleInstrumentedTest.java diff --git a/demos/android/app/src/main/AndroidManifest.xml b/demos/mobile/android/app/src/main/AndroidManifest.xml similarity index 100% rename from demos/android/app/src/main/AndroidManifest.xml rename to demos/mobile/android/app/src/main/AndroidManifest.xml diff --git a/demos/android/app/src/main/assets/blockly/toolbox_standard.js b/demos/mobile/android/app/src/main/assets/blockly/toolbox_standard.js similarity index 100% rename from demos/android/app/src/main/assets/blockly/toolbox_standard.js rename to demos/mobile/android/app/src/main/assets/blockly/toolbox_standard.js diff --git a/demos/android/app/src/main/java/com/google/blockly/android/webview/BlocklyWebViewFragment.java b/demos/mobile/android/app/src/main/java/com/google/blockly/android/webview/BlocklyWebViewFragment.java similarity index 100% rename from demos/android/app/src/main/java/com/google/blockly/android/webview/BlocklyWebViewFragment.java rename to demos/mobile/android/app/src/main/java/com/google/blockly/android/webview/BlocklyWebViewFragment.java diff --git a/demos/android/app/src/main/java/com/google/blockly/android/webview/demo/MainActivity.java b/demos/mobile/android/app/src/main/java/com/google/blockly/android/webview/demo/MainActivity.java similarity index 100% rename from demos/android/app/src/main/java/com/google/blockly/android/webview/demo/MainActivity.java rename to demos/mobile/android/app/src/main/java/com/google/blockly/android/webview/demo/MainActivity.java diff --git a/demos/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/demos/mobile/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from demos/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to demos/mobile/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/demos/android/app/src/main/res/drawable/ic_launcher_background.xml b/demos/mobile/android/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from demos/android/app/src/main/res/drawable/ic_launcher_background.xml rename to demos/mobile/android/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/demos/android/app/src/main/res/layout/activity_main.xml b/demos/mobile/android/app/src/main/res/layout/activity_main.xml similarity index 100% rename from demos/android/app/src/main/res/layout/activity_main.xml rename to demos/mobile/android/app/src/main/res/layout/activity_main.xml diff --git a/demos/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/demos/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from demos/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to demos/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/demos/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/demos/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from demos/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to demos/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/demos/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/demos/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from demos/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to demos/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/demos/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/demos/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from demos/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to demos/mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/demos/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/demos/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from demos/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to demos/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/demos/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/demos/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from demos/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to demos/mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/demos/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/demos/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from demos/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to demos/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/demos/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/demos/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from demos/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to demos/mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/demos/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/demos/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from demos/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to demos/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/demos/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/demos/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from demos/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to demos/mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/demos/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/demos/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from demos/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to demos/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/demos/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/demos/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from demos/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to demos/mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/demos/android/app/src/main/res/values/colors.xml b/demos/mobile/android/app/src/main/res/values/colors.xml similarity index 100% rename from demos/android/app/src/main/res/values/colors.xml rename to demos/mobile/android/app/src/main/res/values/colors.xml diff --git a/demos/android/app/src/main/res/values/strings.xml b/demos/mobile/android/app/src/main/res/values/strings.xml similarity index 100% rename from demos/android/app/src/main/res/values/strings.xml rename to demos/mobile/android/app/src/main/res/values/strings.xml diff --git a/demos/android/app/src/main/res/values/styles.xml b/demos/mobile/android/app/src/main/res/values/styles.xml similarity index 100% rename from demos/android/app/src/main/res/values/styles.xml rename to demos/mobile/android/app/src/main/res/values/styles.xml diff --git a/demos/android/app/src/test/java/com/example/blocklywebview/ExampleUnitTest.java b/demos/mobile/android/app/src/test/java/com/example/blocklywebview/ExampleUnitTest.java similarity index 100% rename from demos/android/app/src/test/java/com/example/blocklywebview/ExampleUnitTest.java rename to demos/mobile/android/app/src/test/java/com/example/blocklywebview/ExampleUnitTest.java diff --git a/demos/android/build.gradle b/demos/mobile/android/build.gradle similarity index 100% rename from demos/android/build.gradle rename to demos/mobile/android/build.gradle diff --git a/demos/android/gradle.properties b/demos/mobile/android/gradle.properties similarity index 100% rename from demos/android/gradle.properties rename to demos/mobile/android/gradle.properties diff --git a/demos/android/gradle/wrapper/gradle-wrapper.jar b/demos/mobile/android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from demos/android/gradle/wrapper/gradle-wrapper.jar rename to demos/mobile/android/gradle/wrapper/gradle-wrapper.jar diff --git a/demos/android/gradle/wrapper/gradle-wrapper.properties b/demos/mobile/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from demos/android/gradle/wrapper/gradle-wrapper.properties rename to demos/mobile/android/gradle/wrapper/gradle-wrapper.properties diff --git a/demos/android/gradlew b/demos/mobile/android/gradlew similarity index 100% rename from demos/android/gradlew rename to demos/mobile/android/gradlew diff --git a/demos/android/gradlew.bat b/demos/mobile/android/gradlew.bat similarity index 100% rename from demos/android/gradlew.bat rename to demos/mobile/android/gradlew.bat diff --git a/demos/android/settings.gradle b/demos/mobile/android/settings.gradle similarity index 100% rename from demos/android/settings.gradle rename to demos/mobile/android/settings.gradle diff --git a/demos/android/app/src/main/assets/blockly/webview.html b/demos/mobile/html/index.html similarity index 100% rename from demos/android/app/src/main/assets/blockly/webview.html rename to demos/mobile/html/index.html diff --git a/demos/ios/.gitignore b/demos/mobile/ios/.gitignore similarity index 93% rename from demos/ios/.gitignore rename to demos/mobile/ios/.gitignore index c3b00e539..d6ce9d3ab 100644 --- a/demos/ios/.gitignore +++ b/demos/mobile/ios/.gitignore @@ -3,6 +3,7 @@ /Resources/Non-Localized/Blockly/blocks_compressed.js /Resources/Non-Localized/Blockly/media /Resources/Non-Localized/Blockly/msg +/Resources/Non-Localized/Blockly/webview.html # Xcode.gitignore diff --git a/demos/ios/Blockly WebView.xcodeproj/project.pbxproj b/demos/mobile/ios/Blockly WebView.xcodeproj/project.pbxproj similarity index 100% rename from demos/ios/Blockly WebView.xcodeproj/project.pbxproj rename to demos/mobile/ios/Blockly WebView.xcodeproj/project.pbxproj diff --git a/demos/ios/Blockly WebView.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/demos/mobile/ios/Blockly WebView.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from demos/ios/Blockly WebView.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to demos/mobile/ios/Blockly WebView.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/demos/ios/Blockly WebView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/demos/mobile/ios/Blockly WebView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from demos/ios/Blockly WebView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to demos/mobile/ios/Blockly WebView.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/demos/ios/Blockly WebView.xcodeproj/xcuserdata/marshalla.xcuserdatad/xcschemes/xcschememanagement.plist b/demos/mobile/ios/Blockly WebView.xcodeproj/xcuserdata/marshalla.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 100% rename from demos/ios/Blockly WebView.xcodeproj/xcuserdata/marshalla.xcuserdatad/xcschemes/xcschememanagement.plist rename to demos/mobile/ios/Blockly WebView.xcodeproj/xcuserdata/marshalla.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/demos/ios/Blockly WebView/AppDelegate.swift b/demos/mobile/ios/Blockly WebView/AppDelegate.swift similarity index 100% rename from demos/ios/Blockly WebView/AppDelegate.swift rename to demos/mobile/ios/Blockly WebView/AppDelegate.swift diff --git a/demos/ios/Blockly WebView/Assets.xcassets/AppIcon.appiconset/Contents.json b/demos/mobile/ios/Blockly WebView/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from demos/ios/Blockly WebView/Assets.xcassets/AppIcon.appiconset/Contents.json rename to demos/mobile/ios/Blockly WebView/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/demos/ios/Blockly WebView/Assets.xcassets/Contents.json b/demos/mobile/ios/Blockly WebView/Assets.xcassets/Contents.json similarity index 100% rename from demos/ios/Blockly WebView/Assets.xcassets/Contents.json rename to demos/mobile/ios/Blockly WebView/Assets.xcassets/Contents.json diff --git a/demos/ios/Blockly WebView/Base.lproj/LaunchScreen.storyboard b/demos/mobile/ios/Blockly WebView/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from demos/ios/Blockly WebView/Base.lproj/LaunchScreen.storyboard rename to demos/mobile/ios/Blockly WebView/Base.lproj/LaunchScreen.storyboard diff --git a/demos/ios/Blockly WebView/Base.lproj/Main.storyboard b/demos/mobile/ios/Blockly WebView/Base.lproj/Main.storyboard similarity index 100% rename from demos/ios/Blockly WebView/Base.lproj/Main.storyboard rename to demos/mobile/ios/Blockly WebView/Base.lproj/Main.storyboard diff --git a/demos/ios/Blockly WebView/Info.plist b/demos/mobile/ios/Blockly WebView/Info.plist similarity index 100% rename from demos/ios/Blockly WebView/Info.plist rename to demos/mobile/ios/Blockly WebView/Info.plist diff --git a/demos/ios/Blockly WebView/ViewController.swift b/demos/mobile/ios/Blockly WebView/ViewController.swift similarity index 100% rename from demos/ios/Blockly WebView/ViewController.swift rename to demos/mobile/ios/Blockly WebView/ViewController.swift diff --git a/demos/ios/Resources/Non-Localized/Blockly/toolbox_standard.js b/demos/mobile/ios/Resources/Non-Localized/Blockly/toolbox_standard.js similarity index 100% rename from demos/ios/Resources/Non-Localized/Blockly/toolbox_standard.js rename to demos/mobile/ios/Resources/Non-Localized/Blockly/toolbox_standard.js diff --git a/demos/ios/cp_resources.sh b/demos/mobile/ios/cp_resources.sh similarity index 63% rename from demos/ios/cp_resources.sh rename to demos/mobile/ios/cp_resources.sh index 6a39b652f..0221c9290 100755 --- a/demos/ios/cp_resources.sh +++ b/demos/mobile/ios/cp_resources.sh @@ -1,10 +1,10 @@ #!/bin/bash set -eux -BLOCKLY_ROOT=../.. +BLOCKLY_ROOT=../../.. IOS_RESOURCES=Resources/Non-Localized/Blockly -FILES_TO_COPY=( +MORE_FILES_TO_COPY=( "blockly_compressed.js" "blocks_compressed.js" "media" @@ -13,7 +13,8 @@ FILES_TO_COPY=( mkdir -p $IOS_RESOURCES/media mkdir -p $IOS_RESOURCES/msg/js -for i in "${FILES_TO_COPY[@]}"; do # The quotes are necessary here +rsync -rp ../html/index.html $IOS_RESOURCES/webview.html +for i in "${MORE_FILES_TO_COPY[@]}"; do # The quotes are necessary here TARGET_DIR=$(dirname $IOS_RESOURCES/$i) rsync -rp $BLOCKLY_ROOT/$i $TARGET_DIR done