From 2e4f2296f96324c07e59941780126924537b4bf5 Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 24 Jul 2024 12:49:28 -0500 Subject: [PATCH] fix: broken tests --- README.md | 2 +- .../airplane_entertainment_system.dart} | 0 ...airplane_entertainment_system_screen.dart} | 38 ++- .../view/view.dart | 1 + .../widgets/clouds.dart | 0 .../widgets/left_side_navigation_rail.dart | 18 +- .../widgets/system_background.dart} | 6 +- .../widgets/top_button_bar.dart | 0 .../widgets/widgets.dart | 2 +- lib/app/view/app.dart | 4 +- lib/demo/view/view.dart | 1 - lib/music_player/view/music_player_page.dart | 232 ++++++++++-------- lib/overview/view/overview_page.dart | 44 ++-- ...rplane_entertainment_system_thumbnail.dart | 2 +- pubspec.yaml | 2 +- ...ane_entertainment_system_screen_test.dart} | 22 +- .../left_side_navigation_rail_test.dart | 2 +- .../widgets/movie_card_test.dart | 0 .../widgets/music_card_test.dart | 0 .../widgets/top_button_bar_test.dart | 4 +- .../view/music_player_page_test.dart | 2 +- .../widgets/music_visualizer_test.dart | 0 .../overview/view/overview_page_test.dart | 2 +- ...e_entertainment_system_thumbnail_test.dart | 2 +- web/index.html | 2 +- web/manifest.json | 2 +- 26 files changed, 185 insertions(+), 205 deletions(-) rename lib/{demo/demo.dart => airplane_entertainment_system/airplane_entertainment_system.dart} (100%) rename lib/{demo/view/airplane_entertainment_system_demo.dart => airplane_entertainment_system/view/airplane_entertainment_system_screen.dart} (86%) create mode 100644 lib/airplane_entertainment_system/view/view.dart rename lib/{demo => airplane_entertainment_system}/widgets/clouds.dart (100%) rename lib/{demo => airplane_entertainment_system}/widgets/left_side_navigation_rail.dart (74%) rename lib/{demo/widgets/demo_background.dart => airplane_entertainment_system/widgets/system_background.dart} (85%) rename lib/{demo => airplane_entertainment_system}/widgets/top_button_bar.dart (100%) rename lib/{demo => airplane_entertainment_system}/widgets/widgets.dart (73%) delete mode 100644 lib/demo/view/view.dart rename test/{src/demo/view/airplane_entertainment_system_demo_test.dart => airplane_entertainment_system/view/airplane_entertainment_system_screen_test.dart} (80%) rename test/{src/demo => airplane_entertainment_system}/widgets/left_side_navigation_rail_test.dart (69%) rename test/{src/demo => airplane_entertainment_system}/widgets/movie_card_test.dart (100%) rename test/{src/demo => airplane_entertainment_system}/widgets/music_card_test.dart (100%) rename test/{src/demo => airplane_entertainment_system}/widgets/top_button_bar_test.dart (89%) rename test/{src => }/music_player/view/music_player_page_test.dart (96%) rename test/{src => }/music_player/widgets/music_visualizer_test.dart (100%) rename test/{src => }/overview/view/overview_page_test.dart (95%) diff --git a/README.md b/README.md index 6ebaeaa..c1e34ca 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Generated by the [Very Good CLI][very_good_cli_link] 🤖 -Airplane Entertainment System demo project. +Airplane Entertainment System project. --- diff --git a/lib/demo/demo.dart b/lib/airplane_entertainment_system/airplane_entertainment_system.dart similarity index 100% rename from lib/demo/demo.dart rename to lib/airplane_entertainment_system/airplane_entertainment_system.dart diff --git a/lib/demo/view/airplane_entertainment_system_demo.dart b/lib/airplane_entertainment_system/view/airplane_entertainment_system_screen.dart similarity index 86% rename from lib/demo/view/airplane_entertainment_system_demo.dart rename to lib/airplane_entertainment_system/view/airplane_entertainment_system_screen.dart index a4d4915..dfd4837 100644 --- a/lib/demo/view/airplane_entertainment_system_demo.dart +++ b/lib/airplane_entertainment_system/view/airplane_entertainment_system_screen.dart @@ -1,18 +1,18 @@ -import 'package:airplane_entertainment_system/demo/demo.dart'; +import 'package:airplane_entertainment_system/airplane_entertainment_system/airplane_entertainment_system.dart'; import 'package:airplane_entertainment_system/music_player/music_player.dart'; import 'package:airplane_entertainment_system/overview/overview.dart'; import 'package:flutter/material.dart'; -class AirplaneEntertainmentSystemDemo extends StatefulWidget { - const AirplaneEntertainmentSystemDemo({super.key}); +class AirplaneEntertainmentSystemScreen extends StatefulWidget { + const AirplaneEntertainmentSystemScreen({super.key}); @override - State createState() => - _AirplaneEntertainmentSystemDemoState(); + State createState() => + _AirplaneEntertainmentSystemScreenState(); } -class _AirplaneEntertainmentSystemDemoState - extends State { +class _AirplaneEntertainmentSystemScreenState + extends State { int _currentPage = 0; @override @@ -23,7 +23,7 @@ class _AirplaneEntertainmentSystemDemoState return Stack( children: [ Positioned.fill( - child: DemoBackground( + child: SystemBackground( page: _currentPage, ), ), @@ -42,7 +42,7 @@ class _AirplaneEntertainmentSystemDemoState }, ), Expanded( - child: _DemoPageView( + child: _ContentPageView( pageSize: Size( constraints.maxWidth, constraints.maxHeight, @@ -80,8 +80,8 @@ class _AirplaneEntertainmentSystemDemoState } } -class _DemoPageView extends StatefulWidget { - const _DemoPageView({ +class _ContentPageView extends StatefulWidget { + const _ContentPageView({ required this.pageSize, required this.pageIndex, }); @@ -90,24 +90,14 @@ class _DemoPageView extends StatefulWidget { final int pageIndex; @override - State<_DemoPageView> createState() => _DemoPageViewState(); + State<_ContentPageView> createState() => _ContentPageViewState(); } -class _DemoPageViewState extends State<_DemoPageView> +class _ContentPageViewState extends State<_ContentPageView> with SingleTickerProviderStateMixin { - static const _placeholderPage = Center( - child: SizedBox.square( - dimension: 400, - child: Placeholder(), - ), - ); static const _pages = [ OverviewPage(key: Key('overviewPage')), MusicPlayerPage(key: Key('musicPlayerPage')), - _placeholderPage, - _placeholderPage, - _placeholderPage, - _placeholderPage, ]; late final AnimationController _controller = AnimationController( @@ -135,7 +125,7 @@ class _DemoPageViewState extends State<_DemoPageView> } @override - void didUpdateWidget(covariant _DemoPageView oldWidget) { + void didUpdateWidget(covariant _ContentPageView oldWidget) { super.didUpdateWidget(oldWidget); if (widget.pageIndex != oldWidget.pageIndex) { diff --git a/lib/airplane_entertainment_system/view/view.dart b/lib/airplane_entertainment_system/view/view.dart new file mode 100644 index 0000000..887ce57 --- /dev/null +++ b/lib/airplane_entertainment_system/view/view.dart @@ -0,0 +1 @@ +export 'airplane_entertainment_system_screen.dart'; diff --git a/lib/demo/widgets/clouds.dart b/lib/airplane_entertainment_system/widgets/clouds.dart similarity index 100% rename from lib/demo/widgets/clouds.dart rename to lib/airplane_entertainment_system/widgets/clouds.dart diff --git a/lib/demo/widgets/left_side_navigation_rail.dart b/lib/airplane_entertainment_system/widgets/left_side_navigation_rail.dart similarity index 74% rename from lib/demo/widgets/left_side_navigation_rail.dart rename to lib/airplane_entertainment_system/widgets/left_side_navigation_rail.dart index 867cdd2..1c6eb2f 100644 --- a/lib/demo/widgets/left_side_navigation_rail.dart +++ b/lib/airplane_entertainment_system/widgets/left_side_navigation_rail.dart @@ -31,29 +31,13 @@ class LeftSideNavigationRail extends StatelessWidget { onDestinationSelected: onOptionSelected, destinations: const [ NavigationRailDestination( - icon: Icon(Icons.airplanemode_active), + icon: Icon(Icons.airplanemode_active_outlined), label: Text('airplanemode_active'), ), NavigationRailDestination( icon: Icon(Icons.headphones), label: Text('headphones'), ), - NavigationRailDestination( - icon: Icon(Icons.play_arrow), - label: Text('play_arrow'), - ), - NavigationRailDestination( - icon: Icon(Icons.face), - label: Text('face'), - ), - NavigationRailDestination( - icon: Icon(Icons.shopping_bag_outlined), - label: Text('shopping_bag_outlined'), - ), - NavigationRailDestination( - icon: Icon(Icons.settings), - label: Text('settings'), - ), ], ), ), diff --git a/lib/demo/widgets/demo_background.dart b/lib/airplane_entertainment_system/widgets/system_background.dart similarity index 85% rename from lib/demo/widgets/demo_background.dart rename to lib/airplane_entertainment_system/widgets/system_background.dart index c1d78ad..c5e9c66 100644 --- a/lib/demo/widgets/demo_background.dart +++ b/lib/airplane_entertainment_system/widgets/system_background.dart @@ -1,8 +1,8 @@ -import 'package:airplane_entertainment_system/demo/demo.dart'; +import 'package:airplane_entertainment_system/airplane_entertainment_system/airplane_entertainment_system.dart'; import 'package:flutter/material.dart' hide Image; -class DemoBackground extends StatelessWidget { - const DemoBackground({ +class SystemBackground extends StatelessWidget { + const SystemBackground({ required this.page, super.key, }); diff --git a/lib/demo/widgets/top_button_bar.dart b/lib/airplane_entertainment_system/widgets/top_button_bar.dart similarity index 100% rename from lib/demo/widgets/top_button_bar.dart rename to lib/airplane_entertainment_system/widgets/top_button_bar.dart diff --git a/lib/demo/widgets/widgets.dart b/lib/airplane_entertainment_system/widgets/widgets.dart similarity index 73% rename from lib/demo/widgets/widgets.dart rename to lib/airplane_entertainment_system/widgets/widgets.dart index 6744715..6b471fa 100644 --- a/lib/demo/widgets/widgets.dart +++ b/lib/airplane_entertainment_system/widgets/widgets.dart @@ -1,4 +1,4 @@ export 'clouds.dart'; -export 'demo_background.dart'; export 'left_side_navigation_rail.dart'; +export 'system_background.dart'; export 'top_button_bar.dart'; diff --git a/lib/app/view/app.dart b/lib/app/view/app.dart index 8d9af4b..2c2c192 100644 --- a/lib/app/view/app.dart +++ b/lib/app/view/app.dart @@ -1,4 +1,4 @@ -import 'package:airplane_entertainment_system/demo/demo.dart'; +import 'package:airplane_entertainment_system/airplane_entertainment_system/airplane_entertainment_system.dart'; import 'package:airplane_entertainment_system/l10n/l10n.dart'; import 'package:flutter/material.dart'; @@ -16,7 +16,7 @@ class App extends StatelessWidget { ), localizationsDelegates: AppLocalizations.localizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, - home: const AirplaneEntertainmentSystemDemo(), + home: const AirplaneEntertainmentSystemScreen(), ); } } diff --git a/lib/demo/view/view.dart b/lib/demo/view/view.dart deleted file mode 100644 index 377b0bc..0000000 --- a/lib/demo/view/view.dart +++ /dev/null @@ -1 +0,0 @@ -export 'airplane_entertainment_system_demo.dart'; diff --git a/lib/music_player/view/music_player_page.dart b/lib/music_player/view/music_player_page.dart index 379e982..f8ee4f5 100644 --- a/lib/music_player/view/music_player_page.dart +++ b/lib/music_player/view/music_player_page.dart @@ -12,9 +12,12 @@ class MusicPlayerPage extends StatelessWidget { children: [ const Expanded( flex: 3, - child: Padding( - padding: EdgeInsets.symmetric(horizontal: 80, vertical: 100), - child: MusicPlayerView(), + child: FittedBox( + fit: BoxFit.scaleDown, + child: Padding( + padding: EdgeInsets.symmetric(horizontal: 80, vertical: 100), + child: MusicPlayerView(), + ), ), ), Expanded( @@ -42,99 +45,107 @@ class MusicPlayerView extends StatelessWidget { child: Padding( padding: const EdgeInsets.all(10), child: Stack( - alignment: Alignment.center, children: [ - const MusicVisualizer(), - SizedBox( - height: 300, - width: 300, + Align( + alignment: Alignment.topLeft, child: DecoratedBox( - decoration: BoxDecoration( + decoration: const BoxDecoration( shape: BoxShape.circle, color: Colors.white, - boxShadow: [ - BoxShadow( - color: Colors.grey.withOpacity(0.5), - spreadRadius: 5, - blurRadius: 7, - offset: const Offset(0, 3), - ), - ], - ), - ), - ), - SizedBox( - height: 130, - width: 130, - child: DecoratedBox( - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.black.withOpacity(0.5), ), - child: const Center( - child: Icon( - Icons.pause, - size: 40, - color: Colors.white, + child: IconButton( + padding: const EdgeInsets.all(12), + onPressed: () {}, + iconSize: 16, + icon: Icon( + Icons.arrow_back_ios_new_rounded, + color: Colors.grey.shade800, ), ), ), ), Column( + mainAxisSize: MainAxisSize.min, children: [ - const SizedBox(height: 56), - const Expanded( - child: Center( - child: Row( - children: [ - Icon(Icons.first_page_rounded), - Spacer(), - Icon(Icons.last_page_rounded), - ], - ), - ), - ), Row( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - const Icon(Icons.shuffle), - Expanded( - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 20), + const Icon(Icons.first_page_rounded), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 40), + child: Stack( + alignment: Alignment.center, + children: [ + const MusicVisualizer(), + SizedBox( + height: 300, + width: 300, + child: DecoratedBox( + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.white, + boxShadow: [ + BoxShadow( + color: Colors.grey.withOpacity(0.5), + spreadRadius: 5, + blurRadius: 7, + offset: const Offset(0, 3), + ), + ], + ), + ), + ), + SizedBox( + height: 130, + width: 130, + child: DecoratedBox( + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black.withOpacity(0.5), + ), + child: const Center( + child: Icon( + Icons.pause, + size: 40, + color: Colors.white, + ), + ), + ), + ), + ], + ), + ), + const Icon(Icons.last_page_rounded), + ], + ), + const SizedBox(height: 40), + Flexible( + child: Row( + children: [ + const Icon(Icons.shuffle), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 10), child: Card( elevation: 0, color: Colors.transparent, - child: Slider( - inactiveColor: Colors.grey, - activeColor: Colors.red, - thumbColor: Colors.white, - value: 0, - onChanged: (_) {}, + child: SizedBox( + width: 360, + child: Slider( + inactiveColor: Colors.grey, + activeColor: Colors.red, + thumbColor: Colors.white, + value: 0, + onChanged: (_) {}, + ), ), ), ), - ), - const Icon(Icons.repeat_rounded), - ], - ), - ], - ), - Align( - alignment: Alignment.topLeft, - child: DecoratedBox( - decoration: const BoxDecoration( - shape: BoxShape.circle, - color: Colors.white, - ), - child: IconButton( - padding: const EdgeInsets.all(12), - onPressed: () {}, - iconSize: 16, - icon: Icon( - Icons.arrow_back_ios_new_rounded, - color: Colors.grey.shade800, + const Icon(Icons.repeat_rounded), + ], ), ), - ), + ], ), ], ), @@ -148,41 +159,45 @@ class MusicMenuView extends StatelessWidget { @override Widget build(BuildContext context) { - return Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - const Padding( - padding: EdgeInsets.only(bottom: 20), - child: _MusicMenuHeader(), - ), - Expanded( - child: ShaderMask( - shaderCallback: (bounds) => LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [ - Colors.white, - Colors.white, - Colors.white.withOpacity(0), - ], - stops: const [0, 0.8, 0.9], - ).createShader(bounds), - child: ListView.separated( - padding: const EdgeInsets.only(bottom: 100), - itemBuilder: (context, pos) => _MusicMenuItem( - title: _musicItems[pos]['title']!, - artist: _musicItems[pos]['artist']!, - trackPosition: pos + 1, - isPlaying: pos == 0, - ), - separatorBuilder: (_, __) => const Divider( - color: Colors.transparent, + return SingleChildScrollView( + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Padding( + padding: EdgeInsets.only(bottom: 20), + child: _MusicMenuHeader(), + ), + Flexible( + child: ShaderMask( + shaderCallback: (bounds) => LinearGradient( + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + colors: [ + Colors.white, + Colors.white, + Colors.white.withOpacity(0), + ], + stops: const [0, 0.8, 0.9], + ).createShader(bounds), + child: ListView.separated( + shrinkWrap: true, + padding: const EdgeInsets.only(bottom: 100), + itemBuilder: (context, pos) => _MusicMenuItem( + title: _musicItems[pos]['title']!, + artist: _musicItems[pos]['artist']!, + trackPosition: pos + 1, + isPlaying: pos == 0, + ), + separatorBuilder: (_, __) => const Divider( + color: Colors.transparent, + ), + itemCount: _musicItems.length, ), - itemCount: _musicItems.length, ), ), - ) - ], + ], + ), ); } } @@ -211,6 +226,7 @@ class _MusicMenuHeader extends StatelessWidget { fontWeight: FontWeight.w600, height: 1, ), + overflow: TextOverflow.ellipsis, ), const SizedBox(height: 10), Text( @@ -261,10 +277,12 @@ class _MusicMenuItem extends StatelessWidget { Text( title, style: const TextStyle(fontWeight: FontWeight.bold), + overflow: TextOverflow.ellipsis, ), Text( artist, style: const TextStyle(color: Colors.grey), + overflow: TextOverflow.ellipsis, ), ], ), diff --git a/lib/overview/view/overview_page.dart b/lib/overview/view/overview_page.dart index 2f4023b..c3f8dab 100644 --- a/lib/overview/view/overview_page.dart +++ b/lib/overview/view/overview_page.dart @@ -11,18 +11,21 @@ class OverviewPage extends StatelessWidget { padding: const EdgeInsets.symmetric( vertical: 20, ), - child: Stack( - children: [ - Row( + child: LayoutBuilder( + builder: (context, constraints) { + final isWide = constraints.maxWidth > 800; + + return Row( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - const Expanded( - flex: 5, - child: Padding( - padding: EdgeInsets.only(left: 80), - child: AirplaneImage(), + if (isWide) + const Expanded( + flex: 5, + child: Padding( + padding: EdgeInsets.only(left: 80), + child: AirplaneImage(), + ), ), - ), const SizedBox(width: 60), Expanded( flex: 4, @@ -42,25 +45,8 @@ class OverviewPage extends StatelessWidget { ), ), ], - ), - Positioned( - left: 75, - bottom: 50, - child: DecoratedBox( - decoration: const BoxDecoration( - shape: BoxShape.circle, - color: Colors.white, - ), - child: Padding( - padding: const EdgeInsets.all(10), - child: Icon( - Icons.video_camera_back_outlined, - color: Colors.grey.shade800, - ), - ), - ), - ) - ], + ); + }, ), ); } @@ -78,11 +64,13 @@ class WelcomeCopy extends StatelessWidget { const SizedBox(height: 50), Text( l10n.welcomeMessage, + maxLines: 2, style: const TextStyle( fontSize: 60, fontWeight: FontWeight.w600, height: 1, ), + overflow: TextOverflow.ellipsis, ), const SizedBox(height: 10), Text( diff --git a/lib/thumbnail/view/airplane_entertainment_system_thumbnail.dart b/lib/thumbnail/view/airplane_entertainment_system_thumbnail.dart index ab7cd99..2efc36b 100644 --- a/lib/thumbnail/view/airplane_entertainment_system_thumbnail.dart +++ b/lib/thumbnail/view/airplane_entertainment_system_thumbnail.dart @@ -1,4 +1,4 @@ -import 'package:airplane_entertainment_system/demo/demo.dart'; +import 'package:airplane_entertainment_system/airplane_entertainment_system/airplane_entertainment_system.dart'; import 'package:airplane_entertainment_system/overview/overview.dart'; import 'package:flutter/material.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index 68131df..fa5986b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ name: airplane_entertainment_system -description: Airplane Entertainment System demo project. +description: Airplane Entertainment System project. version: 1.0.0+1 publish_to: none diff --git a/test/src/demo/view/airplane_entertainment_system_demo_test.dart b/test/airplane_entertainment_system/view/airplane_entertainment_system_screen_test.dart similarity index 80% rename from test/src/demo/view/airplane_entertainment_system_demo_test.dart rename to test/airplane_entertainment_system/view/airplane_entertainment_system_screen_test.dart index d0851c6..6e0375e 100644 --- a/test/src/demo/view/airplane_entertainment_system_demo_test.dart +++ b/test/airplane_entertainment_system/view/airplane_entertainment_system_screen_test.dart @@ -1,38 +1,38 @@ -import 'package:airplane_entertainment_system/demo/demo.dart'; +import 'package:airplane_entertainment_system/airplane_entertainment_system/airplane_entertainment_system.dart'; import 'package:airplane_entertainment_system/music_player/music_player.dart'; import 'package:airplane_entertainment_system/overview/overview.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import '../../../helpers/helpers.dart'; +import '../../helpers/helpers.dart'; void main() { - group('AirplaneEntertainmentSystemDemo', () { + group('AirplaneEntertainmentSystemScreen', () { testWidgets('shows LeftSideNavigationRail', (tester) async { - await tester.pumpExperience(const AirplaneEntertainmentSystemDemo()); + await tester.pumpExperience(const AirplaneEntertainmentSystemScreen()); expect(find.byType(LeftSideNavigationRail), findsOneWidget); }); testWidgets('shows TopButtonBar', (tester) async { - await tester.pumpExperience(const AirplaneEntertainmentSystemDemo()); + await tester.pumpExperience(const AirplaneEntertainmentSystemScreen()); expect(find.byType(TopButtonBar), findsOneWidget); }); testWidgets('contains background', (tester) async { - await tester.pumpExperience(const AirplaneEntertainmentSystemDemo()); + await tester.pumpExperience(const AirplaneEntertainmentSystemScreen()); - expect(find.byType(DemoBackground), findsOneWidget); + expect(find.byType(SystemBackground), findsOneWidget); }); testWidgets('shows OverviewPage initially', (tester) async { - await tester.pumpExperience(const AirplaneEntertainmentSystemDemo()); + await tester.pumpExperience(const AirplaneEntertainmentSystemScreen()); expect(find.byType(OverviewPage), findsOneWidget); }); testWidgets('shows MusicPlayerPage when icon is selected', (tester) async { - await tester.pumpExperience(const AirplaneEntertainmentSystemDemo()); + await tester.pumpExperience(const AirplaneEntertainmentSystemScreen()); await tester.tap(find.byIcon(Icons.headphones)); await tester.pump(); @@ -42,12 +42,12 @@ void main() { }); testWidgets('shows OverviewPage when icon is selected', (tester) async { - await tester.pumpExperience(const AirplaneEntertainmentSystemDemo()); + await tester.pumpExperience(const AirplaneEntertainmentSystemScreen()); await tester.tap(find.byIcon(Icons.headphones)); await tester.pump(const Duration(milliseconds: 600)); - await tester.tap(find.byIcon(Icons.airplanemode_active)); + await tester.tap(find.byIcon(Icons.airplanemode_active_outlined)); await tester.pump(const Duration(milliseconds: 600)); expect(find.byType(OverviewPage), findsOneWidget); diff --git a/test/src/demo/widgets/left_side_navigation_rail_test.dart b/test/airplane_entertainment_system/widgets/left_side_navigation_rail_test.dart similarity index 69% rename from test/src/demo/widgets/left_side_navigation_rail_test.dart rename to test/airplane_entertainment_system/widgets/left_side_navigation_rail_test.dart index 0c93094..ccb5701 100644 --- a/test/src/demo/widgets/left_side_navigation_rail_test.dart +++ b/test/airplane_entertainment_system/widgets/left_side_navigation_rail_test.dart @@ -1,4 +1,4 @@ -import 'package:airplane_entertainment_system/demo/demo.dart'; +import 'package:airplane_entertainment_system/airplane_entertainment_system/airplane_entertainment_system.dart'; import 'package:flutter_test/flutter_test.dart'; void main() { diff --git a/test/src/demo/widgets/movie_card_test.dart b/test/airplane_entertainment_system/widgets/movie_card_test.dart similarity index 100% rename from test/src/demo/widgets/movie_card_test.dart rename to test/airplane_entertainment_system/widgets/movie_card_test.dart diff --git a/test/src/demo/widgets/music_card_test.dart b/test/airplane_entertainment_system/widgets/music_card_test.dart similarity index 100% rename from test/src/demo/widgets/music_card_test.dart rename to test/airplane_entertainment_system/widgets/music_card_test.dart diff --git a/test/src/demo/widgets/top_button_bar_test.dart b/test/airplane_entertainment_system/widgets/top_button_bar_test.dart similarity index 89% rename from test/src/demo/widgets/top_button_bar_test.dart rename to test/airplane_entertainment_system/widgets/top_button_bar_test.dart index 6bf2498..5f535c2 100644 --- a/test/src/demo/widgets/top_button_bar_test.dart +++ b/test/airplane_entertainment_system/widgets/top_button_bar_test.dart @@ -1,8 +1,8 @@ -import 'package:airplane_entertainment_system/demo/demo.dart'; +import 'package:airplane_entertainment_system/airplane_entertainment_system/airplane_entertainment_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import '../../../helpers/helpers.dart'; +import '../../helpers/helpers.dart'; void main() { group('TopButtonBar', () { diff --git a/test/src/music_player/view/music_player_page_test.dart b/test/music_player/view/music_player_page_test.dart similarity index 96% rename from test/src/music_player/view/music_player_page_test.dart rename to test/music_player/view/music_player_page_test.dart index 08a00be..78f2f79 100644 --- a/test/src/music_player/view/music_player_page_test.dart +++ b/test/music_player/view/music_player_page_test.dart @@ -2,7 +2,7 @@ import 'package:airplane_entertainment_system/music_player/view/view.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import '../../../helpers/pump_experience.dart'; +import '../../helpers/pump_experience.dart'; void main() { group('MusicPlayerPage', () { diff --git a/test/src/music_player/widgets/music_visualizer_test.dart b/test/music_player/widgets/music_visualizer_test.dart similarity index 100% rename from test/src/music_player/widgets/music_visualizer_test.dart rename to test/music_player/widgets/music_visualizer_test.dart diff --git a/test/src/overview/view/overview_page_test.dart b/test/overview/view/overview_page_test.dart similarity index 95% rename from test/src/overview/view/overview_page_test.dart rename to test/overview/view/overview_page_test.dart index 3602462..b2f4e69 100644 --- a/test/src/overview/view/overview_page_test.dart +++ b/test/overview/view/overview_page_test.dart @@ -2,7 +2,7 @@ import 'package:airplane_entertainment_system/overview/overview.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import '../../../helpers/helpers.dart'; +import '../../helpers/helpers.dart'; void main() { group('OverviewPage', () { diff --git a/test/thumbnail/airplane_entertainment_system_thumbnail_test.dart b/test/thumbnail/airplane_entertainment_system_thumbnail_test.dart index 4eb48c4..1606de4 100644 --- a/test/thumbnail/airplane_entertainment_system_thumbnail_test.dart +++ b/test/thumbnail/airplane_entertainment_system_thumbnail_test.dart @@ -1,4 +1,4 @@ -import 'package:airplane_entertainment_system/demo/demo.dart'; +import 'package:airplane_entertainment_system/airplane_entertainment_system/airplane_entertainment_system.dart'; import 'package:airplane_entertainment_system/overview/overview.dart'; import 'package:airplane_entertainment_system/thumbnail/thumbnail.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/web/index.html b/web/index.html index c974ede..fd33577 100644 --- a/web/index.html +++ b/web/index.html @@ -18,7 +18,7 @@ - + diff --git a/web/manifest.json b/web/manifest.json index 10ce84c..e1d3393 100644 --- a/web/manifest.json +++ b/web/manifest.json @@ -5,7 +5,7 @@ "display": "standalone", "background_color": "#0175C2", "theme_color": "#0175C2", - "description": "Airplane Entertainment System demo project.", + "description": "Airplane Entertainment System project.", "orientation": "portrait-primary", "prefer_related_applications": false, "icons": [