diff --git a/.buildconfig b/.buildconfig old mode 100644 new mode 100755 diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml old mode 100644 new mode 100755 diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md old mode 100644 new mode 100755 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 658b29d..3371eaf --- a/README.md +++ b/README.md @@ -22,9 +22,9 @@ Simple [Mastodon](https://github.com/tootsuite/mastodon) client for Linux libxml2-dev | 2.9.10 | libgee-0.8-dev | 0.8.5 | libsoup2.4-dev | 2.64 | - libgtk-3-dev | 3.22 | - libhandy-1.0-dev | 1.0.0 | Will be attempted to install automatically if not present. - libsecret-1-dev | 0.20 | Optional. Used for storing accounts using Secret Service API. + libgtk-4-dev | 4.3.0 | + libadwaita-1.0-dev | 1.0.0-alpha2 | Will be attempted to install automatically if not present. + libsecret-1-dev | 0.20 | 2. Run `install.sh` in the project directory. The app will launch automatically on success. @@ -43,4 +43,3 @@ You can always help by reporting bugs, submitting pull requests, and suggesting * 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) - diff --git a/com.github.bleakgrey.tootle.json b/com.github.bleakgrey.tootle.json old mode 100644 new mode 100755 index 34414d0..a21795d --- a/com.github.bleakgrey.tootle.json +++ b/com.github.bleakgrey.tootle.json @@ -1,57 +1,60 @@ { - "app-id": "com.github.bleakgrey.tootle", - "runtime": "org.gnome.Platform", - "sdk": "org.gnome.Sdk", - "runtime-version": "3.38", - "command": "com.github.bleakgrey.tootle", - "finish-args": [ - "--share=network", - "--share=ipc", - "--socket=fallback-x11", - "--socket=wayland", - "--filesystem=xdg-run/dconf", - "--filesystem=~/.config/dconf:ro", - "--talk-name=ca.desrt.dconf", - "--env=DCONF_USER_CONFIG_DIR=.config/dconf" - ], - "cleanup": [ - "/include", - "/lib/pkgconfig", - "/man", - "/share/doc", - "/share/gtk-doc", - "/share/man", - "/share/pkgconfig", - "*.la", - "*.a" - ], - "modules": [ - { - "name": "libhandy", - "buildsystem": "meson", - "config-opts": [ - "-Dtests=false", - "-Dexamples=false", - "-Dglade_catalog=disabled" - ], - "sources": [ + "app-id" : "com.github.bleakgrey.tootle", + "runtime" : "org.gnome.Platform", + "sdk" : "org.gnome.Sdk", + "runtime-version" : "40", + "command" : "com.github.bleakgrey.tootle", + "finish-args" : [ + "--share=network", + "--share=ipc", + "--socket=fallback-x11", + "--socket=wayland", + "--filesystem=xdg-run/dconf", + "--filesystem=~/.config/dconf:ro", + "--talk-name=ca.desrt.dconf", + "--env=DCONF_USER_CONFIG_DIR=.config/dconf" + ], + "cleanup" : [ + "/include", + "/lib/pkgconfig", + "/man", + "/share/doc", + "/share/gtk-doc", + "/share/man", + "/share/pkgconfig", + "*.la", + "*.a" + ], + "modules" : [ { - "type": "archive", - "url": "https://ftp.acc.umu.se/pub/GNOME/sources/libhandy/1.0/libhandy-1.0.3.tar.xz", - "sha256": "559bb3acc2c362488917eb72ed25bdc181f4ae26ac94d177634cc5d34c867f7a" - } - ] - }, - { - "name": "tootle", - "builddir": true, - "buildsystem": "meson", - "sources": [ + "name" : "libadwaita", + "buildsystem" : "meson", + "builddir" : true, + "config-opts" : [ + "-Dexamples=false", + "-Dtests=false" + ], + "sources" : [ + { + "type" : "archive", + "url" : "https://gitlab.gnome.org/GNOME/libadwaita/-/archive/594eb987c57e4d20370cc20520871f230ff02ae2/libadwaita-594eb987c57e4d20370cc20520871f230ff02ae2.tar", + "sha256" : "960d8e95864cac71be9e893d37baace82d67ecb06b3b09bd24b9fdfece9eca9c" + } + ] + }, { - "type": "dir", - "path": "." + "name" : "tootle", + "builddir" : true, + "buildsystem" : "meson", + "sources" : [ + { + "type" : "dir", + "path" : "." + } + ] } - ] + ], + "build-options" : { + "env" : { } } - ] } diff --git a/data/app.css b/data/app.css old mode 100644 new mode 100755 index d70253e..1880a50 --- a/data/app.css +++ b/data/app.css @@ -1,53 +1,43 @@ -.header .chip { - padding: 4px 12px; - border-radius: 4px; - border: 1px solid black; +.sidebar .badge { + padding: 2px 12px; + border-radius: 999px; + background: @accent_bg_color; + color: @text_view_bg; } -.attachment { - border-radius: 5px; - background: rgba (150, 150, 150, 0.2); +/* .header .chip { */ +/* padding: 4px 12px; */ +/* border-radius: 4px; */ +/* border: 1px solid black; */ +/* } */ + +.attachment, .attachment button, flowboxchild { padding:0px; margin:0px; } -.attachment .pic { - border-radius: 5px; -} -.attachment .chip { - padding: 6px; - border-radius:6px; + +.attachment .osd { + padding: 6px 12px; + border-radius: 6px; + margin: 8px; } -.ttl-header-button { - margin: 0px; - border-radius: 0px; - border-top: none; - border-bottom: none; -} -.ttl-header-button .title, .ttl-header-button .subtitle { - padding-left: 0px; - padding-right: 0px; -} - -.padded.ttl-view { - margin: 32px 0 32px 0; -} -.ttl-view:not(.padded) .content row { - border-radius: 0px; -} - -.ttl-action-bar .circular { - box-shadow: none; -} +/* .ttl-header-button { */ +/* margin: 0px; */ +/* border-radius: 0px; */ +/* border-top: none; */ +/* border-bottom: none; */ +/* } */ +/* .ttl-header-button .title, .ttl-header-button .subtitle { */ +/* padding-left: 0px; */ +/* padding-right: 0px; */ +/* } */ .ttl-flat-button { padding: 0px; margin: 0px; } -.ttl-post { - padding: 0px; -} .ttl-thread-line { background: @theme_fg_color; opacity: .1; @@ -55,9 +45,9 @@ margin-bottom: -8px; } -.ttl-large-body { - font-size: 110%; -} +/* .ttl-large-body { */ +/* font-size: 110%; */ +/* } */ .ttl-code { font-family: monospace; @@ -65,3 +55,38 @@ background: rgba(150,150,150,.1); border-radius: 6px; } + +.ttl-view .small .content row { + border-left: none; + border-right: none; + border-radius:0px; +} + +.ttl-view .content row { + padding: 0px; +} + +.ttl-view .large:first-child { + margin-top: 32px; +} +.ttl-view .large:last-child { + margin-bottom: 32px; +} + + + + +/* + Profile +*/ + +.ttl-profile-cover .header-image { + background:grey; +} +.ttl-profile-cover avatar { + border: 6px solid @theme_base_color; + background: @theme_base_color; +} +.large .header-image { + border-radius:6px 6px 0 0; +} diff --git a/data/com.github.bleakgrey.tootle.appdata.xml.in b/data/com.github.bleakgrey.tootle.appdata.xml.in old mode 100644 new mode 100755 diff --git a/data/com.github.bleakgrey.tootle.desktop.in b/data/com.github.bleakgrey.tootle.desktop.in old mode 100644 new mode 100755 diff --git a/data/com.github.bleakgrey.tootle.gschema.xml b/data/com.github.bleakgrey.tootle.gschema.xml old mode 100644 new mode 100755 index f7f08c4..78d9dcc --- a/data/com.github.bleakgrey.tootle.gschema.xml +++ b/data/com.github.bleakgrey.tootle.gschema.xml @@ -1,13 +1,6 @@ - - - - - - - @@ -22,9 +15,6 @@ false - - 'public' - 12 diff --git a/data/gresource.xml b/data/gresource.xml old mode 100644 new mode 100755 index e0af78c..d1137cc --- a/data/gresource.xml +++ b/data/gresource.xml @@ -2,24 +2,37 @@ app.css + + icons/scalable/actions/mention-symbolic.svg + icons/scalable/actions/hashtag-symbolic.svg + icons/scalable/actions/globe-symbolic.svg + icons/scalable/actions/bell-symbolic.svg + + gtk/help-overlay.ui + + gtk/dropdown/icon.ui + gtk/dropdown/full.ui + ui/views/new_account.ui ui/views/base.ui ui/views/profile_header.ui + ui/views/sidebar/view.ui + ui/views/sidebar/account.ui + ui/views/sidebar/item.ui ui/widgets/status.ui - ui/widgets/accounts_button.ui ui/widgets/accounts_button_item.ui ui/widgets/profile_field_row.ui ui/widgets/timeline_menu.ui ui/widgets/list_item.ui ui/widgets/list_editor_item.ui - ui/widgets/attachment_slot.ui ui/widgets/compose_attachment.ui - ui/widgets/adaptive_button.ui ui/dialogs/new_account.ui ui/dialogs/compose.ui ui/dialogs/main.ui ui/dialogs/preferences.ui ui/dialogs/list_editor.ui ui/menus.ui + + diff --git a/data/gtk/dropdown/full.ui b/data/gtk/dropdown/full.ui new file mode 100644 index 0000000..0bf0691 --- /dev/null +++ b/data/gtk/dropdown/full.ui @@ -0,0 +1,63 @@ + + + + diff --git a/data/gtk/dropdown/icon.ui b/data/gtk/dropdown/icon.ui new file mode 100644 index 0000000..33a2368 --- /dev/null +++ b/data/gtk/dropdown/icon.ui @@ -0,0 +1,45 @@ + + + + diff --git a/data/gtk/help-overlay.ui b/data/gtk/help-overlay.ui new file mode 100644 index 0000000..69e2ca0 --- /dev/null +++ b/data/gtk/help-overlay.ui @@ -0,0 +1,56 @@ + + + + 1 + + + + application + + + + Touch gestures + + + <ctrl>R + Refresh column + + + + + <ctrl>T + Compose a post + + + + + + + + + + + shortcuts + + + + Touch gestures + + + + + + + + + gesture-two-finger-swipe-left + Previous column + + + + + + + + + diff --git a/data/icons/color-nightly.svg b/data/icons/color-nightly.svg old mode 100644 new mode 100755 diff --git a/data/icons/color.svg b/data/icons/color.svg old mode 100644 new mode 100755 diff --git a/data/icons/scalable/actions/bell-symbolic.svg b/data/icons/scalable/actions/bell-symbolic.svg new file mode 100644 index 0000000..0ecb9f9 --- /dev/null +++ b/data/icons/scalable/actions/bell-symbolic.svg @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/scalable/actions/globe-symbolic.svg b/data/icons/scalable/actions/globe-symbolic.svg new file mode 100755 index 0000000..964f998 --- /dev/null +++ b/data/icons/scalable/actions/globe-symbolic.svg @@ -0,0 +1,403 @@ + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/scalable/actions/hashtag-symbolic.svg b/data/icons/scalable/actions/hashtag-symbolic.svg new file mode 100755 index 0000000..bcc89f6 --- /dev/null +++ b/data/icons/scalable/actions/hashtag-symbolic.svg @@ -0,0 +1,1509 @@ + + + + + + image/svg+xml + + Gnome Symbolic Icon Theme + + + + + + + + Gnome Symbolic Icon Theme + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/icons/scalable/actions/mention-symbolic.svg b/data/icons/scalable/actions/mention-symbolic.svg new file mode 100755 index 0000000..9afc491 --- /dev/null +++ b/data/icons/scalable/actions/mention-symbolic.svg @@ -0,0 +1,62 @@ + + + + + + image/svg+xml + + + + + + + + + + diff --git a/data/icons/symbolic.svg b/data/icons/symbolic.svg old mode 100644 new mode 100755 diff --git a/data/meson.build b/data/meson.build old mode 100644 new mode 100755 diff --git a/data/screenshot1.png b/data/screenshot1.png old mode 100644 new mode 100755 diff --git a/data/screenshot2.png b/data/screenshot2.png old mode 100644 new mode 100755 diff --git a/data/screenshot3.png b/data/screenshot3.png old mode 100644 new mode 100755 diff --git a/data/screenshot4.png b/data/screenshot4.png old mode 100644 new mode 100755 diff --git a/data/ui/dialogs/compose.ui b/data/ui/dialogs/compose.ui index 028a8a3..bb6bf37 100644 --- a/data/ui/dialogs/compose.ui +++ b/data/ui/dialogs/compose.ui @@ -1,407 +1,54 @@ - - + -