MarianumMobile/Client
5
1
Fork 0
Code Issues 34 Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'develop' into develop-groupedParticipants

Browse Source
This commit is contained in:
Lars Neuhaus
2025-09-06 13:57:10 +00:00
parent 117434a5e3 590a70c623
commit 25a6ef37fa
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/view/pages/talk/components/chatBubble.dart
View File

@@ -1,3 +1,5 @@
import 'dart:developer';
import 'package:bubble/bubble.dart'; import 'package:bubble/bubble.dart';
import 'package:emoji_picker_flutter/emoji_picker_flutter.dart' as emojis; import 'package:emoji_picker_flutter/emoji_picker_flutter.dart' as emojis;
import 'package:flowder/flowder.dart'; import 'package:flowder/flowder.dart';
@@ -323,7 +325,9 @@ class _ChatBubbleState extends State<ChatBubble> with SingleTickerProviderStateM
return; return;
} }
downloadProgress = 1; setState(() {
downloadProgress = 1;
});
downloadCore = FileElement.download(context, message.file!.path!, message.file!.name, (progress) { downloadCore = FileElement.download(context, message.file!.path!, message.file!.name, (progress) {
if(progress > 1) { if(progress > 1) {
setState(() { setState(() {
@@ -408,7 +412,7 @@ class _ChatBubbleState extends State<ChatBubble> with SingleTickerProviderStateM
bottom: 0, bottom: 0,
right: 0, right: 0,
left: 0, left: 0,
child: LinearProgressIndicator(value: downloadProgress/100), child: LinearProgressIndicator(value: downloadProgress == 1 ? null : downloadProgress/100),
), ),
), ),
], ],

4
lib/view/pages/talk/messageReactions.dart
View File

@@ -1,4 +1,6 @@
import 'dart:developer';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@@ -38,7 +40,7 @@ class _MessageReactionsState extends State<MessageReactions> {
future: data, future: data,
builder: (context, snapshot) { builder: (context, snapshot) {
if(snapshot.connectionState == ConnectionState.waiting) return const LoadingSpinner(); if(snapshot.connectionState == ConnectionState.waiting) return const LoadingSpinner();
if(snapshot.data == null) return const PlaceholderView(icon: Icons.search_off_outlined, text: 'Keine Reaktionen gefunden!'); if(snapshot.data!.data.isEmpty) return const PlaceholderView(icon: Icons.search_off_outlined, text: 'Keine Reaktionen gefunden!');
return ListView( return ListView(
children: [ children: [
...snapshot.data!.data.entries.map<Widget>((entry) => ExpansionTile( ...snapshot.data!.data.entries.map<Widget>((entry) => ExpansionTile(