diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..38b467c --- /dev/null +++ b/.editorconfig @@ -0,0 +1,10 @@ +root = true + +[*] +indent_style = space +indent_size = 2 +insert_final_newline = true + +[*.vala] +indent_size = 4 + diff --git a/butler.doap b/butler.doap index f34c8b4..531c366 100644 --- a/butler.doap +++ b/butler.doap @@ -11,8 +11,8 @@ Hybrid native + web app for Home Assistant. Butler wraps your Home Assistant dashboard up in a native UI, integrating better with your OS. - - + + Vala @@ -22,6 +22,18 @@ Cassidy James Blaede cassidyjames + + + + cassidyjames + + + + + + cassidyjames + + diff --git a/com.cassidyjames.butler.json b/com.cassidyjames.butler.json index cea99ba..c78bc0e 100644 --- a/com.cassidyjames.butler.json +++ b/com.cassidyjames.butler.json @@ -1,27 +1,28 @@ { - "app-id" : "com.cassidyjames.butler", - "runtime" : "org.gnome.Platform", - "runtime-version" : "45", - "sdk" : "org.gnome.Sdk", - "command" : "com.cassidyjames.butler", - "finish-args" : [ - "--socket=wayland", - "--socket=fallback-x11", - "--share=ipc", - "--share=network", - "--device=dri" - ], - "modules" : [ + "app-id": "com.cassidyjames.butler", + "runtime": "org.gnome.Platform", + "runtime-version": "45", + "sdk": "org.gnome.Sdk", + "command": "com.cassidyjames.butler", + "finish-args": [ + "--socket=wayland", + "--socket=fallback-x11", + "--share=ipc", + "--share=network", + "--device=dri" + ], + "modules": [ + { + "name": "butler", + "buildsystem": "meson", + "run-tests": true, + "sources": [ { - "name" : "butler", - "buildsystem" : "meson", - "run-tests": true, - "sources" : [ - { - "type" : "dir", - "path" : "." - } - ] + "type": "dir", + "path": "." } - ] -} \ No newline at end of file + ] + } + ] +} + diff --git a/data/icons/app.svg b/data/icons/app.svg index fc13524..349182b 100644 --- a/data/icons/app.svg +++ b/data/icons/app.svg @@ -3,172 +3,114 @@ - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - + + + + - + - - - - - + + + + + - - - + + + + + + + + - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + + + + + + - - - - - + + + + diff --git a/data/icons/com.cassidyjames.butler.Source.svg b/data/icons/com.cassidyjames.butler.Source.svg index f837c63..a13ad50 100644 --- a/data/icons/com.cassidyjames.butler.Source.svg +++ b/data/icons/com.cassidyjames.butler.Source.svg @@ -2,9 +2,9 @@ Adwaita Icon Template + style="display:inline;opacity:0.189471;enable-background:new" /> diff --git a/data/icons/devel.svg b/data/icons/devel.svg index e8af89c..9aad46c 100644 --- a/data/icons/devel.svg +++ b/data/icons/devel.svg @@ -1,1063 +1,240 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + - - - - + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/icons/symbolic.svg b/data/icons/symbolic.svg index b124fa0..f00e770 100644 --- a/data/icons/symbolic.svg +++ b/data/icons/symbolic.svg @@ -8,6 +8,11 @@ + + + + + @@ -16,13 +21,15 @@ - - + + - + + + + + + + - - - - diff --git a/data/metainfo.xml b/data/metainfo.xml index e0eed69..91d39d6 100644 --- a/data/metainfo.xml +++ b/data/metainfo.xml @@ -7,10 +7,16 @@ Butler Companion for Home Assistant + + #03a9f5 + #241f31 + + Cassidy James Blaede Cassidy James Blaede +

Access your Home Assistant dashboard from a native companion UI, integrating better with your OS. Native features include:

    @@ -35,10 +41,6 @@ com.cassidyjames.butler.desktop - - #03a9f5 - - 300 @@ -56,6 +58,19 @@ + + +

    Improved app listing

    +
      +
    • Refreshed icon with better contrast thanks to Tobias Bernard
      • +
    • Brand colors for Flathub and app store clients
      • +
    +     + + Metainfo: failing summery length + Unique icon + +

    Improved app listing

    diff --git a/meson.build b/meson.build index 1c2dad3..6e9af94 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'com.cassidyjames.butler', 'vala', 'c', - version: '1.0.3', + version: '1.1.0', meson_version: '>=0.58', ) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index b7db8b1..fa72fe1 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -45,6 +45,7 @@ public class Butler.MainWindow : Adw.ApplicationWindow { translator_credits = _("translator-credits"), artists = { "Jakub Steiner https://jimmac.eu/", + "Tobias Bernard https://tobiasbernard.com/", }, }; about_window.copyright = "© 2020–%i %s".printf (