Master merge after fixes to personal image classification extension

.gitattributes

@@ -0,0 +1,2 @@
+# Always use linefeed for some test files
+**/tests/assets/**/*.txt text eol=lf

.github/ISSUE_TEMPLATE/bug_report.md

@@ -18,6 +18,7 @@ Please check off the part of the system that is affected by the bug.
 
 - [ ] Designer
 - [ ] Blocks editor
+- [ ] Projects Explorer
 - [ ] Companion
 - [ ] Compiled apps
 - [ ] Buildserver

.github/workflows/ant.yml

@@ -13,9 +13,17 @@ jobs:
         with:
           java-version: 8
       - name: 'Checkout submodules'
-        uses: textbook/git-checkout-submodule-action@master
+        run: git submodule update --init --recursive
       - name: 'Install 32-bit dependencies'
         run: sudo apt-get install -y libc6-i386 lib32z1 lib32stdc++6
+      - name: 'Download phantomJS'
+        run: |
+          mkdir /tmp/phantomJS
+          wget -P /tmp/phantomJS/ https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2
+      - name: 'Untar and add to PATH'
+        run: |
+          tar -xf /tmp/phantomJS/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C /tmp/phantomJS/
+          echo "/tmp/phantomJS/phantomjs-2.1.1-linux-x86_64/bin" >> $GITHUB_PATH
       - name: 'Make Auth Key'
         run: ant MakeAuthKey
         working-directory: appinventor

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "appinventor/lib/closure-library"]
 	path = appinventor/lib/closure-library
 	url = https://github.com/mit-cml/closure-library.git
+[submodule "appinventor/components-ios/SchemeKit/picrin"]
+	path = appinventor/schemekit/src/picrin
+	url = https://github.com/mit-cml/picrin.git

README.ios.md

@@ -0,0 +1,52 @@
+# MIT App Inventor for iOS
+
+## Prerequisites (Mac OS X)
+
+* Xcode 14 or higher
+* macOS 12 or higher
+
+(optional) To automatically install the companion app on a connected, authorized iOS device, install ideviceinstaller via Homebrew:
+
+```
+brew uninstall ideviceinstaller
+brew uninstall libimobiledevice
+brew install --HEAD libimobiledevice
+brew link --overwrite libimobiledevice
+brew install --HEAD  ideviceinstaller
+brew link --overwrite ideviceinstaller
+sudo chmod -R 777 /var/db/lockdown/
+```
+
+## Building
+
+Build iOS:
+
+```shell
+ant ios
+```
+
+To build components and reinstall the companion:
+
+```shell
+ant ioscomps
+```
+
+To build only the Android version of the companion (MIT App Inventor open source):
+
+```shell
+ant android
+```
+
+To build the webapp for Google App Engine:
+
+```shell
+ant webapp
+```
+
+## Testing
+
+To run tests:
+
+```shell
+ant iostests
+```

README.md

@@ -15,6 +15,7 @@ to operate their own App Inventor instance and/or contribute to the project.
 This code is tested and known to work with Java 8.
 
 ## Contributors
