diff --git a/README.md b/README.md index 410df7c..8d36318 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,5 @@ -![Screenshot](https://github.com/krille-chan/fluffychat/blob/main/assets/banner_transparent.png?raw=true) - -[FluffyChat](https://fluffychat.im) is an open source, nonprofit and cute [[matrix](https://matrix.org)] client written in [Flutter](https://flutter.dev). The goal of the app is to create an easy to use instant messenger which is open source and accessible for everyone. - -### Links: - -- 🌐 [[Weblate] Translate FluffyChat into your language](https://hosted.weblate.org/projects/fluffychat/) -- 🌍 [[m] Join the community](https://matrix.to/#/#fluffychat:matrix.org) -- 📰 [[Mastodon] Get updates on social media](https://troet.cafe/@krille) -- 🖥️ [[Famedly] Server hosting and professional support](https://famedly.com/kontakt) -- 💝 [[Liberapay] Support FluffyChat development](https://de.liberapay.com/KrilleChritzelius) - -Buy Me a Coffee at ko-fi.com - -### Screenshots: - -![Screenshot](https://github.com/krille-chan/fluffychat/blob/main/docs/screenshots/product.jpeg?raw=true) +# Extera Next +Extera Next is another generation of Extera, made on top of FluffyChat. # Features @@ -35,33 +20,20 @@ - 🔐 End to end encryption - 🔒 Encrypted chat backup - 😀 Emoji verification & cross signing +- Built-in message translation +- Message recovery for Synapse admins +- Pitch black theme for AMOLED devices ... and much more. -# Installation +# Build +To build, make sure you have [matrix-dart-sdk](https://git.extera.xyz/OfficialDakari/matrix-dart-sdk) in the same directory as Extera Next. -Please visit the website for installation instructions: - -- https://fluffychat.im - -# How to build - -Please visit the [Wiki](https://github.com/krille-chan/fluffychat/wiki) for build instructions: - -- https://github.com/krille-chan/fluffychat/wiki/How-To-Build - - -# Special thanks - -* Fabiyamada is a graphics designer and has made the fluffychat logo and the banner. Big thanks for her great designs. - -* Advocatux has made the Spanish translation with great love and care. He always stands by my side and supports my work with great commitment. - -* Thanks to MTRNord and Sorunome for developing. - -* Also thanks to all translators and testers! With your help, fluffychat is now available in more than 12 languages. - -* WoodenBeaver sound theme for the notification sound. - -* The Matrix Foundation for making and maintaining the [emoji translations](https://github.com/matrix-org/matrix-spec/blob/main/data-definitions/sas-emoji.json) used for emoji verification, licensed Apache 2.0 +Or, replace `matrix` in pubspec.yaml: +```yaml +matrix: + git: + url: https://git.extera.xyz/OfficialDakari/matrix-dart-sdk.git + ref: main +``` \ No newline at end of file diff --git a/lib/pages/chat/add_widget_tile_view.dart b/lib/pages/chat/add_widget_tile_view.dart index 7163a1f..4777001 100644 --- a/lib/pages/chat/add_widget_tile_view.dart +++ b/lib/pages/chat/add_widget_tile_view.dart @@ -11,7 +11,6 @@ class AddWidgetTileView extends StatelessWidget { @override Widget build(BuildContext context) { - return ExpansionTile( title: Text(L10n.of(context).addWidget), leading: const Icon(Icons.add), diff --git a/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/builder.dart b/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/builder.dart index 44bc89b..138d8db 100644 --- a/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/builder.dart +++ b/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/builder.dart @@ -63,7 +63,7 @@ Future flutterMatrixSdkDatabaseBuilder(Client client) async { Future _constructDatabase(Client client) async { if (kIsWeb) { html.window.navigator.storage?.persist(); - return MatrixSdkDatabase.init(client.clientName); + return MatrixSdkDatabase(client.clientName); } final cipher = await getDatabaseCipher(); @@ -113,7 +113,7 @@ Future _constructDatabase(Client client) async { ), ); - return MatrixSdkDatabase.init( + return MatrixSdkDatabase( client.clientName, database: database, maxFileSize: 1000 * 1000 * 10, diff --git a/pubspec.lock b/pubspec.lock index a7960d7..bea1375 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1153,11 +1153,9 @@ packages: matrix: dependency: "direct main" description: - path: "." - ref: main - resolved-ref: "6f3bdad65c079a3784ce487f320195f93a8708a8" - url: "https://git.extera.xyz/OfficialDakari/MatrixDartSdk.git" - source: git + path: "/home/officialdakari/repos/matrix-dart-sdk" + relative: false + source: path version: "0.40.0" meta: dependency: transitive diff --git a/pubspec.yaml b/pubspec.yaml index b735546..fd5909c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -63,9 +63,7 @@ dependencies: linkify: ^5.0.0 material: ^1.0.0+2 matrix: - git: - url: https://git.extera.xyz/OfficialDakari/MatrixDartSdk.git - ref: main + path: ../matrix-dart-sdk mime: ^1.0.6 native_imaging: ^0.2.0 opus_caf_converter_dart: ^1.0.1