UI Rework

.github/workflows/flatpak-nightly.yml

@@ -0,0 +1,19 @@
+name: Build flatpak nightly
+on:
+  push:
+    branches: [next]
+jobs:
+  flatpak:
+    name: "Flatpak"
+    runs-on: ubuntu-latest
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:gnome-nightly
+      options: --privileged
+    steps:
+      - name: Checkout
+        uses: actions/[email protected]
+      - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
+        with:
+          bundle: com.github.AdwCustomizerTeam.AdwCustomizer.flatpak
+          manifest-path: com.github.AdwCustomizerTeam.AdwCustomizer.json
+          cache-key: flatpak-builder-${{ github.sha }}-nightly

.github/workflows/flatpak.yml

@@ -0,0 +1,19 @@
+name: Build flatpak
+on:
+  push:
+    branches: [main]
+jobs:
+  flatpak:
+    name: "Flatpak"
+    runs-on: ubuntu-latest
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:gnome-nightly
+      options: --privileged
+    steps:
+      - name: Checkout
+        uses: actions/[email protected]
+      - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
+        with:
+          bundle: com.github.AdwCustomizerTeam.AdwCustomizer.flatpak
+          manifest-path: com.github.AdwCustomizerTeam.AdwCustomizer.json
+          cache-key: flatpak-builder-${{ github.sha }}

com.github.AdwCustomizerTeam.AdwCustomizer.json

@@ -49,6 +49,20 @@
                 }
             ]
         },
+        {
+            "name": "material-color-utilities-python",
+            "buildsystem": "simple",
+            "build-commands": [
+                "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"material_color_utilities_python~=0.1.0\" --no-build-isolation"
+            ],
+            "sources": [
+                {
+                    "type": "file",
+                    "path": "./monet/material_color_utilities_python-0.1.0-py3-none-any.whl",
+                    "sha256": "735d40c0afae660e319798c697da8fe332cfc7103fbed8a081a187f437ed4523"
+                }
+            ]
+        },
         {
             "name" : "adwcustomizer",
             "builddir" : true,
@@ -57,7 +71,7 @@
                 {
                     "type" : "git",
                     "path" : ".",
-                    "branch": "main"
+                    "branch": "next"
                 }
             ]
         }

data/com.github.AdwCustomizerTeam.AdwCustomizer.appdata.xml.in

@@ -2,8 +2,13 @@
 <component type="desktop">
 	<id>com.github.AdwCustomizerTeam.AdwCustomizer.desktop</id>
 	<metadata_license>CC0-1.0</metadata_license>
-	<project_license>MIT</project_license>
+	<project_license>GPL-3.0</project_license>
+	<name>Adwaita Manager</name>
+	<summary>Change the look of Adwaita, with ease</summary>
 	<description>
-	  <p>Change the look of Adwaita, with ease</p>
+		<p>Change the look of Adwaita, with ease</p>
 	</description>
-</component>
+	<url type="bugtracker">https://github.com/AdwCustomizerTeam/AdwCustomizer/issues</url>
+	<url type="homepage">https://github.com/AdwCustomizerTeam/AdwCustomizer</url>
+	<url type="translate">https://www.transifex.com/adwcustomizerteam/adwcustomizer/</url>
+</component>

data/com.github.AdwCustomizerTeam.AdwCustomizer.gschema.xml

@@ -13,5 +13,8 @@
 		<key name="window-fullscreen" type="b">
 			<default>false</default>
 		</key>
+		<key name="first-run" type="b">
+			<default>true</default>
+		</key>
 	</schema>
 </schemalist>

meson.build

@@ -1,11 +1,15 @@
 project('adwcustomizer',
-          version: 'git',
+          version: '0.1.0',
     meson_version: '>= 0.59.0',
   default_options: [ 'warning_level=2',
                      'werror=false',
                    ],
 )
 