+
 The best way to go about integrating changes in App Inventor is to start a conversation in the [Open Source forum](https://community.appinventor.mit.edu/c/open-source-development/10) about whatever you intend to change or add.
 
 We use ***very brief and informal*** design documents with descriptions of the proposed changes and screenshots of how the functionality would look like and behave, in order to gather as much feedback from the community, as early as possible. We generally use shared Google docs for this (with permissions to add comments), but any format that is accessible from a web browser (and allows comments) would do.
@@ -23,7 +24,7 @@ If you have skipped this step and have gone ahead and made your changes already,
 
 Check out our open source [site](http://appinventor.mit.edu/appinventor-sources/) to find a lot more information about the project and how to contribute to it.
 
-## Setup instructions (Vagrant)
+## Setup Instructions (Vagrant)
 
 The easiest way to get a development environment up and running is to use the provided Vagrantfile. Install [Vagrant](https://vagrantup.com) and open a terminal in the root directory of this repository. Run the following commands
 
@@ -38,7 +39,15 @@ It may take a few minutes for Vagrant to initialize as it will pull down a virtu
 vagrant ssh
 ```
 
-This should open up a terminal within the virtual machine in the directory `/vagrant/appinventor`. This directory is the same as the `appinventor` directory in this repository, shared between your host machine and the virtual machine. Any changes made on one side will be visible in the other. This allows you to edit files on your host machine with your preferred editor, while keeping the build environment relegated to the virtual machine. To build App Inventor, you may now run:
+This should open up a terminal within the virtual machine in the directory `/vagrant/appinventor`. This directory is the same as the `appinventor` directory in this repository, shared between your host machine and the virtual machine. Any changes made on one side will be visible in the other. This allows you to edit files on your host machine with your preferred editor, while keeping the build environment relegated to the virtual machine. 
+
+Before you can build App Inventor, you will need to also obtain the dependencies as described [below](#checkout-dependencies) using `git submodule` command:
+
+```bash
+git submodule update --init
+```
+
+Now, you are ready to build App Inventor, you may now run:
 
 ```bash
 ant
@@ -58,11 +67,37 @@ Note 2: If it seems like none of the dependencies are installed in the VM, run `
 
 For better performance, consider using the manual instructions.
 
-## Setup instructions (manual)
+## Setup Instructions (iOS Support)
+
+Building MIT App Inventor Companion for iOS requires an Apple
+Macintosh computer running macOS 12 or later with Xcode 14 or later
+installed. While earlier versions may work we provide no support for
+building on versions below the ones stated. To install on a device,
+you **must** have a valid Apple Developer account license and have
+added the relevant mobile provisioning profiles from the Developer
+portal to your Xcode organizer (see Apple's website on instructions on
+how to do this).
+
+To build the MIT App Inventor companion, you will need to create a
+file called AICompanionApp.xcconfig in the components-ios directory
+that sets your development team. The easiest way to do this is to copy
+the AICompanionApp.xcconfig.sample file and edit it. Alternatively,
+create a file with the following line:
+
+```conf
+DEVELOPMENT_TEAM = ID
+```
+
+where ID is the development team ID shown in the Apple Developer
+Portal. This ID is unique to your developer account (individual or
+organization).
+
+## Setup Instructions (Manual)
 
 This is a quick guide to get started with the sources. More detailed instructions can be found [here](https://docs.google.com/document/pub?id=1Xc9yt02x3BRoq5m1PJHBr81OOv69rEBy8LVG_84j9jc), a slide show can be seen [here](http://josmas.github.io/contributingToAppInventor2/#/), and all the [documentation](http://appinventor.mit.edu/appinventor-sources/#documentation) for the project is available in our [site](http://appinventor.mit.edu/appinventor-sources/).
 
 ### Dependencies
+
 You will need a full Java JDK (version 8, OpenJDK preferred; JRE is not enough) and Python to compile and run the servers.
 
 You will also need a copy of the [Google Cloud SDK](https://cloud.google.com/appengine/docs/standard/java/download) for Java and [ant](http://ant.apache.org/).
@@ -82,9 +117,11 @@ If you are on an RPM-based distribution(Fedora), use:
 Note 2: Certain Java 8 features, such as lambda expressions, are not supported on Android, so please don't use them in your changes to the source code.
 
 ### Forking or cloning
+
 Consider ***forking*** the project if you want to make changes to the sources. If you simply want to run it locally, you can simply ***clone*** it.
 
 #### Forking
+
 If you decide to fork, follow the [instructions](https://help.github.com/articles/fork-a-repo) given by github. After that you can clone your own copy of the sources with:
 
     $ git clone https://github.com/YOUR_USER_NAME/appinventor-sources.git
@@ -101,6 +138,7 @@ Finally, you will also have to make sure that you are ignoring files that need i
     $ cp sample-.gitignore .gitignore
 
 ### Checkout dependencies
+
 App Inventor uses Blockly, the web-based visual programming editor from Google, as a core part of its editor. Blockly core is made available to App Inventor as a git submodule. The first time after forking or cloning the repository, you will need to perform the following commands:
 
     $ git submodule update --init
@@ -114,19 +152,23 @@ If you need to switch back to a branch that does contains the Blockly and Closur
 to clear out the submodules ___before switching branches___. When switching back, you will need to repeat the initialization and update procedure above.
 
 ### Troubleshooting common installation issues
+
 Run this command to run a self-diagnosis of your environment. This command tries to figure out common installation issues and offers you a solution to fix them yourself. Make sure this passes all the checks before you proceed further.
 
 #### Linux and macOS
+
 ```bash
 ./buildtools doctor
 ```
 
 #### Windows
+
 ```bash
 buildtools doctor
 ```
 
-### Compiling
+## Compiling
+
 Before compiling the code, an [auth key](https://docs.google.com/document/pub?id=1Xc9yt02x3BRoq5m1PJHBr81OOv69rEBy8LVG_84j9jc#h.yikyg2e1rfut) is needed. You can create one by running the following commands:
 
     $ cd appinventor
@@ -138,17 +180,48 @@ Once the key is in place, type the following to compile (from the appinventor fo
 
 You will see a lot of stuff in the terminal and after a few minutes (it can take from 2 to 10 minutes, depending on your machine specs) you should see a message saying something like *Build Successful*.
 
-### Running the server(s)
+### Notes on compiling for iOS
+
+If you are compiling on a Mac and **are not** interested in building
+the companion for iOS, you must set the property `skip.ios` to `true`,
+for example:
+
+```bash
+ant -Dskip.ios=true
+```
+
+iOS builds will automatically be skipped on other operating systems.
+
+We generally use Xcode for iOS development. Open the
+AppInventor.xcworkspace file to view the Xcode workspace. This
+workspace includes three projects:
+
+* SchemeKit: A Scheme implementation for iOS built on Picrin with
+  additions to support foreign function calls to Objective-C and
+  Swift. This also implements some basic types from App Inventor
+  including YailList and YailDictionary.
+* AIComponentKit: App Inventor component implementations, mostly
+  written in Swift.
+* AICompanionApp: The App Inventor companion written in Swift.
+
+In Xcode you can run the AICompanionApp on your device by selecting
+the AICompanionApp target's Debug scheme and pressing the Run button.
+
+For more information about iOS support, please see
+[README.ios.md](README.ios.md).
+
+## Running the Server(s)
+
 There are two servers in App Inventor, the main server that deals with project information, and the build server that creates apk files. More detailed information can be found in the [App Inventor Developer Overview](https://docs.google.com/document/d/1hIvAtbNx-eiIJcTA2LLPQOawctiGIpnnt0AvfgnKBok/pub) document.
 
-#### Running the main server
+### Running the main server
 
-    $ your-google-cloud-SDK-folder/bin/java_dev_appserver.sh
-            --port=8888 --address=0.0.0.0 appengine/build/war/
+    $ your-google-cloud-SDK-folder/bin/java_dev_appserver.sh --port=8888 --address=0.0.0.0 appengine/build/war/
 
 Make sure you change *your-google-cloud-SDK-folder* to wherever in your hard drive you have placed the Google Cloud SDK.
 
-#### Running the build server
+### Running the build server
+
 The build server can be run from the terminal by typing:
 
     $ cd appinventor/buildserver
@@ -157,18 +230,35 @@ The build server can be run from the terminal by typing:
 Note that you will only need to run the build server if you are going to build an app as an apk. You can do all the layout and programming without having the build server running, but you will need it to download the apk.
 
 ### Accessing your local server
+
 You should now be up and running; you can test this by pointing your browser to:
 
     http://localhost:8888
 
 Before entering or scanning the QR code in the Companion, check the box labeled "Use Legacy Connection".
 
 ### Running tests
+
 The automated tests depend on [Phantomjs](http://phantomjs.org/). Make sure you install it and add it to your path. After that, you can run all tests by typing the following in a terminal window:
 
     $ ant tests
-
+
+### Building Release Code
+
+Release builds with optimizations turned on for the web components of the system can be done by passing `-Drelease=true` to `ant`, e.g.:
+
+```
+ant -Drelease=true noplay
+```
+
+The release configuration sets the following additional options:
+
+- Blockly Editor is compiled with SIMPLE optimizations (instead of RAW)
+- App Engine YaClient module is compiled without `<collapse-all-properties/>` to create per-language/browser builds
+- App Engine YaClient module is compiled with optimization tuned to 9 and with 8 threads
+
 ### Hot-reloading GWT code with 'Super Dev Mode'
+
 1. Run `ant devmode`
 2. [Run the main server](#running-the-main-server).
 3. Open http://localhost:9876 (*GWT CodeServer*) and drag the two bookmarklets (*Dev Mode On & Off*) to the bookmarks bar.
@@ -183,5 +273,6 @@ The automated tests depend on [Phantomjs](http://phantomjs.org/). Make sure you
 
 Logs can be found at http://localhost:9876/log/ode and SourceMaps at http://localhost:9876/sourcemaps/ode
 
-## Need help?
+## Need Help?
+
 Join [our community](https://community.appinventor.mit.edu/).

appinventor/.gitignore

@@ -0,0 +1,72 @@
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData/
+Versions/
+
+## OS Generated Files
+*/.DS_Store
+.DS_Store
+.DS_Store?
+*.idea/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xccheckout
+*.xcscmblueprint
+0Looking
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+
+# Code Injection
+#
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/
+AICompanionApp.xcconfig

appinventor/AICompanionApp.xcconfig.sample

@@ -0,0 +1,5 @@
+// -*- mode: conf; -*-
+// Copyright 2023 MIT, All rights reserved.
+
+DEVELOPMENT_TEAM = "Your Team ID here"
+BUNDLE_IDENTIFIER = "Your custom package here"