Skip to content

Commit

Permalink
Merge branch 'feature/fixapkbuikder' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Lionel Laské committed Sep 18, 2024
2 parents 58551c1 + 291f837 commit 3baa84b
Show file tree
Hide file tree
Showing 16 changed files with 50 additions and 37 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Added
- Launch activity directly from url of CLI

### Changed
- Upgrade to Cordova 12

### Fixed
- Images go under each other while editing in Fototoon #1552
- Missalignment of icons and text in Fototoon activity "clean all" button #1596
Expand Down
9 changes: 7 additions & 2 deletions activities/PhysicsJS.activity/js/activity.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,11 @@ define(["sugar-web/activity/activity","tutorial","l10n","sugar-web/env"], functi
zoom();
}
if (readyToWatch) {
watchId = navigator.accelerometer.watchAcceleration(accelerationChanged, null, { frequency: 500 });
var accelerometer = new Accelerometer({ frequency: 500 });
if (accelerometer) {
accelerometer.addEventListener('reading', accelerationChanged);
accelerometer.start();
}
readyToWatch = false;
}
});
Expand Down Expand Up @@ -183,8 +187,9 @@ define(["sugar-web/activity/activity","tutorial","l10n","sugar-web/env"], functi
}
}, true);

function accelerationChanged(acceleration) {
function accelerationChanged(accelerationEvent) {
if (!sensorMode) return;
var acceleration = accelerationEvent.target;
if (acceleration.x < -4.5) {
if (acceleration.y > 4.75)
setGravity(3);
Expand Down
75 changes: 40 additions & 35 deletions config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,34 +23,12 @@
<preference name="DisallowOverscroll" value="true"/>

<content src="index.html" />
<plugin name="cordova-plugin-whitelist" version="1" />
<access origin="*" />
<allow-navigation href="*" />

<preference name="android-minSdkVersion" value="22" />
<preference name="android-targetSdkVersion" value="33" />
<preference name="android-compileSdkVersion" value="33" />

<engine name="android" spec="9.0.0" />
<plugin name="cordova-plugin-inappbrowser" spec="5.0.0" />
<plugin name="cordova-plugin-camera" spec="5.0.1" />
<plugin name="cordova-plugin-file" spec="6.0.2" />
<plugin name="cordova-plugin-device" spec="2.0.3" />
<plugin name="cordova-plugin-device-motion" spec="2.0.1" />
<plugin name="cordova-plugin-dialogs" spec="2.0.2" />
<plugin name="cordova-plugin-file-transfer" spec="1.7.1" />
<plugin name="cordova-plugin-fullscreen" spec="1.3.0" />
<plugin name="cordova-plugin-ios-longpress-fix" spec="1.1.0" />
<plugin name="cordova-plugin-media" spec="5.0.3" />
<plugin name="cordova-plugin-media-capture" spec="3.0.3" />
<plugin name="cordova-plugin-network-information" spec="2.0.2" />
<plugin name="cordova-plugin-qrscanner" spec="3.0.1" />
<plugin name="cordova-plugin-splashscreen" spec="6.0.0" />
<plugin name="cordova-plugin-add-swift-support" spec="2.0.2" />
<plugin name="cordova-plugin-vibration" spec="3.1.1" />
<plugin name="cordova-plugin-whitelist" spec="1.3.4" />
<plugin name="com.develcode.plugins.volumeControl" spec="https://github.com/manusimpson/Phonegap-Android-VolumeControl.git" />
<plugin name="cordova-plugin-audioinput" spec="1.0.2" />
<engine name="android" spec="12.0.0" />

<!-- &SugarizerOS
<plugin name="cordova-plugin-sugarizeros" spec="../cordova-plugin-sugarizeros" />
Expand All @@ -60,27 +38,54 @@
<edit-config file="app/src/main/AndroidManifest.xml" target="/manifest/application/activity" mode="merge">
<activity android:exported="true"/>
</edit-config>
<preference name="AndroidInsecureFileModeEnabled" value="true" />
<icon density="ldpi" src="res/icon/android/icon-36-ldpi.png" />
<icon density="mdpi" src="res/icon/android/icon-48-mdpi.png" />
<icon density="hdpi" src="res/icon/android/icon-72-hdpi.png" />
<icon density="xhdpi" src="res/icon/android/icon-96-xhdpi.png" />
<icon density="xxhdpi" src="res/icon/android/icon-144-xxhdpi.png" />
<icon density="xxxhdpi" src="res/icon/android/icon-192-xxxhdpi.png" />
<plugin name="cordova-plugin-inappbrowser" spec="6.0.0" />
<plugin name="cordova-plugin-camera" spec="7.0.0" />
<plugin name="cordova-plugin-file" spec="8.1.0" />
<plugin name="cordova-plugin-device" spec="3.0.0" />
<plugin name="cordova-plugin-dialogs" spec="2.0.2" />
<plugin name="cordova-plugin-file-transfer" spec="2.0.0" />
<plugin name="cordova-plugin-fullscreen" spec="1.3.0" />
<plugin name="cordova-plugin-ios-longpress-fix" spec="1.1.0" />
<plugin name="cordova-plugin-media" spec="7.0.0" />
<plugin name="cordova-plugin-media-capture" spec="5.0.0" />
<plugin name="cordova-plugin-network-information" spec="3.0.0" />
<plugin name="cordova-plugin-qrscanner-12" spec="https://github.com/Meeco/cordova-plugin-qrscanner" />
<plugin name="cordova-plugin-add-swift-support" spec="2.0.2" />
<plugin name="cordova-plugin-vibration" spec="3.1.1" />
<plugin name="com.develcode.plugins.volumeControl" spec="https://github.com/manusimpson/Phonegap-Android-VolumeControl.git" />
<plugin name="cordova-plugin-audioinput" spec="1.0.3" />
<plugin name="cordova-plugin-ionic-keyboard" spec="2.2.0" />
<splash src="res/splash/android/drawable-land-hdpi.png" density="land-hdpi" />
<splash src="res/splash/android/drawable-land-ldpi.png" density="land-ldpi" />
<splash src="res/splash/android/drawable-land-mdpi.png" density="land-mdpi" />
<splash src="res/splash/android/drawable-land-xhdpi.png" density="land-xhdpi" />
<splash src="res/splash/android/drawable-land-xxhdpi.png" density="land-xxhdpi" />
<splash src="res/splash/android/drawable-land-xxxhdpi.png" density="land-xxxhdpi" />
<splash src="res/splash/android/drawable-port-hdpi.png" density="port-hdpi" />
<splash src="res/splash/android/drawable-port-ldpi.png" density="port-ldpi" />
<splash src="res/splash/android/drawable-port-mdpi.png" density="port-mdpi" />
<splash src="res/splash/android/drawable-port-xhdpi.png" density="port-xhdpi" />
<splash src="res/splash/android/drawable-port-xxhdpi.png" density="port-xxhdpi" />
<splash src="res/splash/android/drawable-port-xxxhdpi.png" density="port-xxxhdpi" />
<preference name="AndroidPersistentFileLocation" value="Compatibility" />
<preference name="AndroidWindowSplashScreenAnimatedIcon" value="res/icon/android/icon-192x192.png" />
<preference name="AndroidWindowSplashScreenBackgroundColor" value="#FF000000" />
</platform>
<platform name="ios">
<plugin name="cordova-plugin-inappbrowser" spec="5.0.0" />
<plugin name="cordova-plugin-camera" spec="5.0.1" />
<plugin name="cordova-plugin-file" spec="6.0.2" />
<plugin name="cordova-plugin-device" spec="2.0.3" />
<plugin name="cordova-plugin-device-motion" spec="2.0.1" />
<plugin name="cordova-plugin-dialogs" spec="2.0.2" />
<plugin name="cordova-plugin-file-transfer" spec="1.7.1" />
<plugin name="cordova-plugin-fullscreen" spec="1.3.0" />
<plugin name="cordova-plugin-ios-longpress-fix" spec="1.1.0" />
<plugin name="cordova-plugin-media" spec="5.0.3" />
<plugin name="cordova-plugin-media-capture" spec="3.0.3" />
<plugin name="cordova-plugin-network-information" spec="2.0.2" />
<plugin name="cordova-plugin-qrscanner" spec="3.0.1" />
<plugin name="cordova-plugin-splashscreen" spec="6.0.0" />
<plugin name="cordova-plugin-add-swift-support" spec="2.0.2" />
<plugin name="cordova-plugin-vibration" spec="3.1.1" />
<plugin name="cordova-plugin-whitelist" spec="1.3.4" />
<plugin name="com.develcode.plugins.volumeControl" spec="https://github.com/manusimpson/Phonegap-Android-VolumeControl.git" />
<plugin name="cordova-plugin-audioinput" spec="1.0.2" />
<plugin name="cordova-plugin-wkwebview-file-xhr" spec="https://github.com/llaske/cordova-plugin-wkwebview-file-xhr.git" />
<config-file parent="UIStatusBarHidden" target="*-Info.plist">
<true/>
Expand Down
Binary file added res/icon/android/icon-192x192.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed res/splash/android/drawable-land-hdpi.png
View file
Binary file not shown.
Binary file removed res/splash/android/drawable-land-ldpi.png
View file
Binary file not shown.
Binary file removed res/splash/android/drawable-land-mdpi.png
View file
Binary file not shown.
Binary file removed res/splash/android/drawable-land-xhdpi.png
View file
Binary file not shown.
Binary file removed res/splash/android/drawable-land-xxhdpi.png
View file
Binary file not shown.
Binary file removed res/splash/android/drawable-land-xxxhdpi.png
View file
Binary file not shown.
Binary file removed res/splash/android/drawable-port-hdpi.png
View file
Binary file not shown.
Binary file removed res/splash/android/drawable-port-ldpi.png
View file
Binary file not shown.
Binary file removed res/splash/android/drawable-port-mdpi.png
View file
Binary file not shown.
Binary file removed res/splash/android/drawable-port-xhdpi.png
View file
Binary file not shown.
Binary file removed res/splash/android/drawable-port-xxhdpi.png
View file
Binary file not shown.
Binary file removed res/splash/android/drawable-port-xxxhdpi.png
View file
Binary file not shown.

0 comments on commit 3baa84b

Please sign in to comment.