diff --git a/.buildconfig b/.buildconfig index 3c7dcdb..7b801cf 100644 --- a/.buildconfig +++ b/.buildconfig @@ -4,10 +4,10 @@ runtime=host toolchain=default config-opts= run-opts= -prefix=/home/user/.cache/gnome-builder/install/tootle/host +prefix=/home/user/.cache/gnome-builder/install/tooth/host app-id= postbuild= prebuild= [default.environment] -G_MESSAGES_DEBUG=tootle +G_MESSAGES_DEBUG=tooth diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 700d4f7..e3d6a1a 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1,2 @@ +github: [GeopJr] custom: https://liberapay.com/bleakgrey/ diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md index a0ed847..80cea80 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -31,7 +31,7 @@ __ - **Build type:** Flatpak / Built from source / Built by a third-party maintainer #### Logs: -*(Terminal logs are often invaluable. If you can, launch the app from terminal with `com.github.bleakgrey.tootle` and paste the output here)* +*(Terminal logs are often invaluable. If you can, launch the app from terminal with `dev.geopjr.tooth` and paste the output here)* #### Additional info (if needed): __ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 93a83ae..8b25f9f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,19 +1,20 @@ on: push: - branches: [master] + branches: [main] pull_request: name: CI jobs: flatpak-builder: name: "Flatpak Builder" - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest container: - image: bilelmoussaoui/flatpak-github-actions:gnome-3.38 + image: bilelmoussaoui/flatpak-github-actions:gnome-43 options: --privileged steps: - - uses: actions/checkout@v2 - - uses: bilelmoussaoui/flatpak-github-actions@v2 + - uses: actions/checkout@v3 + - uses: flatpak/flatpak-github-actions/flatpak-builder@v4 with: - bundle: "com.github.bleakgrey.tootle.flatpak" - manifest-path: "com.github.bleakgrey.tootle.json" + bundle: "dev.geopjr.tooth.flatpak" + manifest-path: "dev.geopjr.tooth.json" run-tests: "true" + cache-key: flatpak-builder-${{ github.sha }} diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..8c5dc91 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,132 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +We as members, contributors, and leaders pledge to make participation in our +community a harassment-free experience for everyone, regardless of age, body +size, visible or invisible disability, ethnicity, sex characteristics, gender +identity and expression, level of experience, education, socio-economic status, +nationality, personal appearance, race, caste, color, religion, or sexual identity +and orientation. + +We pledge to act and interact in ways that contribute to an open, welcoming, +diverse, inclusive, and healthy community. + +## Our Standards + +Examples of behavior that contributes to a positive environment for our +community include: + +* Demonstrating empathy and kindness toward other people +* Being respectful of differing opinions, viewpoints, and experiences +* Giving and gracefully accepting constructive feedback +* Accepting responsibility and apologizing to those affected by our mistakes, + and learning from the experience +* Focusing on what is best not just for us as individuals, but for the + overall community + +Examples of unacceptable behavior include: + +* The use of sexualized language or imagery, and sexual attention or + advances of any kind +* Trolling, insulting or derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or email + address, without their explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Enforcement Responsibilities + +Community leaders are responsible for clarifying and enforcing our standards of +acceptable behavior and will take appropriate and fair corrective action in +response to any behavior that they deem inappropriate, threatening, offensive, +or harmful. + +Community leaders have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, and will communicate reasons for moderation +decisions when appropriate. + +## Scope + +This Code of Conduct applies within all community spaces, and also applies when +an individual is officially representing the community in public spaces. +Examples of representing our community include using an official e-mail address, +posting via an official social media account, or acting as an appointed +representative at an online or offline event. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported to the community leaders responsible for enforcement at +coc@geopjr.dev. +All complaints will be reviewed and investigated promptly and fairly. + +All community leaders are obligated to respect the privacy and security of the +reporter of any incident. + +## Enforcement Guidelines + +Community leaders will follow these Community Impact Guidelines in determining +the consequences for any action they deem in violation of this Code of Conduct: + +### 1. Correction + +**Community Impact**: Use of inappropriate language or other behavior deemed +unprofessional or unwelcome in the community. + +**Consequence**: A private, written warning from community leaders, providing +clarity around the nature of the violation and an explanation of why the +behavior was inappropriate. A public apology may be requested. + +### 2. Warning + +**Community Impact**: A violation through a single incident or series +of actions. + +**Consequence**: A warning with consequences for continued behavior. No +interaction with the people involved, including unsolicited interaction with +those enforcing the Code of Conduct, for a specified period of time. This +includes avoiding interactions in community spaces as well as external channels +like social media. Violating these terms may lead to a temporary or +permanent ban. + +### 3. Temporary Ban + +**Community Impact**: A serious violation of community standards, including +sustained inappropriate behavior. + +**Consequence**: A temporary ban from any sort of interaction or public +communication with the community for a specified period of time. No public or +private interaction with the people involved, including unsolicited interaction +with those enforcing the Code of Conduct, is allowed during this period. +Violating these terms may lead to a permanent ban. + +### 4. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community +standards, including sustained inappropriate behavior, harassment of an +individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within +the community. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], +version 2.1, available at +[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1]. + +Community Impact Guidelines were inspired by +[Mozilla's code of conduct enforcement ladder][Mozilla CoC]. + +For answers to common questions about this code of conduct, see the FAQ at +[https://www.contributor-covenant.org/faq][FAQ]. Translations are available +at [https://www.contributor-covenant.org/translations][translations]. + +[homepage]: https://www.contributor-covenant.org +[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html +[Mozilla CoC]: https://github.com/mozilla/diversity +[FAQ]: https://www.contributor-covenant.org/faq +[translations]: https://www.contributor-covenant.org/translations diff --git a/README.md b/README.md index 3371eaf..3ef77d8 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,19 @@ -## Tootle -Simple [Mastodon](https://github.com/tootsuite/mastodon) client for Linux +

