From e85ac666adaae09e1669dff15ba7a299ad87805e Mon Sep 17 00:00:00 2001 From: Kelrap Date: Tue, 4 Nov 2025 15:21:02 -0500 Subject: [PATCH 01/16] Replace 'ban from chat' with 'ban' and 'kick from chat' with 'kick' --- lib/widgets/member_actions_popup_menu_button.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/widgets/member_actions_popup_menu_button.dart b/lib/widgets/member_actions_popup_menu_button.dart index 01c56e45e..07fa5c2dd 100644 --- a/lib/widgets/member_actions_popup_menu_button.dart +++ b/lib/widgets/member_actions_popup_menu_button.dart @@ -178,7 +178,7 @@ void showMemberActionsPopupMenu({ ), const SizedBox(width: 18), Text( - L10n.of(context).kickFromChat, + L10n.of(context).kick, style: TextStyle(color: theme.colorScheme.onErrorContainer), ), ], @@ -195,7 +195,7 @@ void showMemberActionsPopupMenu({ ), const SizedBox(width: 18), Text( - L10n.of(context).banFromChat, + L10n.of(context).ban, style: TextStyle(color: theme.colorScheme.onErrorContainer), ), ], From 57857765af87eda4e64d9753447bb2566d6e27f1 Mon Sep 17 00:00:00 2001 From: Kelrap Date: Tue, 4 Nov 2025 15:27:46 -0500 Subject: [PATCH 02/16] Decrease share/done button spacing in invite page --- .../pages/pangea_invitation_selection_view.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/pangea/chat_settings/pages/pangea_invitation_selection_view.dart b/lib/pangea/chat_settings/pages/pangea_invitation_selection_view.dart index b6cc3ccd4..63d78a9dc 100644 --- a/lib/pangea/chat_settings/pages/pangea_invitation_selection_view.dart +++ b/lib/pangea/chat_settings/pages/pangea_invitation_selection_view.dart @@ -51,12 +51,12 @@ class PangeaInvitationSelectionView extends StatelessWidget { style: ElevatedButton.styleFrom( backgroundColor: theme.colorScheme.primaryContainer, padding: const EdgeInsets.symmetric( - horizontal: 24, + horizontal: 20, vertical: 16, ), ), child: Row( - spacing: 34.0, + spacing: 12.0, mainAxisAlignment: MainAxisAlignment.center, children: [ Icon( @@ -274,12 +274,12 @@ class PangeaInvitationSelectionView extends StatelessWidget { backgroundColor: theme.colorScheme.primaryContainer, padding: const EdgeInsets.symmetric( - horizontal: 24, + horizontal: 20, vertical: 16, ), ), child: Row( - spacing: 34.0, + spacing: 12.0, mainAxisAlignment: MainAxisAlignment.center, children: [ Icon( From 1caf80aa9c2b638a61a93b685e4c55382d03c299 Mon Sep 17 00:00:00 2001 From: Kelrap Date: Tue, 4 Nov 2025 15:44:40 -0500 Subject: [PATCH 03/16] Decrease vertical spacing in activity card --- .../activity_suggestions/activity_suggestion_card.dart | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/pangea/activity_suggestions/activity_suggestion_card.dart b/lib/pangea/activity_suggestions/activity_suggestion_card.dart index 46879ec81..51378853f 100644 --- a/lib/pangea/activity_suggestions/activity_suggestion_card.dart +++ b/lib/pangea/activity_suggestions/activity_suggestion_card.dart @@ -51,7 +51,10 @@ class ActivitySuggestionCard extends StatelessWidget { ), Expanded( child: Padding( - padding: const EdgeInsets.all(4.0), + padding: const EdgeInsets.symmetric( + vertical: 2.0, + horizontal: 4.0, + ), child: Column( mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.start, From 71577dc3006686f855d146b8b29e8052e9140599 Mon Sep 17 00:00:00 2001 From: Kelrap Date: Tue, 4 Nov 2025 16:11:05 -0500 Subject: [PATCH 04/16] Edit request all button text, make spacing closer to invite page buttons --- .../space_analytics_request_dialog.dart | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/lib/pangea/space_analytics/space_analytics_request_dialog.dart b/lib/pangea/space_analytics/space_analytics_request_dialog.dart index 45867d81a..f47a59217 100644 --- a/lib/pangea/space_analytics/space_analytics_request_dialog.dart +++ b/lib/pangea/space_analytics/space_analytics_request_dialog.dart @@ -61,13 +61,19 @@ class SpaceAnalyticsRequestDialog extends StatelessWidget { ), padding: const EdgeInsets.all(16.0), child: Row( - spacing: 20.0, + spacing: 12.0, children: [ Expanded( child: ElevatedButton( + style: ElevatedButton.styleFrom( + padding: const EdgeInsets.symmetric( + horizontal: 20, + vertical: 16, + ), + ), onPressed: () => Navigator.of(context).pop(), child: Row( - spacing: 10.0, + spacing: 12.0, mainAxisAlignment: MainAxisAlignment.center, children: [ const Icon(Icons.close), @@ -78,13 +84,19 @@ class SpaceAnalyticsRequestDialog extends StatelessWidget { ), Expanded( child: ElevatedButton( + style: ElevatedButton.styleFrom( + padding: const EdgeInsets.symmetric( + horizontal: 20, + vertical: 16, + ), + ), onPressed: () => Navigator.of(context).pop(true), child: Row( - spacing: 10.0, + spacing: 12.0, mainAxisAlignment: MainAxisAlignment.center, children: [ const Icon(Symbols.approval_delegation), - Text(L10n.of(context).requestAll), + Text(L10n.of(context).request), ], ), ), From 858b2375f9f26edb521cdc81fbc05b2c6408721e Mon Sep 17 00:00:00 2001 From: Kelrap Date: Tue, 4 Nov 2025 16:23:13 -0500 Subject: [PATCH 05/16] Edited text/adjusted spacing so requested popup matches requesting popup --- lib/l10n/intl_en.arb | 4 +++- .../space_analytics_requested_dialog.dart | 22 ++++++++++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 05946591b..10a159be6 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -5317,5 +5317,7 @@ "feedbackDialogDesc": "I make mistakes too! Anything to help me improve?", "getStartedFriendsButton": "Invite a friend", "contactHasBeenInvitedToTheCourse": "Contact has been invited to the course", - "inviteFriends": "Invite friends" + "inviteFriends": "Invite friends", + "allow": "Allow", + "deny": "Deny" } \ No newline at end of file diff --git a/lib/pangea/space_analytics/space_analytics_requested_dialog.dart b/lib/pangea/space_analytics/space_analytics_requested_dialog.dart index 399f5f294..1024cd28c 100644 --- a/lib/pangea/space_analytics/space_analytics_requested_dialog.dart +++ b/lib/pangea/space_analytics/space_analytics_requested_dialog.dart @@ -66,30 +66,42 @@ class SpaceAnalyticsRequestedDialog extends StatelessWidget { ), padding: const EdgeInsets.all(16.0), child: Row( - spacing: 16.0, + spacing: 12.0, children: [ Expanded( child: ElevatedButton( + style: ElevatedButton.styleFrom( + padding: const EdgeInsets.symmetric( + horizontal: 20, + vertical: 16, + ), + ), onPressed: () => Navigator.of(context).pop(true), child: Row( - spacing: 10.0, + spacing: 12.0, mainAxisAlignment: MainAxisAlignment.center, children: [ const Icon(Symbols.approval_delegation), - Text(L10n.of(context).allowAccess), + Text(L10n.of(context).allow), ], ), ), ), Expanded( child: ElevatedButton( + style: ElevatedButton.styleFrom( + padding: const EdgeInsets.symmetric( + horizontal: 20, + vertical: 16, + ), + ), onPressed: () => Navigator.of(context).pop(false), child: Row( - spacing: 10.0, + spacing: 12.0, mainAxisAlignment: MainAxisAlignment.center, children: [ const Icon(Icons.visibility_off), - Text(L10n.of(context).denyAccess), + Text(L10n.of(context).deny), ], ), ), From 14205602d43879b2f1e6afce11c8b3ff4aeaf808 Mon Sep 17 00:00:00 2001 From: Kelrap Date: Tue, 4 Nov 2025 16:50:42 -0500 Subject: [PATCH 06/16] Adjusted spacing of individual request button --- .../space_analytics/space_analytics_view.dart | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/pangea/space_analytics/space_analytics_view.dart b/lib/pangea/space_analytics/space_analytics_view.dart index a43db7119..a10640e9d 100644 --- a/lib/pangea/space_analytics/space_analytics_view.dart +++ b/lib/pangea/space_analytics/space_analytics_view.dart @@ -496,19 +496,23 @@ class _RequestButton extends StatelessWidget { child: Opacity( opacity: status.enabled ? 0.9 : 0.3, child: Container( - padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4.0), + padding: EdgeInsets.symmetric( + horizontal: mini ? 4.0 : 8.0, + vertical: 4.0, + ), decoration: BoxDecoration( borderRadius: BorderRadius.circular(40), color: status.backgroundColor(context), ), child: Row( - spacing: 8.0, + spacing: mini ? 2.0 : 8.0, mainAxisSize: MainAxisSize.min, children: [ - Icon( - status.icon, - size: !mini ? 12.0 : 8.0, - ), + if (status.icon != null) + Icon( + status.icon, + size: !mini ? 12.0 : 8.0, + ), Text( status.label(context), style: TextStyle(fontSize: !mini ? 12.0 : 8.0), From aa03985c38bdccb585d5d2e68a46553eb880176b Mon Sep 17 00:00:00 2001 From: Kelrap Date: Thu, 6 Nov 2025 09:48:09 -0500 Subject: [PATCH 07/16] Make single-request status button text shrink as needed --- .../space_analytics/space_analytics_view.dart | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/lib/pangea/space_analytics/space_analytics_view.dart b/lib/pangea/space_analytics/space_analytics_view.dart index a10640e9d..d38dad8fb 100644 --- a/lib/pangea/space_analytics/space_analytics_view.dart +++ b/lib/pangea/space_analytics/space_analytics_view.dart @@ -504,20 +504,23 @@ class _RequestButton extends StatelessWidget { borderRadius: BorderRadius.circular(40), color: status.backgroundColor(context), ), - child: Row( - spacing: mini ? 2.0 : 8.0, - mainAxisSize: MainAxisSize.min, - children: [ - if (status.icon != null) - Icon( - status.icon, - size: !mini ? 12.0 : 8.0, + child: FittedBox( + fit: BoxFit.fitWidth, + child: Row( + spacing: mini ? 2.0 : 8.0, + mainAxisSize: MainAxisSize.min, + children: [ + if (status.icon != null) + Icon( + status.icon, + size: !mini ? 12.0 : 8.0, + ), + Text( + status.label(context), + style: TextStyle(fontSize: !mini ? 12.0 : 8.0), ), - Text( - status.label(context), - style: TextStyle(fontSize: !mini ? 12.0 : 8.0), - ), - ], + ], + ), ), ), ), From 69280ed95d1b94f958b4a0b65123aafd538c13f8 Mon Sep 17 00:00:00 2001 From: Kelrap Date: Thu, 6 Nov 2025 10:10:25 -0500 Subject: [PATCH 08/16] Adjust pages with padding of 30 to 20 (fix potential course page overflow) --- lib/pangea/course_creation/course_invite_page.dart | 2 +- lib/pangea/login/pages/add_course_page.dart | 2 +- lib/pangea/login/pages/course_code_page.dart | 2 +- lib/pangea/login/pages/language_selection_page.dart | 2 +- lib/pangea/login/pages/new_course_page.dart | 2 +- lib/pangea/login/pages/public_courses_page.dart | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/pangea/course_creation/course_invite_page.dart b/lib/pangea/course_creation/course_invite_page.dart index eeacef626..c02259b39 100644 --- a/lib/pangea/course_creation/course_invite_page.dart +++ b/lib/pangea/course_creation/course_invite_page.dart @@ -63,7 +63,7 @@ class CourseInvitePageController extends State body: SafeArea( child: Center( child: Container( - padding: const EdgeInsets.all(30.0), + padding: const EdgeInsets.all(20.0), constraints: const BoxConstraints( maxWidth: 750, ), diff --git a/lib/pangea/login/pages/add_course_page.dart b/lib/pangea/login/pages/add_course_page.dart index 7165233d0..5c2b9b0e5 100644 --- a/lib/pangea/login/pages/add_course_page.dart +++ b/lib/pangea/login/pages/add_course_page.dart @@ -36,7 +36,7 @@ class AddCoursePage extends StatelessWidget { body: SafeArea( child: Center( child: Container( - padding: const EdgeInsets.all(30.0), + padding: const EdgeInsets.all(20.0), constraints: const BoxConstraints( maxWidth: 350, maxHeight: 600, diff --git a/lib/pangea/login/pages/course_code_page.dart b/lib/pangea/login/pages/course_code_page.dart index ecd620bdb..ab232f4e5 100644 --- a/lib/pangea/login/pages/course_code_page.dart +++ b/lib/pangea/login/pages/course_code_page.dart @@ -63,7 +63,7 @@ class CourseCodePageState extends State { body: SafeArea( child: Center( child: Container( - padding: const EdgeInsets.all(30.0), + padding: const EdgeInsets.all(20.0), constraints: const BoxConstraints( maxWidth: 350, maxHeight: 600, diff --git a/lib/pangea/login/pages/language_selection_page.dart b/lib/pangea/login/pages/language_selection_page.dart index ed8aef2f6..cda53fd87 100644 --- a/lib/pangea/login/pages/language_selection_page.dart +++ b/lib/pangea/login/pages/language_selection_page.dart @@ -107,7 +107,7 @@ class LanguageSelectionPageState extends State { body: SafeArea( child: Center( child: Container( - padding: const EdgeInsets.all(30.0), + padding: const EdgeInsets.all(20.0), constraints: const BoxConstraints( maxWidth: 450, ), diff --git a/lib/pangea/login/pages/new_course_page.dart b/lib/pangea/login/pages/new_course_page.dart index 01a3bff97..f35e6040c 100644 --- a/lib/pangea/login/pages/new_course_page.dart +++ b/lib/pangea/login/pages/new_course_page.dart @@ -189,7 +189,7 @@ class NewCoursePageState extends State { body: SafeArea( child: Center( child: Container( - padding: const EdgeInsets.all(30.0), + padding: const EdgeInsets.all(20.0), constraints: const BoxConstraints( maxWidth: 450, ), diff --git a/lib/pangea/login/pages/public_courses_page.dart b/lib/pangea/login/pages/public_courses_page.dart index 710d300f5..c25d1785d 100644 --- a/lib/pangea/login/pages/public_courses_page.dart +++ b/lib/pangea/login/pages/public_courses_page.dart @@ -157,7 +157,7 @@ class PublicCoursesPageState extends State { body: SafeArea( child: Center( child: Container( - padding: const EdgeInsets.all(30.0), + padding: const EdgeInsets.all(20.0), constraints: const BoxConstraints( maxWidth: 450, ), From 83e284590d037de90f0b4af6eb6275f3fdd10017 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 7 Nov 2025 14:16:44 +0000 Subject: [PATCH 09/16] Initial plan From 761ed050f1aaa6c9c182f49b4bf8f0850eced010 Mon Sep 17 00:00:00 2001 From: Kelrap Date: Fri, 7 Nov 2025 09:20:47 -0500 Subject: [PATCH 10/16] Remove getStartedFriendsButton from intl files --- lib/l10n/intl_ar.arb | 5 ----- lib/l10n/intl_be.arb | 5 ----- lib/l10n/intl_bn.arb | 5 ----- lib/l10n/intl_bo.arb | 5 ----- lib/l10n/intl_ca.arb | 5 ----- lib/l10n/intl_cs.arb | 5 ----- lib/l10n/intl_da.arb | 5 ----- lib/l10n/intl_de.arb | 5 ----- lib/l10n/intl_el.arb | 5 ----- lib/l10n/intl_en.arb | 2 -- lib/l10n/intl_eo.arb | 5 ----- lib/l10n/intl_es.arb | 5 ----- lib/l10n/intl_et.arb | 5 ----- lib/l10n/intl_eu.arb | 5 ----- lib/l10n/intl_fa.arb | 5 ----- lib/l10n/intl_fi.arb | 5 ----- lib/l10n/intl_fil.arb | 5 ----- lib/l10n/intl_fr.arb | 5 ----- lib/l10n/intl_ga.arb | 5 ----- lib/l10n/intl_gl.arb | 5 ----- lib/l10n/intl_he.arb | 5 ----- lib/l10n/intl_hi.arb | 5 ----- lib/l10n/intl_hr.arb | 5 ----- lib/l10n/intl_hu.arb | 5 ----- lib/l10n/intl_ia.arb | 5 ----- lib/l10n/intl_id.arb | 5 ----- lib/l10n/intl_ie.arb | 5 ----- lib/l10n/intl_it.arb | 5 ----- lib/l10n/intl_ja.arb | 5 ----- lib/l10n/intl_ka.arb | 5 ----- lib/l10n/intl_ko.arb | 5 ----- lib/l10n/intl_lt.arb | 5 ----- lib/l10n/intl_lv.arb | 5 ----- lib/l10n/intl_nb.arb | 5 ----- lib/l10n/intl_nl.arb | 5 ----- lib/l10n/intl_pl.arb | 5 ----- lib/l10n/intl_pt.arb | 5 ----- lib/l10n/intl_pt_BR.arb | 5 ----- lib/l10n/intl_pt_PT.arb | 5 ----- lib/l10n/intl_ro.arb | 5 ----- lib/l10n/intl_ru.arb | 5 ----- lib/l10n/intl_sk.arb | 5 ----- lib/l10n/intl_sl.arb | 5 ----- lib/l10n/intl_sr.arb | 5 ----- lib/l10n/intl_sv.arb | 5 ----- lib/l10n/intl_ta.arb | 5 ----- lib/l10n/intl_te.arb | 5 ----- lib/l10n/intl_th.arb | 5 ----- lib/l10n/intl_tr.arb | 5 ----- lib/l10n/intl_uk.arb | 5 ----- lib/l10n/intl_vi.arb | 5 ----- lib/l10n/intl_yue.arb | 5 ----- lib/l10n/intl_zh.arb | 5 ----- lib/l10n/intl_zh_Hant.arb | 5 ----- 54 files changed, 267 deletions(-) diff --git a/lib/l10n/intl_ar.arb b/lib/l10n/intl_ar.arb index 472161d2e..95783384a 100644 --- a/lib/l10n/intl_ar.arb +++ b/lib/l10n/intl_ar.arb @@ -4669,7 +4669,6 @@ "getStartedComplete": "لقد أكملت هذا القسم!\nاستمر في استكشاف ميزاتنا المذهلة من خلال الدردشة مع الأصدقاء!", "getStartedFriendsComplete": "يا هلا! لديك أصدقاء! 😉", "getStartedBotChatButton": "ابدأ الدردشة!", - "getStartedFriendsButton": "الدردشة مع صديق", "groupChat": "محادثة جماعية", "directMessage": "رسالة مباشرة", "newDirectMessage": "رسالة مباشرة جديدة", @@ -11000,10 +10999,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_be.arb b/lib/l10n/intl_be.arb index 8f2c13e11..3cf4004f2 100644 --- a/lib/l10n/intl_be.arb +++ b/lib/l10n/intl_be.arb @@ -2186,7 +2186,6 @@ "getStartedComplete": "Вы скончылі гэты раздзел!\nПрацягвайце даследаваць нашы цудоўныя функцыі, перагаворваючыся з сябрамі!", "getStartedFriendsComplete": "Ура! У вас ёсць сябры! 😉", "getStartedBotChatButton": "Пачаць перагавор!", - "getStartedFriendsButton": "Пагаварыць з сябрам", "groupChat": "Групавы чат", "directMessage": "Прамое паведамленне", "newDirectMessage": "Новае прамое паведамленне", @@ -11882,10 +11881,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_bn.arb b/lib/l10n/intl_bn.arb index c5ad4fb5d..8a250384c 100644 --- a/lib/l10n/intl_bn.arb +++ b/lib/l10n/intl_bn.arb @@ -4777,7 +4777,6 @@ "getStartedComplete": "আপনি এই বিভাগটি সম্পন্ন করেছেন!\nআমাদের অসাধারণ বৈশিষ্ট্যগুলি অন্বেষণ চালিয়ে যান বন্ধুদের সাথে চ্যাট করে!", "getStartedFriendsComplete": "উহু! আপনার বন্ধু আছে! 😉", "getStartedBotChatButton": "চ্যাট শুরু করুন!", - "getStartedFriendsButton": "একজন বন্ধুর সাথে চ্যাট করুন", "groupChat": "গ্রুপ চ্যাট", "directMessage": "ডাইরেক্ট মেসেজ", "newDirectMessage": "নতুন ডাইরেক্ট মেসেজ", @@ -11887,10 +11886,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_bo.arb b/lib/l10n/intl_bo.arb index 455fa4395..06f8f4f9c 100644 --- a/lib/l10n/intl_bo.arb +++ b/lib/l10n/intl_bo.arb @@ -4533,7 +4533,6 @@ "getStartedComplete": "ཁྱེད་རང་འདི་ལོག་འཇུག་ཡོད།\nགཙོ་སྤྱོད་ལས་འབྱོར་བྱེད་དགོས་མི་ཚུལ་ལས་སྤྱོད་གནང་བའི་ལས་རོལ།", "getStartedFriendsComplete": "དགོས་མི་ཚུལ་ལས་སྤྱོད་ཡོད། ཁྱེད་རང་གྲོགས་ཚོའི་སྐད་ཆ་ལ་སྐད་ཆ་གི་ནང་བསྐུར་ཡོད། 😉", "getStartedBotChatButton": "ཆ་ཚང་ལ་སྐད་ཆ་གནང་བ།", - "getStartedFriendsButton": "གྲོགས་ལ་སྐད་ཆ་གནང་བ།", "groupChat": "དབྱེད་སྐད", "directMessage": "གནང་བའི་ཚེས་ཁུལ།", "newDirectMessage": "གནང་བའི་ཚེས་ཁུལ་གསར་པ།", @@ -10881,10 +10880,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_ca.arb b/lib/l10n/intl_ca.arb index 738220f84..4e9747164 100644 --- a/lib/l10n/intl_ca.arb +++ b/lib/l10n/intl_ca.arb @@ -4756,7 +4756,6 @@ "getStartedComplete": "Has completat aquesta secció!\nSegueix explorant les nostres funcions increïbles xatejant amb amics!", "getStartedFriendsComplete": "Woohoo! Tens amics! 😙", "getStartedBotChatButton": "Comença a xatejar!", - "getStartedFriendsButton": "Xateja amb un amic", "groupChat": "Xat de grup", "directMessage": "Missatge directe", "newDirectMessage": "Nou missatge directe", @@ -10807,10 +10806,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_cs.arb b/lib/l10n/intl_cs.arb index 5967d3590..bffe93d34 100644 --- a/lib/l10n/intl_cs.arb +++ b/lib/l10n/intl_cs.arb @@ -4313,7 +4313,6 @@ "getStartedComplete": "Dokončili jste tuto sekci!\nPokračujte v objevování našich úžasných funkcí chatováním s přáteli!", "getStartedFriendsComplete": "Hurá! Máte přátele! 😉", "getStartedBotChatButton": "Začněte chatovat!", - "getStartedFriendsButton": "Chatovat s přítelem", "groupChat": "Skupinový chat", "directMessage": "Přímá zpráva", "newDirectMessage": "Nová přímá zpráva", @@ -11390,10 +11389,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_da.arb b/lib/l10n/intl_da.arb index 5c7a2f332..41e912ec0 100644 --- a/lib/l10n/intl_da.arb +++ b/lib/l10n/intl_da.arb @@ -2205,7 +2205,6 @@ "getStartedComplete": "Du har gennemført denne sektion!\nFortsæt med at udforske vores fantastiske funktioner ved at chatte med venner!", "getStartedFriendsComplete": "Woohoo! Du har venner! 😉", "getStartedBotChatButton": "Start chat!", - "getStartedFriendsButton": "Chat med en ven", "groupChat": "Gruppemøde", "directMessage": "Direkte besked", "newDirectMessage": "Ny direkte besked", @@ -11845,10 +11844,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_de.arb b/lib/l10n/intl_de.arb index 7aa10e286..c168f2895 100644 --- a/lib/l10n/intl_de.arb +++ b/lib/l10n/intl_de.arb @@ -4791,7 +4791,6 @@ "getStartedComplete": "Du hast diesen Abschnitt abgeschlossen!\nErkunde weiterhin unsere erstaunlichen Funktionen, indem du mit Freunden chattest!", "getStartedFriendsComplete": "Woohoo! Du hast Freunde! 😉", "getStartedBotChatButton": "Beginne das Chatten!", - "getStartedFriendsButton": "Mit einem Freund chatten", "groupChat": "Gruppenchats", "directMessage": "Direktnachricht", "newDirectMessage": "Neue Direktnachricht", @@ -10790,10 +10789,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_el.arb b/lib/l10n/intl_el.arb index 20dfa7e02..458d5dd7d 100644 --- a/lib/l10n/intl_el.arb +++ b/lib/l10n/intl_el.arb @@ -4731,7 +4731,6 @@ "getStartedComplete": "Ολοκληρώσατε αυτό το τμήμα!\nΣυνεχίστε να εξερευνάτε τις εκπληκτικές λειτουργίες μας μιλώντας με φίλους!", "getStartedFriendsComplete": "Ουάου! Έχετε φίλους! 😊", "getStartedBotChatButton": "Ξεκινήστε το chat!", - "getStartedFriendsButton": "Μιλήστε με έναν φίλο", "groupChat": "Ομαδική Συνομιλία", "directMessage": "Άμεσο μήνυμα", "newDirectMessage": "Νέο άμεσο μήνυμα", @@ -11841,10 +11840,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index fd9191bb7..c35a3149b 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -4921,7 +4921,6 @@ "getStartedComplete": "You've completed this section!\nKeep exploring our amazing features by chatting with friends!", "getStartedFriendsComplete": "Woohoo! You've got friends! 😉", "getStartedBotChatButton": "Start chatting!", - "getStartedFriendsButton": "Chat with a friend", "groupChat": "Group Chat", "directMessage": "Direct Message", "newDirectMessage": "New direct message", @@ -5318,7 +5317,6 @@ "goToExistingCourse": "Go to existing course", "emojiView": "Emoji view", "feedbackDialogDesc": "I make mistakes too! Anything to help me improve?", - "getStartedFriendsButton": "Invite a friend", "contactHasBeenInvitedToTheCourse": "Contact has been invited to the course", "inviteFriends": "Invite friends", "activityStatsButtonTooltip": "Activity info", diff --git a/lib/l10n/intl_eo.arb b/lib/l10n/intl_eo.arb index 29b4ba9d2..7a9603591 100644 --- a/lib/l10n/intl_eo.arb +++ b/lib/l10n/intl_eo.arb @@ -3910,7 +3910,6 @@ "getStartedComplete": "Vi kompletigis ĉi tiun sekcion!\nDaŭre esploru niajn mirindajn trajtojn babilante kun amikoj!", "getStartedFriendsComplete": "Hoho! Vi havas amikojn! 😉", "getStartedBotChatButton": "Komencu babili!", - "getStartedFriendsButton": "Babili kun amiko", "groupChat": "Grupbabileco", "directMessage": "Rekta mesaĝo", "newDirectMessage": "Nova rekta mesaĝo", @@ -11872,10 +11871,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_es.arb b/lib/l10n/intl_es.arb index a9d02aa23..9996a1679 100644 --- a/lib/l10n/intl_es.arb +++ b/lib/l10n/intl_es.arb @@ -5945,7 +5945,6 @@ "getStartedComplete": "¡Has completado esta sección!\nSigue explorando nuestras increíbles funciones chateando con amigos.", "getStartedFriendsComplete": "¡Woohoo! ¡Tienes amigos! 😉", "getStartedBotChatButton": "¡Comienza a chatear!", - "getStartedFriendsButton": "Chatear con un amigo", "groupChat": "Chat grupal", "directMessage": "Mensaje directo", "newDirectMessage": "Nuevo mensaje directo", @@ -6139,10 +6138,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_et.arb b/lib/l10n/intl_et.arb index 5afafe535..3f8985e3e 100644 --- a/lib/l10n/intl_et.arb +++ b/lib/l10n/intl_et.arb @@ -4835,7 +4835,6 @@ "getStartedComplete": "Sa oled selle osa lõpetanud!\nJätka meie suurepäraste funktsioonide avastamist, vesteldes sõpradega!", "getStartedFriendsComplete": "Uuhuu! Sul on sõbrad! 😉", "getStartedBotChatButton": "Alusta vestlust!", - "getStartedFriendsButton": "Vestle sõbraga", "groupChat": "Rühmavestlus", "directMessage": "Otse sõnum", "newDirectMessage": "Uus otse sõnum", @@ -10881,10 +10880,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_eu.arb b/lib/l10n/intl_eu.arb index a5d19a659..e7cacd352 100644 --- a/lib/l10n/intl_eu.arb +++ b/lib/l10n/intl_eu.arb @@ -4784,7 +4784,6 @@ "getStartedComplete": "Atala osatu duzu!\nJarraitu gure ezagutzaz betetako ezaugarriak lagunekin hitz egiten jarraituz!", "getStartedFriendsComplete": "Woohoo! Zure lagunak dituzu! 😉", "getStartedBotChatButton": "Hasi hitz egiten!", - "getStartedFriendsButton": "Hitz egin lagun batekin", "groupChat": "Talde txateoa", "directMessage": "Mezu zuzena", "newDirectMessage": "Mezu zuzena berria", @@ -10783,10 +10782,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_fa.arb b/lib/l10n/intl_fa.arb index 024c7a2e9..81465a34c 100644 --- a/lib/l10n/intl_fa.arb +++ b/lib/l10n/intl_fa.arb @@ -4204,7 +4204,6 @@ "getStartedComplete": "شما این بخش را کامل کردید!\nبه کاوش در ویژگی‌های شگفت‌انگیز ما با گفتگو با دوستان ادامه دهید!", "getStartedFriendsComplete": "وای! دوستان دارید! 😊", "getStartedBotChatButton": "شروع گفتگو!", - "getStartedFriendsButton": "گفتگو با دوست", "groupChat": "گفتگوی گروهی", "directMessage": "پیام مستقیم", "newDirectMessage": "پیام مستقیم جدید", @@ -11515,10 +11514,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_fi.arb b/lib/l10n/intl_fi.arb index e993ea889..e4d2ab39d 100644 --- a/lib/l10n/intl_fi.arb +++ b/lib/l10n/intl_fi.arb @@ -4306,7 +4306,6 @@ "getStartedComplete": "Olet suorittanut tämän osion!\nJatka upeiden ominaisuuksiemme tutkimista keskustelemalla ystävien kanssa!", "getStartedFriendsComplete": "Huraa! Sinulla on ystäviä! 😊", "getStartedBotChatButton": "Aloita keskustelu!", - "getStartedFriendsButton": "Keskustele ystävän kanssa", "groupChat": "Ryhmäsuunnittelu", "directMessage": "Yksityisviesti", "newDirectMessage": "Uusi yksityisviesti", @@ -11428,10 +11427,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_fil.arb b/lib/l10n/intl_fil.arb index 7a8a07e18..6f0cb3b90 100644 --- a/lib/l10n/intl_fil.arb +++ b/lib/l10n/intl_fil.arb @@ -3050,7 +3050,6 @@ "getStartedComplete": "Natapos mo na ang seksyong ito!\nPatuloy na tuklasin ang aming kamangha-manghang mga tampok sa pamamagitan ng pakikipag-chat sa mga kaibigan!", "getStartedFriendsComplete": "Woohoo! May mga kaibigan ka na! 😉", "getStartedBotChatButton": "Simulan ang pakikipag-chat!", - "getStartedFriendsButton": "Makipag-chat sa isang kaibigan", "groupChat": "Pangkat na Chat", "directMessage": "Direktang Mensahe", "newDirectMessage": "Bagong direktang mensahe", @@ -11780,10 +11779,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_fr.arb b/lib/l10n/intl_fr.arb index 3849cb901..6e2bb014f 100644 --- a/lib/l10n/intl_fr.arb +++ b/lib/l10n/intl_fr.arb @@ -4614,7 +4614,6 @@ "getStartedComplete": "Vous avez terminé cette section !\nContinuez à explorer nos fonctionnalités incroyables en discutant avec des amis !", "getStartedFriendsComplete": "Youpi ! Vous avez des amis ! 😉", "getStartedBotChatButton": "Commencer à discuter !", - "getStartedFriendsButton": "Discuter avec un ami", "groupChat": "Chat de groupe", "directMessage": "Message direct", "newDirectMessage": "Nouveau message direct", @@ -11107,10 +11106,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_ga.arb b/lib/l10n/intl_ga.arb index 8bd054e51..585728a42 100644 --- a/lib/l10n/intl_ga.arb +++ b/lib/l10n/intl_ga.arb @@ -4792,7 +4792,6 @@ "getStartedComplete": "Tá tú críochnaithe leis an rannóg seo!\nLean ort ag iniúchadh ár ngnéithe iontacha trí bheith ag comhrá le cairde!", "getStartedFriendsComplete": "Woohoo! Tá cairde agat! 😉", "getStartedBotChatButton": "Tosaigh ag comhrá!", - "getStartedFriendsButton": "Comhrá le cara", "groupChat": "Comhrá Grúpa", "directMessage": "Teachtaireacht Dhíreach", "newDirectMessage": "Teachtaireacht Dhíreach Nua", @@ -10781,10 +10780,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_gl.arb b/lib/l10n/intl_gl.arb index 253865792..324a4e132 100644 --- a/lib/l10n/intl_gl.arb +++ b/lib/l10n/intl_gl.arb @@ -4785,7 +4785,6 @@ "getStartedComplete": "Remataste esta sección!\nSegue explorando as nosas increíbles funcións conversando con amigos!", "getStartedFriendsComplete": "Woohoo! Tes amigos! 😉", "getStartedBotChatButton": "Comezar a conversar!", - "getStartedFriendsButton": "Conversar cun amigo", "groupChat": "Chat de grupo", "directMessage": "Mensaxe directa", "newDirectMessage": "Nova mensaxe directa", @@ -10780,10 +10779,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_he.arb b/lib/l10n/intl_he.arb index 73a5dd706..612b0aa7a 100644 --- a/lib/l10n/intl_he.arb +++ b/lib/l10n/intl_he.arb @@ -3370,7 +3370,6 @@ "getStartedComplete": "סיימת את החלק הזה!\nהמשך לחקור את הפיצ'רים המדהימים שלנו על ידי שיחה עם חברים!", "getStartedFriendsComplete": "יווו! יש לך חברים! 😏", "getStartedBotChatButton": "התחל לשוחח!", - "getStartedFriendsButton": "שוחח עם חבר", "groupChat": "שיחת קבוצה", "directMessage": "הודעה ישירה", "newDirectMessage": "הודעה ישירה חדשה", @@ -11832,10 +11831,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_hi.arb b/lib/l10n/intl_hi.arb index 6ec31a856..c8898aa9b 100644 --- a/lib/l10n/intl_hi.arb +++ b/lib/l10n/intl_hi.arb @@ -4758,7 +4758,6 @@ "getStartedComplete": "आपने इस अनुभाग को पूरा कर लिया है!\nमित्रों के साथ चैट करके हमारे अद्भुत फीचर्स का अन्वेषण जारी रखें!", "getStartedFriendsComplete": "वाह! आपके पास दोस्त हैं! 😊", "getStartedBotChatButton": "चैट शुरू करें!", - "getStartedFriendsButton": "एक मित्र के साथ चैट करें", "groupChat": "समूह चैट", "directMessage": "प्रत्यक्ष संदेश", "newDirectMessage": "नया प्रत्यक्ष संदेश", @@ -11868,10 +11867,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_hr.arb b/lib/l10n/intl_hr.arb index f6468c222..a84e91be6 100644 --- a/lib/l10n/intl_hr.arb +++ b/lib/l10n/intl_hr.arb @@ -4540,7 +4540,6 @@ "getStartedComplete": "Završili ste ovaj odjeljak!\nNastavite istraživati naše nevjerovatne značajke razgovorom s prijateljima!", "getStartedFriendsComplete": "Woohoo! Imate prijatelje! 😉", "getStartedBotChatButton": "Započni razgovor!", - "getStartedFriendsButton": "Razgovaraj s prijateljem", "groupChat": "Grupni chat", "directMessage": "Izravna poruka", "newDirectMessage": "Nova izravna poruka", @@ -11155,10 +11154,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_hu.arb b/lib/l10n/intl_hu.arb index 83eccb064..85c394f25 100644 --- a/lib/l10n/intl_hu.arb +++ b/lib/l10n/intl_hu.arb @@ -4785,7 +4785,6 @@ "getStartedComplete": "Befejezted ezt a szakaszt!\nFedezd fel tovább a csodálatos funkcióinkat barátokkal való beszélgetéssel!", "getStartedFriendsComplete": "Hurrá! Vannak barátaid! 😉", "getStartedBotChatButton": "Beszélgetés indítása!", - "getStartedFriendsButton": "Beszélgetés egy baráttal", "groupChat": "Csoportos beszélgetés", "directMessage": "Közvetlen üzenet", "newDirectMessage": "Új közvetlen üzenet", @@ -10784,10 +10783,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_ia.arb b/lib/l10n/intl_ia.arb index 3be1419fc..ccd648342 100644 --- a/lib/l10n/intl_ia.arb +++ b/lib/l10n/intl_ia.arb @@ -2233,7 +2233,6 @@ "getStartedComplete": "Tu ha completate iste section!\nContinua a explorar nostre fantasticas characteristicas per chat with amicos!", "getStartedFriendsComplete": "Woohoo! Tu ha amicos! 😋", "getStartedBotChatButton": "Comencia a chat!", - "getStartedFriendsButton": "Chat con un amico", "groupChat": "Chat de gruppo", "directMessage": "Message directe", "newDirectMessage": " nove message directe", @@ -11861,10 +11860,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_id.arb b/lib/l10n/intl_id.arb index e8d65a9dc..98885ecb7 100644 --- a/lib/l10n/intl_id.arb +++ b/lib/l10n/intl_id.arb @@ -4786,7 +4786,6 @@ "getStartedComplete": "Anda telah menyelesaikan bagian ini!\nTerus jelajahi fitur menakjubkan kami dengan mengobrol dengan teman!", "getStartedFriendsComplete": "Woohoo! Anda memiliki teman! 😉", "getStartedBotChatButton": "Mulai mengobrol!", - "getStartedFriendsButton": "Bicara dengan teman", "groupChat": "Obrolan Grup", "directMessage": "Pesan Langsung", "newDirectMessage": "Pesan langsung baru", @@ -10774,10 +10773,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_ie.arb b/lib/l10n/intl_ie.arb index 3addb0fa2..b6f5c2563 100644 --- a/lib/l10n/intl_ie.arb +++ b/lib/l10n/intl_ie.arb @@ -4647,7 +4647,6 @@ "getStartedComplete": "Tu ha completat ta section!\nContinua a esplorar nos meraviliose caracteristicas per chat con amicos!", "getStartedFriendsComplete": "Woohoo! Tu ha amicos! 😉", "getStartedBotChatButton": "Cumencia a chat!", - "getStartedFriendsButton": "Chat con un amico", "groupChat": "Chat de gruppo", "directMessage": "Messegg directe", "newDirectMessage": "Nove messegg directe", @@ -11757,10 +11756,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_it.arb b/lib/l10n/intl_it.arb index 23b491c58..e3e8c90c5 100644 --- a/lib/l10n/intl_it.arb +++ b/lib/l10n/intl_it.arb @@ -4763,7 +4763,6 @@ "getStartedComplete": "Hai completato questa sezione!\nContinua a esplorare le nostre fantastiche funzionalità chattando con gli amici!", "getStartedFriendsComplete": "Evvai! Hai degli amici! 😄", "getStartedBotChatButton": "Inizia a chattare!", - "getStartedFriendsButton": "Chattare con un amico", "groupChat": "Chat di gruppo", "directMessage": "Messaggio diretto", "newDirectMessage": "Nuovo messaggio diretto", @@ -10786,10 +10785,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_ja.arb b/lib/l10n/intl_ja.arb index aa0c425de..379a15654 100644 --- a/lib/l10n/intl_ja.arb +++ b/lib/l10n/intl_ja.arb @@ -4127,7 +4127,6 @@ "getStartedComplete": "このセクションは完了です!\n友達とチャットして、素晴らしい機能を引き続き探索しましょう!", "getStartedFriendsComplete": "やった!友達ができました!😊", "getStartedBotChatButton": "チャットを始める!", - "getStartedFriendsButton": "友達とチャット", "groupChat": "グループチャット", "directMessage": "ダイレクトメッセージ", "newDirectMessage": "新しいダイレクトメッセージ", @@ -11573,10 +11572,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_ka.arb b/lib/l10n/intl_ka.arb index 11fbd09a9..8a1f2554a 100644 --- a/lib/l10n/intl_ka.arb +++ b/lib/l10n/intl_ka.arb @@ -2869,7 +2869,6 @@ "getStartedComplete": "თქვენ ამ ნაწილს დაასრულეთ!\nგაგრძელეთ ჩვენი საოცარი ფუნქციების გამოკვლევა მეგობრებთან საუბრის საშუალებით!", "getStartedFriendsComplete": "ვაუ! თქვენ გაქვთ მეგობრები! 😊", "getStartedBotChatButton": "დაიწყეთ საუბარი!", - "getStartedFriendsButton": "მეგობართან ჩატი", "groupChat": "ჯგუფური ჩატი", "directMessage": "მხოლოდ შეტყობინება", "newDirectMessage": "ახალი პირდაპირი შეტყობინება", @@ -11813,10 +11812,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_ko.arb b/lib/l10n/intl_ko.arb index 626d5655e..0e90ba094 100644 --- a/lib/l10n/intl_ko.arb +++ b/lib/l10n/intl_ko.arb @@ -4720,7 +4720,6 @@ "getStartedComplete": "이 섹션을 완료했어요!\n친구들과 채팅하며 우리의 멋진 기능들을 계속 탐험하세요!", "getStartedFriendsComplete": "와우! 친구들이 생겼어요! 😙", "getStartedBotChatButton": "채팅 시작하기!", - "getStartedFriendsButton": "친구와 채팅하기", "groupChat": "단체 채팅", "directMessage": "개인 메시지", "newDirectMessage": "새 개인 메시지", @@ -10891,10 +10890,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_lt.arb b/lib/l10n/intl_lt.arb index 748971241..a268bdbd2 100644 --- a/lib/l10n/intl_lt.arb +++ b/lib/l10n/intl_lt.arb @@ -4136,7 +4136,6 @@ "getStartedComplete": "Jūs baigėte šį skyrių!\nTęskite mūsų nuostabių funkcijų tyrinėjimą bendraudami su draugais!", "getStartedFriendsComplete": "Woohoo! Jūs turite draugų! 😉", "getStartedBotChatButton": "Pradėti pokalbį!", - "getStartedFriendsButton": "Pokalbis su draugu", "groupChat": " Grupinis pokalbis", "directMessage": "Tiesioginė žinutė", "newDirectMessage": "Nauja tiesioginė žinutė", @@ -11588,10 +11587,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_lv.arb b/lib/l10n/intl_lv.arb index 2ea6e0518..4a8237845 100644 --- a/lib/l10n/intl_lv.arb +++ b/lib/l10n/intl_lv.arb @@ -4772,7 +4772,6 @@ "getStartedComplete": "Jūs esat pabeidzis šo sadaļu!\nTurpiniet izpētīt mūsu brīnišķīgās funkcijas, sarunājoties ar draugiem!", "getStartedFriendsComplete": "Uhhē! Jums ir draugi! 😉", "getStartedBotChatButton": "Sākt sarunu!", - "getStartedFriendsButton": "Sarunāties ar draugu", "groupChat": "Grupas saruna", "directMessage": "Tiešā ziņa", "newDirectMessage": "Jauna tiešā ziņa", @@ -10769,10 +10768,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_nb.arb b/lib/l10n/intl_nb.arb index 7931715f4..cc13ccb99 100644 --- a/lib/l10n/intl_nb.arb +++ b/lib/l10n/intl_nb.arb @@ -3699,7 +3699,6 @@ "getStartedComplete": "Du har fullført denne delen!\nFortsett å utforske våre fantastiske funksjoner ved å chatte med venner!", "getStartedFriendsComplete": "Woohoo! Du har venner! 😉", "getStartedBotChatButton": "Begynn å chatte!", - "getStartedFriendsButton": "Chat med en venn", "groupChat": "Gruppchat", "directMessage": "Direktemelding", "newDirectMessage": "Ny direktemelding", @@ -11876,10 +11875,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_nl.arb b/lib/l10n/intl_nl.arb index 470591944..13c4d8bb3 100644 --- a/lib/l10n/intl_nl.arb +++ b/lib/l10n/intl_nl.arb @@ -4783,7 +4783,6 @@ "getStartedComplete": "Je hebt deze sectie voltooid!\nBlijf onze geweldige functies verkennen door met vrienden te chatten!", "getStartedFriendsComplete": "Woohoo! Je hebt vrienden! 😙", "getStartedBotChatButton": "Begin met chatten!", - "getStartedFriendsButton": "Chat met een vriend", "groupChat": "Groepschat", "directMessage": "Direct bericht", "newDirectMessage": "Nieuw direct bericht", @@ -10783,10 +10782,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_pl.arb b/lib/l10n/intl_pl.arb index 775c9c2fe..2fd22d4c8 100644 --- a/lib/l10n/intl_pl.arb +++ b/lib/l10n/intl_pl.arb @@ -4784,7 +4784,6 @@ "getStartedComplete": "Ukończyłeś tę sekcję!\nKontynuuj odkrywanie naszych niesamowitych funkcji, rozmawiając z przyjaciółmi!", "getStartedFriendsComplete": "Hurra! Masz przyjaciół! 😉", "getStartedBotChatButton": "Rozpocznij rozmowę!", - "getStartedFriendsButton": "Porozmawiaj z przyjacielem", "groupChat": "Czat grupowy", "directMessage": "Wiadomość prywatna", "newDirectMessage": "Nowa wiadomość prywatna", @@ -10783,10 +10782,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_pt.arb b/lib/l10n/intl_pt.arb index 16f883f66..03171c9b0 100644 --- a/lib/l10n/intl_pt.arb +++ b/lib/l10n/intl_pt.arb @@ -4774,7 +4774,6 @@ "getStartedComplete": "Você concluiu esta seção!\nContinue explorando nossos recursos incríveis conversando com amigos!", "getStartedFriendsComplete": "Uhul! Você tem amigos! 😉", "getStartedBotChatButton": "Começar a conversar!", - "getStartedFriendsButton": "Conversar com um amigo", "groupChat": "Chat em Grupo", "directMessage": "Mensagem Direta", "newDirectMessage": "Nova mensagem direta", @@ -11883,10 +11882,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_pt_BR.arb b/lib/l10n/intl_pt_BR.arb index 6bc1168d3..81612e7bb 100644 --- a/lib/l10n/intl_pt_BR.arb +++ b/lib/l10n/intl_pt_BR.arb @@ -4531,7 +4531,6 @@ "getStartedComplete": "Você concluiu esta seção!\nContinue explorando nossos recursos incríveis conversando com amigos!", "getStartedFriendsComplete": "Uhul! Você tem amigos! 😉", "getStartedBotChatButton": "Começar a conversar!", - "getStartedFriendsButton": "Conversar com um amigo", "groupChat": "Chat em grupo", "directMessage": "Mensagem direta", "newDirectMessage": "Nova mensagem direta", @@ -11162,10 +11161,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_pt_PT.arb b/lib/l10n/intl_pt_PT.arb index b7c051b41..7b7b78ec4 100644 --- a/lib/l10n/intl_pt_PT.arb +++ b/lib/l10n/intl_pt_PT.arb @@ -3594,7 +3594,6 @@ "getStartedComplete": "Concluíste esta seção!\nContinua a explorar as nossas funcionalidades incríveis conversando com amigos!", "getStartedFriendsComplete": "Uhul! Tens amigos! 😎", "getStartedBotChatButton": "Começar a conversar!", - "getStartedFriendsButton": "Conversar com um amigo", "groupChat": "Chat de Grupo", "directMessage": "Mensagem Direta", "newDirectMessage": "Nova mensagem direta", @@ -11833,10 +11832,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_ro.arb b/lib/l10n/intl_ro.arb index 2092a1b51..06b9b4c92 100644 --- a/lib/l10n/intl_ro.arb +++ b/lib/l10n/intl_ro.arb @@ -4203,7 +4203,6 @@ "getStartedComplete": "Ai finalizat această secțiune!\nContinuă să explorezi caracteristicile noastre uimitoare vorbind cu prietenii!", "getStartedFriendsComplete": "Woohoo! Ai prieteni! 😙", "getStartedBotChatButton": "Începe să discuți!", - "getStartedFriendsButton": "Discută cu un prieten", "groupChat": "Chat de grup", "directMessage": "Mesaj direct", "newDirectMessage": "Mesaj direct nou", @@ -11518,10 +11517,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_ru.arb b/lib/l10n/intl_ru.arb index e4545781c..65230bb81 100644 --- a/lib/l10n/intl_ru.arb +++ b/lib/l10n/intl_ru.arb @@ -4722,7 +4722,6 @@ "getStartedComplete": "Вы завершили этот раздел!\nПродолжайте исследовать наши удивительные функции, общаясь с друзьями!", "getStartedFriendsComplete": "Ура! У вас есть друзья! 😎", "getStartedBotChatButton": "Начать общение!", - "getStartedFriendsButton": "Поговорить с другом", "groupChat": "Групповой чат", "directMessage": "Личное сообщение", "newDirectMessage": "Новое личное сообщение", @@ -10888,10 +10887,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_sk.arb b/lib/l10n/intl_sk.arb index 049574030..d226925df 100644 --- a/lib/l10n/intl_sk.arb +++ b/lib/l10n/intl_sk.arb @@ -3407,7 +3407,6 @@ "getStartedComplete": "Túto sekciu ste dokončili!\nPokračujte v objavovaní našich úžasných funkcií chatovaním s priateľmi!", "getStartedFriendsComplete": "Woohoo! Máte priateľov! 😙", "getStartedBotChatButton": "Začať chatovať!", - "getStartedFriendsButton": "Chatovať s priateľom", "groupChat": "Skupinový chat", "directMessage": "Priama správa", "newDirectMessage": "Nová priama správa", @@ -11867,10 +11866,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_sl.arb b/lib/l10n/intl_sl.arb index 26b21c66a..f9e8e5742 100644 --- a/lib/l10n/intl_sl.arb +++ b/lib/l10n/intl_sl.arb @@ -2739,7 +2739,6 @@ "getStartedComplete": "Dokončali ste ta razdelek!\nNadaljujte z raziskovanjem naših čudovitih funkcij z klepetom s prijatelji!", "getStartedFriendsComplete": "Uau! Imate prijatelje! 😉", "getStartedBotChatButton": "Začni klepet!", - "getStartedFriendsButton": "Klepet z prijateljem", "groupChat": "Skupinski klepet", "directMessage": "Neposredna sporočila", "newDirectMessage": "Novo neposredno sporočilo", @@ -11864,10 +11863,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_sr.arb b/lib/l10n/intl_sr.arb index 67eff2108..cc1943961 100644 --- a/lib/l10n/intl_sr.arb +++ b/lib/l10n/intl_sr.arb @@ -3820,7 +3820,6 @@ "getStartedComplete": "Odeljak je završen!\nNastavite da istražujete naše sjajne funkcije razgovorom sa prijateljima!", "getStartedFriendsComplete": "Ura! Imate prijatelje! 😉", "getStartedBotChatButton": "Počnite da razgovarate!", - "getStartedFriendsButton": "Razgovaraj sa prijateljem", "groupChat": "Grupni razgovor", "directMessage": "Direktna poruka", "newDirectMessage": "Нова директна порука", @@ -11885,10 +11884,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_sv.arb b/lib/l10n/intl_sv.arb index 3febc4fad..b0f47d1aa 100644 --- a/lib/l10n/intl_sv.arb +++ b/lib/l10n/intl_sv.arb @@ -4445,7 +4445,6 @@ "getStartedComplete": "Du har slutfört detta avsnitt! \nFortsätt utforska våra fantastiska funktioner genom att chatta med vänner!", "getStartedFriendsComplete": "Woohoo! Du har vänner! 😉", "getStartedBotChatButton": "Börja chatta!", - "getStartedFriendsButton": "Chatta med en vän", "groupChat": "Gruppchatt", "directMessage": "Direktmeddelande", "newDirectMessage": "Nytt direktmeddelande", @@ -11261,10 +11260,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_ta.arb b/lib/l10n/intl_ta.arb index f1c270bf7..f9c5e1b5b 100644 --- a/lib/l10n/intl_ta.arb +++ b/lib/l10n/intl_ta.arb @@ -4660,7 +4660,6 @@ "getStartedComplete": "இந்த பகுதியை நீங்கள் முடித்துவிட்டீர்கள்!\nநமது அற்புதமான அம்சங்களை நண்பர்களுடன் உரையாடி தொடரவும்!", "getStartedFriendsComplete": "வூஹூ! உங்களுக்கு நண்பர்கள் கிடைத்தனர்! 😉", "getStartedBotChatButton": "உரையாடத் தொடங்கவும்!", - "getStartedFriendsButton": "ஒரு நண்பருடன் உரையாடவும்", "groupChat": "குழு உரையாடல்", "directMessage": "நேரடி செய்தி", "newDirectMessage": "புதிய நேரடி செய்தி", @@ -11007,10 +11006,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_te.arb b/lib/l10n/intl_te.arb index c909b152d..c88277946 100644 --- a/lib/l10n/intl_te.arb +++ b/lib/l10n/intl_te.arb @@ -2195,7 +2195,6 @@ "getStartedComplete": "మీరు ఈ విభాగాన్ని పూర్తి చేసారు!\nమిత్రులతో చాట్ చేయడం ద్వారా మా అద్భుతమైన ఫీచర్లను అన్వేషించండి!", "getStartedFriendsComplete": "వావ్! మీకు మిత్రులు ఉన్నారు! 😉", "getStartedBotChatButton": "చాట్ ప్రారంభించండి!", - "getStartedFriendsButton": "మిత్రుడితో చాట్ చేయండి", "groupChat": "గుంపు చాట్", "directMessage": "నేరుగా సందేశం", "newDirectMessage": "కొత్త నేరుగా సందేశం", @@ -11875,10 +11874,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_th.arb b/lib/l10n/intl_th.arb index 9ae6a2d08..972f5419b 100644 --- a/lib/l10n/intl_th.arb +++ b/lib/l10n/intl_th.arb @@ -4732,7 +4732,6 @@ "getStartedComplete": "คุณทำส่วนนี้เสร็จแล้ว!\nสำรวจคุณสมบัติที่น่าทึ่งของเราโดยการแชทกับเพื่อน!", "getStartedFriendsComplete": "ว้าว! คุณมีเพื่อนแล้ว! 😉", "getStartedBotChatButton": "เริ่มแชทเลย!", - "getStartedFriendsButton": "แชทกับเพื่อน", "groupChat": "แชทกลุ่ม", "directMessage": "ข้อความส่วนตัว", "newDirectMessage": "ข้อความส่วนตัวใหม่", @@ -11841,10 +11840,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_tr.arb b/lib/l10n/intl_tr.arb index 3534dc79e..47167e2bc 100644 --- a/lib/l10n/intl_tr.arb +++ b/lib/l10n/intl_tr.arb @@ -4667,7 +4667,6 @@ "getStartedComplete": "Bu bölümü tamamladın!\nHarika özelliklerimizi arkadaşlarınla sohbet ederek keşfetmeye devam et!", "getStartedFriendsComplete": "Vay canına! Arkadaşların oldu! 😉", "getStartedBotChatButton": "Sohbete başla!", - "getStartedFriendsButton": "Bir arkadaşınla sohbet et", "groupChat": "Grup Sohbeti", "directMessage": "Özel Mesaj", "newDirectMessage": "Yeni özel mesaj", @@ -11005,10 +11004,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_uk.arb b/lib/l10n/intl_uk.arb index d213c8935..a685bc671 100644 --- a/lib/l10n/intl_uk.arb +++ b/lib/l10n/intl_uk.arb @@ -4786,7 +4786,6 @@ "getStartedComplete": "Ви завершили цей розділ!\nПродовжуйте досліджувати наші дивовижні функції, спілкуючись із друзями!", "getStartedFriendsComplete": "Ура! У вас є друзі! 😉", "getStartedBotChatButton": "Почати спілкування!", - "getStartedFriendsButton": "Обговорити з другом", "groupChat": "Груповий чат", "directMessage": "Пряме повідомлення", "newDirectMessage": "Нове пряме повідомлення", @@ -10777,10 +10776,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_vi.arb b/lib/l10n/intl_vi.arb index 62de37a78..5ba746603 100644 --- a/lib/l10n/intl_vi.arb +++ b/lib/l10n/intl_vi.arb @@ -4245,7 +4245,6 @@ "getStartedComplete": "Bạn đã hoàn thành phần này!\nTiếp tục khám phá các tính năng tuyệt vời của chúng tôi bằng cách trò chuyện với bạn bè!", "getStartedFriendsComplete": "Woohoo! Bạn đã có bạn bè! 😉", "getStartedBotChatButton": "Bắt đầu trò chuyện!", - "getStartedFriendsButton": "Trò chuyện với một người bạn", "groupChat": "Nhóm trò chuyện", "directMessage": "Tin nhắn trực tiếp", "newDirectMessage": "Tin nhắn trực tiếp mới", @@ -4404,10 +4403,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_yue.arb b/lib/l10n/intl_yue.arb index 3d43b6340..5d1bb5add 100644 --- a/lib/l10n/intl_yue.arb +++ b/lib/l10n/intl_yue.arb @@ -2119,7 +2119,6 @@ "getStartedComplete": "你完成咗呢個部分!\n繼續用傾偈同朋友探索我哋嘅精彩功能!", "getStartedFriendsComplete": "Woohoo!你有朋友啦!😊", "getStartedBotChatButton": "開始傾偈!", - "getStartedFriendsButton": "同朋友傾偈", "groupChat": "群組聊天", "directMessage": "直接訊息", "newDirectMessage": "新直接訊息", @@ -11476,10 +11475,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_zh.arb b/lib/l10n/intl_zh.arb index a5e918549..c3d43e2c6 100644 --- a/lib/l10n/intl_zh.arb +++ b/lib/l10n/intl_zh.arb @@ -4787,7 +4787,6 @@ "getStartedComplete": "你已完成本节!\n继续通过与朋友聊天探索我们的精彩功能!", "getStartedFriendsComplete": "哇哦!你有朋友啦!😊", "getStartedBotChatButton": "开始聊天!", - "getStartedFriendsButton": "与朋友聊天", "groupChat": "群聊", "directMessage": "私信", "newDirectMessage": "新私信", @@ -10774,10 +10773,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} diff --git a/lib/l10n/intl_zh_Hant.arb b/lib/l10n/intl_zh_Hant.arb index 645cc89e7..431afd8e0 100644 --- a/lib/l10n/intl_zh_Hant.arb +++ b/lib/l10n/intl_zh_Hant.arb @@ -4763,7 +4763,6 @@ "getStartedComplete": "你完成了此部分!\n使用我們的簡單特效功能來管理你的好玩家。", "getStartedFriendsComplete": "好了!你已經有朋友!😉", "getStartedBotChatButton": "開始訊售!", - "getStartedFriendsButton": "話話和朋友", "groupChat": "群組訊售", "directMessage": "直接信檔", "newDirectMessage": "新的直接信檔", @@ -10802,10 +10801,6 @@ "type": "String", "placeholders": {} }, - "@getStartedFriendsButton": { - "type": "String", - "placeholders": {} - }, "@groupChat": { "type": "String", "placeholders": {} From 27b3e96c6e71b8c7985bbadd4fe297ea7e4d22de Mon Sep 17 00:00:00 2001 From: ggurdin Date: Fri, 7 Nov 2025 09:24:46 -0500 Subject: [PATCH 11/16] fix: if activity is finished, always set activity started to true --- lib/pangea/activity_sessions/activity_room_extension.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/pangea/activity_sessions/activity_room_extension.dart b/lib/pangea/activity_sessions/activity_room_extension.dart index 76b7ff905..df5bc9fef 100644 --- a/lib/pangea/activity_sessions/activity_room_extension.dart +++ b/lib/pangea/activity_sessions/activity_room_extension.dart @@ -410,6 +410,7 @@ extension ActivityRoomExtension on Room { } bool get isActivityStarted => + isActivityFinished || (activityPlan?.roles.length ?? 0) - (assignedRoles?.length ?? 0) <= 0; bool get isActivityFinished { From 594df2d6d261fcd21383a575d19a6e7d58c7e2cd Mon Sep 17 00:00:00 2001 From: ggurdin Date: Fri, 7 Nov 2025 09:36:10 -0500 Subject: [PATCH 12/16] fix: open course activity filtering fixes --- .../course_chats/course_chats_page.dart | 34 ++++++++++++++++--- .../courses/course_plan_model.dart | 3 ++ 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/lib/pangea/course_chats/course_chats_page.dart b/lib/pangea/course_chats/course_chats_page.dart index da3dc3469..3baab1d07 100644 --- a/lib/pangea/course_chats/course_chats_page.dart +++ b/lib/pangea/course_chats/course_chats_page.dart @@ -16,6 +16,8 @@ import 'package:fluffychat/pangea/common/utils/error_handler.dart'; import 'package:fluffychat/pangea/course_chats/course_chats_view.dart'; import 'package:fluffychat/pangea/course_chats/extended_space_rooms_chunk.dart'; import 'package:fluffychat/pangea/course_plans/course_activities/activity_summaries_provider.dart'; +import 'package:fluffychat/pangea/course_plans/courses/course_plan_builder.dart'; +import 'package:fluffychat/pangea/course_plans/courses/course_plan_room_extension.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; import 'package:fluffychat/pangea/public_spaces/public_room_bottom_sheet.dart'; import 'package:fluffychat/pangea/spaces/constants/space_constants.dart'; @@ -42,7 +44,7 @@ class CourseChats extends StatefulWidget { } class CourseChatsController extends State - with ActivitySummariesProvider { + with ActivitySummariesProvider, CoursePlanProvider { String get roomId => widget.roomId; Room? get room => widget.client.getRoomById(widget.roomId); @@ -117,6 +119,7 @@ class CourseChatsController extends State final Map> sessionsMap = {}; + final validIDs = course?.activityIDs ?? {}; for (final chunk in discoveredChildren!) { if (chunk.roomType?.startsWith(PangeaRoomTypes.activitySession) != true) { continue; @@ -130,11 +133,24 @@ class CourseChatsController extends State final activity = summary.activityPlan; final users = summary.activityRoles.roles.values.map((r) => r.userId).toList(); + + if (users.isEmpty || !validIDs.contains(activity.activityId)) { + continue; + } + if (activity.req.numberOfParticipants <= users.length) { // Don't show full activities continue; } + // If any user has archived the activity, don't show it. + // It's possible for users to finish an activity and then for some of the + // users to leave, but if the activity was archived by anyone, that means + // it was full at some point. + if (summary.activityRoles.roles.values.any((role) => role.isArchived)) { + continue; + } + sessionsMap[activity] ??= []; sessionsMap[activity]!.add( ExtendedSpaceRoomsChunk( @@ -198,9 +214,19 @@ class CourseChatsController extends State await _loadHierarchy(activeSpace: room, reload: reload); if (mounted) await _joinDefaultChats(); if (mounted) { - await loadRoomSummaries( - room.spaceChildren.map((c) => c.roomId).whereType().toList(), - ); + final futures = [ + loadRoomSummaries( + room.spaceChildren + .map((c) => c.roomId) + .whereType() + .toList(), + ), + if (room.coursePlan?.uuid != null) loadCourse(room.coursePlan!.uuid), + ]; + await Future.wait(futures); + if (mounted) { + await loadTopics(); + } } } catch (e, s) { Logs().w('Unable to load hierarchy', e, s); diff --git a/lib/pangea/course_plans/courses/course_plan_model.dart b/lib/pangea/course_plans/courses/course_plan_model.dart index b88adc625..2f52a44d6 100644 --- a/lib/pangea/course_plans/courses/course_plan_model.dart +++ b/lib/pangea/course_plans/courses/course_plan_model.dart @@ -99,6 +99,9 @@ class CoursePlanModel { ), ).topics; + Set get activityIDs => + loadedTopics.values.expand((topic) => topic.activityIds).toSet(); + Future> fetchTopics() async { final resp = await CourseTopicRepo.get( TranslateTopicRequest( From ed0b1545bc5ba4fa65cb645fd3c6ca6b233cdce1 Mon Sep 17 00:00:00 2001 From: ggurdin Date: Fri, 7 Nov 2025 09:37:08 -0500 Subject: [PATCH 13/16] build: bump version number --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 042d69637..3a069a75b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,7 +6,7 @@ description: Learn a language while texting your friends. # Pangea# publish_to: none # On version bump also increase the build number for F-Droid -version: 4.1.15+2 +version: 4.1.15+3 environment: sdk: ">=3.0.0 <4.0.0" From bd97e523b065414377bc3a7ec0cbaeb51a84bd88 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 7 Nov 2025 14:48:15 +0000 Subject: [PATCH 14/16] Add horizontal padding to promo code message Co-authored-by: ggurdin <46800240+ggurdin@users.noreply.github.com> --- .../pages/change_subscription.dart | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/lib/pangea/subscription/pages/change_subscription.dart b/lib/pangea/subscription/pages/change_subscription.dart index 1f9bfb8fb..a124abf09 100644 --- a/lib/pangea/subscription/pages/change_subscription.dart +++ b/lib/pangea/subscription/pages/change_subscription.dart @@ -199,17 +199,20 @@ class ChangeSubscription extends StatelessWidget { ], ), if (kIsWeb) - Row( - spacing: 8.0, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const Icon(Icons.info_outlined), - Flexible( - child: Text( - L10n.of(context).promoCodeInfo, + Padding( + padding: const EdgeInsets.symmetric(horizontal: 16.0), + child: Row( + spacing: 8.0, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Icon(Icons.info_outlined), + Flexible( + child: Text( + L10n.of(context).promoCodeInfo, + ), ), - ), - ], + ], + ), ), const SizedBox(height: 20.0), ], From 7d7ba5112336df42a00373c7c6e47dbdd79ec349 Mon Sep 17 00:00:00 2001 From: ggurdin Date: Fri, 7 Nov 2025 10:05:02 -0500 Subject: [PATCH 15/16] fix: don't check if user L2 is set unless user is logged in --- lib/widgets/matrix.dart | 16 ++++++++-------- pubspec.yaml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart index 4a1512833..678ee8991 100644 --- a/lib/widgets/matrix.dart +++ b/lib/widgets/matrix.dart @@ -385,14 +385,14 @@ class MatrixState extends State with WidgetsBindingObserver { } } else { // #Pangea - final isL2Set = await pangeaController.userController.isUserL2Set; - FluffyChatApp.router.go( - state == LoginState.loggedIn - ? isL2Set - ? '/rooms' - : '/registration/create' - : '/home', - ); + if (state == LoginState.loggedIn) { + final isL2Set = await pangeaController.userController.isUserL2Set; + FluffyChatApp.router.go( + isL2Set ? '/rooms' : '/registration/create', + ); + } else { + FluffyChatApp.router.go('/home'); + } // FluffyChatApp.router // .go(state == LoginState.loggedIn ? '/rooms' : '/home'); // Pangea# diff --git a/pubspec.yaml b/pubspec.yaml index 3a069a75b..2e153701d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,7 +6,7 @@ description: Learn a language while texting your friends. # Pangea# publish_to: none # On version bump also increase the build number for F-Droid -version: 4.1.15+3 +version: 4.1.15+4 environment: sdk: ">=3.0.0 <4.0.0" From 5a3ff8998c6a437b2eb21a75ba41d232676ede25 Mon Sep 17 00:00:00 2001 From: ggurdin Date: Fri, 7 Nov 2025 10:29:12 -0500 Subject: [PATCH 16/16] fix: on leave activity, if activity in course, redirect to course --- .../activity_session_popup_menu.dart | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/pangea/activity_sessions/activity_session_chat/activity_session_popup_menu.dart b/lib/pangea/activity_sessions/activity_session_chat/activity_session_popup_menu.dart index 22c791e7f..c0826cace 100644 --- a/lib/pangea/activity_sessions/activity_session_chat/activity_session_popup_menu.dart +++ b/lib/pangea/activity_sessions/activity_session_chat/activity_session_popup_menu.dart @@ -30,6 +30,7 @@ class ActivitySessionPopupMenuState extends State onSelected: (choice) async { switch (choice) { case ActivityPopupMenuActions.leave: + final parentSpaceId = widget.room.courseParent?.id; final router = GoRouter.of(context); final confirmed = await showOkCancelAlertDialog( context: context, @@ -45,7 +46,11 @@ class ActivitySessionPopupMenuState extends State future: () => widget.room.leave(), ); if (result.error == null) { - router.go('/rooms'); + router.go( + parentSpaceId != null + ? '/rooms/spaces/$parentSpaceId' + : '/rooms', + ); } break; case ActivityPopupMenuActions.invite: @@ -85,7 +90,7 @@ class ActivitySessionPopupMenuState extends State value: ActivityPopupMenuActions.leave, child: Row( children: [ - const Icon(Icons.delete_outlined), + const Icon(Icons.logout_outlined), const SizedBox(width: 12), Text(L10n.of(context).leave), ],