This commit is contained in:
Chaos53925 2023-09-23 21:39:33 +02:00 committed by GitHub
commit 829a9d6869
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3,9 +3,11 @@
// icon-color: red; icon-glyph: broadcast-tower; // icon-color: red; icon-glyph: broadcast-tower;
/************** /**************
Version 2.3.0 Version 2.4.0
Changelog: Changelog:
v2.4.0:
- added Support for flat tariff like "GigaMobil M mit unbegrenzten GB", "GigaMobil XL mit unbegrenzten GB" or other flat tariffs
v2.3.0: v2.3.0:
- Support for lockscreen widgets added - Support for lockscreen widgets added
v2.2.2: v2.2.2:
@ -374,7 +376,7 @@ function creatProgress(total, havegone) {
return context.getImage() return context.getImage()
} }
function getDiagram(percentage) { function getDiagram(percentage, v) {
function drawArc(ctr, rad, w, deg) { function drawArc(ctr, rad, w, deg) {
bgx = ctr.x - rad bgx = ctr.x - rad
bgy = ctr.y - rad bgy = ctr.y - rad
@ -427,8 +429,15 @@ function getDiagram(percentage) {
canvas.setTextAlignedCenter() canvas.setTextAlignedCenter()
canvas.setTextColor(textColor) canvas.setTextColor(textColor)
canvas.setFont(Font.boldSystemFont(canvTextSize)) canvas.setFont(Font.boldSystemFont(canvTextSize))
canvas.drawTextInRect(`${percentage}%`, canvTextRect) if (v.total >= 100000000) {
const infinitySize = canvSize / 2;
canvas.setFont(Font.boldSystemFont(infinitySize));
const verticalPosition = config.widgetFamily === "small" || "medium" || "large" || "extraLarge" ? infinitySize / 3 : infinitySize / 1;
const textRect = new Rect(0, verticalPosition, canvSize, canvSize);
canvas.drawTextInRect(``, textRect);
} else {
canvas.drawTextInRect(`${percentage}%`, canvTextRect);
}
return canvas.getImage() return canvas.getImage()
} }
@ -449,17 +458,19 @@ function getTimeRemaining(endtime) {
} }
function getTotalValues(v) { function getTotalValues(v) {
let totalValues; const unitOfMeasure = descriptionMapping[v.unitOfMeasure] || v.unitOfMeasure;
if (v.unitOfMeasure !== 'MB') { const remainingOrUsed = showRemainingContingent ? v.remaining : v.used;
totalValues = `${(showRemainingContingent ? v.remaining : v.used)} ${descriptionMapping[v.unitOfMeasure] !== undefined ? descriptionMapping[v.unitOfMeasure] : v.unitOfMeasure} von ${v.total} ${descriptionMapping[v.unitOfMeasure] !== undefined ? descriptionMapping[v.unitOfMeasure] : v.unitOfMeasure}` const total = parseInt(v.total);
} else if (parseInt(v.total) < 1000) {
totalValues = `${(showRemainingContingent ? v.remaining : v.used)} MB von ${v.total} MB` if (v.unitOfMeasure !== 'MB' || total < 1024) {
return `${remainingOrUsed} ${unitOfMeasure} von ${total} ${unitOfMeasure}`;
} else if (total >= 100000000) {
return showRemainingContingent ? 'Flat' : (v.used <= 1024 ? `${v.used} MB verbraucht` : `${(v.used / 1024).toFixed(2)} GB verbraucht`);
} else { } else {
let GB = ((showRemainingContingent ? v.remaining : v.used) / 1024).toFixed(2) const GB = (remainingOrUsed / 1024).toFixed(2);
let totalGB = (v.total / 1024).toFixed(2) const totalGB = (total / 1024).toFixed(2);
totalValues = `${GB} GB von ${totalGB} GB` return `${GB} GB von ${totalGB} GB`;
} }
return totalValues
} }
async function getSessionCookiesViaNetworkLogin() { async function getSessionCookiesViaNetworkLogin() {
@ -673,8 +684,8 @@ if (data !== undefined) {
stack.layoutHorizontally() stack.layoutHorizontally()
let v = data.usage[0] let v = data.usage[0]
if (config.widgetFamily !== "accessoryInline") { if (config.widgetFamily !== "accessoryInline") {
const percentage = (100 / v.total * (showRemainingContingent ? v.remaining : v.used)).toFixed(0); const percentage = v.total >= 100000000 ? '∞' : (100 / v.total * (showRemainingContingent ? v.remaining : v.used)).toFixed(0);
stack.addImage(getDiagram(percentage)); stack.addImage(getDiagram(percentage, v));
} }
if(config.widgetFamily === "accessoryRectangular"){ if(config.widgetFamily === "accessoryRectangular"){
stack.addSpacer(5) stack.addSpacer(5)
@ -733,11 +744,11 @@ stack.addImage(getDiagram(percentage));
column.layoutVertically() column.layoutVertically()
column.centerAlignContent() column.centerAlignContent()
const percentage = (100 / v.total * (showRemainingContingent ? v.remaining : v.used)).toFixed(0); const percentage = v.total > 100000000 ? 100 : (100 / v.total * (showRemainingContingent ? v.remaining : v.used)).toFixed(0);
const imageStack = column.addStack() const imageStack = column.addStack()
imageStack.layoutHorizontally() imageStack.layoutHorizontally()
imageStack.addSpacer() imageStack.addSpacer()
imageStack.addImage(getDiagram(percentage)); imageStack.addImage(getDiagram(percentage, v));
imageStack.addSpacer() imageStack.addSpacer()
column.addSpacer(2) column.addSpacer(2)