Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
sudo apt-get install -y ninja-build libgtk-3-dev
sudo apt-get install libsdl2-dev
sudo apt-get install webkit2gtk-4.0
sudo apt-get install libopus-dev
sudo apt-get install libopus-dev libogg-dev
flutter doctor

- name: Install dependencies
Expand Down
86 changes: 77 additions & 9 deletions .github/workflows/manual-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
sudo apt-get install -y ninja-build libgtk-3-dev
sudo apt-get install libsdl2-dev
sudo apt-get install webkit2gtk-4.0
sudo apt-get install libopus-dev
sudo apt-get install libopus-dev libogg-dev
flutter doctor

- run: flutter config --enable-linux-desktop
Expand All @@ -38,28 +38,96 @@ jobs:
- name: Build APP
run: flutter build linux

- name: Compress Flutter build
run: tar -C build/linux/x64/release/bundle -cvf mixin-desktop-linux-portable.tar.gz .

- name: Upload app archive for next steps
uses: actions/upload-artifact@v2
with:
name: mixin-desktop-linux-portable-archive
path: mixin-desktop-linux-portable.tar.gz

- name: Package APP
run: ./dist/linux_deb.sh

- name: Upload Artifact
uses: actions/upload-artifact@v2
with:
name: mixin_desktop_amd64.deb.zip
path: build/mixin_desktop_amd64.deb

build-linux-flatpak:
needs: build-linux
runs-on: ubuntu-latest
container:
image: bilelmoussaoui/flatpak-github-actions:gnome-42
options: --privileged
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Download app archive
uses: actions/download-artifact@v3
with:
name: mixin-desktop-linux-portable-archive
path: dist/flatpak

- name: Build .flatpak
uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
with:
bundle: mixin-desktop-flatpak.flatpak
cache-key: flatpak-builder-${{ github.sha }}
manifest-path: dist/flatpak/one.mixin.messenger.desktop.yml

build-linux-snap:
needs: build-linux
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Download app archive
uses: actions/download-artifact@v3
with:
name: mixin-desktop-linux-portable-archive

- name: uncompress app archive
run: |
mkdir -p build/linux/x64/release/bundle
tar -C build/linux/x64/release/bundle -xvf mixin-desktop-linux-portable.tar.gz

- name: Prepare snap build
run: ./dist/linux_snap_prepare.sh

- uses: snapcore/action-build@v1
- name: Build .snap
uses: snapcore/action-build@v1
id: build-snap
with:
snapcraft-args: '--enable-experimental-extensions'
path: dist/snap

- uses: actions/upload-artifact@v3
- name: Upload snap
uses: actions/upload-artifact@v3
with:
name: mixin-desktop-snap
path: ${{ steps.build-snap.outputs.snap }}

- name: Package APP
run: ./dist/linux_deb.sh
build-linux-appimage:
needs: build-linux
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Upload Artifact
uses: actions/upload-artifact@v2
- name: Download app archive
uses: actions/download-artifact@v3
with:
name: mixin_desktop_amd64.deb.zip
path: build/mixin_desktop_amd64.deb
name: mixin-desktop-linux-portable-archive

- name: uncompress app archive
run: |
mkdir -p build/linux/x64/release/bundle
tar -C build/linux/x64/release/bundle -xvf mixin-desktop-linux-portable.tar.gz

- name: Build AppImage unsing appimage-builder
uses: docker://appimagecrafters/appimage-builder:0.9.1
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,7 @@ gradlew
gradlew.bat
local.properties

