scratchfoundation/scratchjr
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratchjr.git synced 2025-02-17 17:01:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #221 from LLK/ios-scroll-bug

Browse source 
Fixes the iOS scrolling problem
This commit is contained in:
chrisgarrity 2019-10-25 16:24:59 -04:00 committed by GitHub
commit a5686e9111
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 68 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/ScratchJr/app/src/main/res/layout/activity_scratch_jr.xml
View file

@ -11,6 +11,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:overScrollMode="never"
/>
</RelativeLayout>

41
editions/free/android-resources/google-services.json
View file

@ -1 +1,40 @@
{"project_info":{"project_id":"scratchjr-1118","project_number":"162006577143","name":"ScratchJr"},"client":[{"client_info":{"mobilesdk_app_id":"1:162006577143:android:30ace9185722a94d","client_id":"android:org.scratchjr.androidfree","client_type":1,"android_client_info":{"package_name":"org.scratchjr.androidfree"}},"oauth_client":[],"api_key":[{"current_key":""}],"services":{"analytics_service":{"status":2,"analytics_property":{"tracking_id":"UA-68375411-1"}},"cloud_messaging_service":{"status":1,"apns_config":[]},"appinvite_service":{"status":1,"other_platform_oauth_client":[]},"google_signin_service":{"status":1},"ads_service":{"status":1}}}],"client_info":[],"ARTIFACT_VERSION":"1"}
{
"project_info": {
"project_number": "",
"firebase_url": "",
"project_id": "",
"storage_bucket": ""
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "",
"android_client_info": {
"package_name": ""
}
},
"oauth_client": [
{
"client_id": "",
"client_type": 3
}
],
"api_key": [
{
"current_key": ""
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "",
"client_type": 3
}
]
}
}
}
],
"configuration_version": "1"
}

28
editions/free/ios-resources/GoogleService-Info.plist
View file

@ -2,23 +2,37 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>TRACKING_ID</key>
<string>UA-68375411-1</string>
<key>CLIENT_ID</key>
<string></string>
<key>REVERSED_CLIENT_ID</key>
<string></string>
<key>ANDROID_CLIENT_ID</key>
<string></string>
<key>API_KEY</key>
<string></string>
<key>GCM_SENDER_ID</key>
<string></string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>edu.mitmedialab.scratchjr</string>
<string></string>
<key>PROJECT_ID</key>
<string></string>
<key>STORAGE_BUCKET</key>
<string></string>
<key>IS_ADS_ENABLED</key>
<false/>
<key>IS_ANALYTICS_ENABLED</key>
<true/>
<key>IS_APPINVITE_ENABLED</key>
<false/>
<true/>
<key>IS_GCM_ENABLED</key>
<false/>
<true/>
<key>IS_SIGNIN_ENABLED</key>
<false/>
<true/>
<key>GOOGLE_APP_ID</key>
<string>1:162006577143:ios:4b9a5a9918a291b0</string>
<string></string>
<key>DATABASE_URL</key>
<string></string>
</dict>
</plist>

2
ios/Podfile.lock
View file

@ -95,6 +95,6 @@ SPEC CHECKSUMS:
GoogleUtilities: f895fde57977df4e0233edda0dbeac490e3703b6
nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
PODFILE CHECKSUM: 7ea7f79f063091643bd6a21d5d4b4e8981dda797
PODFILE CHECKSUM: d5c223883d3d06483e7e9d419cc9560fba5781d5
COCOAPODS: 1.8.4

1
ios/ScratchJr.xcodeproj/project.pbxproj
View file

@ -206,7 +206,6 @@
5A3230A01AEC02BC09345F16 /* Pods-ScratchJrTests.debug.xcconfig */,
72E2C9BF3BE9F67099F0180F /* Pods-ScratchJrTests.release.xcconfig */,
);
name = Pods;
path = Pods;
sourceTree = "<group>";
};

8
src/editor/ScratchJr.js
View file

@ -226,15 +226,17 @@ export default class ScratchJr {
static editorEvents () {
document.ongesturestart = undefined;
document.ontouchmove = function (e) {
e.preventDefault();
};
window.ontouchstart = ScratchJr.unfocus;
if (isTablet) {
window.ontouchend = undefined;
} else {
window.onmouseup = undefined;
}
document.body.addEventListener('touchmove',
function (e) {
e.preventDefault();
},
{passive: false});
}
static unfocus (evt) {