3 Commits

Author SHA1 Message Date
a52817231e fixed list view breaking layout 2026-02-01 17:16:42 +01:00
f6933b6529 Merge pull request 'develop-polls' (#93) from develop-polls into develop
Reviewed-on: #93
Reviewed-by: Elias Müller <elias@elias-mueller.com>
2026-02-01 14:56:23 +00:00
e4243e53ac resolved pr issues 2026-02-01 15:55:43 +01:00
4 changed files with 55 additions and 61 deletions

View File

@@ -1,5 +1,4 @@
import 'dart:convert'; import 'dart:convert';
import 'dart:developer';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:http/http.dart'; import 'package:http/http.dart';
@@ -8,22 +7,18 @@ import '../getPoll/getPollStateResponse.dart';
import '../talkApi.dart'; import '../talkApi.dart';
import 'votePollParams.dart'; import 'votePollParams.dart';
@Deprecated('VotePoll is broken (known issues)') @Deprecated('VotePoll is broken')
class VotePoll extends TalkApi { class VotePoll extends TalkApi {
String token; String token;
int pollId; int pollId;
VotePoll({required this.token, required this.pollId, required VotePollParams params}) : super('v1/poll/$token/$pollId', params); VotePoll({required this.token, required this.pollId, required VotePollParams params}) : super('v1/poll/$token/$pollId', params);
@override @override
GetPollStateResponse assemble(String raw) { GetPollStateResponse assemble(String raw) => GetPollStateResponse.fromJson(jsonDecode(raw)['ocs']);
log(raw);
return GetPollStateResponse.fromJson(jsonDecode(raw)['ocs']);
}
@override @override
Future<Response>? request(Uri uri, Object? body, Map<String, String>? headers) { Future<Response>? request(Uri uri, Object? body, Map<String, String>? headers) {
if(body is VotePollParams) { if(body is VotePollParams) {
log(body.toJson().toString());
return http.post(uri, headers: headers, body: body.toJson().toString()); return http.post(uri, headers: headers, body: body.toJson().toString());
} }
return null; return null;

View File

@@ -5,10 +5,11 @@ import '../../../apiParams.dart';
part 'votePollParams.g.dart'; part 'votePollParams.g.dart';
@JsonSerializable() @JsonSerializable()
@Deprecated('VotePoll is broken')
class VotePollParams extends ApiParams { class VotePollParams extends ApiParams {
List<int> optionIds; List<int> optionIds;
VotePollParams({required this.optionIds}); VotePollParams({required this.optionIds});
factory VotePollParams.fromJson(Map<String, dynamic> json) => _$VotePollParamsFromJson(json); factory VotePollParams.fromJson(Map<String, dynamic> json) => _$VotePollParamsFromJson(json);
Map<String, dynamic> toJson() => _$VotePollParamsToJson(this); Map<String, dynamic> toJson() => _$VotePollParamsToJson(this);
} }

View File

@@ -304,21 +304,18 @@ class _ChatBubbleState extends State<ChatBubble> with SingleTickerProviderStateM
var pollId = int.parse(message.originalData!['object']!.id); var pollId = int.parse(message.originalData!['object']!.id);
var pollState = GetPollState(token: widget.bubbleData.token, pollId: pollId).run(); var pollState = GetPollState(token: widget.bubbleData.token, pollId: pollId).run();
showDialog(context: context, builder: (context) => AlertDialog( showDialog(context: context, builder: (context) => AlertDialog(
title: Text(message.originalData!['object']!.name, textScaler: TextScaler.linear(0.9), overflow: TextOverflow.ellipsis), title: Text(message.originalData!['object']!.name, overflow: TextOverflow.ellipsis),
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 SingleChildScrollView(
shrinkWrap: true, child: PollOptionsList(
children: [ pollData: pollData,
PollOptionsList( chatToken: widget.chatData.token,
pollData: pollData, ),
chatToken: widget.chatData.token
)
]
); );
} }
), ),

View File

@@ -17,50 +17,51 @@ class PollOptionsList extends StatefulWidget {
class _PollOptionsListState extends State<PollOptionsList> { class _PollOptionsListState extends State<PollOptionsList> {
@override @override
Widget build(BuildContext context) => Column( Widget build(BuildContext context) => Column(
children: [ children: [
...widget.pollData.options.map<Widget>((option) { ...widget.pollData.options.map<Widget>((option) {
var optionId = widget.pollData.options.indexOf(option); var optionId = widget.pollData.options.indexOf(option);
var votedSelf = widget.pollData.votedSelf.contains(optionId); var votedSelf = widget.pollData.votedSelf.contains(optionId);
var portionsVisible = widget.pollData.votes is Map<String, dynamic>; var portionsVisible = widget.pollData.votes is Map<String, dynamic>;
var votes = !portionsVisible ? 0 var votes = portionsVisible
: (widget.pollData.votes['option-$optionId'] as num?) ?? 0; ? (widget.pollData.votes['option-$optionId'] as num?) ?? 0
var numVoters = widget.pollData.numVoters ?? 0; : 0;
double portion = numVoters == 0 ? 0 : (votes / numVoters); var numVoters = widget.pollData.numVoters ?? 0;
double portion = numVoters == 0 ? 0 : (votes / numVoters);
return ListTile( return ListTile(
enabled: false, // enabled: false,
isThreeLine: portionsVisible, isThreeLine: portionsVisible,
dense: true, dense: true,
title: Text( title: Text(
option, option,
style: Theme.of(context).textTheme.bodyLarge, style: Theme.of(context).textTheme.bodyLarge,
),
leading: Icon(
votedSelf ? Icons.check_circle_outlined : Icons.circle_outlined,
color: votedSelf
? Theme.of(context).colorScheme.primary.withValues(alpha: 0.6)
: Theme.of(context).colorScheme.onSurfaceVariant.withValues(alpha: 0.6),
),
subtitle: portionsVisible ? Row(
children: [
Expanded(
child: LinearProgressIndicator(value: portion.clamp(0.0, 1.0)),
),
Container(
margin: const EdgeInsets.only(left: 10),
child: Text('${(portion * 100).round()}%'),
),
],
) : null,
);
}),
ListTile(
title: Linkify(
text: 'Wenn du abstimmen möchtest, verwende die Webversion unter https://cloud.marianum-fulda.de/call/${widget.chatToken}',
onOpen: UrlOpener.onOpen,
style: Theme.of(context).textTheme.bodySmall,
), ),
) leading: Icon(
], votedSelf ? Icons.check_circle_outlined : Icons.circle_outlined,
); color: votedSelf
? Theme.of(context).colorScheme.primary.withValues(alpha: 0.6)
: Theme.of(context).colorScheme.onSurfaceVariant.withValues(alpha: 0.6),
),
subtitle: portionsVisible ? Row(
children: [
Expanded(
child: LinearProgressIndicator(value: portion.clamp(0.0, 1.0)),
),
Container(
margin: const EdgeInsets.only(left: 10),
child: Text('${(portion * 100).round()}%'),
),
],
) : null,
);
}),
ListTile(
title: Linkify(
text: 'Wenn du abstimmen möchtest, verwende die Webversion unter https://cloud.marianum-fulda.de/call/${widget.chatToken}',
onOpen: UrlOpener.onOpen,
style: Theme.of(context).textTheme.bodySmall,
),
)
],
);
} }