diff --git a/packages/neon_framework/lib/src/widgets/account_tile.dart b/packages/neon_framework/lib/src/widgets/account_tile.dart index 08917f28872..7ad87b04221 100644 --- a/packages/neon_framework/lib/src/widgets/account_tile.dart +++ b/packages/neon_framework/lib/src/widgets/account_tile.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:intersperse/intersperse.dart'; import 'package:meta/meta.dart'; import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/models.dart'; @@ -52,6 +51,7 @@ class NeonAccountTile extends StatelessWidget { title: ResultBuilder.behaviorSubject( subject: userDetailsBloc.userDetails, builder: (context, userDetails) => Row( + spacing: 5, children: [ if (userDetails.hasData) Flexible( @@ -71,7 +71,7 @@ class NeonAccountTile extends StatelessWidget { iconSize: 24, onRetry: userDetailsBloc.refresh, ), - ].intersperse(const SizedBox(width: 5)).toList(), + ], ), ), subtitle: Text( diff --git a/packages/neon_framework/packages/dashboard_app/lib/src/pages/main.dart b/packages/neon_framework/packages/dashboard_app/lib/src/pages/main.dart index 9938a4f7b34..0735083d569 100644 --- a/packages/neon_framework/packages/dashboard_app/lib/src/pages/main.dart +++ b/packages/neon_framework/packages/dashboard_app/lib/src/pages/main.dart @@ -8,7 +8,6 @@ import 'package:dashboard_app/src/widgets/widget.dart'; import 'package:dashboard_app/src/widgets/widget_button.dart'; import 'package:dashboard_app/src/widgets/widget_item.dart'; import 'package:flutter/material.dart'; -import 'package:intersperse/intersperse.dart'; import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/theme.dart'; @@ -97,13 +96,8 @@ class DashboardMainPage extends StatelessWidget { child: Column( mainAxisAlignment: MainAxisAlignment.center, mainAxisSize: MainAxisSize.min, - children: children - .intersperse( - const SizedBox( - height: 40, - ), - ) - .toList(), + spacing: 40, + children: children, ), ), ), diff --git a/packages/neon_framework/packages/dashboard_app/pubspec.yaml b/packages/neon_framework/packages/dashboard_app/pubspec.yaml index 932f081c7f7..b4752b8c802 100644 --- a/packages/neon_framework/packages/dashboard_app/pubspec.yaml +++ b/packages/neon_framework/packages/dashboard_app/pubspec.yaml @@ -14,7 +14,6 @@ dependencies: flutter_localizations: sdk: flutter go_router: ^14.0.0 - intersperse: ^2.0.0 logging: ^1.0.0 neon_framework: git: diff --git a/packages/neon_framework/packages/notifications_app/lib/src/widgets/notification.dart b/packages/neon_framework/packages/notifications_app/lib/src/widgets/notification.dart index 95479353dc7..70121c0cb39 100644 --- a/packages/neon_framework/packages/notifications_app/lib/src/widgets/notification.dart +++ b/packages/neon_framework/packages/notifications_app/lib/src/widgets/notification.dart @@ -1,6 +1,5 @@ import 'package:built_collection/built_collection.dart'; import 'package:flutter/material.dart'; -import 'package:intersperse/intersperse.dart'; import 'package:neon_framework/models.dart'; import 'package:neon_framework/theme.dart'; import 'package:neon_framework/utils.dart'; @@ -63,6 +62,7 @@ class NotificationsNotification extends StatelessWidget { title: subject, subtitle: Column( crossAxisAlignment: CrossAxisAlignment.start, + spacing: 5, children: [ if (notification.message.isNotEmpty) message, RelativeTime( @@ -78,13 +78,7 @@ class NotificationsNotification extends StatelessWidget { ) .toList(), ), - ] - .intersperse( - const SizedBox( - height: 5, - ), - ) - .toList(), + ], ), leading: notification.icon!.isNotEmpty ? NeonUriImage( diff --git a/packages/neon_framework/packages/notifications_app/pubspec.yaml b/packages/neon_framework/packages/notifications_app/pubspec.yaml index 3d4f3dafa11..c514ce41087 100644 --- a/packages/neon_framework/packages/notifications_app/pubspec.yaml +++ b/packages/neon_framework/packages/notifications_app/pubspec.yaml @@ -15,7 +15,6 @@ dependencies: sdk: flutter flutter_material_design_icons: ^1.1.7296 go_router: ^14.0.0 - intersperse: ^2.0.0 intl: ^0.19.0 logging: ^1.0.0 meta: ^1.0.0 diff --git a/packages/neon_framework/packages/talk_app/lib/src/pages/room.dart b/packages/neon_framework/packages/talk_app/lib/src/pages/room.dart index 470397152e8..3475d859f34 100644 --- a/packages/neon_framework/packages/talk_app/lib/src/pages/room.dart +++ b/packages/neon_framework/packages/talk_app/lib/src/pages/room.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:intersperse/intersperse.dart'; import 'package:intl/intl.dart'; import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/utils.dart'; @@ -79,6 +78,7 @@ class _TalkRoomPageState extends State { final appBar = AppBar( title: Row( + spacing: 10, children: [ TalkRoomAvatar( room: room, @@ -94,13 +94,7 @@ class _TalkRoomPageState extends State { visible: result.isLoading, ), ), - ] - .intersperse( - const SizedBox( - width: 10, - ), - ) - .toList(), + ], ), ); diff --git a/packages/neon_framework/packages/talk_app/lib/src/widgets/message.dart b/packages/neon_framework/packages/talk_app/lib/src/widgets/message.dart index 89d5d4ebf63..bb8c364bbbe 100644 --- a/packages/neon_framework/packages/talk_app/lib/src/widgets/message.dart +++ b/packages/neon_framework/packages/talk_app/lib/src/widgets/message.dart @@ -1,6 +1,5 @@ import 'package:built_collection/built_collection.dart'; import 'package:flutter/material.dart'; -import 'package:intersperse/intersperse.dart'; import 'package:intl/intl.dart'; import 'package:neon_framework/blocs.dart'; import 'package:neon_framework/models.dart'; @@ -420,6 +419,7 @@ class _TalkCommentMessageState extends State { Widget message = Column( crossAxisAlignment: CrossAxisAlignment.start, + spacing: 5, children: [ Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -440,13 +440,7 @@ class _TalkCommentMessageState extends State { room: widget.room, chatMessage: widget.chatMessage, ), - ] - .intersperse( - const SizedBox( - height: 5, - ), - ) - .toList(), + ], ); if (!widget.isParent) { diff --git a/packages/neon_framework/packages/talk_app/pubspec.yaml b/packages/neon_framework/packages/talk_app/pubspec.yaml index ac7813eb017..7fefcddf5c3 100644 --- a/packages/neon_framework/packages/talk_app/pubspec.yaml +++ b/packages/neon_framework/packages/talk_app/pubspec.yaml @@ -17,7 +17,6 @@ dependencies: flutter_material_design_icons: ^1.1.7296 flutter_typeahead: ^5.2.0 go_router: ^14.0.0 - intersperse: ^2.0.0 intl: ^0.19.0 logging: ^1.0.0 meta: ^1.0.0 diff --git a/packages/neon_framework/pubspec.yaml b/packages/neon_framework/pubspec.yaml index 28e417de5de..61be0e26580 100644 --- a/packages/neon_framework/pubspec.yaml +++ b/packages/neon_framework/pubspec.yaml @@ -41,7 +41,6 @@ dependencies: go_router: ^14.0.0 http: ^1.0.0 image: ^4.0.0 - intersperse: ^2.0.0 intl: ^0.19.0 logging: ^1.0.0 meta: ^1.0.0