Remove timer

CONTRIBUTORS.md

@@ -56,3 +56,6 @@ Marinara is open source software and is built by volunteers from around the worl
 - [Brian L](https://github.com/brianl9995): Spanish translation
 - [Wesley Matos](https://github.com/wricke): Portuguese (Brazil) translation
 - [Rachel Ng](https://github.com/rachelnml): Malay translation
+- [Lui Rocha](https://github.com/LuiFr): Skip break button
+- [Carolina Arenas](https://github.com/arenasoy): Remove timer
+- [Ana Fainelo](http://github.com/anafainelo): Remove timer

package/_locales/en/messages.json

@@ -15,6 +15,10 @@
     "message": "• Short & long breaks\n• Toolbar icon with countdown timer\n• Track Pomodoro history & stats\n• Configurable long break intervals\n• Configurable timer durations\n• Desktop & tab notifications\n• Audio notifications with over 20 sounds\n• Ticking timer sounds\n• Scheduled automatic timers\n• Open source software",
     "description": "Detailed extension description shown to users in the Chrome Web Store."
   },
+  "general_settings": {
+    "message": "General Settings",
+    "description": "General section header. Shown on the settings page."
+  },
   "pomodoro_assistant": {
     "message": "Pomodoro Assistant",
     "description": "Marinara title tagline. Shown on the settings-feedback page."
@@ -51,6 +55,10 @@
     "message": "Stop Timer",
     "description": "Menu entry to stop the current timer. Shown in the dropdown menu."
   },
+  "show_timer": {
+    "message": "Show Timer",
+    "description": "Show timer settings label. Shown on the settings page."
+  },
   "pause_timer": {
     "message": "Pause Timer",
     "description": "Menu entry to pause the current timer. Shown in the dropdown menu."

src/Messages.js

@@ -345,6 +345,12 @@ class Messages
   get long_break() {
     return chrome.i18n.getMessage('long_break', []);
   }
+  get general_settings() {
+    return chrome.i18n.getMessage('general_settings', []);
+  }
+  get show_timer() {
+    return chrome.i18n.getMessage('show_timer', []);
+  }
   get march() {
     return chrome.i18n.getMessage('march', []);
   }

src/background/Observers.js

@@ -10,6 +10,9 @@ import { SingletonPage, PageHost } from './SingletonPage';
 
 class BadgeObserver
 {
+  constructor(settings) {
+    this.settings = settings;
+  }
   onStart({ phase, remaining }) {
     this.updateBadge({ phase, minutes: Math.round(remaining / 60) });
   }
@@ -42,7 +45,12 @@ class BadgeObserver
     }[phase];
 
     if (minutes != null) {
-      text = minutes < 1 ? M.less_than_minute : M.n_minutes(minutes);
+      if (!this.settings.showTimer) {
+        text = ' ';
+      }
+      else {
+        text = minutes < 1 ? M.less_than_minute : M.n_minutes(minutes);
+      }
       tooltip = M.browser_action_tooltip(title, M.time_remaining(text));
     } else {
       tooltip = M.browser_action_tooltip(title, tooltip);

src/background/Services.js

@@ -102,6 +102,10 @@ class PomodoroService extends Service
     this.timer.start();
   }
 
+  async startFocus() {
+    this.timer.startFocus();
+  }
+
   async pause() {
     this.timer.pause();
   }

src/background/Settings.js

@@ -65,9 +65,10 @@ class SettingsSchema
         notifications: {
           desktop: true,
           tab: true,
-          sound: null
+          sound: null,
         }
       },
+      showTimer: true,
       autostart: {
         time: null,
       },

src/background/main.js

@@ -24,7 +24,7 @@ async function run() {
 
   let menu = createPomodoroMenu(timer);
   timer.observe(new HistoryObserver(history));
-  timer.observe(new BadgeObserver());
+  timer.observe(new BadgeObserver(settings));
   timer.observe(new NotificationObserver(timer, settings, history));
   timer.observe(new ExpirationSoundObserver(settings));
   timer.observe(new TimerSoundObserver(settings));

src/countdown/Countdown.vue

@@ -161,6 +161,7 @@ export default {
       }[this.phase];
     },
     title() {
+
       let phase = M.countdown;
       let remaining = '';
       if (this.checkpointStartAt) {

src/expire/Expire.vue

@@ -5,9 +5,12 @@
     <button @click.prevent="startSession" class="button start-session" :class="phase">
       {{ action }}
     </button>
+    <button v-if="phase !== 'focus'" @click.prevent="startFocus" class="button start-session focus">
+      {{ M.start_focusing }}
+    </button>
     <div class="pomodoros-today">
       <p class="pomodoros">
-        <i v-for="_ of new Array(pomodoroCount)" class="icon-circle"></i>
+        <i v-for="i of new Array(pomodoroCount)" v-bind:key=i class="icon-circle"></i>
       </p>
       <p>{{ M.completed_today }}</p>
       <button @click.prevent="showHistoryPage" class="view-history">{{ M.view_history }}</button>
@@ -102,6 +105,7 @@ body {
 }
 .start-session {
   margin-top: 10px;
+  margin-left: 10px;
 }
 .pomodoros-today {
   margin-top: 110px;
@@ -170,6 +174,9 @@ export default {
     startSession() {
       PomodoroClient.once.start();
     },
+    startFocus() {
+      PomodoroClient.once.startFocus();
+    },
     showHistoryPage() {
       OptionsClient.once.showHistoryPage();
     },