+dependency('glib-2.0')
+dependency('pygobject-3.0')
+dependency('libadwaita-1')
+
 i18n = import('i18n')
 
 gnome = import('gnome')

pypi-dependencies.json

@@ -1,14 +1,49 @@
 {
-    "name": "python3-anyascii",
+    "name": "pypi-dependencies",
     "buildsystem": "simple",
-    "build-commands": [
-        "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"anyascii~=0.3\" --no-build-isolation"
-    ],
-    "sources": [
+    "build-commands": [],
+    "modules": [
         {
-            "type": "file",
-            "url": "https://files.pythonhosted.org/packages/39/f6/7c1e3a2a54f18b67c5bd092c25ac7327083d4b3b15731b98a9c193df2db9/anyascii-0.3.1-py3-none-any.whl",
-            "sha256": "8707d3185017435933360462a65e2c70a4818490745804f38a5ca55e59eb56a0"
+            "name": "python3-anyascii",
+            "buildsystem": "simple",
+            "build-commands": [
+                "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"anyascii~=0.3\" --no-build-isolation"
+            ],
+            "sources": [
+                {
+                    "type": "file",
+                    "url": "https://files.pythonhosted.org/packages/39/f6/7c1e3a2a54f18b67c5bd092c25ac7327083d4b3b15731b98a9c193df2db9/anyascii-0.3.1-py3-none-any.whl",
+                    "sha256": "8707d3185017435933360462a65e2c70a4818490745804f38a5ca55e59eb56a0"
+                }
+            ]
+        },
+        {
+            "name": "python3-Pillow",
+            "buildsystem": "simple",
+            "build-commands": [
+                "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"Pillow>=9.2.0\" --no-build-isolation"
+            ],
+            "sources": [
+                {
+                    "type": "file",
+                    "url": "https://files.pythonhosted.org/packages/8c/92/2975b464d9926dc667020ed1abfa6276e68c3571dcb77e43347e15ee9eed/Pillow-9.2.0.tar.gz",
+                    "sha256": "75e636fd3e0fb872693f23ccb8a5ff2cd578801251f3a4f6854c6a5d437d3c04"
+                }
+            ]
+        },
+        {
+            "name": "python3-regex",
+            "buildsystem": "simple",
+            "build-commands": [
+                "pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"regex\" --no-build-isolation"
+            ],
+            "sources": [
+                {
+                    "type": "file",
+                    "url": "https://files.pythonhosted.org/packages/c6/5a/e266ef579433b9cbd3e704032bb3ffa66b89ff3f0b0874a8cbaa4d451427/regex-2022.7.25.tar.gz",
+                    "sha256": "bd0883e86964cd61360ffc36dbebbc49b928e92a306f886eab02c11dfde5b7aa"
+                }
+            ]
         }
     ]
 }

requirements.txt

@@ -1,7 +1,27 @@
+# requirements.txt
+#
+# Change the look of Adwaita, with ease
+# Copyright (C) 2022  Adwaita Manager Team
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
 # After changing this file, download the flatpak pip generator script:
 # curl -O https://raw.githubusercontent.com/flatpak/flatpak-builder-tools/master/pip/flatpak-pip-generator
 # chmod +x flatpak-pip-generator
 # Then run:
 # ./flatpak-pip-generator --requirements-file=requirements.txt --output pypi-dependencies
 
-anyascii~=0.3
+anyascii~=0.3
+Pillow>=9.2.0
+regex

src/adwcustomizer.gresource.xml

@@ -20,5 +20,37 @@
       preprocess="xml-stripblanks"
       alias="palette-symbolic.svg"
      >icons/com.github.AdwCustomizerTeam.AdwCustomizer-palette-symbolic.svg</file>
+    <file
+      preprocess="xml-stripblanks"
+      alias="larger-brush-symbolic.svg"
+     >icons/com.github.AdwCustomizerTeam.AdwCustomizer-larger-brush-symbolic.svg</file>
+    <file
+      preprocess="xml-stripblanks"
+      alias="color-picker-symbolic.svg"
+     >icons/com.github.AdwCustomizerTeam.AdwCustomizer-color-picker-symbolic.svg</file>
+    <file
+      preprocess="xml-stripblanks"
+      alias="code-symbolic.svg"
+     >icons/com.github.AdwCustomizerTeam.AdwCustomizer-code-symbolic.svg</file>
+    <file
+      preprocess="xml-stripblanks"
+      alias="disk-saved-symbolic.svg"
+     >icons/com.github.AdwCustomizerTeam.AdwCustomizer-disk-saved-symbolic.svg</file>
+    <file
+      preprocess="xml-stripblanks"
+      alias="disk-unsaved-symbolic.svg"
+     >icons/com.github.AdwCustomizerTeam.AdwCustomizer-disk-unsaved-symbolic.svg</file>
+    <file
+     preprocess="xml-stripblanks"
+     alias="open-menu-symbolic.svg"
+    >icons/com.github.AdwCustomizerTeam.AdwCustomizer-open-menu-symbolic.svg</file>
+    <file
+     preprocess="xml-stripblanks"
+     alias="disk-unsaved-fill-symbolic.svg"
+    >icons/com.github.AdwCustomizerTeam.AdwCustomizer-disk-unsaved-fill-symbolic.svg</file>
+    <file
+     preprocess="xml-stripblanks"
+     alias="settings-symbolic.svg"
+    >icons/com.github.AdwCustomizerTeam.AdwCustomizer-settings-symbolic.svg</file>
   </gresource>
 </gresources>

src/adwcustomizer.in

@@ -2,31 +2,21 @@
 
 # adwcustomizer.in
 #
-# Copyright 2022 Adwaita Manager Team
+# Change the look of Adwaita, with ease
+# Copyright (C) 2022  Adwaita Manager Team
 #
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name(s) of the above copyright
-# holders shall not be used in advertising or otherwise to promote the sale,
-# use or other dealings in this Software without prior written
-# authorization.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 import os
 import sys

src/app_type_dialog.py

@@ -1,41 +1,42 @@
 # window.py
 #
-# Copyright 2022 Adwaita Manager Team
+# Change the look of Adwaita, with ease
+# Copyright (C) 2022  Adwaita Manager Team
 #
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name(s) of the above copyright
-# holders shall not be used in advertising or otherwise to promote the sale,
-# use or other dealings in this Software without prior written
-# authorization.
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 from gi.repository import Gtk, Adw
 
-@Gtk.Template(resource_path='/com/github/AdwCustomizerTeam/AdwCustomizer/ui/app_type_dialog.ui')
+
+@Gtk.Template(
+    resource_path="/com/github/AdwCustomizerTeam/AdwCustomizer/ui/app_type_dialog.ui"
+)
 class AdwcustomizerAppTypeDialog(Adw.MessageDialog):
-    __gtype_name__ = 'AdwcustomizerAppTypeDialog'
+    __gtype_name__ = "AdwcustomizerAppTypeDialog"
 
     gtk4_app_type = Gtk.Template.Child("gtk4-app-type")
     gtk3_app_type = Gtk.Template.Child("gtk3-app-type")
 
-    def __init__(self, heading, body, ok_response_name, ok_response_label, ok_response_appearance, **kwargs):
+    def __init__(
+        self,
+        heading,
+        body,
+        ok_response_name,
+        ok_response_label,
+        ok_response_appearance,
+        **kwargs
+    ):
         super().__init__(**kwargs)
         self.set_heading(heading)
         self.set_body(body)
@@ -49,5 +50,5 @@ def __init__(self, heading, body, ok_response_name, ok_response_label, ok_respon
     def get_app_types(self):
         return {
             "gtk4": self.gtk4_app_type.get_active(),
-            "gtk3": self.gtk3_app_type.get_active()
+            "gtk3": self.gtk3_app_type.get_active(),
         }