+ branding +

+

Tooth

+

A GTK Mastodon Client

+

+
+ COC + GPL-3.0 +

-![Screenshot](https://raw.githubusercontent.com/bleakgrey/tootle/master/data/screenshot1.png) - - -### Installation - -Download on Flathub +

+ screenshot of the tooth app showing the home tim +

+> This is a fork of the now archived [Tootle](https://github.com/bleakgrey/tootle). ### Building From Source @@ -30,16 +36,11 @@ Simple [Mastodon](https://github.com/tootsuite/mastodon) client for Linux 2. Run `install.sh` in the project directory. The app will launch automatically on success. -### Contributing -Please consider donating with [LiberaPay](https://liberapay.com/bleakgrey/) to keep the developer happy. +## Contributing -Donate using Liberapay - -You can always help by reporting bugs, submitting pull requests, and suggesting ideas. - - -### Credits -* Icon design by [Tobias Bernard](https://github.com/bertob) -* German translation by [@koyuawsmbrtn](https://github.com/koyuawsmbrtn) -* Spanish translation by [@oscfdezdz](https://github.com/oscfdezdz) -* Norwegian (Bokmål) translation by [@Octolinger](https://github.com/Octolinger) +1. Read the [Code of Conduct](./CODE_OF_CONDUCT.md) +2. Fork it ( https://github.com/GeopJr/Tooth/fork ) +3. Create your feature branch (git checkout -b my-new-feature) +4. Commit your changes (git commit -am 'Add some feature') +5. Push to the branch (git push origin my-new-feature) +6. Create a new Pull Request diff --git a/data/com.github.bleakgrey.tootle.appdata.xml.in b/data/dev.geopjr.tooth.appdata.xml.in similarity index 78% rename from data/com.github.bleakgrey.tootle.appdata.xml.in rename to data/dev.geopjr.tooth.appdata.xml.in index 497ae68..7e4f270 100644 --- a/data/com.github.bleakgrey.tootle.appdata.xml.in +++ b/data/dev.geopjr.tooth.appdata.xml.in @@ -1,28 +1,28 @@ - com.github.bleakgrey.tootle + dev.geopjr.tooth CC0-1.0 GPL-3.0+ - Tootle + Tooth Lightning fast client for Mastodon

- Tootle is a GTK client for the world's largest, decentralized, microblogging platform, Mastodon. With the user experience in mind, it provides a clean, native interface that allows you to integrate Mastodon's social experience seamlessly with your desktop environment. + Tooth is a GTK client for the world's largest, decentralized, microblogging platform, Mastodon. With the user experience in mind, it provides a clean, native interface that allows you to integrate Mastodon's social experience seamlessly with your desktop environment.

- Mastodon is a free and open source microblogging platform similar to Twitter, but with user privacy and decentralization in mind. It is one of many protocols that interacts with the Fediverse of protocols like Pleroma, GNU Social, and others. The power of federated microblogging that Mastodon brings and the agility of Tootle creates a fantastic duo for all of your social media needs. + Mastodon is a free and open source microblogging platform similar to Twitter, but with user privacy and decentralization in mind. It is one of many protocols that interacts with the Fediverse of protocols like Pleroma, GNU Social, and others. The power of federated microblogging that Mastodon brings and the agility of Tooth creates a fantastic duo for all of your social media needs.

- com.github.bleakgrey.tootle + dev.geopjr.tooth bleak_grey https://github.com/bleakgrey - https://github.com/bleakgrey/tootle/issues + https://github.com/GeopJr/tooth/issues https://liberapay.com/bleakgrey/donate @@ -62,16 +62,16 @@ - https://raw.githubusercontent.com/bleakgrey/tootle/master/data/screenshot1.png + https://raw.githubusercontent.com/GeopJr/tooth/main/data/screenshot1.png - https://raw.githubusercontent.com/bleakgrey/tootle/master/data/screenshot2.png + https://raw.githubusercontent.com/GeopJr/tooth/main/data/screenshot2.png - https://raw.githubusercontent.com/bleakgrey/tootle/master/data/screenshot3.png + https://raw.githubusercontent.com/GeopJr/tooth/main/data/screenshot3.png - https://raw.githubusercontent.com/bleakgrey/tootle/master/data/screenshot4.png + https://raw.githubusercontent.com/GeopJr/tooth/main/data/screenshot4.png diff --git a/data/com.github.bleakgrey.tootle.desktop.in b/data/dev.geopjr.tooth.desktop.in similarity index 66% rename from data/com.github.bleakgrey.tootle.desktop.in rename to data/dev.geopjr.tooth.desktop.in index f08abae..f11f563 100644 --- a/data/com.github.bleakgrey.tootle.desktop.in +++ b/data/dev.geopjr.tooth.desktop.in @@ -1,15 +1,15 @@ [Desktop Entry] Type=Application -Name=Tootle +Name=Tooth Comment=Mastodon Client GenericName=Mastodon Client -Exec=com.github.bleakgrey.tootle %u -Icon=com.github.bleakgrey.tootle +Exec=dev.geopjr.tooth %u +Icon=dev.geopjr.tooth Terminal=false Categories=GNOME;GTK;Network; Keywords=toot;mastodon;social;network;post; -X-GNOME-Gettext-Domain=com.github.bleakgrey.tootle +X-GNOME-Gettext-Domain=dev.geopjr.tooth X-GNOME-UsesNotifications=true -MimeType=x-scheme-handler/tootle; +MimeType=x-scheme-handler/tooth; # Translators: Do NOT translate or transliterate this text (these are enum types)! X-Purism-FormFactor=Workstation;Mobile; diff --git a/data/com.github.bleakgrey.tootle.gschema.xml b/data/dev.geopjr.tooth.gschema.xml similarity index 89% rename from data/com.github.bleakgrey.tootle.gschema.xml rename to data/dev.geopjr.tooth.gschema.xml index dff697a..772d555 100644 --- a/data/com.github.bleakgrey.tootle.gschema.xml +++ b/data/dev.geopjr.tooth.gschema.xml @@ -1,7 +1,7 @@ - + '' diff --git a/data/gresource.xml b/data/gresource.xml index f46465a..035c3cb 100644 --- a/data/gresource.xml +++ b/data/gresource.xml @@ -1,6 +1,6 @@ - + app.css icons/scalable/actions/mention-symbolic.svg diff --git a/data/gtk/dropdown/full.ui b/data/gtk/dropdown/full.ui index 0bf0691..c31f4f8 100644 --- a/data/gtk/dropdown/full.ui +++ b/data/gtk/dropdown/full.ui @@ -14,7 +14,7 @@ 6 6 - + GtkListItem @@ -30,7 +30,7 @@ 0 - + GtkListItem @@ -40,7 +40,7 @@ 0 - + GtkListItem diff --git a/data/gtk/dropdown/icon.ui b/data/gtk/dropdown/icon.ui index 33a2368..304684d 100644 --- a/data/gtk/dropdown/icon.ui +++ b/data/gtk/dropdown/icon.ui @@ -4,7 +4,7 @@ - + GtkListItem @@ -13,7 +13,7 @@ - + diff --git a/data/icons/color-nightly.svg b/data/icons/color-nightly.svg index 0a6efd0..e523fa2 100644 --- a/data/icons/color-nightly.svg +++ b/data/icons/color-nightly.svg @@ -1,499 +1,195 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/color.svg b/data/icons/color.svg index f254da9..403fcb6 100644 --- a/data/icons/color.svg +++ b/data/icons/color.svg @@ -1,233 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/data/ui/dialogs/compose.ui b/data/ui/dialogs/compose.ui index d69960e..ff57a7c 100644 --- a/data/ui/dialogs/compose.ui +++ b/data/ui/dialogs/compose.ui @@ -2,7 +2,7 @@ -