feat: flatpak support (#23)

* feat: flatpak support

* remove flatpak commands for justfile

* fix justfile

* rename to CosmicTweaks

* update metainfo file to pass appstreamcli validate

* Update dev.edfloreshz.CosmicTweaks.json

* use git instead of path

* update desktop entry

* Update desktop_entry.desktop

* Update res/metainfo.xml

Co-authored-by: Eduardo Flores <[email protected]>

* Update res/metainfo.xml

Co-authored-by: Eduardo Flores <[email protected]>

* Update res/metainfo.xml

Co-authored-by: Eduardo Flores <[email protected]>

* Update res/metainfo.xml

Co-authored-by: Eduardo Flores <[email protected]>

* Update res/metainfo.xml

Co-authored-by: Eduardo Flores <[email protected]>

* use latest version of runtime

---------

Co-authored-by: Eduardo Flores <[email protected]>

.gitignore

@@ -8,3 +8,8 @@ target/
 
 # MSVC Windows builds of rustc generate these, which store debugging information
 *.pdb
+
+/flatpak-builder-tools
+/.flatpak-builder
+/repo
+/flatpak-out

README.md

@@ -1,5 +1,5 @@
 <div align="center">
-    <img src="res/icons/hicolor/256x256/apps/dev.edfloreshz.CosmicTweaks.svg" width="300"/>
+    <img src="res/app_icon.svg" width="300"/>
 </div>
 
 # Tweaks for COSMIC

dev.edfloreshz.CosmicTweaks.json

@@ -0,0 +1,43 @@
+{
+  "id": "dev.edfloreshz.CosmicTweaks",
+  "runtime": "org.freedesktop.Platform",
+  "runtime-version": "24.08",
+  "sdk": "org.freedesktop.Sdk",
+  "sdk-extensions": ["org.freedesktop.Sdk.Extension.rust-stable"],
+  "command": "cosmic-ext-tweaks",
+  "finish-args": [
+    "--share=ipc",
+    "--share=network",
+    "--socket=fallback-x11",
+    "--socket=wayland",
+    "--device=dri",
+    "--talk-name=com.system76.CosmicSettingsDaemon",
+    "--filesystem=xdg-config/cosmic:rw"
+  ],
+  "build-options": {
+    "append-path": "/usr/lib/sdk/rust-stable/bin",
+    "env": {
+      "CARGO_HOME": "/run/build/tweaks/cargo"
+    }
+  },
+  "modules": [
+    {
+      "name": "tweaks",
+      "buildsystem": "simple",
+      "build-commands": [
+        "cargo --offline build --release --verbose",
+        "install -Dm0755 ./target/release/cosmic-ext-tweaks -t /app/bin/",
+        "install -Dm644 ./res/app_icon.svg /app/share/icons/hicolor/scalable/apps/dev.edfloreshz.CosmicTweaks.svg",
+        "install -Dm644 ./res/metainfo.xml /app/share/metainfo/dev.edfloreshz.CosmicTweaks.metainfo.xml",
+        "install -Dm644 ./res/desktop_entry.desktop /app/share/applications/dev.edfloreshz.CosmicTweaks.desktop"
+      ],
+      "sources": [
+        {
+          "type": "dir",
+          "path": "./"
+        },
+        "./cargo-sources.json"
+      ]
+    }
+  ]
+}

i18n/fr/cosmic_ext_tweaks.ftl

@@ -0,0 +1,31 @@
+app-title = Tweaks pour COSMIC
+app-description = Un outil pour customizer votre COSMIC expérience.
+
+home = Home
+dock = Dock
+panel = Panneau
+color-schemes = Color schemes
+color-schemes-error = Error loading color schemes
+import-color-scheme = Import color scheme
+delete-color-scheme = Delete color scheme
+install-color-scheme = Install color scheme
+open-containing-folder = Ouvrir le dossier
+open-link = Ouvrir le lien
+installed = Installés
+available = Disponibles
+loading = Chargement...
+
+# Panel only
+show-panel = Afficher le panneau
+force-icon-buttons-in-panel = Forcer l'affichage des boutons avec des icons dans le panneau
+
+padding = Padding
+padding-description = Padding is the space between the contents and the borders of the dock or panel.
+
+spacing = Espacement
+spacing-description = L'espacement est l'espace entre les icônes dans le dock ou le panneau.
+
+save = Sauvegarder
+cancel = Annuler
+save-current-color-scheme = Save current color scheme
+color-scheme-name = Color scheme name

justfile

@@ -2,31 +2,21 @@ name := 'cosmic-ext-tweaks'
 export APPID := 'dev.edfloreshz.CosmicTweaks'
 
 rootdir := ''
-prefix := '/usr'
-flatpak-prefix := '/app'
+prefix := '/app'
 
 base-dir := absolute_path(clean(rootdir / prefix))
-flatpak-base-dir := absolute_path(clean(rootdir / flatpak-prefix))
 
-export INSTALL_DIR := base-dir / 'share'
 
 bin-src := 'target' / 'release' / name
 bin-dst := base-dir / 'bin' / name
-flatpak-bin-dst := flatpak-base-dir / 'bin' / name
 
 desktop := APPID + '.desktop'
-desktop-src := 'res' / desktop
-desktop-dst := clean(rootdir / prefix) / 'share' / 'applications' / desktop
-flatpak-desktop-dst := clean(rootdir / flatpak-prefix) / 'share' / 'applications' / desktop
+desktop-dst := base-dir / 'share' / 'applications' / desktop
 
 metainfo := APPID + '.metainfo.xml'
-metainfo-src := 'res' / metainfo
-metainfo-dst := clean(rootdir / prefix) / 'share' / 'metainfo' / metainfo
-flatpak-metainfo-dst := clean(rootdir / flatpak-prefix) / 'share' / 'metainfo' / metainfo
+metainfo-dst := base-dir / 'share' / 'metainfo' / metainfo
 
-icons-src := 'res' / 'icons' / 'hicolor'
-icons-dst := clean(rootdir / prefix) / 'share' / 'icons' / 'hicolor'
-flatpak-icons-dst := clean(rootdir / flatpak-prefix) / 'share' / 'icons' / 'hicolor'
+icons-dst := base-dir / 'share' / 'icons' / 'hicolor'
 
 # Default recipe which runs `just build-release`
 default: build-release
@@ -70,29 +60,16 @@ run *args:
 # Installs files
 install:
     install -Dm0755 {{bin-src}} {{bin-dst}}
-    install -Dm0644 {{desktop-src}} {{desktop-dst}}
-    install -Dm0644 {{metainfo-src}} {{metainfo-dst}}
-    for size in `ls {{icons-src}}`; do \
-        install -Dm0644 "{{icons-src}}/$size/apps/{{APPID}}.svg" "{{icons-dst}}/$size/apps/{{APPID}}.svg"; \
-    done
-
-# Installs files
-flatpak:
-    install -Dm0755 {{bin-src}} {{flatpak-bin-dst}}
-    install -Dm0644 {{desktop-src}} {{flatpak-desktop-dst}}
-    install -Dm0644 {{metainfo-src}} {{flatpak-metainfo-dst}}
-    for size in `ls {{icons-src}}`; do \
-        install -Dm0644 "{{icons-src}}/$size/apps/{{APPID}}.svg" "{{flatpak-icons-dst}}/$size/apps/{{APPID}}.svg"; \
-    done
+    install -Dm0644 res/desktop_entry.desktop {{desktop-dst}}
+    install -Dm0644 res/metainfo.xml {{metainfo-dst}}
+    install -Dm0644 res/app_icon.svg "{{icons-dst}}/scalable/apps/{{APPID}}.svg"
 
 # Uninstalls installed files
 uninstall:
     rm {{bin-dst}}
     rm {{desktop-dst}}
     rm {{metainfo-dst}}
-    for size in `ls {{icons-src}}`; do \
-        rm "{{icons-dst}}/$size/apps/{{APPID}}.svg"; \
-    done
+    rm "{{icons-dst}}/scalable/apps/{{APPID}}.svg"
 
 # Vendor dependencies locally
 vendor:
@@ -118,3 +95,4 @@ vendor:
 vendor-extract:
     rm -rf vendor
     tar pxf vendor.tar
+

res/desktop_entry.desktop

@@ -0,0 +1,16 @@
+[Desktop Entry]
+Name=Tweaks for COSMIC
+Name[fr]=Tweaks pour COSMIC
+GenericName = COSMIC tweaks
+Comment=Tweaks your COSMIC desktop environment
+Comment[fr]=Améliorez votre environnement de bureau COSMIC
+Keywords=Folder;Manager
+Keywords[fr]=ajustement
+
+Exec=cosmic-ext-tweaks
+Terminal=false
+Type=Application
+StartupNotify=true
+Icon=dev.edfloreshz.CosmicTweaks
+Categories=COSMIC;Utility;Settings;DesktopSettings
+OnlyShowIn=COSMIC