Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

user name is not getting displayed properly in poll bottom sheet #1732

Merged
merged 2 commits into from
Mar 14, 2024
Merged

user name is not getting displayed properly in poll bottom sheet #1732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0548e44
Fixed participants list bug
Decoder07 Mar 13, 2024
d99c01a
🤖 Automated Format and Fix
Decoder07 Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions packages/hms_room_kit/lib/src/widgets/bottom_sheets/poll_vote_bottom_sheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,18 @@ class _PollVoteBottomSheetState extends State<PollVoteBottomSheet> {
}
}

String _getUserName(HMSPollStore hmsPollStore) {
String? userName = hmsPollStore.poll.createdBy?.name;
if (userName != null) {
if (userName.length > 15) {
return userName.substring(0, math.min(15, userName.length)) + "...";
}
return userName;
} else {
return "Participant";
}
}

@override
Widget build(BuildContext context) {
var hmsPollStore = context.watch<HMSPollStore>();
Expand Down Expand Up @@ -176,9 +188,8 @@ class _PollVoteBottomSheetState extends State<PollVoteBottomSheet> {
),
),
HMSTitleText(
text: hmsPollStore.poll.createdBy == null
? "Participant started a new ${hmsPollStore.poll.category == HMSPollCategory.poll ? "poll" : "quiz"}"
: "${hmsPollStore.poll.createdBy?.name.substring(0, math.min(15, hmsPollStore.poll.createdBy?.name.length ?? 0)) ?? ""} started a ${widget.isPoll ? "poll" : "quiz"}",
text:
"${_getUserName(hmsPollStore)} started a ${widget.isPoll ? "poll" : "quiz"}",
textColor: HMSThemeColors.onSurfaceHighEmphasis,
letterSpacing: 0.15,
),
Expand Down
9 changes: 5 additions & 4 deletions packages/hmssdk_flutter/lib/src/model/polls/hms_poll_answer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'package:hmssdk_flutter/src/enum/hms_poll_enum.dart';
///[HMSPollAnswer] class represents answer to poll questions
class HMSPollAnswer {
final String? answerText;
final Duration duration;
final Duration? duration;
final int questionId;
final HMSPollQuestionType questionType;
final int? selectedOption;
Expand All @@ -14,7 +14,7 @@ class HMSPollAnswer {

HMSPollAnswer({
this.answerText,
required this.duration,
this.duration,
required this.questionId,
required this.questionType,
this.selectedOption,
Expand All @@ -27,7 +27,8 @@ class HMSPollAnswer {
factory HMSPollAnswer.fromMap(Map map) {
return HMSPollAnswer(
answerText: map['answer'],
duration: Duration(seconds: map['duration']),
duration:
map['duration'] != null ? Duration(seconds: map['duration']) : null,
questionId: map['question_id'],
questionType: HMSPollQuestionTypeValues.getHMSPollQuestionTypeFromString(
map['question_type']),
Expand All @@ -44,7 +45,7 @@ class HMSPollAnswer {
Map<String, dynamic> toMap() {
return {
'answer': answerText,
'duration': duration.inSeconds,
'duration': duration?.inSeconds,
'question_id': questionId,
'question_type': questionType.toString(),
'selected_option': selectedOption,
Expand Down
4 changes: 3 additions & 1 deletion packages/hmssdk_flutter/lib/src/model/polls/hms_poll_leaderboard_summary.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ class HMSPollLeaderboardSummary {
factory HMSPollLeaderboardSummary.fromMap(Map map) {
return HMSPollLeaderboardSummary(
averageScore: map["average_score"],
averageTime: Duration(milliseconds: map["average_time"].toInt()),
averageTime: map["average_time"] != null
? Duration(milliseconds: map["average_time"].toInt())
: null,
respondedCorrectlyPeersCount: map["responded_correctly_peers_count"],
respondedPeersCount: map["responded_peers_count"],
totalPeersCount: map["total_peers_count"]);
Expand Down