FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

calculator: clean-up unused variables

pull/3562/head
Flaparoo 2024-09-10 21:42:35 +08:00
parent 563829bf82
commit 393f68260f
1 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apps/calculator/app.js
View File

@ -89,28 +89,11 @@ function prepareScreen(screen, grid, defaultColor) {
} }
function drawKey(name, k, selected) { function drawKey(name, k, selected) {
var rMargin = 0;
var bMargin = 0;
var color = k.color || COLORS.DEFAULT; var color = k.color || COLORS.DEFAULT;
g.setColor(color[selected ? 1 : 0]); g.setColor(color[selected ? 1 : 0]);
g.setFont('Vector', 20).setFontAlign(0,0); g.setFont('Vector', 20).setFontAlign(0,0);
g.fillRect(k.xy[0], k.xy[1], k.xy[2], k.xy[3]); g.fillRect(k.xy[0], k.xy[1], k.xy[2], k.xy[3]);
g.setColor(-1); g.setColor(-1);
// correct margins to center the texts
if (name == '0') {
rMargin = (RIGHT_MARGIN * 2) - 7;
} else if (name === '/') {
rMargin = 5;
} else if (name === '*') {
bMargin = 5;
rMargin = 3;
} else if (name === '-') {
rMargin = 3;
} else if (name === 'R' || name === 'N') {
rMargin = k.val === 'C' ? 0 : -9;
} else if (name === '%') {
rMargin = -3;
}
g.drawString(k.val || name, (k.xy[0] + k.xy[2])/2, (k.xy[1] + k.xy[3])/2); g.drawString(k.val || name, (k.xy[0] + k.xy[2])/2, (k.xy[1] + k.xy[3])/2);
} }
@ -139,29 +122,21 @@ function drawGlobal() {
screen[k] = specials[k]; screen[k] = specials[k];
} }
drawKeys(); drawKeys();
var selected = DEFAULT_SELECTION_NUMBERS;
var prevSelected = DEFAULT_SELECTION_NUMBERS;
} }
function drawNumbers() { function drawNumbers() {
screen = numbers; screen = numbers;
screenColor = COLORS.DEFAULT; screenColor = COLORS.DEFAULT;
drawKeys(); drawKeys();
var selected = DEFAULT_SELECTION_NUMBERS;
var prevSelected = DEFAULT_SELECTION_NUMBERS;
} }
function drawOperators() { function drawOperators() {
screen = operators; screen = operators;
screenColor =COLORS.OPERATOR; screenColor =COLORS.OPERATOR;
drawKeys(); drawKeys();
var selected = DEFAULT_SELECTION_OPERATORS;
var prevSelected = DEFAULT_SELECTION_OPERATORS;
} }
function drawSpecials() { function drawSpecials() {
screen = specials; screen = specials;
screenColor = COLORS.SPECIAL; screenColor = COLORS.SPECIAL;
drawKeys(); drawKeys();
var selected = DEFAULT_SELECTION_SPECIALS;
var prevSelected = DEFAULT_SELECTION_SPECIALS;
} }
function getIntWithPrecision(x) { function getIntWithPrecision(x) {
@ -219,8 +194,6 @@ function doMath(x, y, operator) {
} }
function displayOutput(num) { function displayOutput(num) {
var len;
var minusMarge = 0;
g.setBgColor(0).clearRect(0, 0, g.getWidth(), RESULT_HEIGHT-1); g.setBgColor(0).clearRect(0, 0, g.getWidth(), RESULT_HEIGHT-1);
g.setColor(-1); g.setColor(-1);
if (num === Infinity || num === -Infinity || isNaN(num)) { if (num === Infinity || num === -Infinity || isNaN(num)) {
@ -231,9 +204,7 @@ function displayOutput(num) {
num = '-INFINITY'; num = '-INFINITY';
} else { } else {
num = 'NOT A NUMBER'; num = 'NOT A NUMBER';
minusMarge = -25;
} }
len = (num + '').length;
currNumber = null; currNumber = null;
results = null; results = null;
isDecimal = false; isDecimal = false;