scratchfoundation/scratchjr
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratchjr.git synced 2024-11-28 18:15:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #139 from chrisgarrity/develop

Browse source 
Bring develop up to date with master
This commit is contained in:
chrisgarrity 2017-07-18 09:06:59 -04:00 committed by GitHub
commit 3143ec01d4
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -28,12 +28,12 @@ This repository has the following directory structure:
* <tt>src/</tt> - Shared Javasript code for iOS and Android common client. This is where most changes should be made for features, bug fixes, UI, etc. * <tt>src/</tt> - Shared Javasript code for iOS and Android common client. This is where most changes should be made for features, bug fixes, UI, etc.
* <tt>editions/</tt> - Assembly directories for each "flavor" of ScratchJr. These symlink to src for common code, and could diverge in settings and assets. * <tt>editions/</tt> - Assembly directories for each "flavor" of ScratchJr. These symlink to src for common code, and could diverge in settings and assets.
* <tt>free/</tt> - Free edition JavaScript, including all shared code for all releases * <tt>free/</tt> - Free edition JavaScript, including all shared code for all releases
* <tt>android/</tt> - Android port of Scratch Jr. (Java, Android Studio Projects) * <tt>android/</tt> - Android port of Scratch Jr. (Java, Android Studio Projects)
* <tt>ScratchJr/</tt> - Android Studio Project for ScratchJr Android Application * <tt>ScratchJr/</tt> - Android Studio Project for ScratchJr Android Application
* <tt>bin/</tt> - Build scripts and other executables * <tt>bin/</tt> - Build scripts and other executables
* <tt>doc/</tt> - Developer Documentation * <tt>doc/</tt> - Developer Documentation
* <tt>ios/</tt> - XCode project for iOS build. * <tt>ios/</tt> - XCode project for iOS build. (Make sure to open <tt>ScratchJr.xcworkspace</tt> not <tt>ScratchJr.xcodeproj</tt>)
## Building ScratchJr ## Building ScratchJr
To build the Android version, you need to have a system equipped with Android Studio. To build the iOS version, you need to have a Mac with XCode. To build the Android version, you need to have a system equipped with Android Studio. To build the iOS version, you need to have a Mac with XCode.

2
editions/free/src/localizations/en.json
View file

@ -361,7 +361,7 @@
"SHARING_BY_EMAIL": "Share by Email", "SHARING_BY_EMAIL": "Share by Email",
"SHARING_BY_AIRDROP": "Share by Airdrop", "SHARING_BY_AIRDROP": "Share by Airdrop",
"SHARING_EMAIL_SUBJECT": "ScratchJr Project: {PROJECT_NAME}", "SHARING_EMAIL_SUBJECT": "ScratchJr Project: {PROJECT_NAME}",
"SHARING_EMAIL_TEXT": "Click the icon to try my ScratchJr project on your iPad or Android tablet!<br><br>If you don't have the ScratchJr app, you can <a href='http://www.scratchjr.org'>download it</a> from the Apple App store or the Google Play Store.<br><br>With ScratchJr, children can create their own interactive stories and games.To learn more, see <a href='http://www.scratchjr.org'>scratchjr.org</a>.", "SHARING_EMAIL_TEXT": "Click the icon to try my ScratchJr project on your iPad or Android tablet!<br><br>If you don't have the ScratchJr app, you can <a href='http://www.scratchjr.org'>download it</a> from the Apple App store or the Google Play Store.<br><br>With ScratchJr, children can create their own interactive stories and games. To learn more, see <a href='http://www.scratchjr.org'>scratchjr.org</a>.",
"PARENTAL_GATE_EXPLANATION": "Why are we asking this? An adult must approve online sharing.", "PARENTAL_GATE_EXPLANATION": "Why are we asking this? An adult must approve online sharing.",
"GRID_NUMBER": "{N, number}", "GRID_NUMBER": "{N, number}",
"NEW_PROJECT_PREFIX": "Project", "NEW_PROJECT_PREFIX": "Project",

4
ios/ScratchJr/src/RecordSound.m
View file

@ -61,9 +61,9 @@ NSString *canRecord;
NSError *err; NSError *err;
NSDictionary *settings = [NSDictionary dictionaryWithObjectsAndKeys: NSDictionary *settings = [NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithInt: kAudioFormatLinearPCM], AVFormatIDKey, [NSNumber numberWithInt: kAudioFormatLinearPCM], AVFormatIDKey,
[NSNumber numberWithFloat: 22050.0], AVSampleRateKey, [NSNumber numberWithFloat: 16000.0], AVSampleRateKey,
[NSNumber numberWithInt: 1], AVNumberOfChannelsKey, [NSNumber numberWithInt: 1], AVNumberOfChannelsKey,
[NSNumber numberWithInt: 16], AVLinearPCMBitDepthKey, [NSNumber numberWithInt: 8], AVLinearPCMBitDepthKey,
nil]; nil];
recorder = [[ AVAudioRecorder alloc] initWithURL:url settings:settings error:&err]; recorder = [[ AVAudioRecorder alloc] initWithURL:url settings:settings error:&err];
if (err) { if (err) {

2
src/editor/ui/Record.js
View file

@ -173,7 +173,7 @@ export default class Record {
if (isRecording) { if (isRecording) {
Record.stopRecording(); Record.stopRecording();
} }
}, 60000); }, 30000);
} }
} }