scratchfoundation/scratchjr
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratchjr.git synced 2024-11-29 10:35:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
249 commits 73 branches 4 tags 34 MiB
Commit graph

249 commits

This branch
This branch
All branches
Author SHA1 Message Date
chrisgarrity
952ce54b52 Don’t reload index 
Instead of reloading the page, just load Start and have Start hide the usage parts.
 2017-08-10 17:03:30 -04:00
chrisgarrity
852df3edbb Add splash page for usage tracking 
* Adds a usage cookie
* Only asks for usage on first launch
* will need checking with the official version to make sure the right elements are showing/hiding.
 2017-08-10 10:00:22 -04:00
chrisgarrity
3143ec01d4 Merge pull request #139 from chrisgarrity/develop 
Bring develop up to date with master
 2017-07-18 09:06:59 -04:00
chrisgarrity
5c2cd3ce23 Merge pull request #138 from chrisgarrity/reduce-sound-sizes 
Limit size of sounds
 2017-07-17 16:01:33 -04:00
chrisgarrity
16e4b7ce27 Limit size of sounds 
We know that projects with lots of (large) sounds tend to crash ScratchJr. Hopefully reducing the size of the sounds will help to reduce the number of crashes.
 2017-07-17 11:25:59 -04:00
chrisgarrity
f6c75c3019 Merge pull request #133 from chrisgarrity/email-text-typo 
Fix typo in SHARING_EMAIL_TEXT
 2017-05-24 12:23:56 -04:00
chrisgarrity
6626ba6cea Fix typo in SHARING_EMAIL_TEXT 
missing space
 2017-05-05 11:49:21 -04:00
chrisgarrity
02fc0fd26a Update README.md 2017-05-05 11:39:07 -04:00
chrisgarrity
d4a6b2885d Merge pull request #121 from chrisgarrity/bug/iOS-sound 
Rewrite iOS sound management to use native audio instead of webaudio. Quirks are consistent with Android which was already doing native audio.
 2017-03-14 21:56:59 -04:00
chrisgarrity
7e4f6682d6 Fun with sound timers 
If the same sound gets triggered while it’s playing, the sound restarts and both sound blocks will be highlighted until the sound completes - this matches what happens on Android.

Also more formatting changes.
 2017-03-14 18:09:43 -04:00
chrisgarrity
f752ff5760 Fix formatting and restart bug 
In the current system you can’t have the same sound playing more than once at the same time - this is how it was implemented on Android, so we used the same restriction on iOS.

However in the previous version if you interrupted the sound to play it again, it continued from where it was instead of starting over. So it didn’t appear to do anything. Added resetting the current time to 0.0 on play to restart sounds.
 2017-03-14 14:31:18 -04:00
chrisgarrity
bd21989830 Merge pull request #122 from chrisgarrity/bug/downsample-sounds 
Reduced sound effects to 16-bit for Android compatibility
 2017-03-13 14:15:47 -04:00
chrisgarrity
46f77164d8 Reduced sound effects to 16-bit for Android compatibility 
- down sampled all the .wav files
- updated plist for free edition to include new required keys for iOS10
 2017-03-13 13:56:02 -04:00
chrisgarrity
e9d0d0d7be Change iOS to use native sound. 
This is after the coding session with Paula - mostly just clean up of obsolete code and leftover debugging output.
 2017-03-08 11:16:31 -05:00
chrisgarrity
6a6d92e06b [WIP] new audio engine 
Post coding session with Paula
 2017-02-21 17:17:35 -05:00
chrisgarrity
57114ed678 Merge pull request #113 from chrisgarrity/feature-addlanguages 
Adding 5 more languages to ScratchJr:
Catalan
French
Italian
Dutch
Thai (as a non-latin character set test)
 2016-09-20 11:21:21 -04:00
chrisgarrity
07ff36a1ae Pull latest translations from transifex 2016-09-20 09:54:39 -04:00
chrisgarrity
72b807726b iOS: show unescaped filename in email 
Displayed name in the email was using the escaped filename rather than the filename passed as the name parameter.
 2016-09-19 17:10:10 -04:00
chrisgarrity
e035b0f86e Sanitize filename 
Allow non-latin characters, but remove anything that could be problematic
 2016-09-19 15:17:13 -04:00
chrisgarrity
9923c34e76 Add new languages to ScratchJr 
Needed slight adjustment to css for settings
added new language codes to settings.json and Localizations.js
 2016-09-06 17:33:17 -04:00
chrisgarrity
940a08998c Merge pull request #107 from chrisgarrity/uses-sdk 
add default uses-sdk
 2016-08-13 13:38:58 -04:00
chrisgarrity
ef04f2e1e2 add default uses-sdk 
PBS Kids has automated testing that looks for uses-sdk with a minimum targetSDK of 23. Even though this gets overridden in the build.gradle settings, adding a line with default values to get through their testing.
 2016-08-12 10:48:49 -04:00
chrisgarrity
576bf9d0e7 Merge pull request #104 from chrisgarrity/bug/gh102 
Localize sample project name
 2016-06-23 15:37:22 -04:00
