Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 11:41:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Advance the haptic feedback from onClick to onPressDown

Browse source
This commit is contained in:
Gabriel Calero 2018-04-24 17:15:05 -03:00
parent 11d2321467
commit d33855b860
3 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/system/+android/actionbar.js
View file

@ -33,19 +33,24 @@ function init() {
hoverBgOpacity: 0.0, hoverBgOpacity: 0.0,
activeBgOpacity: 0.0 activeBgOpacity: 0.0
}); });
backButton.clicked.connect(onBackPressed); backButton.entered.connect(onBackPressed);
backButton.clicked.connect(onBackClicked);
} }
function onBackPressed() { function onBackPressed() {
App.performHapticFeedback("CONTEXT_CLICK"); App.performHapticFeedback("CONTEXT_CLICK");
}
function onBackClicked() {
App.openAndroidActivity("Home"); App.openAndroidActivity("Home");
} }
Script.scriptEnding.connect(function() { Script.scriptEnding.connect(function() {
if(backButton) { if(backButton) {
backButton.clicked.disconnect(onBackPressed); backButton.entered.disconnect(onBackPressed);
backButton.clicked.disconnect(onBackClicked);
} }
}); });

9
scripts/system/+android/audio.js
View file

@ -15,7 +15,7 @@
var audiobar; var audiobar;
var audioButton; var audioButton;
var logEnabled = true; var logEnabled = false;
function printd(str) { function printd(str) {
if (logEnabled) if (logEnabled)
@ -40,13 +40,15 @@ function init() {
onMuteToggled(); onMuteToggled();
audioButton.clicked.connect(onMuteClicked); audioButton.clicked.connect(onMuteClicked);
audioButton.entered.connect(onMutePressed);
Audio.mutedChanged.connect(onMuteToggled); Audio.mutedChanged.connect(onMuteToggled);
} }
function onMuteClicked() { function onMuteClicked() {
printd("On Mute Clicked");
//Menu.setIsOptionChecked("Mute Microphone", !Menu.isOptionChecked("Mute Microphone"));
Audio.muted = !Audio.muted; Audio.muted = !Audio.muted;
}
function onMutePressed() {
App.performHapticFeedback("CONTEXT_CLICK"); App.performHapticFeedback("CONTEXT_CLICK");
} }
@ -59,6 +61,7 @@ function onMuteToggled() {
Script.scriptEnding.connect(function () { Script.scriptEnding.connect(function () {
if(audioButton) { if(audioButton) {
audioButton.clicked.disconnect(onMuteClicked); audioButton.clicked.disconnect(onMuteClicked);
audioButton.entered.disconnect(onMutePressed);
Audio.mutedChanged.connect(onMuteToggled); Audio.mutedChanged.connect(onMuteToggled);
} }
}); });

17
scripts/system/+android/modes.js
View file

@ -57,15 +57,22 @@ function init() {
}); });
switchToMode(getCurrentModeSetting()); switchToMode(getCurrentModeSetting());
modeButton.clicked.connect(function() { modeButton.entered.connect(modeButtonPressed);
App.performHapticFeedback("CONTEXT_CLICK"); modeButton.clicked.connect(modeButtonClicked);
switchToMode(nextMode[currentMode]);
});
} }
function shutdown() { function shutdown() {
modeButton.entered.disconnect(modeButtonPressed);
modeButton.clicked.disconnect(modeButtonClicked);
}
function modeButtonPressed() {
App.performHapticFeedback("CONTEXT_CLICK");
}
function modeButtonClicked() {
switchToMode(nextMode[currentMode]);
} }
function saveCurrentModeSetting(mode) { function saveCurrentModeSetting(mode) {