Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,7 @@ dist-ssr
*.njsproj
*.sln
*.sw?

# Tauri
/artifacts
latest.json
14 changes: 8 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

## ⬇️ Download

- macOS: <a href="https://github.com/ModuleArt/plain-color/releases/download/v1.0.9/PlainColor_1.0.9_aarch64.dmg">dmg</a>
- macOS: <a href="https://github.com/ModuleArt/plain-color/releases/download/v1.0.10/PlainColor_1.0.10_aarch64.dmg">dmg</a>
- Windows: exe | microsoft store - Coming soon...
- Linux: deb | flathub - Coming soon...

Expand Down Expand Up @@ -61,10 +61,9 @@ If you want to report a bug, first, thank you, that helps us a lot. Please open
### v1.1.x

- Add ability to reorder colors
- Add ability to reorder palettes
- More color formats:
- Common:
- Oklab `oklch(40.1% 0.123 21.57)`
- HSB/HSV `268, 69, 57`
- RGB/RGBA from 0 to 1 `0,36; 0,18; 0,57`
- LAB
- RAL
Expand All @@ -81,7 +80,8 @@ If you want to report a bug, first, thank you, that helps us a lot. Please open
- 🖥️ Obj-C NSColor Calibrated RGB
- 📱 Obj-C UIColor RGB
- 🌊 .NET RGB/ARGB
- ☕ Java RGB/RGBA
- ☕ Java HEX
- ☕ Java RGB
- 📱 Android RGB/ARGB
- Custom color formatter
- Add ability to change global shortcuts
Expand All @@ -91,10 +91,12 @@ If you want to report a bug, first, thank you, that helps us a lot. Please open
- Control Select with arrows up/down
- Search for colors in palette
- Fix: Sometimes the cursor is not visible - Hide cursor with `set_cursor_visible` ([issue](https://github.com/tauri-apps/tauri/issues/10231))
- <a href="https://v2.tauri.app/plugin/updater/">Add app updater</a>
- [Aperture size](https://github.com/ModuleArt/plain-color/pull/9#issuecomment-2599870209)
- Improve list performance (infinite scroll)
- Move picker with arrows (step = 1px), make sure it cannot be out of screen bounds
- Settings: Add "Reset to defaults" button
- Instant copy shortcut `CommandOrControl+Alt+C`
- Instant pick shortcut `CommandOrControl+Shift+C`
- Improve list performance (infinite scroll)
- Add color formats:
- Oklab `oklch(40.1% 0.123 21.57)`
- HSB/HSV `268, 69, 57`
32 changes: 32 additions & 0 deletions docs/RELEASE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# How to release a new version

### Preparation (skip if it's already done)

1. Place `tauri.key` and `tauri.key.pub` files into `~/.tauri` folder
2. Add this to your `.zshrc`:

```
export TAURI_SIGNING_PRIVATE_KEY="$HOME/.tauri/tauri.key"
export TAURI_SIGNING_PRIVATE_KEY_PASSWORD="$$$"
```

3. Refresh `.zshrc`:

```bash
source ~/.zshrc
```

where `$$$` is password for the `tauri.key`

### Build

1. Build bundle:

```bash
yarn t:build:release
```

### Release

1. Create a new GitHub release
2. Attach all files from `/artifacts` folder to the release
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
{
"name": "plain-color",
"description": "Lightweight, versatile, cross-platform color picker app",
"private": false,
"version": "1.0.9",
"version": "1.0.10",
"license": "GPL-3.0-only",
"type": "module",
"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"
"t:build:release": "tauri build && node src-tauri/updater/generate-artifacts.js"
},
"dependencies": {
"@phosphor-icons/react": "^2.1.7",
Expand All @@ -23,6 +25,7 @@
"@tauri-apps/plugin-os": "~2",
"@tauri-apps/plugin-process": "^2.0.0",
"@tauri-apps/plugin-shell": "^2",
"@tauri-apps/plugin-updater": "~2",
"@tauri-apps/plugin-window": "^2.0.0-alpha.1",
"classnames": "^2.5.1",
"color-is-dark": "^1.0.1",
Expand Down
111 changes: 109 additions & 2 deletions src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "PlainColor"
version = "1.0.9"
description = "A Tauri App"
version = "1.0.10"
description = "Lightweight, versatile, cross-platform color picker app"
authors = ["Eugene Volynko <volynko.ua@gmail.com>"]
edition = "2021"

Expand Down Expand Up @@ -44,3 +44,4 @@ cocoa = "0.26.0"
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
tauri-plugin-global-shortcut = "2"
tauri-plugin-single-instance = "2"
tauri-plugin-updater = "2"
5 changes: 4 additions & 1 deletion src-tauri/capabilities/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@
]
},
"deep-link:default",
"deep-link:allow-get-current"
"deep-link:allow-get-current",
"updater:default",
"updater:allow-check",
"updater:allow-download-and-install"
]
}
5 changes: 3 additions & 2 deletions src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ mod mod_screenshot;
use tauri::{
generate_context, generate_handler,
menu::{Menu, PredefinedMenuItem, Submenu},
Builder, DragDropEvent, Emitter, Manager, WindowEvent,
DragDropEvent, Emitter, Manager, WindowEvent,
};

#[allow(non_upper_case_globals)]
Expand All @@ -24,7 +24,7 @@ pub fn run() {
let loop_state =
std::sync::Arc::new(tokio::sync::Mutex::new(mod_pickerloop::LoopState::default()));

Builder::default()
tauri::Builder::default()
.manage(loop_state)
.menu(|handle| {
Menu::with_items(
Expand All @@ -45,6 +45,7 @@ pub fn run() {
],
)
})
.plugin(tauri_plugin_updater::Builder::new().build())
.plugin(tauri_plugin_http::init())
.plugin(tauri_plugin_fs::init())
.plugin(tauri_plugin_dialog::init())
Expand Down
14 changes: 12 additions & 2 deletions src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://schema.tauri.app/config/2",
"productName": "PlainColor",
"version": "1.0.9",
"version": "1.0.10",
"identifier": "com.moduleart.plaincolor",
"build": {
"beforeDevCommand": "yarn dev",
Expand Down Expand Up @@ -84,6 +84,16 @@
"role": "Editor",
"mimeType": "application/octet-stream"
}
]
],
"createUpdaterArtifacts": true
},
"plugins": {
"updater": {
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEJBQkJEQkYwMjQ2ODk5NTYKUldSV21XZ2s4TnU3dXB2andtOS9vK0o1UE91MjBaZHR6T2g5UEpScHNTK0FBMExmRURLdjlUZ3oK",
"endpoints": ["https://github.com/ModuleArt/plain-color/releases/latest/download/latest.json"],
"windows": {
"installMode": "passive"
}
}
}
}
Loading