ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4616 from pangeachat/overflow-fixes

Browse source 
Overflow fixes
This commit is contained in:
ggurdin 2025-11-07 08:59:05 -05:00 • committed by GitHub
commit a80de9b72b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 73 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/l10n/intl_en.arb
View file

@ -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"
}

5
lib/pangea/activity_suggestions/activity_suggestion_card.dart
View file

@ -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,

8
lib/pangea/chat_settings/pages/pangea_invitation_selection_view.dart
View file

@ -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(

2
lib/pangea/course_creation/course_invite_page.dart
View file

@ -63,7 +63,7 @@ class CourseInvitePageController extends State<CourseInvitePage>
body: SafeArea(
child: Center(
child: Container(
padding: const EdgeInsets.all(30.0),
padding: const EdgeInsets.all(20.0),
constraints: const BoxConstraints(
maxWidth: 750,
),

2
lib/pangea/login/pages/add_course_page.dart
View file

@ -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,

2
lib/pangea/login/pages/course_code_page.dart
View file

@ -63,7 +63,7 @@ class CourseCodePageState extends State<CourseCodePage> {
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,

2
lib/pangea/login/pages/language_selection_page.dart
View file

@ -107,7 +107,7 @@ class LanguageSelectionPageState extends State<LanguageSelectionPage> {
body: SafeArea(
child: Center(
child: Container(
padding: const EdgeInsets.all(30.0),
padding: const EdgeInsets.all(20.0),
constraints: const BoxConstraints(
maxWidth: 450,
),

2
lib/pangea/login/pages/new_course_page.dart
View file

@ -189,7 +189,7 @@ class NewCoursePageState extends State<NewCoursePage> {
body: SafeArea(
child: Center(
child: Container(
padding: const EdgeInsets.all(30.0),
padding: const EdgeInsets.all(20.0),
constraints: const BoxConstraints(
maxWidth: 450,
),

2
lib/pangea/login/pages/public_courses_page.dart
View file

@ -157,7 +157,7 @@ class PublicCoursesPageState extends State<PublicCoursesPage> {
body: SafeArea(
child: Center(
child: Container(
padding: const EdgeInsets.all(30.0),
padding: const EdgeInsets.all(20.0),
constraints: const BoxConstraints(
maxWidth: 450,
),

20
lib/pangea/space_analytics/space_analytics_request_dialog.dart
View file

@ -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),
],
),
),

22
lib/pangea/space_analytics/space_analytics_requested_dialog.dart
View file

@ -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),
],
),
),

35
lib/pangea/space_analytics/space_analytics_view.dart
View file

@ -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),
),
],
),
),
),
),

4
lib/widgets/member_actions_popup_menu_button.dart
View file

@ -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),
),
],