2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into weblate-fluffychat-translations

Browse source
This commit is contained in:
Krille-chan 2025-06-25 10:13:45 +02:00 • committed by GitHub
commit ea24eccd22
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/integrate.yaml vendored
View file

@ -82,7 +82,7 @@ jobs:
- run: ./flutter/bin/flutter build linux --target-platform linux-${{ matrix.arch }} - run: ./flutter/bin/flutter build linux --target-platform linux-${{ matrix.arch }}
build_debug_ios: build_debug_ios:
runs-on: macos-15 runs-on: macos-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- run: cat .github/workflows/versions.env >> $GITHUB_ENV - run: cat .github/workflows/versions.env >> $GITHUB_ENV

6
lib/pages/chat/events/message.dart
View file

@ -461,8 +461,10 @@ class Message extends StatelessWidget {
clipBehavior: Clip.antiAlias, clipBehavior: Clip.antiAlias,
child: BubbleBackground( child: BubbleBackground(
colors: colors, colors: colors,
ignore: ignore: noBubble ||
noBubble || !ownMessage, !ownMessage ||
MediaQuery.of(context)
.highContrast,
scrollController: scrollController:
scrollController, scrollController,
child: Container( child: Container(

2
macos/Podfile.lock
View file

@ -178,7 +178,7 @@ SPEC CHECKSUMS:
desktop_drop: e0b672a7d84c0a6cbc378595e82cdb15f2970a43 desktop_drop: e0b672a7d84c0a6cbc378595e82cdb15f2970a43
device_info_plus: a56e6e74dbbd2bb92f2da12c64ddd4f67a749041 device_info_plus: a56e6e74dbbd2bb92f2da12c64ddd4f67a749041
dynamic_color: b820c000cc68df65e7ba7ff177cb98404ce56651 dynamic_color: b820c000cc68df65e7ba7ff177cb98404ce56651
emoji_picker_flutter: b9d4f4d08bdf3168fa3827f1290d435083745a14 emoji_picker_flutter: 51ca408e289d84d1e460016b2a28721ec754fcf7
file_picker: 7584aae6fa07a041af2b36a2655122d42f578c1a file_picker: 7584aae6fa07a041af2b36a2655122d42f578c1a
file_selector_macos: 6280b52b459ae6c590af5d78fc35c7267a3c4b31 file_selector_macos: 6280b52b459ae6c590af5d78fc35c7267a3c4b31
flutter_local_notifications: 7e5a17a1dbc00d83dc10d43c2c4c05f2ceed233c flutter_local_notifications: 7e5a17a1dbc00d83dc10d43c2c4c05f2ceed233c

4
pubspec.lock
View file

@ -346,10 +346,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: emoji_picker_flutter name: emoji_picker_flutter
sha256: "08567e6f914d36c32091a96cf2f51d2558c47aa2bd47a590dc4f50e42e0965f6" sha256: "9a44c102079891ea5877f78c70f2e3c6e9df7b7fe0a01757d31f1046eeaa016d"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.1.0" version: "4.3.0"
emojis: emojis:
dependency: "direct main" dependency: "direct main"
description: description:

2
pubspec.yaml
View file

@ -22,7 +22,7 @@ dependencies:
desktop_notifications: ^0.6.3 desktop_notifications: ^0.6.3
device_info_plus: ^10.0.1 device_info_plus: ^10.0.1
dynamic_color: ^1.7.0 dynamic_color: ^1.7.0
emoji_picker_flutter: ^3.1.0 emoji_picker_flutter: ^4.3.0
emojis: ^0.9.9 emojis: ^0.9.9
#fcm_shared_isolate: ^0.2.0 #fcm_shared_isolate: ^0.2.0
file_picker: ^8.1.2 file_picker: ^8.1.2