diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
new file mode 100644
index 00000000..abe866de
--- /dev/null
+++ b/.github/CONTRIBUTING.md
@@ -0,0 +1,60 @@
+## Contributing
+The development of ScratchJr is an ongoing process, and we love to have people in the ScratchJr and open source communities help us along the way.
+
+### Ways to Help
+
+* **Documenting bugs**
+ * If you've identified a bug in ScratchJr you should first check to see if it's been filed as an issue, if not you can file one. Make sure you follow the issue template.
+ * It's important that we can consistently reproduce issues. When writing an issue, be sure to follow our [reproduction step guidelines](https://github.com/LLK/scratch-gui/wiki/Writing-good-repro-steps). The example is based on Scratch, but the same principles apply to ScratchJr.
+ * Some issues are marked "Needs Repro". Adding a comment with good reproduction steps to those issues is a great way to help.
+
+* **Fixing bugs**
+ * You can request to fix a bug in a comment on the issue if you at mention the repo coordinator, who for this repo is @chrisgarrity.
+ * If the issue is marked "Help Wanted" you can go ahead and start working on it!
+ * **We will only accept Pull Requests for bugs that have an issue filed that has a priority label**
+ * If you're interested in fixing a bug with no issue, file the issue first and wait for it to have a priority added to it.
+
+ * We are not looking for Pull Requests ("PR") for every issue and may deny a PR if it doesn't fit our criteria.
+ * We are far more likely to accept a PR if it is for an issue marked with Help Wanted.
+ * We will not accept PRs for issues marked with "Needs Discussion" or "Needs Design."
+
+### Learning Git and Github
+
+If you want to work on fixing issues, you should be familiar with Git and Github.
+
+* [Learn Git branching](https://learngitbranching.js.org/) includes an introduction to basic git commands and useful branching features.
+* Here's a general introduction to [contributing to an open source project](https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github).
+
+**Important:** we follow the [Github Flow process](https://guides.github.com/introduction/flow/) as our development process.
+
+### How to Fix Bugs
+1. Identify which Github issue you are working on. Leave a comment on the issue to let us (and other contributors) know you're working on it.
+2. Make sure you have a fork of this repo (see [Github's forking a repo](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) for details)
+3. Switch to the `develop` branch, and pull down the latest changes from upstream
+4. Run the code, and reproduce the problem
+5. Create your branch from the `develop` branch
+6. Make code changes to fix the problem
+7. Run `npm test` to make sure that your changes pass our tests
+8. Commit your changes
+9. Push your branch to your fork
+10. Create your pull request
+ 1. Make sure to follow the template in the PR description
+ 1. Remember to check the “[Allow edits from maintainers](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)” box
+
+When submitting pull requests keep in mind:
+* please be patient -- it can take a while to find time to review them
+* try to change the least amount of code necessary to fix the bug
+* the code can't be radically changed without significant coordination with the Scratch Team, so these types of changes should be avoided
+* if you find yourself changing a substantial amount of code or considering radical changes, please ask for clarification -- we may have envisioned a different approach, or underestimated the amount of effort
+
+### Suggestions
+
+
+Please note: **_we are unlikely to accept PRs with new features that haven't been thought through and discussed as a group_**.
+
+Why? Because we have a strong belief in the value of keeping things simple for new users. It's been said that the Scratch Team spends about one hour of design discussion for every pixel in Scratch or ScratchJr. To learn more about our design philosophy, see [the Scratch Developers page](https://scratch.mit.edu/developers), or [this paper](https://ase.tufts.edu/DevTech/publications/scratchjr_idc_2013.pdf).
+
+### Other resources
+Beyond this repo, there are also some other resources that you might want to take a look at:
+* [Community Guidelines](https://github.com/LLK/scratch-www/wiki/Community-Guidelines) (we find it important to maintain a constructive and welcoming community for ScratchJr, just like on Scratch)
+* [Open Source forum](https://scratch.mit.edu/discuss/49/) on Scratch
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..9c073e4c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,15 @@
+### Expected Behavior
+
+_Please describe what should happen_
+
+### Actual Behavior
+
+_Describe what actually happens, screenshots are helpful._
+
+### Steps to Reproduce
+
+_Explain what someone needs to do in order to see what's described in *Actual behavior* above_
+
+### Device and Operating System
+
+_e.g. iPad mini, iOS 10.3 or Samsung Galaxy Tab S6, Android 10_
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..fd46e941
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,18 @@
+### Resolves
+
+_What Github issue does this resolve (please include link)? Please make sure that the PR title reflects what the PR will do, not what is changing.
+Please do not submit PRs that are not associated with a Github issue, or that only partially implement an issue._
+
+- Resolves #
+
+### Proposed Changes
+
+_Describe what this Pull Request does_
+
+### Reason for Changes
+
+_Explain why these changes should be made_
+
+### Test Coverage
+
+_Please show how you have added tests to cover your changes, or provide the testing steps to verify the change. Screenshots that show the change are also helpful._
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 09d55d03..00000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,10 +0,0 @@
-## Contributing
-Here are some ways you can contribute to ScratchJr:
-* Report bugs
- * If you find any bugs in ScratchJr, please let us know! Please be as descriptive as possible and include screenshots if possible.
-* Work on bugs and make pull requests
- * If you have made a fix for a bug, please make a pull request! Fork the scratchjr repository, make the code changes. Please provide an explanation of what you have changed, a link to the relevant bug, and how your changes fix the bug. All code that's merged into ScratchJr must pass our linter (`npm run lint`). We'll review your changes and hopefully merge them into the project, benefiting all users of ScratchJr!
-
-* [README](https://github.com/LLK/scratchjr/blob/master/README.md)
-* [Scratch Community Guidelines](https://github.com/LLK/scratch-www/wiki/Community-Guidelines)
-* [Issues](https://github.com/LLK/scratchjr/issues)
diff --git a/android/ScratchJr/.idea/codeStyles/Project.xml b/android/ScratchJr/.idea/codeStyles/Project.xml
new file mode 100644
index 00000000..681f41ae
--- /dev/null
+++ b/android/ScratchJr/.idea/codeStyles/Project.xml
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ xmlns:android
+
+ ^$
+
+
+
+
+
+
+
+
+ xmlns:.*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:id
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:name
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ name
+
+ ^$
+
+
+
+
+
+
+
+
+ style
+
+ ^$
+
+
+
+
+
+
+
+
+ .*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*
+
+ http://schemas.android.com/apk/res/android
+
+
+ ANDROID_ATTRIBUTE_ORDER
+
+
+
+
+
+
+ .*
+
+ .*
+
+
+ BY_NAME
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/ScratchJr/.idea/misc.xml b/android/ScratchJr/.idea/misc.xml
index e8ee3d97..d5d4a5ca 100644
--- a/android/ScratchJr/.idea/misc.xml
+++ b/android/ScratchJr/.idea/misc.xml
@@ -5,7 +5,7 @@
diff --git a/android/ScratchJr/app/src/main/java/org/scratchjr/android/JavaScriptDirectInterface.java b/android/ScratchJr/app/src/main/java/org/scratchjr/android/JavaScriptDirectInterface.java
index 856eaefa..f61f1f66 100644
--- a/android/ScratchJr/app/src/main/java/org/scratchjr/android/JavaScriptDirectInterface.java
+++ b/android/ScratchJr/app/src/main/java/org/scratchjr/android/JavaScriptDirectInterface.java
@@ -629,4 +629,24 @@ public void setAnalyticsPlacePref(String place) {
_activity.setAnalyticsPlacePref(place);
}
}
+
+ /**
+ * Record a user property
+ * @param prefObjStr single key-value JSON string, like "{\"school\": \"Central High\"}"
+ */
+ @JavascriptInterface
+ public void setAnalyticsPref(String prefObjStr) {
+ if (prefObjStr != null) {
+ try {
+ JSONObject jsonObject = new JSONObject(prefObjStr);
+ JSONArray jsonArray = jsonObject.names();
+ String key = jsonArray.getString(0);
+ String value = jsonObject.getString(key);
+ _activity.setAnalyticsPref(key, value);
+ } catch (JSONException e) {
+ Log.e(LOG_TAG, "JSON error: " + e.getMessage(), e);
+ return;
+ }
+ }
+ }
}
diff --git a/android/ScratchJr/app/src/main/java/org/scratchjr/android/ScratchJrActivity.java b/android/ScratchJr/app/src/main/java/org/scratchjr/android/ScratchJrActivity.java
index 6d4f9cab..e511efc9 100644
--- a/android/ScratchJr/app/src/main/java/org/scratchjr/android/ScratchJrActivity.java
+++ b/android/ScratchJr/app/src/main/java/org/scratchjr/android/ScratchJrActivity.java
@@ -337,7 +337,7 @@ private void receiveProject(Uri projectUri) {
}
// We send the project Base64-encoded to JavaScript where it's processed and unpacked
String base64Project = Base64.encodeToString(projectData.toByteArray(), Base64.DEFAULT);
- runJavaScript("iOS.loadProjectFromSjr('" + base64Project + "');");
+ runJavaScript("OS.loadProjectFromSjr('" + base64Project + "');");
}
public RelativeLayout getContainer() {
@@ -507,10 +507,9 @@ public void run() {
*/
public void logAnalyticsEvent(String category, String action, String label) {
Bundle params = new Bundle();
- params.putString(FirebaseAnalytics.Param.ITEM_ID, action);
params.putString(FirebaseAnalytics.Param.ITEM_CATEGORY, category);
params.putString(FirebaseAnalytics.Param.ITEM_NAME, label);
- _FirebaseAnalytics.logEvent(FirebaseAnalytics.Event.VIEW_ITEM, params);
+ _FirebaseAnalytics.logEvent(action, params);
}
/**
@@ -521,6 +520,15 @@ public void setAnalyticsPlacePref(String place) {
_FirebaseAnalytics.setUserProperty("place_preference", place);
}
+ /**
+ * Record a user property
+ * @param key like "school"
+ * @param value like "Central High"
+ */
+ public void setAnalyticsPref(String key, String value) {
+ _FirebaseAnalytics.setUserProperty(key, value);
+ }
+
public void translateAndScaleRectToContainerCoords(RectF rect, float devicePixelRatio) {
float wx = _webView.getX();
float wy = _webView.getY();
diff --git a/editions/free/ios-resources/Default-Landscape@2x~ipad.png b/editions/free/ios-resources/Default-Landscape@2x~ipad.png
index ed492020..34d2de11 100644
Binary files a/editions/free/ios-resources/Default-Landscape@2x~ipad.png and b/editions/free/ios-resources/Default-Landscape@2x~ipad.png differ
diff --git a/editions/free/ios-resources/Default-Landscape~ipad.png b/editions/free/ios-resources/Default-Landscape~ipad.png
index f6ee5829..e946fe5b 100644
Binary files a/editions/free/ios-resources/Default-Landscape~ipad.png and b/editions/free/ios-resources/Default-Landscape~ipad.png differ
diff --git a/editions/free/src/css/start.css b/editions/free/src/css/start.css
index f8989f0d..ff64a1f2 100644
--- a/editions/free/src/css/start.css
+++ b/editions/free/src/css/start.css
@@ -344,3 +344,44 @@ div.frame {
text-align: right;
}
+.optionsInstruction {
+ position: absolute;
+ width: 96%;
+ top: 0;
+ padding: 2%;
+ color: #ffdd44;
+ font-size: 2.75rem;
+ font-weight: 500;
+ text-align: center;
+ text-shadow: 1px 1px 4px #333333;
+ list-style-type: none;
+}
+
+.optionsInstruction.hide {display: none;}
+.optionsInstruction.show {display: block;}
+
+.optionsList {
+ position: absolute;
+ width: 92%;
+ height: 86%;
+ padding: 4%;
+ top: 6%;
+ column-count: 3;
+ column-fill: auto; /* use first column up first */
+ color: white;
+ font-size: 2.25rem;
+ font-weight: 500;
+ text-align: left;
+ text-shadow: 1px 1px 4px #333333;
+ list-style-type: none;
+ z-index: 1000;
+}
+
+.optionsList.hide {display: none;}
+.optionsList.show {display: block;}
+
+.optionsList > div {
+ display: block;
+ padding: .25em;
+ break-inside: avoid-column; /* don't allow column to break inside item */
+}
diff --git a/editions/free/src/index.html b/editions/free/src/index.html
index d2ba3484..40b2dd10 100644
--- a/editions/free/src/index.html
+++ b/editions/free/src/index.html
@@ -55,6 +55,11 @@