From c1eebc155f82869a3f38c94b89c9d36c402153ab Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Sun, 18 Oct 2020 14:09:02 +0200 Subject: [PATCH 1/5] fix: Snapcraft --- snap/snapcraft.yaml | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 9e20cee..26ac664 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: fluffychat -base: core18 # the base snap is the execution environment for this snap -version: git # just for humans, typically '1.2+git' or '1.3.2' +base: core18 +version: script summary: Open. Nonprofit. Cute ♥ description: | FluffyChat - Chat with your friends @@ -22,24 +22,28 @@ description: | Website: http://fluffy.chat Microblog: https://metalhead.club/@krille -grade: devel # must be 'stable' to release into candidate/stable channels -confinement: strict # use 'strict' once you have the right plugs and slots +grade: devel +icon: assets/logo.png +confinement: devmode parts: - olm: - plugin: cmake + olm: # FIXME source: https://gitlab.matrix.org/matrix-org/olm.git source-type: git source-tag: 3.2.1 + plugin: cmake + build-packages: + - build-essential + override-build: | + cd /root/parts/olm/src + cmake . -Bbuild + cmake --build build fluffychat: - plugin: flutter - source: . - flutter-target: lib/main.dart + after: [olm] + plugin: dump + source: ./build/linux/release/bundle stage-packages: - - libsqlite3-0 - override-prime: | - snapcraftctl prime - ln -sf libsqlite3.so.0 ${SNAPCRAFT_PRIME}/usr/lib/x86_64-linux-gnu/libsqlite3.so + - libsqlite3-dev slots: dbus-svc: @@ -51,7 +55,7 @@ apps: fluffychat: command: fluffychat extensions: - - flutter-dev + - gnome-3-28 plugs: - network - home From 0892ca9dd55130821ea449d07c534577eedf041d Mon Sep 17 00:00:00 2001 From: Sorunome Date: Sun, 18 Oct 2020 16:20:57 +0200 Subject: [PATCH 2/5] chore: upate matrix link text --- CHANGELOG.md | 2 ++ pubspec.lock | 6 +++--- pubspec.yaml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d7c031..6480554 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ ### Changes - Re-scale images in a separate isolate to prevent the UI from freezing - URLs without https:// now linkify +- Parse all URIs, not just URLs +- emails will linkify now ### Fixes - Fix amoled / theme settings not always saving properly - Show device name in account information correctly diff --git a/pubspec.lock b/pubspec.lock index ff9b2ab..c3b84db 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -526,14 +526,14 @@ packages: name: matrix_link_text url: "https://pub.dartlang.org" source: hosted - version: "0.2.0" + version: "0.3.0" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.4" + version: "1.3.0-nullsafety.3" mime: dependency: transitive description: @@ -869,7 +869,7 @@ packages: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.10.0-nullsafety.2" + version: "1.10.0-nullsafety.1" stream_channel: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 1a9ca8f..f67467b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -37,7 +37,7 @@ dependencies: firebase_messaging: ^7.0.2 flutter_local_notifications: ^1.4.3 # desktop_notifications: ^0.0.0-dev.4 // Currently blocked by: https://github.com/canonical/desktop_notifications.dart/issues/5 - matrix_link_text: ^0.2.0 + matrix_link_text: ^0.3.0 path_provider: ^1.5.1 webview_flutter: ^0.3.19+9 share: ^0.6.3+5 From b29ebce7173623626e0d3583e11ac092e0bcad70 Mon Sep 17 00:00:00 2001 From: Sorunome Date: Mon, 19 Oct 2020 16:56:40 +0200 Subject: [PATCH 3/5] fix: Some single-emoji names crashing --- lib/components/avatar.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/components/avatar.dart b/lib/components/avatar.dart index c32faa9..c4b8e16 100644 --- a/lib/components/avatar.dart +++ b/lib/components/avatar.dart @@ -30,9 +30,9 @@ class Avatar extends StatelessWidget { ); final src = thumbnail; var fallbackLetters = '@'; - if ((name?.length ?? 0) >= 2) { + if ((name?.runes?.length ?? 0) >= 2) { fallbackLetters = String.fromCharCodes(name.runes, 0, 2); - } else if ((name?.length ?? 0) == 1) { + } else if ((name?.runes?.length ?? 0) == 1) { fallbackLetters = name; } final textWidget = Center( From 4cb19be8adfaf2c864b10a49b19dd82ef1bec3a3 Mon Sep 17 00:00:00 2001 From: Sorunome Date: Wed, 21 Oct 2020 12:05:35 +0200 Subject: [PATCH 4/5] fix: Web server picker --- lib/utils/famedlysdk_store.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/utils/famedlysdk_store.dart b/lib/utils/famedlysdk_store.dart index d305ade..25acf11 100644 --- a/lib/utils/famedlysdk_store.dart +++ b/lib/utils/famedlysdk_store.dart @@ -16,8 +16,8 @@ import 'package:random_string/random_string.dart'; Future getLocalStorage() async { final directory = PlatformInfos.isBetaDesktop ? await getApplicationSupportDirectory() - : await getApplicationDocumentsDirectory(); - final localStorage = LocalStorage('LocalStorage', directory.path); + : (PlatformInfos.isWeb ? null : await getApplicationDocumentsDirectory()); + final localStorage = LocalStorage('LocalStorage', directory?.path); await localStorage.ready; return localStorage; } From 427cdc06d661ecc34fba42b91657de439b3a0f4b Mon Sep 17 00:00:00 2001 From: Sorunome Date: Wed, 21 Oct 2020 13:32:10 +0200 Subject: [PATCH 5/5] chore: update dependencies --- CHANGELOG.md | 3 +++ pubspec.lock | 15 +++++++++++---- pubspec.yaml | 6 +++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6480554..3d11148 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,15 +6,18 @@ - Add swipe to reply - Thanks @inexcode - Initial support for compiling to desktop - Initial snap metadata - Thanks @RAOF_47 +- Add latex parsing as per [MSC2191](https://github.com/matrix-org/matrix-doc/pull/2191) - `$tex$` for inline and `$$` for blocks ### Changes - Re-scale images in a separate isolate to prevent the UI from freezing - URLs without https:// now linkify - Parse all URIs, not just URLs - emails will linkify now +- Make sure login to dendrite is working properly ### Fixes - Fix amoled / theme settings not always saving properly - Show device name in account information correctly - Fix tapping on aliases / room pills not always working +- Link clicking in web not always working # Version 0.19.0 - 2020-09-21 ### Features diff --git a/pubspec.lock b/pubspec.lock index c3b84db..cc8eab9 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -85,6 +85,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.0" + catex: + dependency: transitive + description: + name: catex + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.1+6" characters: dependency: transitive description: @@ -194,8 +201,8 @@ packages: dependency: "direct main" description: path: "." - ref: "74bd1d331b77f45ab0793af7c9e607795b8c16f0" - resolved-ref: "74bd1d331b77f45ab0793af7c9e607795b8c16f0" + ref: be6824b7465b2bda7e5b769254be5cddd207b479 + resolved-ref: be6824b7465b2bda7e5b769254be5cddd207b479 url: "https://gitlab.com/famedly/famedlysdk.git" source: git version: "0.0.1" @@ -334,7 +341,7 @@ packages: name: flutter_matrix_html url: "https://pub.dartlang.org" source: hosted - version: "0.1.7" + version: "0.1.9" flutter_olm: dependency: "direct main" description: @@ -526,7 +533,7 @@ packages: name: matrix_link_text url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.3.1" meta: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index f67467b..5dfbe56 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -27,7 +27,7 @@ dependencies: famedlysdk: git: url: https://gitlab.com/famedly/famedlysdk.git - ref: 74bd1d331b77f45ab0793af7c9e607795b8c16f0 + ref: be6824b7465b2bda7e5b769254be5cddd207b479 localstorage: ^3.0.1+4 file_picker_cross: ^4.2.2 @@ -37,7 +37,7 @@ dependencies: firebase_messaging: ^7.0.2 flutter_local_notifications: ^1.4.3 # desktop_notifications: ^0.0.0-dev.4 // Currently blocked by: https://github.com/canonical/desktop_notifications.dart/issues/5 - matrix_link_text: ^0.3.0 + matrix_link_text: ^0.3.1 path_provider: ^1.5.1 webview_flutter: ^0.3.19+9 share: ^0.6.3+5 @@ -51,7 +51,7 @@ dependencies: open_file: ^3.0.1 mime_type: ^0.3.0 bot_toast: ^3.0.0 - flutter_matrix_html: ^0.1.7 + flutter_matrix_html: ^0.1.9 moor: ^3.3.1 sqlite3_flutter_libs: ^0.2.0 sqlite3: ^0.1.4