Skip to content

Commit

Permalink
merge pull request #14 from mariinkys/oboete_rewrite
Browse files Browse the repository at this point in the history
feat: complete application rewrite
  • Loading branch information
mariinkys authored Jan 28, 2025
2 parents 2df126b + e3a87df commit 19c2ac6
Show file tree
Hide file tree
Showing 45 changed files with 3,238 additions and 3,255 deletions.
392 changes: 201 additions & 191 deletions Cargo.lock

Large diffs are not rendered by default.

18 changes: 7 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "oboete"
version = "0.1.7"
version = "0.1.8"
authors = ["mariinkys (Alex Marín)"]
edition = "2021"
description = "A simple flashcards application for the COSMIC™ desktop"
Expand All @@ -19,22 +19,19 @@ open = "5.3.2"
rust-embed = "8.5.0"
tokio = { version = "1.43.0", features = ["full"] }

# Added by me
sqlx = { version = "0.8.3", features = [
"sqlite",
"runtime-tokio",
"tls-rustls",
] }
futures = "0.3.31"
dirs = "6.0.0"
rand = "0.8.5"
ashpd = { version = "0.10.2", features = ["wayland"] }
percent-encoding = "2.1"
serde = { version = "1.0.217", features = ["derive"] }
serde_json = "1.0.135"
log = "0.4.25"
tracing-subscriber = { version = "0.3.18", features = ["json"] }
paste = "1.0"
tracing = "0.1.40"
rand = "0.9.0" #needed for flashcard selection
ashpd = { version = "0.10.2", features = ["wayland"] } #needed for file dialogs
percent-encoding = "2.3.1" #needed for correct anki file importing
serde_json = "1.0.137" #needed for file exporting and importing

[dependencies.i18n-embed]
version = "0.15.3"
Expand All @@ -60,11 +57,10 @@ features = [
"wayland",
# GPU-accelerated rendering
"wgpu",
# About Page
# COSMIC About Page Support
"about",
]


# Uncomment to test a locally-cloned libcosmic
# [patch.'https://github.com/pop-os/libcosmic']
# libcosmic = { path = "../libcosmic" }
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@

# Notes

This application has been made thanks to the [libcosmic Documentation](https://pop-os.github.io/libcosmic/cosmic/) and [edfloreshz](https://github.com/edfloreshz) application template and examples.

This project is related to my [other flashcard project](https://github.com/mariinkys/delphinus_flashcards), if you want Chinese or Japanese flashcards you can [check it out](https://github.com/mariinkys/delphinus_flashcards)!

> [!WARNING]
Expand Down
423 changes: 218 additions & 205 deletions cargo-sources.json

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions info/ANKI_IMPORTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ The file once exported should be a TXT file that looks similar to this:
```
#separator:tab
#html:false
Front Content Sample Back Content Sample
Front Content Sample Back Content Sample
Cat Gato
Dog Perro
```
At least for now this is the only way to import Anki flash cards to Oboete. You can also check the custom import options for mor advanced imports.
At least for now this is the only way to import Anki flash cards to Oboete. You can also check the custom import options for more advanced imports.
7 changes: 7 additions & 0 deletions res/dev.mariinkys.Oboete.metainfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,13 @@
</keywords>

<releases>
<release version="0.1.8" date="2025-01-28">
<description>
<p>Complete application rewrite that will make code easier to modify and mantain</p>
<p>Updated design</p>
<p>Updated dependencies</p>
</description>
</release>
<release version="0.1.7" date="2024-12-19">
<description>
<p>New about page</p>
Expand Down
3 changes: 3 additions & 0 deletions res/icons/bundled/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Attribution

> "[Pop Icons](http://github.com/pop-os/icon-theme)" by [System76](http://system76.com/) is licensed under [CC-SA-4.0](http://creativecommons.org/licenses/by-sa/4.0/)
6 changes: 0 additions & 6 deletions res/icons/bundled/add-symbolic.svg

This file was deleted.

7 changes: 0 additions & 7 deletions res/icons/bundled/edit-button-symbolic.svg

This file was deleted.

1 change: 1 addition & 0 deletions res/icons/bundled/edit-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions res/icons/bundled/emblem-system-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 1 addition & 6 deletions res/icons/bundled/folder-open-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions res/icons/bundled/folder-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions res/icons/bundled/list-add-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 0 additions & 8 deletions res/icons/bundled/menu-vertical-symbolic.svg

This file was deleted.

7 changes: 0 additions & 7 deletions res/icons/bundled/share-symbolic.svg

This file was deleted.

9 changes: 1 addition & 8 deletions res/icons/bundled/user-trash-full-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions res/icons/bundled/x-office-document-symbolic.svg
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/folder-inside-dark.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/main-dark.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/study-dark.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 19c2ac6

Please sign in to comment.