Skip to content

Commit

Permalink
apk branding, velocity mode, remove build server API calls as workaround
Browse files Browse the repository at this point in the history
  • Loading branch information
@tblaha
tblaha committed Oct 5, 2023
1 parent 5b7414a commit 60af0ae
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 29 deletions.
Binary file modified assets/android/icon/drawable-hdpi-icon.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 modified assets/android/icon/drawable-ldpi-icon.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 modified assets/android/icon/drawable-mdpi-icon.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 modified assets/android/icon/drawable-xhdpi-icon.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 modified assets/android/icon/drawable-xxhdpi-icon.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 modified assets/android/icon/drawable-xxxhdpi-icon.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.
4 changes: 4 additions & 0 deletions locales/en/messages.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2448,6 +2448,10 @@
"message": "Experimental position controller with external position system optitrack",
"description": "Help text to POSITION CONTROL mode"
},
"auxiliaryHelpMode_VELOCITYCONTROL": {
"message": "Experimental velocity controller with external position system optitrack and sticks as setpoints",
"description": "Help text to VELOCITY CONTROL mode"
},
"adjustmentsHelp": {
"message": "Configure adjustment switches. See the 'in-flight adjustments' section of the manual for details. The changes that adjustment functions make are not saved automatically."
},
Expand Down
22 changes: 11 additions & 11 deletions src/css/main.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ input[type="number"] {
height: 52px;
a.flash {
background-color: var(--accent);
border: 1px solid #dba718;
border: 1px solid #d3d3d3;
background-repeat: no-repeat;
height: 50px;
width: 50px;
Expand Down Expand Up @@ -299,7 +299,7 @@ input[type="number"] {
height: 52px;
a.connect {
background-color: var(--accent);
border: 1px solid #dba718;
border: 1px solid #d3d3d3;
background-repeat: no-repeat;
height: 50px;
width: 50px;
Expand Down Expand Up @@ -1076,7 +1076,7 @@ dialog {
margin-right: 20px;
background-color: var(--accent);
border-radius: 3px;
border: 1px solid #dba718;
border: 1px solid #d3d3d3;
color: #000;
float: left;
font-weight: bold;
Expand Down Expand Up @@ -1205,7 +1205,7 @@ dialog {
margin-right: 20px;
background-color: var(--accent);
border-radius: 3px;
border: 1px solid #dba718;
border: 1px solid #d3d3d3;
color: #000;
float: right;
font-weight: bold;
Expand Down Expand Up @@ -1429,7 +1429,7 @@ dialog {
margin-right: 20px;
background-color: var(--accent);
border-radius: 3px;
border: 1px solid #dba718;
border: 1px solid #d3d3d3;
color: #000;
float: right;
font-weight: bold;
Expand Down Expand Up @@ -1458,7 +1458,7 @@ dialog {
text-align: center;
background-color: var(--accent);
border-radius: 4px;
border: 1px solid #dba718;
border: 1px solid #d3d3d3;
color: #000;
font-weight: 600;
font-size: 12px;
Expand Down Expand Up @@ -1496,7 +1496,7 @@ dialog {
margin-right: 10px;
background-color: var(--accent);
border-radius: 3px;
border: 1px solid #dba718;
border: 1px solid #d3d3d3;
color: #000;
font-weight: bold;
font-size: 12px;
Expand Down Expand Up @@ -1582,11 +1582,11 @@ dialog {
background-color: var(--accent);
text-shadow: 0 1px rgba(255, 255, 255, 0.25);
color: #000;
border: 1px solid #dba718;
border: 1px solid #d3d3d3;
transition: all ease 0.2s;
&:hover {
background-color: #ffcc3f;
border: 1px solid #dba718;
border: 1px solid #d3d3d3;
text-shadow: 0 1px rgba(255, 255, 255, 0.25);
color: #000;
transition: all ease 0.2s;
Expand Down Expand Up @@ -1756,7 +1756,7 @@ dialog {
text-align: center;
background-color: var(--accent);
border-radius: 4px;
border: 1px solid #dba718;
border: 1px solid #d3d3d3;
color: #000;
font-weight: 600;
font-size: 10px;
Expand Down Expand Up @@ -1818,7 +1818,7 @@ button {
}
button.active {
background-color: var(--accent);
border: 1px solid #dba718;
border: 1px solid #d3d3d3;
color: #000;
}
.jBox-Tooltip {
Expand Down
2 changes: 1 addition & 1 deletion src/css/main_cordova.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ body {
text-align: center;
background-color: #ffbb00;
border-radius: 4px;
border: 1px solid #dba718;
border: 1px solid #d3d3d3;
color: #ffffff;
font-weight: 600;
font-size: 12px;
Expand Down
2 changes: 1 addition & 1 deletion src/css/tabs/setup.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
margin-right: 10px;
background-color: #ffbb00;
border-radius: 3px;
border: 1px solid #dba718;
border: 1px solid #d3d3d3;
color: #000;
font-size: 12px;
text-shadow: 0 1px rgba(255, 255, 255, 0.25);
Expand Down
35 changes: 19 additions & 16 deletions src/js/BuildApi.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,28 +127,31 @@ export default class BuildApi {
});
}

// todo: fix this properly for the cases that there is no internet connection
requestBuildStatus(key, onSuccess, onFailure) {
const url = `${this._url}/api/builds/${key}/status`;
$.get(url, function (data) {
gui_log(i18n.getMessage('buildServerSuccess', [url]));
onSuccess(data);
}).fail(xhr => {
gui_log(i18n.getMessage('buildServerFailure', [url, `HTTP ${xhr.status}`]));
if (onFailure !== undefined) {
onFailure();
}
});
//$.get(url, function (data) {
// gui_log(i18n.getMessage('buildServerSuccess', [url]));
// onSuccess(data);
//}).fail(xhr => {
// gui_log(i18n.getMessage('buildServerFailure', [url, `HTTP ${xhr.status}`]));
// if (onFailure !== undefined) {
// onFailure();
// }
//});
onFailure();
}

requestBuildOptions(key, onSuccess, onFailure) {
const url = `${this._url}/api/builds/${key}/json`;
$.get(url, function (data) {
onSuccess(data);
}).fail(xhr => {
if (onFailure !== undefined) {
onFailure();
}
});
//$.get(url, function (data) {
// onSuccess(data);
//}).fail(xhr => {
// if (onFailure !== undefined) {
// onFailure();
// }
//});
onFailure();
}

loadOptions(release, onSuccess, onFailure) {
Expand Down
1 change: 1 addition & 0 deletions src/js/tabs/auxiliary.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ auxiliary.initialize = function (callback) {
$(newMode).find('.name').text(modeNameAjusted);

// add help to mode
//console.log(`${modeIndex}, ${modeId}, ${modeNameCamel}`);
$(newMode).find('.helpicon').attr('i18n_title', `auxiliaryHelpMode_${modeNameCamel}`);

$(newMode).data('index', modeIndex);
Expand Down

0 comments on commit 60af0ae

Please sign in to comment.