Skip to content

Commit

Permalink
Merge pull request #39 from avojak/gtk4
Browse files Browse the repository at this point in the history
Update to Gtk4
  • Loading branch information
avojak authored Sep 2, 2022
2 parents 0295473 + 4d787ae commit 442c080
Show file tree
Hide file tree
Showing 80 changed files with 5,308 additions and 10,717 deletions.
11 changes: 10 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,34 @@ K := $(foreach exec,$(EXECUTABLES),\
.PHONY: all
all: translations flatpak

# Fetch the Flatpak dependencies for building for AppCenter
.PHONY: flatpak-init
flatpak-init:
flatpak remote-add --if-not-exists --user $(ELEMENTARY_FLATPAK_REMOTE_NAME) $(ELEMENTARY_FLATPAK_REMOTE_URL)
flatpak install -y --user $(ELEMENTARY_FLATPAK_REMOTE_NAME) io.elementary.Platform//$(ELEMENTARY_PLATFORM_VERSION)
flatpak install -y --user $(ELEMENTARY_FLATPAK_REMOTE_NAME) io.elementary.Sdk//$(ELEMENTARY_PLATFORM_VERSION)

# Fetch the dependencies locally so that the IDE will be able to locate packages outside of Flatpak
.PHONY: dev-init
dev-init:
sudo apt install -y libadwaita-1-dev libgranite-7-dev sassc

.PHONY: init
init: flatpak-init
init: flatpak-init dev-init

# Builds the Flatpak application for AppCenter
.PHONY: flatpak
flatpak:
flatpak-builder build $(APP_ID).yml $(FLATPAK_BUILDER_FLAGS)

# Fetch the Flatpak dependencies for building for Flathub
.PHONY: flathub-init
flathub-init:
flatpak remote-add --if-not-exists --user $(FLATHUB_FLATPAK_REMOTE_NAME) $(FLATHUB_FLATPAK_REMOTE_URL)
flatpak install -y --user $(FLATHUB_FLATPAK_REMOTE_NAME) org.gnome.Platform//$(FLATHUB_PLATFORM_VERSION)
flatpak install -y --user $(FLATHUB_FLATPAK_REMOTE_NAME) org.gnome.Sdk//$(FLATHUB_PLATFORM_VERSION)

# Builds the Flatpak application for Flathub
.PHONY: flathub
flathub:
flatpak-builder build flathub/$(APP_ID).yml --user --install --force-clean
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<a href='https://flathub.org/apps/details/com.github.avojak.warble'><img width='155' alt='Download on Flathub' src='https://flathub.org/assets/badges/flathub-badge-en.png'/></a>
</p>

| ![Screenshot](data/assets/screenshots/warble-screenshot-01.png) | ![Screenshot](data/assets/screenshots/warble-screenshot-02.png) | ![Screenshot](data/assets/screenshots/warble-screenshot-03.png) |
|------------------------------------------------------------------|------------------------------------------------------------------|------------------------------------------------------------------|
| ![Screenshot](data/assets/screenshots/warble-screenshot-01.png) | ![Screenshot](data/assets/screenshots/warble-screenshot-02.png) | ![Screenshot](data/assets/screenshots/warble-screenshot-03.png) | ![Screenshot](data/assets/screenshots/warble-screenshot-04.png) |
|------------------------------------------------------------------|------------------------------------------------------------------|------------------------------------------------------------------|------------------------------------------------------------------|

## The word-guessing game

Expand Down
2 changes: 2 additions & 0 deletions com.github.avojak.warble.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ finish-args:
- '--share=ipc'
- '--socket=fallback-x11'
- '--socket=wayland'
- '--device=dri'
- '--metadata=X-DConf=migrate-path=/com/github/avojak/warble/'

modules:
- name: warble
Expand Down
7,892 changes: 3,886 additions & 4,006 deletions data/assets/github/Warble GitHub Repo Card.ai

Large diffs are not rendered by default.

Binary file modified data/assets/github/Warble GitHub Repo Card.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 30 additions & 10 deletions data/assets/icons/128x128/com.github.avojak.warble.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 29 additions & 22 deletions data/assets/icons/24x24/com.github.avojak.warble.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 442c080

Please sign in to comment.