From 08a3796884254df162abe7cc791ca53d8bb1cece Mon Sep 17 00:00:00 2001 From: cheeseisdisgusting Date: Wed, 14 Mar 2018 23:39:22 -0400 Subject: [PATCH] Added support for the Fitbit Versa --- README.md | 8 +-- .../screenshots}/Tomatina-Long_Break.png | Bin .../screenshots}/Tomatina-Paused.png | Bin .../screenshots}/Tomatina-Progress.png | Bin .../screenshots}/Tomatina-Short_Break.png | Bin .../screenshots}/Tomatina-Start.png | Bin {app => src/app}/index.js | 2 +- {common => src/common}/utils.js | 0 {companion => src/companion}/index.js | 0 package.json => src/package.json | 4 ++ {resources => src/resources}/forward.png | Bin .../resources}/forward_press.png | Bin {resources => src/resources}/icon.png | Bin {resources => src/resources}/index.gui | 2 +- {resources => src/resources}/pause.png | Bin {resources => src/resources}/pause_press.png | Bin {resources => src/resources}/play.png | Bin {resources => src/resources}/play_press.png | Bin {resources => src/resources}/reset.png | Bin src/resources/styles~300x300.css | 48 ++++++++++++++++++ .../resources/styles~348x250.css | 0 {resources => src/resources}/widgets.gui | 0 {settings => src/settings}/index.jsx | 1 + 23 files changed, 59 insertions(+), 6 deletions(-) rename {screenshots => docs/screenshots}/Tomatina-Long_Break.png (100%) rename {screenshots => docs/screenshots}/Tomatina-Paused.png (100%) rename {screenshots => docs/screenshots}/Tomatina-Progress.png (100%) rename {screenshots => docs/screenshots}/Tomatina-Short_Break.png (100%) rename {screenshots => docs/screenshots}/Tomatina-Start.png (100%) rename {app => src/app}/index.js (100%) rename {common => src/common}/utils.js (100%) rename {companion => src/companion}/index.js (100%) rename package.json => src/package.json (92%) rename {resources => src/resources}/forward.png (100%) rename {resources => src/resources}/forward_press.png (100%) rename {resources => src/resources}/icon.png (100%) rename {resources => src/resources}/index.gui (97%) rename {resources => src/resources}/pause.png (100%) rename {resources => src/resources}/pause_press.png (100%) rename {resources => src/resources}/play.png (100%) rename {resources => src/resources}/play_press.png (100%) rename {resources => src/resources}/reset.png (100%) create mode 100644 src/resources/styles~300x300.css rename resources/styles.css => src/resources/styles~348x250.css (100%) rename {resources => src/resources}/widgets.gui (100%) rename {settings => src/settings}/index.jsx (97%) diff --git a/README.md b/README.md index a18fe6e..9a4b07f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Fitbit Pomodoro A Pomodoro app for the Fitbit Ionic. -![alt](/screenshots/Tomatina-Start.png?raw=true) -![alt](/screenshots/Tomatina-Short_Break.png?raw=true) -![alt](/screenshots/Tomatina-Progress.png?raw=true) -![alt](/screenshots/Tomatina-Paused.png?raw=true) \ No newline at end of file +![alt](/docs/screenshots/Tomatina-Start.png?raw=true) +![alt](/docs/screenshots/Tomatina-Short_Break.png?raw=true) +![alt](/docs/screenshots/Tomatina-Progress.png?raw=true) +![alt](/docs/screenshots/Tomatina-Paused.png?raw=true) \ No newline at end of file diff --git a/screenshots/Tomatina-Long_Break.png b/docs/screenshots/Tomatina-Long_Break.png similarity index 100% rename from screenshots/Tomatina-Long_Break.png rename to docs/screenshots/Tomatina-Long_Break.png diff --git a/screenshots/Tomatina-Paused.png b/docs/screenshots/Tomatina-Paused.png similarity index 100% rename from screenshots/Tomatina-Paused.png rename to docs/screenshots/Tomatina-Paused.png diff --git a/screenshots/Tomatina-Progress.png b/docs/screenshots/Tomatina-Progress.png similarity index 100% rename from screenshots/Tomatina-Progress.png rename to docs/screenshots/Tomatina-Progress.png diff --git a/screenshots/Tomatina-Short_Break.png b/docs/screenshots/Tomatina-Short_Break.png similarity index 100% rename from screenshots/Tomatina-Short_Break.png rename to docs/screenshots/Tomatina-Short_Break.png diff --git a/screenshots/Tomatina-Start.png b/docs/screenshots/Tomatina-Start.png similarity index 100% rename from screenshots/Tomatina-Start.png rename to docs/screenshots/Tomatina-Start.png diff --git a/app/index.js b/src/app/index.js similarity index 100% rename from app/index.js rename to src/app/index.js index 9a872c3..5cd0ef3 100644 --- a/app/index.js +++ b/src/app/index.js @@ -1,9 +1,9 @@ +import { me } from "appbit"; import clock from "clock"; import document from "document"; import * as fs from "fs"; import * as haptics from "haptics"; import * as messaging from "messaging"; -import { me } from "appbit"; import { sendVal, stripQuotes } from "../common/utils.js"; var backgroundRect = document.getElementById("backgroundRect"); diff --git a/common/utils.js b/src/common/utils.js similarity index 100% rename from common/utils.js rename to src/common/utils.js diff --git a/companion/index.js b/src/companion/index.js similarity index 100% rename from companion/index.js rename to src/companion/index.js diff --git a/package.json b/src/package.json similarity index 92% rename from package.json rename to src/package.json index 30901a9..43a50bb 100644 --- a/package.json +++ b/src/package.json @@ -8,6 +8,10 @@ "requestedPermissions": [ "run_background" ], + "buildTargets": [ + "higgs", + "meson" + ], "i18n": { "en": { "name": "Tomatina" diff --git a/resources/forward.png b/src/resources/forward.png similarity index 100% rename from resources/forward.png rename to src/resources/forward.png diff --git a/resources/forward_press.png b/src/resources/forward_press.png similarity index 100% rename from resources/forward_press.png rename to src/resources/forward_press.png diff --git a/resources/icon.png b/src/resources/icon.png similarity index 100% rename from resources/icon.png rename to src/resources/icon.png diff --git a/resources/index.gui b/src/resources/index.gui similarity index 97% rename from resources/index.gui rename to src/resources/index.gui index 71c253a..cf39844 100644 --- a/resources/index.gui +++ b/src/resources/index.gui @@ -31,7 +31,7 @@ pointer-events="none"> - Pomodoro #1 + Pomodoro #1 Start a Pomodoro 25 min diff --git a/resources/pause.png b/src/resources/pause.png similarity index 100% rename from resources/pause.png rename to src/resources/pause.png diff --git a/resources/pause_press.png b/src/resources/pause_press.png similarity index 100% rename from resources/pause_press.png rename to src/resources/pause_press.png diff --git a/resources/play.png b/src/resources/play.png similarity index 100% rename from resources/play.png rename to src/resources/play.png diff --git a/resources/play_press.png b/src/resources/play_press.png similarity index 100% rename from resources/play_press.png rename to src/resources/play_press.png diff --git a/resources/reset.png b/src/resources/reset.png similarity index 100% rename from resources/reset.png rename to src/resources/reset.png diff --git a/src/resources/styles~300x300.css b/src/resources/styles~300x300.css new file mode 100644 index 0000000..69646eb --- /dev/null +++ b/src/resources/styles~300x300.css @@ -0,0 +1,48 @@ +#backgroundRectResting { + display: inline; +} + +#backgroundRect { + display: inline; + width: 300; + height: 300; +} + +#btn-tr-reset { + display: none; +} + +#btn-tr-forward { + display: none; +} + +#btn-br-pause { + display: none; +} + +#pomodoroText { + display: none; + fill: #D3D3D3; + font-family: Seville-Book; + font-size: 24; +} + +#stateText { + display: inline; + fill: #FFFFFF; + font-family: Seville-Book; + font-size: 35; +} + +#minuteText { + fill: #FFFFFF; + font-family: Seville-Book; + font-size: 90; +} + +#unitText { + display: inline; + fill: #C0C0C0; + font-family: Seville-Book; + font-size: 40; +} \ No newline at end of file diff --git a/resources/styles.css b/src/resources/styles~348x250.css similarity index 100% rename from resources/styles.css rename to src/resources/styles~348x250.css diff --git a/resources/widgets.gui b/src/resources/widgets.gui similarity index 100% rename from resources/widgets.gui rename to src/resources/widgets.gui diff --git a/settings/index.jsx b/src/settings/index.jsx similarity index 97% rename from settings/index.jsx rename to src/settings/index.jsx index a9a9a9a..81c6293 100644 --- a/settings/index.jsx +++ b/src/settings/index.jsx @@ -44,6 +44,7 @@ function mySettings(props) { settingsKey="long-rest-duration" options={[ // {name:"15 seconds", value:.25}, + {name:"10 minutes", value:10}, {name:"15 minutes", value:15}, {name:"20 minutes", value:20}, {name:"25 minutes", value:25},