Merge branch 'main' into release

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: need more investigation
+assignees: vjousse
+
+---
+
+## 🪲 Describe the bug
+A clear and concise description of what the bug is.
+
+## 📑 To Reproduce
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+## ☑️ Expected behavior
+A clear and concise description of what you expected to happen.
+
+## 🖼️ Screenshots
+If applicable, add screenshots to help explain your problem.
+
+## 🧑‍💻 Desktop (please complete the following information):
+ - OS: [e.g. Windows]
+ - Version [e.g. 11]
+
+## ⚙️ Additional context
+Add any other context about the problem here.
+
+## 🍅 Pomodorolm information
+How did you install pomodorolm?
+What version number are you using? (click on the top left menu, and the the ℹ️ icon at the bottom right)

.github/workflows/ci.yml

@@ -5,8 +5,12 @@ on:
   push:
     branches: [main]
 
+env:
+  RUSTFLAGS: "-Dwarnings"
+
 jobs:
   linting:
+    name: Lint python and elm
     runs-on: ubuntu-latest
 
     steps:
@@ -36,3 +40,24 @@ jobs:
 
       - name: Run pre-commit hooks on all files
         run: uv run pre-commit run --all-files
+
+  rust_testing:
+    name: Lint and test rust code
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libasound2-dev
+
+      - name: Update Rust
+        run: rustup update stable && rustup default stable
+
+      - name: Run clippy
+        run: |
+          mkdir dist
+          cargo clippy --all-targets --all-features --manifest-path src-tauri/Cargo.toml
+
+      - name: Run cargo test
+        run: cargo test --verbose --manifest-path src-tauri/Cargo.toml

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file.
 
+## [[app-v0.3.0](https://github.com/vjousse/pomodorolm/releases/tag/app-v0.3.0)] - 2024-11-06
+
+### 🚀 Features
+
+- Customize notification sounds ([#127](https://github.com/vjousse/pomodorolm/issues/127))
+
+### 🚜 Refactor
+
+- Manage state on the rust side ([#112](https://github.com/vjousse/pomodorolm/issues/112))
+- Simplify resource resolving ([#120](https://github.com/vjousse/pomodorolm/issues/120))
+
+### 📚 Documentation
+
+- Add a workaround for flatpak and nvidia ([#118](https://github.com/vjousse/pomodorolm/issues/118))
+- Add instructions for flatpak
+
+### ⚙️ Miscellaneous Tasks
+
+- Update to stable Tauri v2 ([#116](https://github.com/vjousse/pomodorolm/issues/116))
+- Create issue template ([#124](https://github.com/vjousse/pomodorolm/issues/124))
+- Update to Tauri stable ([#128](https://github.com/vjousse/pomodorolm/issues/128))
+
 ## [[app-v0.2.2](https://github.com/vjousse/pomodorolm/releases/tag/app-v0.2.2)] - 2024-10-16
 
 ### 🐛 Bug Fixes

README.md

@@ -29,6 +29,7 @@
 - [x] Fully compatible with **HiDPI/4K screens**
 - [x] Linux: **Wayland** and **X11** support
 - [x] Small: size < 4Mb (no electron, no node)
+- [x] Custom sounds
 - [ ] Mini mode
 - [ ] Terminal User Interface
 - [ ] Mobile version
@@ -49,6 +50,9 @@ Download the install file for your OS from the latest release on https://github.
     <img width="240" alt="Get it on Flathub" src="https://flathub.org/api/badge?locale=en"/>
 </a>
 
+    flatpak install flathub org.jousse.vincent.Pomodorolm
+    flatpak run org.jousse.vincent.Pomodorolm
+
 ## Snap Store
 
 [![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-black.svg)](https://snapcraft.io/pomodorolm)
@@ -110,7 +114,15 @@ You can try to run `pomodorolm` using this command:
 
     WEBKIT_DISABLE_DMABUF_RENDERER=1 pomodorolm
 
-Thanks to @Bad3r for the [bug report](https://github.com/vjousse/pomodorolm/issues/62)!
+Thanks to [@Bad3r](https://github.com/Bad3r) for the [bug report](https://github.com/vjousse/pomodorolm/issues/62)!
+
+### `Error 71 (Protocol error) dispatching to Wayland display.`
+
+If you are using the flatpak, you can resolve this issue by using this command:
+
+    flatpak override --user --env=WEBKIT_DISABLE_DMABUF_RENDERER=1 org.jousse.vincent.Pomodorolm
+
+This will set the environment variable for the flatpak, and you should be able to launch the application as normal from there on.
 
 ## Windows
 

aur/PKGBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Vincent Jousse <[email protected]> - https://vincent.jousse.org
 pkgname=pomodorolm-bin
-pkgver=0.2.2
+pkgver=0.3.0
 pkgrel=1
 pkgdesc="Multi-platform pomodoro tracker with a nice looking UI, inspired by Pomotroid"
 arch=('x86_64')
@@ -9,7 +9,7 @@ license=('MIT')
 depends=('alsa-lib' 'gtk3' 'hicolor-icon-theme' 'glibc' 'webkit2gtk-4.1' 'libsoup' 'cairo' 'glib2' 'pango' 'gcc-libs' 'gdk-pixbuf2')
 provides=('pomodorolm')
 source=("https://github.com/vjousse/pomodorolm/releases/download/app-v$pkgver/pomodorolm_${pkgver}_amd64.deb")
-sha256sums=('4aed027759bdc58cebdc372afc16635882bb0d11045d92f352ec942aba2de7a9')
+sha256sums=('807ade5646cd287cb4932f25eaa7f9f56fe858b0fa9979015522320be5e828f6')
 package() {
   bsdtar -xf "$srcdir/data.tar.gz" -C "$pkgdir"
 }

elm.json

@@ -1,27 +1,26 @@
 {
-    "type": "application",
-    "source-directories": [
-        "src-elm"
-    ],
-    "elm-version": "0.19.1",
-    "dependencies": {
-        "direct": {
-            "NoRedInk/elm-json-decode-pipeline": "1.0.1",
-            "elm/browser": "1.0.2",
-            "elm/core": "1.0.3",
-            "elm/html": "1.0.0",
-            "elm/json": "1.1.3",
-            "elm/svg": "1.0.1",
-            "rtfeldman/elm-hex": "1.0.0"
-        },
-        "indirect": {
-            "elm/time": "1.0.0",
-            "elm/url": "1.0.0",
-            "elm/virtual-dom": "1.0.3"
-        }
+  "type": "application",
+  "source-directories": ["src-elm"],
+  "elm-version": "0.19.1",
+  "dependencies": {
+    "direct": {
+      "NoRedInk/elm-json-decode-pipeline": "1.0.1",
+      "elm/browser": "1.0.2",
+      "elm/core": "1.0.3",
+      "elm/html": "1.0.0",
+      "elm/json": "1.1.3",
+      "elm/svg": "1.0.1",
+      "rtfeldman/elm-hex": "1.0.0"
     },
-    "test-dependencies": {
-        "direct": {},
-        "indirect": {}
+    "indirect": {
+      "elm/bytes": "1.0.8",
+      "elm/time": "1.0.0",
+      "elm/url": "1.0.0",
+      "elm/virtual-dom": "1.0.3"
     }
+  },
+  "test-dependencies": {
+    "direct": {},
+    "indirect": {}
+  }
 }