Fresh Colors

.github/workflows/flatpak.yml

@@ -21,5 +21,5 @@ jobs:
     - uses: flathub-infra/flatpak-github-actions/flatpak-builder@master
       with:
         bundle: tally.flatpak
-        manifest-path: com.cassidyjames.plausible.json
+        manifest-path: build-aux/flatpak/com.cassidyjames.plausible.json
         cache-key: "flatpak-builder-${{ github.sha }}"

.github/workflows/lint.yml

@@ -1,6 +1,8 @@
 name: Lint
 on:
   pull_request:
+    paths:
+    - '**.vala'
 
 jobs:
   lint:

README.md

@@ -5,9 +5,9 @@
 
 Hybrid native + web app for [Plausible Analytics](https://plausible.io).
 
-![Screenshot](data/screenshots/sites-light.png)      | ![Screenshot](data/screenshots/dashboard-dark.png)
----------------------------------------------------- | -----------------------------------------------------
-![Screenshot](data/screenshots/extra/about-dark.png) | ![Screenshot](data/screenshots/extra/domain-light.png) ![Screenshot](data/screenshots/extra/logout-light.png)
+![Screenshot](data/screenshots/dashboard-light.png) | ![Screenshot](data/screenshots/dashboard-dark.png)
+--------------------------------------------------- | --------------------------------------------------
+![Screenshot](data/screenshots/sites-dark.png)      | ![Screenshot](data/screenshots/sites-light.png)
 
 Plausible is the simple privacy-friendly alternative to Google Analytics. Tally wraps the Plausible web app in a native UI, integrating better with desktop operating systems. Native features include:
 
@@ -31,4 +31,3 @@ Other features include:
 I recommend using GNOME Builder with default settings to build the Flatpak.
 
 [flathub]: https://flathub.org/apps/details/com.cassidyjames.plausible
-

build-aux/flatpak/com.cassidyjames.plausible.json

@@ -0,0 +1,26 @@
+{
+  "id": "com.cassidyjames.plausible",
+  "runtime": "org.gnome.Platform",
+  "runtime-version": "46",
+  "sdk": "org.gnome.Sdk",
+  "command": "com.cassidyjames.plausible",
+  "finish-args": [
+    "--socket=wayland",
+    "--socket=fallback-x11",
+    "--share=ipc",
+    "--share=network",
+    "--device=dri"
+  ],
+  "modules": [
+    {
+      "name": "tally",
+      "buildsystem": "meson",
+      "sources": [
+        {
+          "type": "dir",
+          "path": "../.."
+        }
+      ]
+    }
+  ]
+}

data/gresource.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/com/cassidyjames/plausible">
+  <gresource prefix="/com/cassidyjames/plausible/">
+    <file preprocess="xml-stripblanks">metainfo.xml</file>
     <file>style.css</file>
     <file>style-dark.css</file>
   </gresource>

data/metainfo.xml

@@ -40,6 +40,17 @@
     <control>touch</control>
   </supports>
   <releases>
+    <release version="3.2.0" date="2024-05-24">
+      <description>
+        <p>Fresh Colors</p>
+        <ul>
+          <li>Updated colors throughout the app</li>
+          <li>More subtle header bar to fit in better in both light and dark styles</li>
+          <li>Improved About dialog</li>
+          <li>Preparation for translations</li>
+        </ul>
+      </description>
+    </release>
     <release version="3.1.0" date="2024-04-22">
       <description>
         <p>Updated for GNOME 46</p>
@@ -124,22 +135,16 @@
   </releases>
   <screenshots>
     <screenshot type="default">
-      <image>https://raw.githubusercontent.com/cassidyjames/tally/3.0.1/data/screenshots/dashboard-dark.png</image>
-    </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/cassidyjames/tally/3.0.1/data/screenshots/dashboard-light.png</image>
-    </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/cassidyjames/tally/3.0.1/data/screenshots/sites-dark.png</image>
+      <image>https://raw.githubusercontent.com/cassidyjames/tally/d1723acc47ff79df9764aeacd16eeb6091934cb2/data/screenshots/dashboard-light.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/cassidyjames/tally/3.0.1/data/screenshots/sites-light.png</image>
+      <image>https://raw.githubusercontent.com/cassidyjames/tally/d1723acc47ff79df9764aeacd16eeb6091934cb2/data/screenshots/dashboard-dark.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/cassidyjames/tally/3.0.1/data/screenshots/login-dark.png</image>
+      <image>https://raw.githubusercontent.com/cassidyjames/tally/d1723acc47ff79df9764aeacd16eeb6091934cb2/data/screenshots/sites-light.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/cassidyjames/tally/3.0.1/data/screenshots/login-light.png</image>
+      <image>https://raw.githubusercontent.com/cassidyjames/tally/d1723acc47ff79df9764aeacd16eeb6091934cb2/data/screenshots/sites-dark.png</image>
     </screenshot>
   </screenshots>
   <content_rating type="oars-1.1">
@@ -152,7 +157,7 @@
   <url type="help">https://cassidyjames.com/support</url>
   <!--url type="contact">https://cassidyjames.com/support</url-->
   <branding>
-    <color type="primary" scheme_preference="light">#b5b3fe</color>
-    <color type="primary" scheme_preference="dark">#393499</color>
+    <color type="primary" scheme_preference="light">#9e99fe</color>
+    <color type="primary" scheme_preference="dark">#352f99</color>
   </branding>
 </component>

data/style-dark.css

@@ -1,3 +1,8 @@
-@define-color accent_color #9c95fd;
-@define-color window_bg_color #1a202c;
-@define-color dialog_bg_color #1f2937;
+@define-color accent_color #99A8FE;
+@define-color accent_alt_color @accent_color;
+
+@define-color headerbar_bg_color #1e293b;
+
+@define-color window_bg_color #1a202C;
+@define-color window_fg_color #f1f5f9;
+@define-color dialog_bg_color #1e293b;

data/style.css

@@ -1,14 +1,17 @@
-@define-color headerbar_bg_color #5850ec;
-@define-color headerbar_fg_color #fff;
-@define-color headerbar_border_color #fff;
-@define-color headerbar_backdrop_color mix(@headerbar_bg_color, @window_bg_color, 0.2);
+@define-color accent_color #4f46e5;
+@define-color accent_alt_color #1f2961;
 
-@define-color accent_color @headerbar_bg_color;
+@define-color headerbar_bg_color #f4f5fc;
+@define-color headerbar_fg_color @accent_color;
+@define-color headerbar_border_color @headerbar_fg_color;
+@define-color headerbar_backdrop_color mix(@headerbar_bg_color, @window_bg_color, 0.2);
 
-@define-color window_bg_color #f9fafb;
+@define-color window_bg_color #f8fafc;
+@define-color window_fg_color #0f172a;
 @define-color dialog_bg_color #fff;
 @define-color popover_bg_color @dialog_bg_color;
 
 .loading {
-  background-color: @dialog_bg_color;
+  background-color: @headerbar_bg_color;
+  color: @accent_alt_color;
 }

meson.build

@@ -1,17 +1,20 @@
 project(
   'com.cassidyjames.plausible',
   'vala', 'c',
-  version: '3.1.0'
+  version: '3.2.0',
+  meson_version: '>= 0.62',
 )
 
+i18n = import('i18n')
 gnome = import('gnome')
 
 add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), language:'c')
 
 asresources = gnome.compile_resources(
   'as-resources',
   'data' / 'gresource.xml',
-  source_dir: 'data'
+  source_dir: 'data',
+  c_name: 'as',
 )
 
 config_data = configuration_data()
@@ -22,7 +25,7 @@ config_data.set_quoted('VERSION', meson.project_version())
 config_file = configure_file(
   input: 'src/Config.vala.in',
   output: '@BASENAME@',
-  configuration: config_data
+  configuration: config_data,
 )
 
 executable(
@@ -35,13 +38,17 @@ executable(
   dependencies: [
     dependency('glib-2.0'),
     dependency('gtk4'),
-    dependency('libadwaita-1'),
+    dependency('libadwaita-1', version: '>=1.5'),
     dependency('webkitgtk-6.0'),
     meson.get_compiler('vala').find_library('posix'),
   ],
-  install: true
+  install: true,
 )
 
 subdir('data')
 
-meson.add_install_script('build-aux' / 'meson'/ 'post_install.py')
+gnome.post_install(
+  glib_compile_schemas: true,
+  gtk_update_icon_cache: true,
+  update_desktop_database: true,
+)

src/App.vala

@@ -5,9 +5,6 @@
 
 public class Plausible.App : Adw.Application {
     public const string NAME = "Tally";
-    public const string DEVELOPER = "Cassidy James Blaede";
-    public const string EMAIL = "c@ssidyjam.es";
-    public const string URL = "https://cassidyjames.com";
 
     public static GLib.Settings settings;