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

Commit 2eaef98

Browse files
0xMRTT0xMRTT
authored
Merge pull request #95 from AdwCustomizerTeam/next
UI Rework
2 parents 1f357e6 + 616eef7 commit 2eaef98

40 files changed

+1520
-556
lines changed

‎.github/workflows/flatpak-nightly.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Build flatpak nightly
2+
on:
3+
push:
4+
branches: [next]
5+
jobs:
6+
flatpak:
7+
name: "Flatpak"
8+
runs-on: ubuntu-latest
9+
container:
10+
image: bilelmoussaoui/flatpak-github-actions:gnome-nightly
11+
options: --privileged
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v3.0.2
15+
- uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
16+
with:
17+
bundle: com.github.AdwCustomizerTeam.AdwCustomizer.Devel.flatpak
18+
manifest-path: com.github.AdwCustomizerTeam.AdwCustomizer.Devel.json
19+
cache-key: flatpak-builder-${{ github.sha }}-nightly

‎.github/workflows/flatpak.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Build flatpak
2+
on:
3+
push:
4+
branches: [main]
5+
jobs:
6+
flatpak:
7+
name: "Flatpak"
8+
runs-on: ubuntu-latest
9+
container:
10+
image: bilelmoussaoui/flatpak-github-actions:gnome-nightly
11+
options: --privileged
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v3.0.2
15+
- uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
16+
with:
17+
bundle: com.github.AdwCustomizerTeam.AdwCustomizer.flatpak
18+
manifest-path: com.github.AdwCustomizerTeam.AdwCustomizer.json
19+
cache-key: flatpak-builder-${{ github.sha }}

‎com.github.AdwCustomizerTeam.AdwCustomizer.Devel.json‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
{
2+
"app-id" : "com.github.AdwCustomizerTeam.AdwCustomizer",
3+
"runtime" : "org.gnome.Platform",
4+
"runtime-version" : "master",
5+
"sdk" : "org.gnome.Sdk",
6+
"command" : "adwcustomizer",
7+
"finish-args" : [
8+
"--share=network",
9+
"--share=ipc",
10+
"--socket=fallback-x11",
11+
"--device=dri",
12+
"--socket=wayland",
13+
"--filesystem=xdg-config/gtk-3.0",
14+
"--filesystem=xdg-config/gtk-4.0"
15+
],
16+
"cleanup" : [
17+
"/include",
18+
"/lib/pkgconfig",
19+
"/man",
20+
"/share/doc",
21+
"/share/gtk-doc",
22+
"/share/man",
23+
"/share/pkgconfig",
24+
"*.la",
25+
"*.a"
26+
],
27+
"modules" : [
28+
"pypi-dependencies.json",
29+
{
30+
"name" : "blueprint-compiler",
31+
"buildsystem" : "meson",
32+
"sources" : [
33+
{
34+
"type" : "git",
35+
"url" : "https://gitlab.gnome.org/jwestman/blueprint-compiler",
36+
"branch" : "main"
37+
}
38+
]
39+
},
40+
{
41+
"name": "libportal",
42+
"buildsystem": "meson",
43+
"config-opts": ["-Ddocs=false", "-Dvapi=false", "-Dbackends=gtk4"],
44+
"sources": [
45+
{
46+
"type": "git",
47+
"url": "https://github.com/flatpak/libportal",
48+
"branch": "main"
49+
}
50+
]
51+
},
52+
{
53+
"name": "material-color-utilities-python",
54+
"buildsystem": "simple",
55+
"build-commands": [
56+
"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"
57+
],
58+
"sources": [
59+
{
60+
"type": "file",
61+
"path": "./monet/material_color_utilities_python-0.1.0-py3-none-any.whl",
62+
"sha256": "735d40c0afae660e319798c697da8fe332cfc7103fbed8a081a187f437ed4523"
63+
}
64+
]
65+
},
66+
{
67+
"name" : "adwcustomizer",
68+
"builddir" : true,
69+
"buildsystem" : "meson",
70+
"sources" : [
71+
{
72+
"type" : "git",
73+
"path" : ".",
74+
"branch": "next"
75+
}
76+
]
77+
}
78+
],
79+
"build-options" : {
80+
"env" : { }
81+
}
82+
}

‎com.github.AdwCustomizerTeam.AdwCustomizer.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,20 @@
4949
}
5050
]
5151
},
52+
{
53+
"name": "material-color-utilities-python",
54+
"buildsystem": "simple",
55+
"build-commands": [
56+
"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"
57+
],
58+
"sources": [
59+
{
60+
"type": "file",
61+
"path": "./monet/material_color_utilities_python-0.1.0-py3-none-any.whl",
62+
"sha256": "735d40c0afae660e319798c697da8fe332cfc7103fbed8a081a187f437ed4523"
63+
}
64+
]
65+
},
5266
{
5367
"name" : "adwcustomizer",
5468
"builddir" : true,

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,29 @@
104104
<description>
105105
<p>First release of Adwaita Manager.</p>
106106
</description>
107+
<ul>
108+
<li>Add AdwViewSwitcher in the header bar.</li>
109+
<li>Move CSS to the "Advanced" tab</li>
110+
<li>Move the rest to the "Colours" tab</li>
111+
<li>Add Monet tab which generates a theme from a background</li>
112+
<li>Add disk saved and disk unsaved icon in the header bar</li>
113+
<li>Update about dialog</li>
114+
<li>Change license to GNU GPLv3</li>
115+
<li>Begin plugin support</li>
116+
<li>Move preset selector to a drop-down called palette (icon palette)</li>
117+
<li>Add ability to apply the theme onlyfor dark theme or oy for light theme</li>
118+
<li>Automaticly use Adwaita-dark preset if the user prefered scheme is dark.</li>
119+
<li>Added Flatpak CI build</li>
120+
<li>Added issue template for bug and feature request </li>
121+
<li>`Main` branch is now protected by GitHub branch protection. The development is done on `next` branch </li>
122+
</ul>
107123
</release>
108124
</releases>
109125

110126
<url type="homepage">https://github.com/AdwCustomizerTeam/AdwCustomizer</url>
111127
<url type="bugtracker">https://github.com/AdwCustomizerTeam/AdwCustomizer/issues</url>
112-
<url type="help">https://github.com/AdwCustomizerTeam/AdwCustomizer/issues</url>
128+
<url type="help">https://github.com/orgs/AdwCustomizerTeam/discussions</url>
113129
<url type="translate">https://www.transifex.com/adwcustomizerteam/adwcustomizer</url>
114130

115-
<update_contact>add-team-email-here</update_contact>
131+
<update_contact>AdwCustomizerTeam@proton.me</update_contact>
116132
</component>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,8 @@
1313
<key name="window-fullscreen" type="b">
1414
<default>false</default>
1515
</key>
16+
<key name="first-run" type="b">
17+
<default>true</default>
18+
</key>
1619
</schema>
1720
</schemalist>

‎meson.build‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
project('adwcustomizer',
2-
version: 'git',
2+
version: '0.1.0',
33
meson_version: '>= 0.59.0',
44
default_options: [ 'warning_level=2',
55
'werror=false',
66
],
77
)
88

9+
dependency('glib-2.0')
10+
dependency('pygobject-3.0')
11+
dependency('libadwaita-1')
12+
913
i18n = import('i18n')
1014

1115
gnome = import('gnome')

‎monet/material_color_utilities_python-0.1.0-py3-none-any.whl‎

29.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)