From b6845d9f6fae379dbda74a38a426256ce7f30cec Mon Sep 17 00:00:00 2001 From: Eugene Volynko Date: Thu, 23 Jan 2025 19:40:55 +0200 Subject: [PATCH 1/4] Increment app version to 1.0.12 --- README.md | 2 +- package.json | 2 +- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3f7b3c9..397187e 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ ## ⬇️ Download -- macOS: dmg +- macOS: dmg - Windows: exe | microsoft store - Coming soon... - Linux: deb | flathub - Coming soon... diff --git a/package.json b/package.json index f39fb89..17850e9 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "plain-color", "description": "Lightweight, versatile, cross-platform color picker app", "private": false, - "version": "1.0.11", + "version": "1.0.12", "license": "GPL-3.0-only", "type": "module", "scripts": { diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 52225d7..c8ac110 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "PlainColor" -version = "1.0.11" +version = "1.0.12" dependencies = [ "base64 0.22.1", "cocoa", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 990ccbd..74faf39 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "PlainColor" -version = "1.0.11" +version = "1.0.12" description = "Lightweight, versatile, cross-platform color picker app" authors = ["Eugene Volynko "] edition = "2021" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 8b30033..31bd1b0 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "PlainColor", - "version": "1.0.11", + "version": "1.0.12", "identifier": "com.moduleart.plaincolor", "build": { "beforeDevCommand": "yarn dev", From 26f96070c57cd39d95fadb03a699089254c0c684 Mon Sep 17 00:00:00 2001 From: Eugene Volynko Date: Thu, 23 Jan 2025 23:43:31 +0200 Subject: [PATCH 2/4] Updater: Add progress bar & Fix progress indicator text (always set to 0%) --- README.md | 4 --- package.json | 1 - src/components/PaletteCard/index.scss | 6 ++++ src/components/PaletteCard/index.tsx | 5 ++- src/components/ProgressBar/index.scss | 13 ++++++++ src/components/ProgressBar/index.tsx | 11 +++++++ src/components/ProgressBar/props.ts | 4 +++ src/components/Updater/index.tsx | 39 +++++++++++++++++++++--- src/components/VirtualScroller/index.tsx | 3 +- 9 files changed, 73 insertions(+), 13 deletions(-) create mode 100644 src/components/ProgressBar/index.scss create mode 100644 src/components/ProgressBar/index.tsx create mode 100644 src/components/ProgressBar/props.ts diff --git a/README.md b/README.md index 397187e..a092fed 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,3 @@ If you want to report a bug, first, thank you, that helps us a lot. Please open - Instant copy shortcut `CommandOrControl+Alt+C` - Instant pick shortcut `CommandOrControl+Shift+C` - Build app releases with GitHub action -- New color formats: - - Oklab `oklch(40.1% 0.123 21.57)` - - HSB/HSV `268, 69, 57` -- Control Select component with arrows keys (up/down) diff --git a/package.json b/package.json index 17850e9..af98ba7 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,6 @@ "scripts": { "dev": "vite", "build": "tsc && vite build", - "preview": "vite preview", "t:dev": "tauri dev", "t:build:debug": "tauri build --debug", "t:build:release": "tauri build && node src-tauri/updater/generate-artifacts.js" diff --git a/src/components/PaletteCard/index.scss b/src/components/PaletteCard/index.scss index 61db1a1..5ee9bc2 100644 --- a/src/components/PaletteCard/index.scss +++ b/src/components/PaletteCard/index.scss @@ -8,6 +8,12 @@ height: 1.75rem; } + &__empty { + background-image: var(--bgImg_checkerboard); + background-color: var(--color_element); + height: 100%; + } + &__color { height: 100%; flex: 1; diff --git a/src/components/PaletteCard/index.tsx b/src/components/PaletteCard/index.tsx index 25df17a..9606e9d 100644 --- a/src/components/PaletteCard/index.tsx +++ b/src/components/PaletteCard/index.tsx @@ -119,10 +119,9 @@ export const PaletteCard: FC = ({ palette, onDelete, onDuplic {uniqueColors.length === 0 && ( - + )} {uniqueColors.map((color, index) => (