Skip to content

Commit b3cce7a

Browse files
authored
Odin (#44)
* Fix compilation error * Use libhandy * Add support for dark mode * Use Granite style classes * Satisfy linter * Delete Travis CI * Add Flatpak manifest * Delete debian packaging * Update Flatpak manifest * Update GitHub CI * Update README.md * Use RDNN * Use daily as runtime-version * Update main.yml * Update runtime version * Add stripe key * Update stripe key * Update AppCenter colors * Fix icon * Improve tooling * Update .gitignore * MainWindow: Remove WindowHandle * GitHub CI: Add build for ARM * Add gettext domain * Flatpak: Update runtime to 6.1 * Rebrand to own domain * Rename files * DevicePage: Fix compiler warnings for debug mode * Fix icon path * Update screenshots
1 parent 0ed206a commit b3cce7a

File tree

89 files changed

+754
-888
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+754
-888
lines changed

Diff for: .github/workflows/ci.yml

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: CI
2+
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
- reopened
8+
- synchronize
9+
10+
jobs:
11+
flatpak:
12+
name: Flatpak
13+
runs-on: ubuntu-latest
14+
15+
strategy:
16+
matrix:
17+
arch: [x86_64, aarch64]
18+
# Don't fail the whole workflow if one architecture fails
19+
fail-fast: false
20+
21+
container:
22+
image: ghcr.io/elementary/flatpak-platform/runtime:6-${{ matrix.arch }}
23+
options: --privileged
24+
25+
steps:
26+
- name: Checkout
27+
uses: actions/checkout@v2
28+
29+
- name: Set up QEMU for aarch64 emulation
30+
if: ${{ matrix.arch != 'x86_64' }}
31+
uses: docker/setup-qemu-action@v1
32+
with:
33+
platforms: arm64
34+
35+
- name: Build
36+
uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
37+
with:
38+
bundle: com.manexim.home.flatpak
39+
manifest-path: com.manexim.home.yml
40+
run-tests: true
41+
repository-name: appcenter
42+
repository-url: https://flatpak.elementary.io/repo.flatpakrepo
43+
cache-key: "flatpak-builder-${{ github.sha }}"
44+
arch: ${{ matrix.arch }}
45+
46+
lint:
47+
name: Lint
48+
runs-on: ubuntu-latest
49+
50+
container:
51+
image: valalang/lint
52+
53+
steps:
54+
- name: Checkout
55+
uses: actions/checkout@v2
56+
57+
- name: Lint
58+
run: io.elementary.vala-lint -d .

Diff for: .github/workflows/main.yml

-16
This file was deleted.

Diff for: .gitignore

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
*~
2-
build/
3-
src/Application
2+
build
3+
build-dir
4+
.flatpak-builder
5+
repo/
6+
*.flatpak

Diff for: .travis.yml

-24
This file was deleted.

Diff for: .vscode/tasks.json

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
// See https://go.microsoft.com/fwlink/?LinkId=733558
3+
// for the documentation about the tasks.json format
4+
"version": "2.0.0",
5+
"tasks": [
6+
{
7+
"label": "Build & Run",
8+
"type": "shell",
9+
"command": "./app build && ./app install && ./app run",
10+
"problemMatcher": [],
11+
"group": {
12+
"kind": "build",
13+
"isDefault": true
14+
}
15+
}
16+
]
17+
}

Diff for: README.md

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<div align="center">
2-
<span align="center"> <img width="80" height="80" class="center" src="data/icons/128/com.github.manexim.home.svg" alt="Icon"></span>
2+
<span align="center"> <img width="80" height="80" class="center" src="data/icons/128/com.manexim.home.svg" alt="Icon"></span>
33
<h1 align="center">Home</h1>
44
<h3 align="center">Control your smart home gadgets</h3>
55
<p align="center">Designed for <a href="https://elementary.io">elementary OS</a></p>
66
</div>
77

88
<p align="center">
9-
<a href="https://appcenter.elementary.io/com.github.manexim.home" target="_blank">
9+
<a href="https://appcenter.elementary.io/com.manexim.home" target="_blank">
1010
<img src="https://appcenter.elementary.io/badge.svg">
1111
</a>
1212
</p>
1313

