diff --git a/lib/api/marianumcloud/talk/getPoll/getPollStateResponse.dart b/lib/api/marianumcloud/talk/getPoll/getPollStateResponse.dart index 6678803..75d20c0 100644 --- a/lib/api/marianumcloud/talk/getPoll/getPollStateResponse.dart +++ b/lib/api/marianumcloud/talk/getPoll/getPollStateResponse.dart @@ -28,7 +28,7 @@ class GetPollStateResponseObject { int maxVotes; List votedSelf; int? numVoters; - List? details; + List? details; GetPollStateResponseObject( this.id, diff --git a/lib/api/marianumcloud/talk/getPoll/getPollStateResponse.g.dart b/lib/api/marianumcloud/talk/getPoll/getPollStateResponse.g.dart index 9d89f4c..3015979 100644 --- a/lib/api/marianumcloud/talk/getPoll/getPollStateResponse.g.dart +++ b/lib/api/marianumcloud/talk/getPoll/getPollStateResponse.g.dart @@ -40,7 +40,7 @@ GetPollStateResponseObject _$GetPollStateResponseObjectFromJson( (json['maxVotes'] as num).toInt(), (json['votedSelf'] as List).map((e) => (e as num).toInt()).toList(), (json['numVoters'] as num?)?.toInt(), - (json['details'] as List?)?.map((e) => e as String).toList(), + json['details'] as List?, ); Map _$GetPollStateResponseObjectToJson( diff --git a/lib/view/pages/talk/components/pollOptionsList.dart b/lib/view/pages/talk/components/pollOptionsList.dart index 5fdb698..6a9b63d 100644 --- a/lib/view/pages/talk/components/pollOptionsList.dart +++ b/lib/view/pages/talk/components/pollOptionsList.dart @@ -15,7 +15,6 @@ class PollOptionsList extends StatefulWidget { class _PollOptionsListState extends State { @override Widget build(BuildContext context) => Column( - mainAxisSize: MainAxisSize.min, children: [ ...widget.pollData.options.map((option) { var optionId = widget.pollData.options.indexOf(option); @@ -29,6 +28,7 @@ class _PollOptionsListState extends State { return ListTile( enabled: false, isThreeLine: portionsVisible, + dense: true, title: Text( option, style: Theme.of(context).textTheme.bodyLarge, @@ -36,12 +36,10 @@ class _PollOptionsListState extends State { trailing: Icon( votedSelf ? Icons.check_circle_outlined : Icons.circle_outlined, color: votedSelf - ? Theme.of(context).colorScheme.primary.withValues(alpha: 0.8) - : Theme.of(context).colorScheme.onSurfaceVariant.withValues(alpha: 0.8), + ? Theme.of(context).colorScheme.primary.withValues(alpha: 0.6) + : Theme.of(context).colorScheme.onSurfaceVariant.withValues(alpha: 0.6), ), - subtitle: Visibility( - visible: portionsVisible, - child: Row( + subtitle: portionsVisible ? Row( children: [ Expanded( child: LinearProgressIndicator(value: portion.clamp(0.0, 1.0)), @@ -51,14 +49,12 @@ class _PollOptionsListState extends State { child: Text('${(portion * 100).round()}%'), ), ], - ) - ) + ) : null, ); }), ListTile( title: Linkify( - text: 'Zurzeit kann in dieser App leider nicht abgestimmt werden. ' - 'Verwende dafür die Webversion unter https://cloud.marianum-fulda.de', + text: 'Wenn du abstimmen möchtest, verwende die Webversion unter https://cloud.marianum-fulda.de', style: Theme.of(context).textTheme.bodySmall, ), )