* build: Reenable shrink resources and minify in gradle * build: (deps): bump image from 4.6.0 to 4.7.1 Bumps [image](https://github.com/brendan-duncan/image) from 4.6.0 to 4.7.1. - [Changelog](https://github.com/brendan-duncan/image/blob/main/CHANGELOG.md) - [Commits](https://github.com/brendan-duncan/image/commits) --- updated-dependencies: - dependency-name: image dependency-version: 4.7.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build: (deps): bump file_picker from 10.3.7 to 10.3.8 Bumps [file_picker](https://github.com/miguelpruivo/flutter_file_picker) from 10.3.7 to 10.3.8. - [Release notes](https://github.com/miguelpruivo/flutter_file_picker/releases) - [Changelog](https://github.com/miguelpruivo/flutter_file_picker/blob/master/CHANGELOG.md) - [Commits](https://github.com/miguelpruivo/flutter_file_picker/compare/v10.3.7...v10.3.8) --- updated-dependencies: - dependency-name: file_picker dependency-version: 10.3.8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * feat: Improved search * build: Use matrix sdk vom pub.dev again * chore: Follow up better search * build: (deps): bump image from 4.7.1 to 4.7.2 Bumps [image](https://github.com/brendan-duncan/image) from 4.7.1 to 4.7.2. - [Changelog](https://github.com/brendan-duncan/image/blob/main/CHANGELOG.md) - [Commits](https://github.com/brendan-duncan/image/commits) --- updated-dependencies: - dependency-name: image dependency-version: 4.7.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * chore: Make cross signing self sign mandatory for bootstrap * chore: Update user device keys before creating bootstrap * fix: Better wait for secrets after verification bootstrap * refactor: Remove native imaging and enable web worker * refactor: Remove unused html onfocus streams * build: (deps): bump flutter_foreground_task from 9.1.0 to 9.2.0 Bumps [flutter_foreground_task](https://github.com/Dev-hwang/flutter_foreground_task) from 9.1.0 to 9.2.0. - [Changelog](https://github.com/Dev-hwang/flutter_foreground_task/blob/master/CHANGELOG.md) - [Commits](https://github.com/Dev-hwang/flutter_foreground_task/commits) --- updated-dependencies: - dependency-name: flutter_foreground_task dependency-version: 9.2.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore(translations): Translated using Weblate (Uzbek) Currently translated at 99.7% (823 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uz/ * chore(translations): Translated using Weblate (Russian) Currently translated at 99.8% (824 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * chore(translations): Translated using Weblate (Norwegian Bokmål) Currently translated at 90.9% (750 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nb_NO/ * chore(translations): Translated using Weblate (Galician) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/ * chore(translations): Translated using Weblate (Basque) Currently translated at 99.7% (823 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/ * chore(translations): Translated using Weblate (Ukrainian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/ * chore(translations): Translated using Weblate (Estonian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * chore(translations): Translated using Weblate (Dutch) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nl/ * chore(translations): Translated using Weblate (Russian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * chore(translations): Translated using Weblate (Spanish) Currently translated at 95.2% (788 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/es/ * chore(translations): Translated using Weblate (Spanish) Currently translated at 96.3% (797 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/es/ * chore(translations): Translated using Weblate (Russian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * chore(translations): Translated using Weblate (Russian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * fix: Broken ruzzian plurals * chore(translations): Translated using Weblate (Norwegian Bokmål) Currently translated at 91.2% (753 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nb_NO/ * chore(translations): Translated using Weblate (Bengali) Currently translated at 4.5% (38 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/bn/ * chore(translations): Translated using Weblate (French) Currently translated at 82.3% (679 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/fr/ * build: (deps): bump translations_cleaner from 0.0.5 to 0.1.0 Bumps [translations_cleaner](https://github.com/Chinmay-KB/translations_cleaner) from 0.0.5 to 0.1.0. - [Changelog](https://github.com/Chinmay-KB/translations_cleaner/blob/main/CHANGELOG.md) - [Commits](https://github.com/Chinmay-KB/translations_cleaner/commits) --- updated-dependencies: - dependency-name: translations_cleaner dependency-version: 0.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore(translations): Translated using Weblate (German) Currently translated at 99.2% (821 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * chore(translations): Translated using Weblate (Estonian) Currently translated at 100.0% (827 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * build: Bump version to 2.4.0 * build: (deps): bump sqflite_common_ffi from 2.3.6 to 2.3.7+1 Bumps [sqflite_common_ffi](https://github.com/tekartik/sqflite) from 2.3.6 to 2.3.7+1. - [Commits](https://github.com/tekartik/sqflite/compare/sqflite_common_ffi_v2.3.6...sqflite_common_ffi/v2.3.7) --- updated-dependencies: - dependency-name: sqflite_common_ffi dependency-version: 2.3.7+1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * chore(translations): Translated using Weblate (Czech) Currently translated at 66.1% (547 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/cs/ * chore(translations): Translated using Weblate (Czech) Currently translated at 72.7% (602 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/cs/ * chore(translations): Translated using Weblate (German) Currently translated at 99.8% (826 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * chore: Add security.md file * fix: Locale unlocalized strings * build: (deps): bump matrix from 4.1.0 to 5.0.0 Bumps [matrix](https://github.com/famedly/matrix-dart-sdk) from 4.1.0 to 5.0.0. - [Release notes](https://github.com/famedly/matrix-dart-sdk/releases) - [Changelog](https://github.com/famedly/matrix-dart-sdk/blob/main/CHANGELOG.md) - [Commits](https://github.com/famedly/matrix-dart-sdk/compare/v4.1.0...v5.0.0) --- updated-dependencies: - dependency-name: matrix dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * fix: Notifications on web correctly managed when tab not focused * chore: Add changelog for android * chore: Remove duplicated localization * fix: Sign in label * chore: Versionize fcm shared isolate * build: Remove unused packag * build: (deps): bump package_info_plus from 8.3.1 to 9.0.0 Bumps [package_info_plus](https://github.com/fluttercommunity/plus_plugins/tree/main/packages/package_info_plus) from 8.3.1 to 9.0.0. - [Release notes](https://github.com/fluttercommunity/plus_plugins/releases) - [Commits](https://github.com/fluttercommunity/plus_plugins/commits/package_info_plus-v9.0.0/packages/package_info_plus) --- updated-dependencies: - dependency-name: package_info_plus dependency-version: 9.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * feat: Display particle animation on login page * chore: Use fixed version of fcm shared isolate * fix: apk crash on some platforms due new flutter version * chore: Correct kotlin format * fix iOS notifications * fluffychat merge * fluffychat merge * fluffychat merge * fluffychat merge * fluffychat merge * fluffychat merge * add missing type annotations * update matrix version * fluffychat merge * fluffychat merge * fix notification on click actions --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Christian Kußowski <c.kussowski@famedly.com> Co-authored-by: Krille-chan <christian-kussowski@posteo.de> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: BeMeritus <bemerituss@gmail.com> Co-authored-by: Frank Paul Silye <frankps@gmail.com> Co-authored-by: josé m. <correoxm@disroot.org> Co-authored-by: xabirequejo <xabi.rn@gmail.com> Co-authored-by: Ihor Hordiichuk <igor_ck@outlook.com> Co-authored-by: Priit Jõerüüt <jrthwlate@users.noreply.hosted.weblate.org> Co-authored-by: Jelv <post@jelv.nl> Co-authored-by: Дмитрий Михирев <bizdelnick@gmail.com> Co-authored-by: Kimby <kimbyqs@gmail.com> Co-authored-by: Christian <christian-pauly@posteo.de> Co-authored-by: Kom nake <kominak310@svcache.com> Co-authored-by: hugues de keyzer <komputilisto@hugues.info> Co-authored-by: nautilusx <translate@disroot.org> Co-authored-by: Šebestová <ka.sebestova.cz@gmail.com>
339 lines
12 KiB
Dart
339 lines
12 KiB
Dart
import 'package:flutter/material.dart';
|
|
|
|
import 'package:collection/collection.dart';
|
|
import 'package:material_symbols_icons/symbols.dart';
|
|
import 'package:matrix/matrix.dart';
|
|
|
|
import 'package:fluffychat/config/app_config.dart';
|
|
import 'package:fluffychat/config/themes.dart';
|
|
import 'package:fluffychat/l10n/l10n.dart';
|
|
import 'package:fluffychat/pages/chat/chat.dart';
|
|
import 'package:fluffychat/pangea/activity_sessions/activity_participant_indicator.dart';
|
|
import 'package:fluffychat/pangea/activity_sessions/activity_role_model.dart';
|
|
import 'package:fluffychat/pangea/activity_sessions/activity_room_extension.dart';
|
|
import 'package:fluffychat/pangea/activity_summary/activity_summary_response_model.dart';
|
|
import 'package:fluffychat/widgets/avatar.dart';
|
|
|
|
class ActivityUserSummaries extends StatelessWidget {
|
|
final ChatController controller;
|
|
|
|
const ActivityUserSummaries({super.key, required this.controller});
|
|
|
|
Room get room => controller.room;
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final summary = room.activitySummary?.summary;
|
|
if (summary == null) return const SizedBox();
|
|
|
|
return Padding(
|
|
padding: const EdgeInsets.all(12.0),
|
|
child: Column(
|
|
spacing: 4.0,
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
Padding(
|
|
padding: const EdgeInsets.symmetric(
|
|
horizontal: 12.0,
|
|
vertical: 4.0,
|
|
),
|
|
child: Center(
|
|
child: Material(
|
|
color: Theme.of(context).colorScheme.surface.withAlpha(128),
|
|
borderRadius: BorderRadius.circular(AppConfig.borderRadius / 3),
|
|
child: Padding(
|
|
padding: const EdgeInsets.symmetric(
|
|
horizontal: 8.0,
|
|
vertical: 4.0,
|
|
),
|
|
child: Column(
|
|
spacing: 4.0,
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
Text(L10n.of(context).activityFinishedMessage),
|
|
Text(summary.summary, textAlign: TextAlign.center),
|
|
],
|
|
),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
const Padding(padding: EdgeInsets.symmetric(vertical: 8.0)),
|
|
ButtonControlledCarouselView(
|
|
summary: summary,
|
|
controller: controller,
|
|
),
|
|
],
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
class ButtonControlledCarouselView extends StatelessWidget {
|
|
final ActivitySummaryResponseModel summary;
|
|
final ChatController controller;
|
|
const ButtonControlledCarouselView({
|
|
super.key,
|
|
required this.summary,
|
|
required this.controller,
|
|
});
|
|
|
|
void _scrollToUser(ActivityRoleModel role, int index, double cardWidth) {
|
|
controller.activityController.highlightRole(role);
|
|
|
|
final scrollController = controller.activityController.carouselController;
|
|
|
|
if (!scrollController.hasClients) return;
|
|
|
|
const spacing = 5.0;
|
|
final itemExtent = cardWidth + spacing;
|
|
|
|
final viewportWidth = scrollController.position.viewportDimension;
|
|
|
|
final itemCenter = (index * itemExtent) + (cardWidth / 2);
|
|
|
|
final targetOffset = itemCenter - (viewportWidth / 2);
|
|
|
|
final clampedOffset = targetOffset.clamp(
|
|
scrollController.position.minScrollExtent,
|
|
scrollController.position.maxScrollExtent,
|
|
);
|
|
|
|
scrollController.animateTo(
|
|
clampedOffset,
|
|
duration: const Duration(milliseconds: 300),
|
|
curve: Curves.easeOutCubic,
|
|
);
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final room = controller.room;
|
|
final superlatives = room.activitySummary?.analytics
|
|
?.generateSuperlatives();
|
|
final availableRoles = room.activityPlan!.roles;
|
|
final assignedRoles = room.assignedRoles ?? {};
|
|
final userSummaries = summary.participants
|
|
.where(
|
|
(p) => assignedRoles.values.any(
|
|
(role) => role.userId == p.participantId,
|
|
),
|
|
)
|
|
.toList();
|
|
|
|
final isColumnMode = FluffyThemes.isColumnMode(context);
|
|
|
|
if (userSummaries.isEmpty) {
|
|
return const SizedBox();
|
|
}
|
|
|
|
final cardWidth = isColumnMode ? 400.0 : 350.0;
|
|
|
|
return Column(
|
|
children: [
|
|
SizedBox(
|
|
height: 270.0,
|
|
child: ListView.builder(
|
|
key: PageStorageKey('summaries-carousel-${room.id}'),
|
|
shrinkWrap: true,
|
|
controller: controller.activityController.carouselController,
|
|
scrollDirection: Axis.horizontal,
|
|
itemCount: userSummaries.length,
|
|
itemBuilder: (context, i) {
|
|
final p = userSummaries[i];
|
|
final user = room.getParticipants().firstWhereOrNull(
|
|
(u) => u.id == p.participantId,
|
|
);
|
|
final userRole = assignedRoles.values.firstWhere(
|
|
(role) => role.userId == p.participantId,
|
|
);
|
|
return Container(
|
|
width: cardWidth,
|
|
margin: i == userSummaries.length - 1
|
|
? null
|
|
: const EdgeInsets.only(right: 5.0),
|
|
padding: const EdgeInsets.all(12.0),
|
|
decoration: ShapeDecoration(
|
|
color: Color.alphaBlend(
|
|
Theme.of(context).colorScheme.surface.withAlpha(70),
|
|
AppConfig.gold,
|
|
),
|
|
shape: RoundedRectangleBorder(
|
|
borderRadius: BorderRadius.circular(12),
|
|
),
|
|
),
|
|
child: Column(
|
|
spacing: 4.0,
|
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
children: [
|
|
Row(
|
|
spacing: 10.0,
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
Avatar(
|
|
name: p.participantId.localpart,
|
|
mxContent: user?.avatarUrl,
|
|
size: 40,
|
|
),
|
|
Flexible(
|
|
child: Text(
|
|
"${userRole.role ?? L10n.of(context).participant} | ${user?.calcDisplayname() ?? p.participantId.localpart}",
|
|
style: const TextStyle(fontSize: 14.0),
|
|
overflow: TextOverflow.ellipsis,
|
|
),
|
|
),
|
|
],
|
|
),
|
|
Flexible(
|
|
child: _SummaryText(
|
|
text: p.displayFeedback(
|
|
user?.calcDisplayname() ??
|
|
p.participantId.localpart ??
|
|
p.participantId,
|
|
),
|
|
),
|
|
),
|
|
Padding(
|
|
padding: const EdgeInsets.all(8.0),
|
|
child: Row(
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
children: [
|
|
Wrap(
|
|
alignment: WrapAlignment.center,
|
|
spacing: 12,
|
|
runSpacing: 8,
|
|
children: [
|
|
Text(
|
|
p.cefrLevel,
|
|
style: const TextStyle(fontSize: 14.0),
|
|
),
|
|
//const SizedBox(width: 8),
|
|
if (superlatives != null &&
|
|
(superlatives['vocab']!.contains(
|
|
p.participantId,
|
|
))) ...[
|
|
const SuperlativeTile(icon: Symbols.dictionary),
|
|
],
|
|
if (superlatives != null &&
|
|
(superlatives['grammar']!.contains(
|
|
p.participantId,
|
|
))) ...[
|
|
const SuperlativeTile(
|
|
icon: Symbols.toys_and_games,
|
|
),
|
|
],
|
|
if (superlatives != null &&
|
|
(superlatives['xp']!.contains(
|
|
p.participantId,
|
|
))) ...[
|
|
const SuperlativeTile(icon: Icons.star),
|
|
],
|
|
if (p.superlatives.isNotEmpty) ...[
|
|
Text(
|
|
p.superlatives.first,
|
|
style: const TextStyle(fontSize: 14.0),
|
|
),
|
|
],
|
|
],
|
|
),
|
|
],
|
|
),
|
|
),
|
|
],
|
|
),
|
|
);
|
|
},
|
|
),
|
|
),
|
|
const SizedBox(height: 12),
|
|
SizedBox(
|
|
height: 125.0,
|
|
child: ValueListenableBuilder(
|
|
valueListenable: controller.activityController.highlightedRole,
|
|
builder: (context, highlightedRole, _) {
|
|
return ListView.builder(
|
|
shrinkWrap: true,
|
|
scrollDirection: Axis.horizontal,
|
|
itemCount: userSummaries.length,
|
|
itemBuilder: (context, index) {
|
|
final p = userSummaries[index];
|
|
final user = room.getParticipants().firstWhereOrNull(
|
|
(u) => u.id == p.participantId,
|
|
);
|
|
final userRole = assignedRoles.values.firstWhere(
|
|
(role) => role.userId == p.participantId,
|
|
);
|
|
final userRoleInfo = availableRoles[userRole.id]!;
|
|
return SizedBox(
|
|
width: 100.0,
|
|
height: 125.0,
|
|
child: Center(
|
|
child: ActivityParticipantIndicator(
|
|
name: userRoleInfo.name,
|
|
userId: p.participantId,
|
|
user: user,
|
|
borderRadius: BorderRadius.circular(4),
|
|
selected: highlightedRole?.id == userRole.id,
|
|
onTap: () => _scrollToUser(userRole, index, cardWidth),
|
|
room: controller.room,
|
|
),
|
|
),
|
|
);
|
|
},
|
|
);
|
|
},
|
|
),
|
|
),
|
|
],
|
|
);
|
|
}
|
|
}
|
|
|
|
class SuperlativeTile extends StatelessWidget {
|
|
final IconData icon;
|
|
|
|
const SuperlativeTile({super.key, required this.icon});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return Row(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
Icon(icon, size: 14, color: Theme.of(context).colorScheme.onSurface),
|
|
const SizedBox(width: 2),
|
|
const Text("1st", style: TextStyle(fontSize: 14.0)),
|
|
],
|
|
);
|
|
}
|
|
}
|
|
|
|
class _SummaryText extends StatefulWidget {
|
|
final String text;
|
|
const _SummaryText({required this.text});
|
|
|
|
@override
|
|
State<_SummaryText> createState() => _SummaryTextState();
|
|
}
|
|
|
|
class _SummaryTextState extends State<_SummaryText> {
|
|
final ScrollController _scrollController = ScrollController();
|
|
|
|
@override
|
|
void dispose() {
|
|
_scrollController.dispose();
|
|
super.dispose();
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return Scrollbar(
|
|
controller: _scrollController,
|
|
thumbVisibility: true,
|
|
child: SingleChildScrollView(
|
|
controller: _scrollController,
|
|
child: Text(widget.text, style: const TextStyle(fontSize: 14.0)),
|
|
),
|
|
);
|
|
}
|
|
}
|