Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Use spacing from Row/Column instead of intersperse #2705

Merged
merged 2 commits into from
Dec 12, 2024
Merged

refactor: Use spacing from Row/Column instead of intersperse #2705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e381a47
fix(deps): Require flutter ^3.27.0
provokateurin Dec 12, 2024
bfc177d
refactor: Use spacing from Row/Column instead of intersperse
provokateurin Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/neon_framework/example/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1800,4 +1800,4 @@ packages:
version: "3.1.2"
sdks:
dart: ">=3.5.0 <4.0.0"
flutter: ">=3.24.0"
flutter: ">=3.27.0"
2 changes: 1 addition & 1 deletion packages/neon_framework/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: 'none'

environment:
sdk: ^3.0.0
flutter: ^3.22.0
flutter: ^3.27.0

dependencies:
built_collection: ^5.0.0
Expand Down
4 changes: 2 additions & 2 deletions packages/neon_framework/lib/src/widgets/account_tile.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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(
Expand All @@ -71,7 +71,7 @@ class NeonAccountTile extends StatelessWidget {
iconSize: 24,
onRetry: userDetailsBloc.refresh,
),
].intersperse(const SizedBox(width: 5)).toList(),
],
),
),
subtitle: Text(
Expand Down
2 changes: 1 addition & 1 deletion packages/neon_framework/packages/account_repository/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ publish_to: none

environment:
sdk: ^3.0.0
flutter: ^3.22.0
flutter: ^3.27.0

dependencies:
built_collection: ^5.1.1
Expand Down
10 changes: 2 additions & 8 deletions packages/neon_framework/packages/dashboard_app/lib/src/pages/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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,
),
),
),
Expand Down
3 changes: 1 addition & 2 deletions packages/neon_framework/packages/dashboard_app/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: 'none'

environment:
sdk: ^3.0.0
flutter: ^3.22.0
flutter: ^3.27.0

dependencies:
built_collection: ^5.0.0
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion packages/neon_framework/packages/files_app/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: 'none'

environment:
sdk: ^3.0.0
flutter: ^3.22.0
flutter: ^3.27.0

dependencies:
built_collection: ^5.0.0
Expand Down
2 changes: 1 addition & 1 deletion packages/neon_framework/packages/neon_rich_text/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ publish_to: none

environment:
sdk: ^3.0.0
flutter: ^3.22.0
flutter: ^3.27.0

dependencies:
built_collection: ^5.0.0
Expand Down
2 changes: 1 addition & 1 deletion packages/neon_framework/packages/news_app/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: 'none'

environment:
sdk: ^3.0.0
flutter: ^3.22.0
flutter: ^3.27.0

dependencies:
built_collection: ^5.0.0
Expand Down
2 changes: 1 addition & 1 deletion packages/neon_framework/packages/notes_app/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: 'none'

environment:
sdk: ^3.0.0
flutter: ^3.22.0
flutter: ^3.27.0

dependencies:
built_collection: ^5.0.0
Expand Down
10 changes: 2 additions & 8 deletions packages/neon_framework/packages/notifications_app/lib/src/widgets/notification.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -63,6 +62,7 @@ class NotificationsNotification extends StatelessWidget {
title: subject,
subtitle: Column(
crossAxisAlignment: CrossAxisAlignment.start,
spacing: 5,
children: [
if (notification.message.isNotEmpty) message,
RelativeTime(
Expand All @@ -78,13 +78,7 @@ class NotificationsNotification extends StatelessWidget {
)
.toList(),
),
]
.intersperse(
const SizedBox(
height: 5,
),
)
.toList(),
],
),
leading: notification.icon!.isNotEmpty
? NeonUriImage(
Expand Down
3 changes: 1 addition & 2 deletions packages/neon_framework/packages/notifications_app/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: 'none'

environment:
sdk: ^3.0.0
flutter: ^3.22.0
flutter: ^3.27.0

dependencies:
built_collection: ^5.0.0
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/neon_framework/packages/notifications_push_repository/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ publish_to: none

environment:
sdk: ^3.0.0
flutter: ^3.22.0
flutter: ^3.27.0

dependencies:
account_repository:
Expand Down
10 changes: 2 additions & 8 deletions packages/neon_framework/packages/talk_app/lib/src/pages/room.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -79,6 +78,7 @@ class _TalkRoomPageState extends State<TalkRoomPage> {

final appBar = AppBar(
title: Row(
spacing: 10,
children: <Widget>[
TalkRoomAvatar(
room: room,
Expand All @@ -94,13 +94,7 @@ class _TalkRoomPageState extends State<TalkRoomPage> {
visible: result.isLoading,
),
),
]
.intersperse(
const SizedBox(
width: 10,
),
)
.toList(),
],
),
);

Expand Down
10 changes: 2 additions & 8 deletions packages/neon_framework/packages/talk_app/lib/src/widgets/message.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -420,6 +419,7 @@ class _TalkCommentMessageState extends State<TalkCommentMessage> {

Widget message = Column(
crossAxisAlignment: CrossAxisAlignment.start,
spacing: 5,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
Expand All @@ -440,13 +440,7 @@ class _TalkCommentMessageState extends State<TalkCommentMessage> {
room: widget.room,
chatMessage: widget.chatMessage,
),
]
.intersperse(
const SizedBox(
height: 5,
),
)
.toList(),
],
);

if (!widget.isParent) {
Expand Down
3 changes: 1 addition & 2 deletions packages/neon_framework/packages/talk_app/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: 'none'

environment:
sdk: ^3.0.0
flutter: ^3.22.0
flutter: ^3.27.0

dependencies:
built_collection: ^5.0.0
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions packages/neon_framework/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: 'none'

environment:
sdk: ^3.0.0
flutter: ^3.22.0
flutter: ^3.27.0

dependencies:
account_repository:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/neon_lints/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ publish_to: none

environment:
sdk: ^3.0.0
flutter: ^3.22.0
flutter: ^3.27.0

dependencies:
flutter:
Expand Down