diff --git a/apps/rings/README.md b/apps/rings/README.md index 1f689623f..8c72baa17 100644 --- a/apps/rings/README.md +++ b/apps/rings/README.md @@ -7,5 +7,16 @@ By Amos Blanton, inspired by and remixed from Rinkulainen by Jukio Kallio. ![](screenshot1.png) View when watch is locked. +![](screenshot4.png) +View when watch is locked with numbers and bubble settings on + +![](screenshot5.png) +View when watch is locked with numbers settings on + +![](screenshot3.png) +Watch unlocked, without numbers + ![](screenshot2.png) -Watch unlocked, showing the date. \ No newline at end of file +Watch unlocked, showing the date. + + diff --git a/apps/rings/app.js b/apps/rings/app.js index 472aefb8e..72485a763 100644 --- a/apps/rings/app.js +++ b/apps/rings/app.js @@ -10,9 +10,9 @@ const watch = { color:"#000000", - dateRing : { size:109, weight:20, color:"#00FF00", numbers: true, range: 30 }, - hourRing : { size:82, weight:20, color:"#00FFFF", numbers: true, range: 12}, - minuteRing : { size:55, weight:18, color:"#FFFF00", numbers: true, range: 60}, + dateRing : { size:109, weight:20, color:"#00FF00", numbers: false, range: 30 }, + hourRing : { size:82, weight:20, color:"#00FFFF", numbers: false, range: 12}, + minuteRing : { size:55, weight:18, color:"#FFFF00", numbers: false, range: 60}, batteryRing: { size :30, weight:10, color:"#ff3300", numbers: false, range: 100}, screen : { width:g.getWidth(), height:g.getHeight(), centerX: g.getWidth() *0.5, centerY: g.getHeight() * 0.5, cursor: 14, font:"Vector:18", bubble:false }, }; @@ -232,7 +232,7 @@ function draw() { // if the day has changed if(watch.dateRing.range != days_month) watch.dateRing.range = days_month; drawCircle(watch.dateRing, -unLockedOffset, date.getDate()); - drawMonthCircleText( date.getDate() + " " + month[date.getMonth()] + " " +date.getFullYear(), watch.dateRing.size - 24, getDays(date.getFullYear(), date.getMonth()+1), date.getDate()); + drawMonthCircleText( date.getDate() + " " + month[date.getMonth()] + " " + date.getFullYear(), watch.dateRing.size - 24, getDays(date.getFullYear(), date.getMonth()+1), date.getDate()); } drawCircle(watch.hourRing, -unLockedOffset, date.getHours()); drawCircle(watch.minuteRing, -unLockedOffset, date.getMinutes()); diff --git a/apps/rings/screenshot1.png b/apps/rings/screenshot1.png index 26f2521fc..520a48363 100644 Binary files a/apps/rings/screenshot1.png and b/apps/rings/screenshot1.png differ diff --git a/apps/rings/screenshot3.png b/apps/rings/screenshot3.png new file mode 100644 index 000000000..28bcc4557 Binary files /dev/null and b/apps/rings/screenshot3.png differ diff --git a/apps/rings/screenshot4.png b/apps/rings/screenshot4.png new file mode 100644 index 000000000..6ee903dd5 Binary files /dev/null and b/apps/rings/screenshot4.png differ diff --git a/apps/rings/screenshot5.png b/apps/rings/screenshot5.png new file mode 100644 index 000000000..57973b76a Binary files /dev/null and b/apps/rings/screenshot5.png differ