1414
<p align="center">
15-
<a href="https://travis-ci.org/manexim/home">
16-
<img src="https://img.shields.io/travis/manexim/home.svg">
15+
<a href="https://github.com/manexim/home/actions/workflows/main.yml">
16+
<img src="https://github.com/manexim/home/workflows/CI/badge.svg">
1717
</a>
1818
<a href="https://github.com/manexim/home/releases/">
1919
<img src="https://img.shields.io/github/release/manexim/home.svg">
@@ -73,6 +73,7 @@ These dependencies must be present before building:
7373
- `meson (>=0.40)`
7474
- `valac (>=0.40)`
7575
- `libgtk-3-dev`
76+
- `libhandy-1-dev` >=1.0.0
7677
- `libjson-glib-dev`
7778
- `libgee-0.8-dev`
7879
- `libgranite-dev`
@@ -88,7 +89,7 @@ meson build --prefix=/usr
8889
cd build
8990
ninja
9091
sudo ninja install
91-
com.github.manexim.home
92+
com.manexim.home
9293
```
9394

9495
### Deconstruct

Diff for: app

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/bash
2+
3+
# fail on first error
4+
set -e
5+
6+
APP=com.manexim.home
7+
8+
case "$1" in
9+
build)
10+
flatpak-builder --repo=repo build ${APP}.yml --force-clean
11+
flatpak build-bundle repo ${APP}.flatpak --runtime-repo=https://flatpak.elementary.io/repo.flatpakrepo ${APP} master
12+
;;
13+
install)
14+
flatpak install --user -y ${APP}.flatpak
15+
;;
16+
run)
17+
flatpak run ${APP}
18+
;;
19+
esac

Diff for: com.manexim.home.yml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
app-id: com.manexim.home
2+
runtime: io.elementary.Platform
3+
runtime-version: '6.1'
4+
sdk: io.elementary.Sdk
5+
command: com.manexim.home
6+
finish-args:
7+
- '--share=ipc'
8+
- '--share=network'
9+
- '--socket=fallback-x11'
10+
- '--socket=wayland'
11+
modules:
12+
- name: home
13+
buildsystem: meson
14+
sources:
15+
- type: dir
16+
path: .

Diff for: data/com.github.manexim.home.appdata.xml.in renamed to data/com.manexim.home.appdata.xml.in

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!-- Copyright 2019 Manexim -->
33
<component type="desktop">
4-
<id>com.github.manexim.home</id>
4+
<id>com.manexim.home</id>
55
<metadata_license>CC0</metadata_license>
66
<project_license>GPL-3.0+</project_license>
77
<name>Home</name>
@@ -18,7 +18,7 @@
1818
<category>Network</category>
1919
</categories>
2020
<provides>
21-
<binary>com.github.manexim.home</binary>
21+
<binary>com.manexim.home</binary>
2222
</provides>
2323
​<releases>
2424
<release date="2019-11-03" version="0.5.0">
@@ -208,10 +208,11 @@
208208
<url type="bugtracker">https://github.com/manexim/home/issues</url>
209209
<custom>
210210
<!-- elementary AppCenter specific values -->
211-
<value key="x-appcenter-color-primary">#fafafa</value>
212-
<value key="x-appcenter-color-primary-text">#333</value>
211+
<value key="x-appcenter-color-primary">#802392</value>
212+
<value key="x-appcenter-color-primary-text">#fafafa</value>
213213
<!-- Suggested price in USD; just a suggestion, NOT a minimum. -->
214214
<value key="x-appcenter-suggested-price">5</value>
215+
<value key="x-appcenter-stripe">pk_live_FiCVZObTHO7IaLtSXRETuJiJ00aW6Su9kN</value>
215216
</custom>
216217
<content_rating type="oars-1.1">
217218
<content_attribute id="violence-cartoon">none</content_attribute>

Diff for: data/com.github.manexim.home.desktop.in renamed to data/com.manexim.home.desktop.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ Type=Application
33
Name=Home
44
GenericName=Home
55
Comment=Control your smart home gadgets
6-
Exec=com.github.manexim.home
7-
Icon=com.github.manexim.home
6+
Exec=com.manexim.home
7+
Icon=com.manexim.home
88
Categories=GNOME;GTK;Network;
File renamed without changes.

Diff for: data/com.github.manexim.home.gschema.xml renamed to data/com.manexim.home.gschema.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<schemalist>
3-
<schema id="com.github.manexim.home" path="/com/github/manexim/home/" gettext-domain="com.github.manexim.home">
3+
<schema id="com.manexim.home" path="/com/github/manexim/home/" gettext-domain="com.manexim.home">
44
<key name="uuid" type="s">
55
<default>""</default>
66
<summary>The universally unique identifier</summary>

Diff for: data/icons/128/com.github.manexim.home.svg renamed to data/icons/128/com.manexim.home.svg

+1-1
Loading

Diff for: data/icons/16/com.github.manexim.home.svg renamed to data/icons/16/com.manexim.home.svg

+1-1
Loading

Diff for: data/icons/24/com.github.manexim.home.svg renamed to data/icons/24/com.manexim.home.svg

+1-1
Loading

Diff for: data/icons/32/com.github.manexim.home.svg renamed to data/icons/32/com.manexim.home.svg

+1-1
Loading

Diff for: data/icons/48/com.github.manexim.home.svg renamed to data/icons/48/com.manexim.home.svg

+1-1
Loading

Diff for: data/icons/64/com.github.manexim.home.svg renamed to data/icons/64/com.manexim.home.svg

+1-1
Loading

0 commit comments

Comments
 (0)