Skip to content
This repository has been archived by the owner on Jul 23, 2024. It is now read-only.

Commit

Permalink
Merge pull request #95 from AdwCustomizerTeam/next
Browse files Browse the repository at this point in the history
UI Rework
  • Loading branch information
0xMRTT committed Aug 12, 2022
2 parents 1f357e6 + 616eef7 commit 2eaef98
Show file tree
Hide file tree
Showing 40 changed files with 1,520 additions and 556 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/flatpak-nightly.yml
Original file line number Diff line number Diff line change
@@ -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/checkout@v3.0.2
- uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
with:
bundle: com.github.AdwCustomizerTeam.AdwCustomizer.Devel.flatpak
manifest-path: com.github.AdwCustomizerTeam.AdwCustomizer.Devel.json
cache-key: flatpak-builder-${{ github.sha }}-nightly
19 changes: 19 additions & 0 deletions .github/workflows/flatpak.yml
Original file line number Diff line number Diff line change
@@ -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/checkout@v3.0.2
- 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 }}
82 changes: 82 additions & 0 deletions com.github.AdwCustomizerTeam.AdwCustomizer.Devel.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
{
"app-id" : "com.github.AdwCustomizerTeam.AdwCustomizer",
"runtime" : "org.gnome.Platform",
"runtime-version" : "master",
"sdk" : "org.gnome.Sdk",
"command" : "adwcustomizer",
"finish-args" : [
"--share=network",
"--share=ipc",
"--socket=fallback-x11",
"--device=dri",
"--socket=wayland",
"--filesystem=xdg-config/gtk-3.0",
"--filesystem=xdg-config/gtk-4.0"
],
"cleanup" : [
"/include",
"/lib/pkgconfig",
"/man",
"/share/doc",
"/share/gtk-doc",
"/share/man",
"/share/pkgconfig",
"*.la",
"*.a"
],
"modules" : [
"pypi-dependencies.json",
{
"name" : "blueprint-compiler",
"buildsystem" : "meson",
"sources" : [
{
"type" : "git",
"url" : "https://gitlab.gnome.org/jwestman/blueprint-compiler",
"branch" : "main"
}
]
},
{
"name": "libportal",
"buildsystem": "meson",
"config-opts": ["-Ddocs=false", "-Dvapi=false", "-Dbackends=gtk4"],
"sources": [
{
"type": "git",
"url": "https://github.com/flatpak/libportal",
"branch": "main"
}
]
},
{
"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,
"buildsystem" : "meson",
"sources" : [
{
"type" : "git",
"path" : ".",
"branch": "next"
}
]
}
],
"build-options" : {
"env" : { }
}
}
14 changes: 14 additions & 0 deletions com.github.AdwCustomizerTeam.AdwCustomizer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
20 changes: 18 additions & 2 deletions data/com.github.AdwCustomizerTeam.AdwCustomizer.appdata.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,29 @@
<description>
<p>First release of Adwaita Manager.</p>
</description>
<ul>
<li>Add AdwViewSwitcher in the header bar.</li>
<li>Move CSS to the "Advanced" tab</li>
<li>Move the rest to the "Colours" tab</li>
<li>Add Monet tab which generates a theme from a background</li>
<li>Add disk saved and disk unsaved icon in the header bar</li>
<li>Update about dialog</li>
<li>Change license to GNU GPLv3</li>
<li>Begin plugin support</li>
<li>Move preset selector to a drop-down called palette (icon palette)</li>
<li>Add ability to apply the theme onlyfor dark theme or oy for light theme</li>
<li>Automaticly use Adwaita-dark preset if the user prefered scheme is dark.</li>
<li>Added Flatpak CI build</li>
<li>Added issue template for bug and feature request </li>
<li>`Main` branch is now protected by GitHub branch protection. The development is done on `next` branch </li>
</ul>
</release>
</releases>

<url type="homepage">https://github.com/AdwCustomizerTeam/AdwCustomizer</url>
<url type="bugtracker">https://github.com/AdwCustomizerTeam/AdwCustomizer/issues</url>
<url type="help">https://github.com/AdwCustomizerTeam/AdwCustomizer/issues</url>
<url type="help">https://github.com/orgs/AdwCustomizerTeam/discussions</url>
<url type="translate">https://www.transifex.com/adwcustomizerteam/adwcustomizer</url>

<update_contact>add-team-email-here</update_contact>
<update_contact>AdwCustomizerTeam@proton.me</update_contact>
</component>
3 changes: 3 additions & 0 deletions data/com.github.AdwCustomizerTeam.AdwCustomizer.gschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 5 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
Binary file not shown.
Loading

0 comments on commit 2eaef98

Please sign in to comment.