Merge branch 'master' into api-migration

CHANGELOG.md

@@ -1,11 +1,18 @@
 # Changelog
 
-## [0.7.2]
+## [0.7.3]
 
 ### ⚙️ Internal
 
 - When installed on API version 0.13.25 or higher, the plugin now uses Obsidian's own `requestUrl` API instead of the third-party dependency `got`. This lays the foundation for supporting Mobile platforms in the future.
 
+## [0.7.2]
+
+### 🐛 Fixes
+
+- Fix timers having "Unknown project" on opening Obsidian (issue #32)
+- Fixed the start/stop button accent color to be more accessible on Minimal Theme (issue #67)
+
 ## [0.7.1] 
 
 ### ✨ Features

lib/model/Project.ts

@@ -7,7 +7,7 @@ export interface Project {
 	/**
 	 * Project ID in Toggl API
 	 */
-	id: string;
+	id: number;
 
 	/**
 	 * Client ID for the project

lib/toggl/TogglManager.ts

@@ -92,6 +92,21 @@ export default class TogglManager {
 	private async _preloadWorkspaceData() {
 		this._apiManager.getProjects().then((response: Project[]) => {
 			this._projects = response;
+
+			// Update the current timer if it was fetched before the preload finished.
+			currentTimer.update((entry) => {
+				if (entry && entry.pid !== undefined) {
+					const project = response.find((p) => p.id === entry.pid);
+					return {
+						...entry,
+						project: project.name,
+						project_hex_color: project.hex_color
+					};
+				}
+				return entry;
+			});
+
+			// if there is already a timer running, add the project name.
 		});
 		this._apiManager.getTags().then((response: Tag[]) => {
 			this._tags = response;
@@ -142,7 +157,7 @@ export default class TogglManager {
 			if (new_timer == null) {
 				const project = await this._plugin.input.selectProject();
 				new_timer = await this._plugin.input.enterTimerDetails();
-				new_timer.pid = project != null ? parseInt(project.id) : null;
+				new_timer.pid = project != null ? project.id : null;
 			}
 
 			this._apiManager.startTimer(new_timer).then((t: TimeEntry) => {
@@ -415,7 +430,7 @@ export default class TogglManager {
 
 	// NOTE: relies on cached projects for project names
 	private responseToTimeEntry(response: any): TimeEntry {
-		let project = this.cachedProjects.find((p) => p.id == response.pid);
+		const project = this.cachedProjects.find((p) => p.id == response.pid);
 		return {
 			description: response.description,
 			pid: response.pid,

lib/ui/components/current_timer/CurrentTimerStartButton.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
-	import { ApiStatus } from 'lib/toggl/TogglManager';
-	import { apiStatusStore, togglStore } from 'lib/util/stores';
+	import { togglStore } from 'lib/util/stores';
 
 	export let buttonSize = 36;
 
@@ -30,11 +29,11 @@
 <style>
 	.timer-start-button {
 		--button-fill-outer: var(--interactive-accent);
-		--button-fill-inner: var(--interactive-normal);
+		--button-fill-inner: var(--background-primary);
 	}
 
 	.timer-start-button:hover {
 		--button-fill-outer: var(--interactive-accent-hover);
-		--button-fill-inner: var(--interactive-hover);
+		--button-fill-inner: var(--background-secondary);
 	}
 </style>

lib/ui/components/current_timer/CurrentTimerStopButton.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
-	import { ApiStatus } from 'lib/toggl/TogglManager';
-	import { apiStatusStore, togglStore } from 'lib/util/stores';
+	import { togglStore } from 'lib/util/stores';
 
 	export let buttonSize = 36;
 
@@ -32,11 +31,11 @@
 <style>
 	.timer-stop-button {
 		--button-fill-outer: var(--interactive-accent);
-		--button-fill-inner: var(--interactive-normal);
+		--button-fill-inner: var(--background-primary);
 	}
 
 	.timer-stop-button:hover {
 		--button-fill-outer: var(--interactive-accent-hover);
-		--button-fill-inner: var(--interactive-hover);
+		--button-fill-inner: var(--background-secondary);
 	}
 </style>

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-toggl-integration",
 	"name": "Toggl Track",
-	"version": "0.7.1",
+	"version": "0.7.2",
 	"minAppVersion": "0.11.13",
 	"description": "Manage timers and generate time reports using Toggl Track without leaving Obsidian.",
 	"author": "Maxime Cannoodt (@mcndt)",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-toggl-integration",
-	"version": "0.7.1",
+	"version": "0.7.2",
 	"description": "Manage timers and generate time reports using Toggl Track without leaving Obsidian.",
 	"main": "main.js",
 	"files": [

versions.json

@@ -16,5 +16,6 @@
 	"0.6.0": "0.11.13",
 	"0.6.1": "0.11.13",
 	"0.7.0": "0.11.13",
-	"0.7.1": "0.11.13"
+	"0.7.1": "0.11.13",
+	"0.7.2": "0.11.13"
 }