diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 7dc790f88..fd9191bb7 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -5321,5 +5321,7 @@ "getStartedFriendsButton": "Invite a friend", "contactHasBeenInvitedToTheCourse": "Contact has been invited to the course", "inviteFriends": "Invite friends", - "activityStatsButtonTooltip": "Activity info" + "activityStatsButtonTooltip": "Activity info", + "allow": "Allow", + "deny": "Deny" } \ No newline at end of file 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, 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( 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 9ad351994..b3b38af13 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 466656e00..7710d518e 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, ), 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), ], ), ), diff --git a/lib/pangea/space_analytics/space_analytics_requested_dialog.dart b/lib/pangea/space_analytics/space_analytics_requested_dialog.dart index afe49d689..76fbe3dc9 100644 --- a/lib/pangea/space_analytics/space_analytics_requested_dialog.dart +++ b/lib/pangea/space_analytics/space_analytics_requested_dialog.dart @@ -71,30 +71,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), ], ), ), diff --git a/lib/pangea/space_analytics/space_analytics_view.dart b/lib/pangea/space_analytics/space_analytics_view.dart index 5c745bb60..afd58d848 100644 --- a/lib/pangea/space_analytics/space_analytics_view.dart +++ b/lib/pangea/space_analytics/space_analytics_view.dart @@ -516,24 +516,31 @@ 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, - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - status.icon, - size: !mini ? 12.0 : 8.0, - ), - Text( - status.label(context), - style: TextStyle(fontSize: !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), + ), + ], + ), ), ), ), 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), ), ],