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

feat: adaptive layout #4

Merged
merged 3 commits into from
Jul 29, 2024
Merged

feat: adaptive layout #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee8332b
feat: adaptive layout
jneschisi Jul 26, 2024
3074081
fixed tests
jneschisi Jul 26, 2024
4a0d452
fix: music list scroll
jneschisi Jul 26, 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
104 changes: 60 additions & 44 deletions lib/airplane_entertainment_system/view/airplane_entertainment_system_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,53 +41,56 @@ class _AirplaneEntertainmentSystemScreenState
page: _currentPage,
),
),
Column(
children: [
const TopButtonBar(),
Expanded(
child: Row(
children: [
if (layout == AesLayoutData.large)
AesNavigationRail(
destinations: destinations,
selectedIndex: _currentPage,
onDestinationSelected: (value) {
setState(() {
_currentPage = value;
});
},
),
Expanded(
child: _ContentPageView(
pageSize: Size(
constraints.maxWidth,
constraints.maxHeight,
SafeArea(
child: Column(
children: [
const TopButtonBar(),
Expanded(
child: Row(
children: [
if (layout != AesLayoutData.small)
AesNavigationRail(
destinations: destinations,
selectedIndex: _currentPage,
onDestinationSelected: (value) {
setState(() {
_currentPage = value;
});
},
),
Expanded(
child: _ContentPageView(
pageSize: Size(
constraints.maxWidth,
constraints.maxHeight,
),
pageIndex: _currentPage,
),
pageIndex: _currentPage,
),
),
],
],
),
),
),
],
],
),
),
// Display clouds over the airplane only on the first screen.
Positioned.fill(
left: 80,
right: constraints.maxWidth * 0.4,
child: IgnorePointer(
child: AnimatedOpacity(
duration: const Duration(milliseconds: 600),
opacity: _currentPage == 0 ? 0.8 : 0,
child: const Clouds(
key: Key('foregroundClouds'),
count: 3,
averageScale: 0.25,
averageVelocity: 2,
if (layout == AesLayoutData.large)
Positioned.fill(
left: 80,
right: constraints.maxWidth * 0.4,
child: IgnorePointer(
child: AnimatedOpacity(
duration: const Duration(milliseconds: 600),
opacity: _currentPage == 0 ? 0.8 : 0,
child: const Clouds(
key: Key('foregroundClouds'),
count: 3,
averageScale: 0.25,
averageVelocity: 2,
),
),
),
),
),
],
);
},
Expand Down Expand Up @@ -173,12 +176,17 @@ class _ContentPageViewState extends State<_ContentPageView>

@override
Widget build(BuildContext context) {
final pageOffset = widget.pageSize.height / 4;
final isSmall = AesLayout.of(context) == AesLayoutData.small;
final pageSize = widget.pageSize;
final pageSide = isSmall ? pageSize.width : pageSize.width.hashCode;
final pageOffset = pageSide / 4;
final axis = isSmall ? Axis.horizontal : Axis.vertical;

return Stack(
children: [
if (_previousPage != _currentPage)
_PositionedFadeTransition(
axis: axis,
positionAnimation: _controller.drive(
CurveTween(
curve: Curves.easeInOut,
Expand All @@ -200,6 +208,7 @@ class _ContentPageViewState extends State<_ContentPageView>
child: _pages[_previousPage],
),
_PositionedFadeTransition(
axis: axis,
positionAnimation: _controller.drive(
CurveTween(
curve: Curves.easeInOut,
Expand Down Expand Up @@ -229,6 +238,7 @@ class _PositionedFadeTransition extends StatelessWidget {
required this.opacityAnimation,
required this.pageSize,
required this.child,
required this.axis,
this.beginOffset = 0,
this.endOffset = 0,
});
Expand All @@ -239,15 +249,21 @@ class _PositionedFadeTransition extends StatelessWidget {
final Widget child;
final double beginOffset;
final double endOffset;
final Axis axis;

@override
Widget build(BuildContext context) {
final begin = axis == Axis.horizontal
? RelativeRect.fromLTRB(beginOffset, 0, -beginOffset, 0)
: RelativeRect.fromLTRB(0, beginOffset, 0, -beginOffset);

final end = axis == Axis.horizontal
? RelativeRect.fromLTRB(endOffset, 0, -endOffset, 0)
: RelativeRect.fromLTRB(0, endOffset, 0, -endOffset);

return PositionedTransition(
rect: positionAnimation.drive(
RelativeRectTween(
begin: RelativeRect.fromLTRB(0, beginOffset, 0, -beginOffset),
end: RelativeRect.fromLTRB(0, endOffset, 0, -endOffset),
),
RelativeRectTween(begin: begin, end: end),
),
child: FadeTransition(
key: ValueKey<Key?>(child.key),
Expand Down
9 changes: 7 additions & 2 deletions lib/airplane_entertainment_system/widgets/top_button_bar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,13 @@ class TopButtonBar extends StatelessWidget {
letterSpacing: 1.2,
),
),
icon: const Icon(Icons.support),
label: Text(context.l10n.assistButton),
icon: const Icon(Icons.support, color: Colors.white),
label: Text(
context.l10n.assistButton,
style: const TextStyle(
color: Colors.white,
),
),
),
],
),
Expand Down
Loading