dist/snap/mixin_desktop
dist/snap/mixin_desktop
dist/flatpak/build-dir*
dist/flatpak/.flatpak-builder
dist/flatpak/mixin-desktop-linux-portable.tar.gz
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ there are some addition library needed.
sudo apt-get install libsqlite3-dev
sudo apt-get install webkit2gtk-4.0
sudo apt-get install libsdl2-dev
sudo apt-get install libopus-dev
sudo apt-get install libopus-dev libogg-dev
```


Expand Down
10 changes: 10 additions & 0 deletions dist/flatpak/mixin_desktop.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[Desktop Entry]
Type=Application
Name=Mixin Messenger
Comment=An encrypted messenger with Signal protocol and cryptocurrency wallet
GenericName=Internet Messenger
Categories=InstantMessaging
Version=1.0
Exec=mixin_desktop
Terminal=false
Icon=mixin_desktop
32 changes: 32 additions & 0 deletions dist/flatpak/mixin_desktop.metainfo.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Generator for metainfo & .desktop files:
https://www.freedesktop.org/software/appstream/metainfocreator/#/
-->
<component type="desktop-application">
<id>one.mixin.messenger.desktop</id>
<name>Mixin Messenger</name>
<summary>Mixin Messenger</summary>
<developer_name>Mixin Team</developer_name>
<url type="homepage">https://mixin.one/mm</url>
<metadata_license>GPL-3.0</metadata_license>
<project_license>GPL-3.0</project_license>
<supports>
<control>pointing</control>
<control>keyboard</control>
<control>touch</control>
</supports>
<description>
<p>Mixin Messenger is an open-source signal protocol messenger.</p>
</description>
<launchable type="desktop-id">one.mixin.messenger.desktop.desktop</launchable>
<screenshots>
<screenshot type="default">
<image>https://mixin.one/assets/cd25391eaca31876c588.webp</image>
</screenshot>
</screenshots>
<content_rating type="oars-1.1" />
<releases>
<release version="0.37.7" date="2022-11-10" />
</releases>
</component>
Binary file added dist/flatpak/mixin_desktop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 50 additions & 0 deletions dist/flatpak/one.mixin.messenger.desktop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
id: one.mixin.messenger.desktop
runtime: org.gnome.Platform
runtime-version: '42'
sdk: org.gnome.Sdk
command: mixin_desktop
rename-desktop-file: mixin_desktop.desktop
rename-icon: mixin_desktop
rename-appdata-file: mixin_desktop.metainfo.xml
finish-args:
- --share=ipc
- --socket=fallback-x11
- --socket=wayland
- --device=dri
- --socket=pulseaudio
- --share=network
- --filesystem=home
- --talk-name=org.freedesktop.Notifications
- --talk-name=org.kde.StatusNotifierWatcher
- --device=all
- --env=PATH=/app/bin:/usr/bin

modules:
- name: mixin_desktop
buildsystem: simple
only-arches:
- x86_64
build-commands:
- mkdir -p FlutterApp
- tar -xf mixin-desktop-linux-portable.tar.gz -C FlutterApp
- cp -r FlutterApp /app/
- chmod +x /app/FlutterApp/mixin_desktop
- mkdir -p /app/bin
- ln -s /app/FlutterApp/mixin_desktop /app/bin/mixin_desktop
- mkdir -p /app/share/metainfo
- cp -r mixin_desktop.metainfo.xml /app/share/metainfo/
- mkdir -p /app/share/icons/hicolor/256x256/apps
- cp -r mixin_desktop.png /app/share/icons/hicolor/256x256/apps/mixin_desktop.png
- mkdir -p /app/share/applications
- cp -r mixin_desktop.desktop /app/share/applications/mixin_desktop.desktop
- mkdir -p /app/share/appdata
- cp -r mixin_desktop.metainfo.xml /app/share/appdata/
sources:
- type: file
path: mixin_desktop.desktop
- type: file
path: mixin_desktop.png
- type: file
path: mixin-desktop-linux-portable.tar.gz
- type: file
path: mixin_desktop.metainfo.xml
1 change: 1 addition & 0 deletions lib/ui/home/bloc/message_bloc.dart
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ class MessageState extends Equatable {
);
}

// ignore: avoid_returning_this
return this;
}
}
Expand Down
4 changes: 2 additions & 2 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1026,10 +1026,10 @@ packages:
dependency: "direct main"
description:
name: ogg_opus_player
sha256: a3d5cde18fdc376fd322a57404cd8c8446f75f61acaf659058119a4b091c3592
sha256: "9d3f813d3ed39dc9bd58e599ed835ce9c06018d48c58237ee5c5ed85411aa8fb"
url: "https://pub.dev"
source: hosted
version: "0.5.0"
version: "0.5.1"
open_file:
dependency: "direct main"
description:
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ dependencies:
mime: ^1.0.2
mixin_bot_sdk_dart: ^0.3.7
octo_image: ^1.0.2
ogg_opus_player: ^0.5.0
ogg_opus_player: ^0.5.1
open_file:
git:
url: https://github.com/crazecoder/open_file.git
Expand Down