chrisgarrity
6e46696d2c Localize sample project name 2016-06-22 11:58:48 -04:00
chrisgarrity
f3181a1757 Merge pull request #100 from chrisgarrity/master 
Add settings to index page topbar
 2016-06-15 08:40:00 -04:00
Andrew Sliwinski
c2da808405 Do not throw exception when app moves to background during audio recording. Resolves GH-91 2016-05-31 15:50:50 -04:00
Andrew Sliwinski
6de70fd6ba Merge pull request #94 from thisandagain/bugfix/91 
Do not throw exception when backgrounding app during audio recording
 2016-05-31 09:02:32 -04:00
chrisgarrity
3d6e015a6b Add settings to index page topbar 
Add the settings button to the topbar - used in the PBS Kids version.
 2016-05-26 14:00:21 -04:00
Andrew Sliwinski
693db43729 Do not throw exception when app moves to background during audio recording. Resolves GH-91 2016-05-19 20:19:27 -07:00
chrisgarrity
c2071f8168 Merge pull request #87 from thisandagain/bugfix/473 
Finalize license and trademark information
 2016-05-18 09:21:35 -04:00
chrisgarrity
63bb184917 Merge pull request #86 from chrisgarrity/master 
Update SmallestWidthDp in manifest
 2016-05-18 09:20:13 -04:00
Andrew Sliwinski
4be8d81a6d Add license and trademark. Update package.json author information. Resolves GH-473 2016-05-18 04:58:44 -07:00
chrisgarrity
2245410d99 Update SmallestWidthDp in manifest 
Changed android:requiresSmallestWidthDp from 600 to 500.
Android suggests that 600 is a normal value for 7 inch tablets and up. It turns out that many 7-inch tablets are in the 500-600 range (half of the Amazon ones for example).

Fixes #85
 2016-05-16 10:29:49 -04:00
chrisgarrity
fca4cd04cf Make microphone optional in manifest 2016-05-09 10:59:44 -04:00
chrisgarrity
ecde9e726c Merge pull request #62 from chrisgarrity/master 
Cleaned up Android Studio configuration
 2016-05-03 09:16:04 -04:00
chrisgarrity
8183e302d7 Remove redundant .idea folder 
More clean up of unecessary files/folders.
.idea folder at top level (current one is in android/Scratchjr
.settings/.project/.esformatter leftover files from other IDEs and tools
Added notes to the README to clarify what folder/file to open in XCode or Android Studio
 2016-05-02 16:42:50 -04:00
chrisgarrity
0ba59b499d More clean up of Android studio files 
untrack workspace.xml and remove obsolete files
 2016-05-02 13:02:36 -04:00
chrisgarrity
4734b53f49 Updating .gitignore 
Untracking gradle.xml, updating .gitgnore.
 2016-05-02 11:05:08 -04:00
chrisgarrity
a93d91808d Untrack app.iml 2016-05-02 09:30:43 -04:00
chrisgarrity
7ca3da3793 Merge pull request #58 from chrisgarrity/master 
Fix for Android format bugs on language selection screen
 2016-04-15 13:36:34 -04:00
chrisgarrity
e41d145cbd Fix localization selection formatting bug on Android 
Position selected checkmark pseudo element absolutely to fix bug on Android.
Fix fontsize at 34.5px (previous font size relative to view height looked good on iPad, but was too small on 16:9 android)
 2016-04-15 12:30:56 -04:00
chrisgarrity
5136f2ae75 Update Spanish translations 2016-04-15 12:01:14 -04:00
Tim Mickel
70ddc00913 Merge pull request #56 from tmickel/bugfix/storystarter-autosave 
Prevent new projects via autosave in story-starter mode
 2016-04-11 14:37:51 -04:00
Tim Mickel
d928f81821 Merge pull request #55 from LLK/bugfix/autosave-disable 
Disable autosave when onHold, Project.saving, or info box open
 2016-04-11 14:31:28 -04:00
Tim Mickel
7fd14cc6d4 Add missing line-break in UI.js 2016-04-11 14:31:04 -04:00
Tim Mickel
5dd0bc964e Prevent new projects via autosave in story-starter mode 2016-04-11 14:13:45 -04:00
Tim Mickel
ae52b67863 Disable autosave when onHold, Project.saving, or info box open 2016-04-11 14:01:26 -04:00
Andrew Sliwinski
9f14b53853 Merge pull request #53 from thisandagain/bugfix/500 
Prevent crash bug edge case with sharing by email. Resolves GH-500
 2016-04-08 13:00:17 -04:00
Andrew Sliwinski
fcbe425ea9 Merge pull request #54 from thisandagain/bugfix/36 
Explicitly persist and accept cookies. Resolves GH-36
 2016-04-08 12:59:43 -04:00
chrisgarrity
0867873405 Add store listing content as json for localization 
First part of LLK/scratchjr-private#501
Still need to get actual translations from translators and upload to iTunes/Google Play
 2016-04-07 16:49:50 -04:00