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

develop-polls #93

Merged
Pupsi merged 13 commits from develop-polls into develop 2026-02-01 14:56:23 +00:00
Conversation 5 Commits 13 Files Changed 11 +15 -14
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 567184bcf9 - Show all commits

3
lib/view/pages/talk/chatView.dart
View File

@@ -51,6 +51,7 @@ class _ChatViewState extends State<ChatView> {
var elementDate = DateTime.fromMillisecondsSinceEpoch(element.timestamp * 1000); var elementDate = DateTime.fromMillisecondsSinceEpoch(element.timestamp * 1000);
if(element.systemMessage.contains('reaction')) return; if(element.systemMessage.contains('reaction')) return;
if(element.systemMessage.contains('poll_voted')) return;
var commonRead = int.parse(data.getChatResponse.headers?['x-chat-last-common-read'] ?? '0'); var commonRead = int.parse(data.getChatResponse.headers?['x-chat-last-common-read'] ?? '0');
if(!elementDate.isSameDay(lastDate)) { if(!elementDate.isSameDay(lastDate)) {
@@ -128,7 +129,7 @@ class _ChatViewState extends State<ChatView> {
), ),
), ),
Container( Container(
color: Theme.of(context).colorScheme.background, color: Theme.of(context).colorScheme.surface,
child: TalkNavigator.isSecondaryVisible(context) child: TalkNavigator.isSecondaryVisible(context)
? ChatTextfield(widget.room.token, selfId: widget.selfId) ? ChatTextfield(widget.room.token, selfId: widget.selfId)
: SafeArea(child: ChatTextfield(widget.room.token, selfId: widget.selfId) : SafeArea(child: ChatTextfield(widget.room.token, selfId: widget.selfId)

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

@@ -306,20 +306,20 @@ class _ChatBubbleState extends State<ChatBubble> with SingleTickerProviderStateM
showDialog(context: context, builder: (context) => AlertDialog( showDialog(context: context, builder: (context) => AlertDialog(
title: Text(message.originalData!['object']!.name, textScaler: TextScaler.linear(0.9)), title: Text(message.originalData!['object']!.name, textScaler: TextScaler.linear(0.9)),
Pupsi marked this conversation as resolved Outdated
MineTec commented 2026-02-01 14:47:33 +00:00
Outdated
Review
Copy Link

ist der scale an andern stellen auch so präsent?

ist der scale an andern stellen auch so präsent?
content: FutureBuilder( content: FutureBuilder(
future: pollState, future: pollState,
builder: (context, snapshot) { builder: (context, snapshot) {
if(snapshot.connectionState == ConnectionState.waiting) return const Column(mainAxisSize: MainAxisSize.min, children: [LoadingSpinner()]); if(snapshot.connectionState == ConnectionState.waiting) return const Column(mainAxisSize: MainAxisSize.min, children: [LoadingSpinner()]);
var pollData = snapshot.data!.data; var pollData = snapshot.data!.data;
return ListView( return ListView(
shrinkWrap: true, shrinkWrap: true,
children: [ children: [
PollOptionsList( PollOptionsList(
pollData: pollData pollData: pollData
) )
] ]
); );
} }
), ),
actions: [ actions: [
TextButton( TextButton(