Skip to content

Commit

Permalink
refactor: Refactor Application
Browse files Browse the repository at this point in the history
Refactoring the following:
* Consolidate app structure (via submodules).
* Update application initialization logic.
* Refactoring application config.
* Updating to latest `libcosmic` (resolves #54).
* Using native libcosmic's `About` widget (resolves #31).

Fixing account deletion dialog text.

Updating screenshots.

Updating `README.md`.
  • Loading branch information
vkhitrin committed Feb 8, 2025
1 parent 6ab1a69 commit b48ca9b
Show file tree
Hide file tree
Showing 23 changed files with 671 additions and 701 deletions.
541 changes: 260 additions & 281 deletions Cargo.lock

Large diffs are not rendered by default.

42 changes: 36 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ log = "0.4.22"
once_cell = "1.19.0"
open = "5.3.0"
paste = "1.0.15"
pretty_env_logger = "0.5.0"
reqwest = { version = "0.12.8", features = ["json"] }
rust-embed = "8.5.0"
serde = "1.0.210"
Expand All @@ -28,23 +29,52 @@ tokio = { version = "1.40.0", features = ["full"] }
version = "0.15"
features = ["fluent-system", "desktop-requester"]

[dependencies.libcosmic]
[target.'cfg(target_os="macos")'.dependencies.libcosmic]
git = "https://github.com/pop-os/libcosmic"
default-features = false
# features = ["dbus-config", "tokio", "winit", "wgpu"]
features = [
# Native cosmic about drawer
"about",
# Accessibility support
"a11y",
# Uses cosmic-settings-daemon to watch for config file changes
"dbus-config",
# NOTE: (vkhitrin) this is a temporary workaround to set initial
# application title.
# Support creating additional application windows.
"multi-window",
# On app startup, focuses an existing instance if the app is already open
"single-instance",
# Uses tokio as the executor for the runtime
"tokio",
# Windowing support for X11, Windows, Mac, & Redox
"winit",
# GPU-accelerated rendering
"wgpu",
]
process = []

[target.'cfg(target_os="linux")'.dependencies.libcosmic]
git = "https://github.com/pop-os/libcosmic"
default-features = false
features = [
# Native cosmic about drawer
"about",
# Accessibility support
"a11y",
# Uses cosmic-settings-daemon to watch for config file changes
"dbus-config",
# Support creating additional application windows.
"multi-window",
# On app startup, focuses an existing instance if the app is already open
"single-instance",
# Uses tokio as the executor for the runtime
"tokio",
# Windowing support for X11, Windows, Mac, & Redox
"winit",
# Add Wayland support to winit
"wayland",
# GPU-accelerated rendering
"wgpu",
]
rev = "953685a88267894ea3fa40f2b99139c3c4e784d6"
version = "0.1.0"

[build-dependencies]
vergen = { version = "8", features = ["git", "gitcl"] }
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
cosmicding is a [linkding](https://github.com/sissbruecker/linkding) companion app for COSMIC™ Desktop Environment.
It provides an alternative frontend to linkding based on [libcosmic](https://github.com/pop-os/libcosmic).

While cosmicding was designed for COSMIC™ Desktop Environment, it may "run" cross-platform (#24).
While cosmicding was designed for COSMIC™ Desktop Environment, it may "run" cross-platform ([#24](https://github.com/vkhitrin/cosmicding/issues/24)).

Features:

Expand All @@ -25,6 +25,9 @@ cosmicding was tested against linkding releases `1.31.0`, and `1.36.0`.

## Installation

> [!WARNING]
> macOS build are currently broken, `about` feature of `libcosmic` uses a dependency which is broken on macOS.
> [!NOTE]
> Currently cosmicding is hard-codded to build Apple Silicon releases for macOS.
Expand Down
Binary file modified res/screenshots/accounts.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/screenshots/bookmarks.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit b48ca9b

Please sign in to comment.