Skip to content

chore: better scaling #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
vjousse wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore: better scaling #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ body {
margin-bottom: 5vw;
position: relative;
text-align: center;
height: 13.9vw;
display: flex;
-webkit-app-region: drag;
}
Expand Down Expand Up @@ -139,6 +138,7 @@ body {
.timer-wrapper {
display: flex;
flex-direction: column;
height: 100%;
}

.dial-bg {
Expand Down
212 changes: 107 additions & 105 deletions src-ts/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,51 +2,51 @@ import "../main.css";

import { Elm } from "../src-elm/Main.elm";

import { invoke } from "@tauri-apps/api/core";
import { listen } from "@tauri-apps/api/event";

import { info, attachConsole } from "@tauri-apps/plugin-log";
import { getVersion } from "@tauri-apps/api/app";
// import { invoke } from "@tauri-apps/api/core";
// import { listen } from "@tauri-apps/api/event";
//
// import { info, attachConsole } from "@tauri-apps/plugin-log";
// import { getVersion } from "@tauri-apps/api/app";

// Display logs in the webview inspector
attachConsole();

type Color = {
r: number;
g: number;
b: number;
};

type ElmState = {
color: Color;
percentage: number;
paused: boolean;
playTick: boolean;
};

type Notification = {
body: string;
title: string;
name: string;
red: number;
green: number;
blue: number;
};

type ElmConfig = {
alwaysOnTop: boolean;
autoStartWorkTimer: boolean;
autoStartBreakTimer: boolean;
desktopNotifications: boolean;
longBreakDuration: number;
maxRoundNumber: number;
minimizeToTray: boolean;
minimizeToTrayOnClose: boolean;
pomodoroDuration: number;
shortBreakDuration: number;
tickSoundsDuringWork: boolean;
tickSoundsDuringBreak: boolean;
};
// attachConsole();

// type Color = {
// r: number;
// g: number;
// b: number;
// };

// type ElmState = {
// color: Color;
// percentage: number;
// paused: boolean;
// playTick: boolean;
// };
//
// type Notification = {
// body: string;
// title: string;
// name: string;
// red: number;
// green: number;
// blue: number;
// };
//
// type ElmConfig = {
// alwaysOnTop: boolean;
// autoStartWorkTimer: boolean;
// autoStartBreakTimer: boolean;
// desktopNotifications: boolean;
// longBreakDuration: number;
// maxRoundNumber: number;
// minimizeToTray: boolean;
// minimizeToTrayOnClose: boolean;
// pomodoroDuration: number;
// shortBreakDuration: number;
// tickSoundsDuringWork: boolean;
// tickSoundsDuringBreak: boolean;
// };

type RustConfig = {
always_on_top: boolean;
Expand Down Expand Up @@ -80,11 +80,13 @@ let rustConfig: RustConfig = {
tick_sounds_during_break: true,
};

const app = Elm.Main.init({
//const app = Elm.Main.init({
Elm.Main.init({
node: root,
flags: {
alwaysOnTop: rustConfig.always_on_top,
appVersion: await getVersion(),
// appVersion: await getVersion(),
appVersion: "myVersion",
autoStartWorkTimer: rustConfig.auto_start_work_timer,
autoStartBreakTimer: rustConfig.auto_start_break_timer,
desktopNotifications: rustConfig.desktop_notifications,
Expand All @@ -99,63 +101,63 @@ const app = Elm.Main.init({
},
});

app.ports.playSound.subscribe(function (soundElementId: string) {
info("Playing sound");
invoke("play_sound_command", { soundId: soundElementId });
});

app.ports.hideWindow.subscribe(function () {
invoke("hide_window");
});

app.ports.minimizeWindow.subscribe(function () {
invoke("minimize_window");
});

app.ports.closeWindow.subscribe(function () {
invoke("close_window");
});

app.ports.loadRustConfig.subscribe(function () {
invoke("load_config").then((config) => {
app.ports.loadConfig.send(config);
});
});

app.ports.notify.subscribe(function (notification: Notification) {
invoke("notify", { notification: notification });
});

app.ports.updateConfig.subscribe(function (config: ElmConfig) {
invoke("update_config", {
config: {
always_on_top: config.alwaysOnTop,
auto_start_work_timer: config.autoStartWorkTimer,
auto_start_break_timer: config.autoStartBreakTimer,
desktop_notifications: config.desktopNotifications,
long_break_duration: config.longBreakDuration,
max_round_number: config.maxRoundNumber,
minimize_to_tray: config.minimizeToTray,
minimize_to_tray_on_close: config.minimizeToTrayOnClose,
pomodoro_duration: config.pomodoroDuration,
short_break_duration: config.shortBreakDuration,
tick_sounds_during_work: config.tickSoundsDuringWork,
tick_sounds_during_break: config.tickSoundsDuringBreak,
},
});
});

app.ports.updateCurrentState.subscribe(function (state: ElmState) {
invoke("update_play_tick", { playTick: state.playTick });
invoke("change_icon", {
red: state.color.r,
green: state.color.g,
blue: state.color.b,
fillPercentage: state.percentage,
paused: state.paused,
});
});

await listen("tick-event", () => {
app.ports.tick.send("");
});
// app.ports.playSound.subscribe(function (soundElementId: string) {
// info("Playing sound");
// invoke("play_sound_command", { soundId: soundElementId });
// });
//
// app.ports.hideWindow.subscribe(function () {
// invoke("hide_window");
// });
//
// app.ports.minimizeWindow.subscribe(function () {
// invoke("minimize_window");
// });
//
// app.ports.closeWindow.subscribe(function () {
// invoke("close_window");
// });
//
// app.ports.loadRustConfig.subscribe(function () {
// invoke("load_config").then((config) => {
// app.ports.loadConfig.send(config);
// });
// });
//
// app.ports.notify.subscribe(function (notification: Notification) {
// invoke("notify", { notification: notification });
// });
//
// app.ports.updateConfig.subscribe(function (config: ElmConfig) {
// invoke("update_config", {
// config: {
// always_on_top: config.alwaysOnTop,
// auto_start_work_timer: config.autoStartWorkTimer,
// auto_start_break_timer: config.autoStartBreakTimer,
// desktop_notifications: config.desktopNotifications,
// long_break_duration: config.longBreakDuration,
// max_round_number: config.maxRoundNumber,
// minimize_to_tray: config.minimizeToTray,
// minimize_to_tray_on_close: config.minimizeToTrayOnClose,
// pomodoro_duration: config.pomodoroDuration,
// short_break_duration: config.shortBreakDuration,
// tick_sounds_during_work: config.tickSoundsDuringWork,
// tick_sounds_during_break: config.tickSoundsDuringBreak,
// },
// });
// });
//
// app.ports.updateCurrentState.subscribe(function (state: ElmState) {
// invoke("update_play_tick", { playTick: state.playTick });
// invoke("change_icon", {
// red: state.color.r,
// green: state.color.g,
// blue: state.color.b,
// fillPercentage: state.percentage,
// paused: state.paused,
// });
// });
//
// await listen("tick-event", () => {
// app.ports.tick.send("");
// });