diff --git a/.esformatter b/.esformatter deleted file mode 100644 index d7bfb2a..0000000 --- a/.esformatter +++ /dev/null @@ -1,26 +0,0 @@ -{ - "indent": { - "value": " " - }, - "whiteSpace": { - "before": { - "FunctionExpressionOpeningBrace": 1, - "FunctionExpressionClosingBrace": 0 - }, - "after": { - "FunctionExpressionOpeningBrace": 1, - "FunctionExpressionClosingBrace": -1, - "FunctionReservedWord": 1 - } - }, - "plugins": [ - "esformatter-quotes", - "esformatter-semicolons", - "esformatter-dot-notation", - "esformatter-braces" - ], - "quotes": { - "type": "single", - "avoidEscape": false - } -} diff --git a/.gitignore b/.gitignore index e8f79a3..e423d44 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,23 @@ /src/build/ .DS_Store *.iml +.gradle + +# User-specific stuff: +.idea/workspace.xml +.idea/tasks.xml +.idea/dictionaries +.idea/vcs.xml +.idea/jsLibraryMappings.xml + +# Sensitive or high-churn files: +.idea/dataSources.ids +.idea/dataSources.xml +.idea/dataSources.local.xml +.idea/sqlDataSources.xml +.idea/dynamic.xml +.idea/uiDesigner.xml + +# Gradle: +.idea/gradle.xml +.idea/libraries diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/libraries/Size_Pngs.xml b/.idea/libraries/Size_Pngs.xml deleted file mode 100644 index 627c840..0000000 --- a/.idea/libraries/Size_Pngs.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/gradle_wrapper.xml b/.idea/libraries/gradle_wrapper.xml deleted file mode 100644 index 0593464..0000000 --- a/.idea/libraries/gradle_wrapper.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index f50b2b9..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - 1.7 - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 29315b5..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 276ba54..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,264 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1434859049570 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.project b/.project deleted file mode 100644 index 30a5db9..0000000 --- a/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - scratchjr_git - - - - - - - - diff --git a/.settings/launch.json b/.settings/launch.json deleted file mode 100644 index 2a6441e..0000000 --- a/.settings/launch.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "version": "0.1.0", - // List of configurations. Add new configurations or edit existing ones. - // ONLY "node" and "mono" are supported, change "type" to switch. - "configurations": [ - { - // Name of configuration; appears in the launch configuration drop down menu. - "name": "Launch app.js", - // Type of configuration. Possible values: "node", "mono". - "type": "node", - // Workspace relative or absolute path to the program. - "program": "app.js", - // Automatically stop program after launch. - "stopOnEntry": true, - // Command line arguments passed to the program. - "args": [], - // Workspace relative or absolute path to the working directory of the program being debugged. Default is the current workspace. - "cwd": ".", - // Workspace relative or absolute path to the runtime executable to be used. Default is the runtime executable on the PATH. - "runtimeExecutable": null, - // Environment variables passed to the program. - "env": { } - }, - { - "name": "Attach", - "type": "node", - // TCP/IP address. Default is "localhost". - "address": "localhost", - // Port to attach to. - "port": 5858 - } - ] -} diff --git a/README.md b/README.md index b7c2f91..e610338 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ On OS X: * Run brew install librsvg to install rsvg-convert * Run brew install imagemagick to install ImageMagick -Once these are installed, select the appropriate target in XCode or the appropriate flavor/build variant in Android Studio. +Once these are installed, select the appropriate target in XCode or the appropriate flavor/build variant in Android Studio. To build in Android Studio, open the project android/ScratchJr. To build for iOS in XCode, open ios/ScratchJr.xcworkspace as ScratchJr uses CocoaPods. ## Where and how to make changes diff --git a/android/ScratchJr/.gitignore b/android/ScratchJr/.gitignore index fa54292..e1edd88 100644 --- a/android/ScratchJr/.gitignore +++ b/android/ScratchJr/.gitignore @@ -1,7 +1,26 @@ -.gradle /local.properties -/.idea/workspace.xml -/.idea/libraries .DS_Store /build /assets + +*.iml +.gradle + +# User-specific stuff: +.idea/workspace.xml +.idea/tasks.xml +.idea/dictionaries +.idea/vcs.xml +.idea/jsLibraryMappings.xml + +# Sensitive or high-churn files: +.idea/dataSources.ids +.idea/dataSources.xml +.idea/dataSources.local.xml +.idea/sqlDataSources.xml +.idea/dynamic.xml +.idea/uiDesigner.xml + +# Gradle: +.idea/gradle.xml +.idea/libraries diff --git a/.idea/vcs.xml b/android/ScratchJr/.idea/encodings.xml similarity index 51% rename from .idea/vcs.xml rename to android/ScratchJr/.idea/encodings.xml index 35eb1dd..97626ba 100644 --- a/.idea/vcs.xml +++ b/android/ScratchJr/.idea/encodings.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/android/ScratchJr/.idea/gradle.xml b/android/ScratchJr/.idea/gradle.xml deleted file mode 100644 index 261ec28..0000000 --- a/android/ScratchJr/.idea/gradle.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/android/ScratchJr/.idea/misc.xml b/android/ScratchJr/.idea/misc.xml index 1a3eaff..e45faed 100644 --- a/android/ScratchJr/.idea/misc.xml +++ b/android/ScratchJr/.idea/misc.xml @@ -1,32 +1,5 @@ - - - - - - - diff --git a/android/ScratchJr/.idea/vcs.xml b/android/ScratchJr/.idea/vcs.xml deleted file mode 100644 index b2bdec2..0000000 --- a/android/ScratchJr/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/android/ScratchJr/app/app.iml b/android/ScratchJr/app/app.iml deleted file mode 100644 index 2e1e61c..0000000 --- a/android/ScratchJr/app/app.iml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file