msb-public
/
samples
mirror of https://github.com/flutter/samples.git
1
0
Code Issues Projects Releases Wiki Activity

gemini ran ci

Browse Source
pull/2701/head
Eric Windmill 1 month ago
parent 535a71c6b1
commit a94af64678
188 changed files with 1955 additions and 2233 deletions
Show Stats Download Patch File Download Diff File

0
.gemini/RELEASE.md
Unescape View File

26
.github/workflows/beta.yml vendored
Unescape View File

@ -38,19 +38,19 @@ jobs:
# Verify the Android add-to-app samples build and pass tests with the beta # Verify the Android add-to-app samples build and pass tests with the beta
# channel. # channel.
# android-build: android-build:
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# if: github.repository == 'flutter/samples' if: github.repository == 'flutter/samples'
# steps: steps:
# - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
# - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
# with: with:
# distribution: 'zulu' distribution: 'zulu'
# java-version: '17' java-version: '17'
# - uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 - uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046
# with: with:
# channel: beta channel: beta
# - run: ./tool/android_ci_script.sh - run: ./tool/android_ci_script.sh
# Verify the iOS add-to-app samples build and pass tests with the beta # Verify the iOS add-to-app samples build and pass tests with the beta
# channel. # channel.

28
.github/workflows/main.yml vendored
Unescape View File

@ -24,7 +24,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
flutter_version: [stable, beta, master] flutter_version: [stable]
os: [ubuntu-latest, macos-latest, windows-latest] os: [ubuntu-latest, macos-latest, windows-latest]
steps: steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@ -37,19 +37,19 @@ jobs:
channel: ${{ matrix.flutter_version }} channel: ${{ matrix.flutter_version }}
- run: ./tool/flutter_ci_script_${{ matrix.flutter_version }}.sh - run: ./tool/flutter_ci_script_${{ matrix.flutter_version }}.sh
# android-build: android-build:
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# if: github.repository == 'flutter/samples' if: github.repository == 'flutter/samples'
# steps: steps:
# - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
# - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00
# with: with:
# distribution: 'zulu' distribution: 'zulu'
# java-version: '17' java-version: '17'
# - uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046 - uses: subosito/flutter-action@e938fdf56512cc96ef2f93601a5a40bde3801046
# with: with:
# channel: stable channel: stable
# - run: ./tool/android_ci_script.sh - run: ./tool/android_ci_script.sh
ios-build: ios-build:
runs-on: macos-latest runs-on: macos-latest

22
add_to_app/android_view/flutter_module_using_plugin/lib/cell.dart
Unescape View File

@ -112,22 +112,22 @@ class _CellState extends State<Cell> with WidgetsBindingObserver {
child: StreamBuilder<AccelerometerEvent>( child: StreamBuilder<AccelerometerEvent>(
// Don't continuously rebuild for nothing when the // Don't continuously rebuild for nothing when the
// cell isn't visible. // cell isn't visible.
stream: stream: appLifecycleState == AppLifecycleState.resumed
appLifecycleState == AppLifecycleState.resumed ? accelerometerEventStream()
? accelerometerEventStream() : Stream.value(defaultPosition),
: Stream.value(defaultPosition),
initialData: defaultPosition, initialData: defaultPosition,
builder: (context, snapshot) { builder: (context, snapshot) {
return Transform( return Transform(
// Figure out the phone's orientation relative // Figure out the phone's orientation relative
// to gravity's direction. Ignore the z vector. // to gravity's direction. Ignore the z vector.
transform: Matrix4.rotationX( transform:
snapshot.data!.y / gravity * pi / 2, Matrix4.rotationX(
)..multiply( snapshot.data!.y / gravity * pi / 2,
Matrix4.rotationY( )..multiply(
snapshot.data!.x / gravity * pi / 2, Matrix4.rotationY(
), snapshot.data!.x / gravity * pi / 2,
), ),
),
alignment: Alignment.center, alignment: Alignment.center,
child: const FlutterLogo(size: 72), child: const FlutterLogo(size: 72),
); );

6
add_to_app/android_view/flutter_module_using_plugin/pubspec.yaml
Unescape View File

@ -4,13 +4,13 @@ description: An example Flutter module that uses a plugin.
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ^3.7.0-0 sdk: '>=3.9.0-0 <4.0.0'
dependencies: dependencies:
flutter: flutter:
sdk: flutter sdk: flutter
provider: ^6.0.2 provider: ^6.1.5
url_launcher: ^6.0.20 url_launcher: ^6.3.2
sensors_plus: ^5.0.1 sensors_plus: ^5.0.1
dev_dependencies: dev_dependencies:

36
add_to_app/books/flutter_module_books/lib/main.dart
Unescape View File

@ -125,28 +125,26 @@ class _BookDetailState extends State<BookDetail> {
IconButton( IconButton(
icon: const Icon(Icons.check), icon: const Icon(Icons.check),
// Pressing save sends the updated book to the platform. // Pressing save sends the updated book to the platform.
onPressed: onPressed: book != null
book != null ? () {
? () { hostApi.finishEditingBook(book!);
hostApi.finishEditingBook(book!); clear();
clear(); }
} : null,
: null,
), ),
], ],
), ),
body: body: book == null
book == null // Draw a spinner until the platform gives us the book to show details
// Draw a spinner until the platform gives us the book to show details // for.
// for. ? const Center(child: CircularProgressIndicator())
? const Center(child: CircularProgressIndicator()) : BookForm(
: BookForm( book: book!,
book: book!, focusNode: textFocusNode,
focusNode: textFocusNode, authorTextController: authorTextController,
authorTextController: authorTextController, subtitleTextController: subtitleTextController,
subtitleTextController: subtitleTextController, titleTextController: titleTextController,
titleTextController: titleTextController, ),
),
); );
} }
} }

2
add_to_app/books/flutter_module_books/pubspec.yaml
Unescape View File

@ -6,7 +6,7 @@ description: A Flutter module using the Pigeon package to demonstrate
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ^3.7.0-0 sdk: '>=3.9.0-0 <4.0.0'
dependencies: dependencies:
flutter: flutter:

4
add_to_app/books/flutter_module_books/test/widget_test.dart
Unescape View File

@ -24,7 +24,9 @@ void main() {
MockHostBookApi mockHostApi = MockHostBookApi(); MockHostBookApi mockHostApi = MockHostBookApi();
await tester.pumpWidget( await tester.pumpWidget(
MaterialApp(home: BookDetail(book: Book(), hostApi: mockHostApi)), MaterialApp(
home: BookDetail(book: Book(), hostApi: mockHostApi),
),
); );
await tester.tap(find.byIcon(Icons.check)); await tester.tap(find.byIcon(Icons.check));

2
add_to_app/fullscreen/flutter_module/pubspec.yaml
Unescape View File

@ -4,7 +4,7 @@ description: An example Flutter module.
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ^3.7.0-0 sdk: '>=3.9.0-0 <4.0.0'
dependencies: dependencies:
flutter: flutter:

2
add_to_app/multiple_flutters/multiple_flutters_module/pubspec.yaml
Unescape View File

@ -4,7 +4,7 @@ description: A module that is embedded in the multiple_flutters_ios and multiple
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ^3.7.0-0 sdk: '>=3.9.0-0 <4.0.0'
dependencies: dependencies:
flutter: flutter:

18
add_to_app/plugin/flutter_module_using_plugin/lib/cell.dart
Unescape View File

@ -112,10 +112,9 @@ class _CellState extends State<Cell> with WidgetsBindingObserver {
child: StreamBuilder<AccelerometerEvent>( child: StreamBuilder<AccelerometerEvent>(
// Don't continuously rebuild for nothing when the // Don't continuously rebuild for nothing when the
// cell isn't visible. // cell isn't visible.
stream: stream: appLifecycleState == AppLifecycleState.resumed
appLifecycleState == AppLifecycleState.resumed ? accelerometerEventStream()
? accelerometerEventStream() : Stream.value(defaultPosition),
: Stream.value(defaultPosition),
initialData: defaultPosition, initialData: defaultPosition,
builder: (context, snapshot) { builder: (context, snapshot) {
final data = snapshot.data; final data = snapshot.data;
@ -125,11 +124,12 @@ class _CellState extends State<Cell> with WidgetsBindingObserver {
return Transform( return Transform(
// Figure out the phone's orientation relative // Figure out the phone's orientation relative
// to gravity's direction. Ignore the z vector. // to gravity's direction. Ignore the z vector.
transform: Matrix4.rotationX( transform:
data.y / gravity * pi / 2, Matrix4.rotationX(
)..multiply( data.y / gravity * pi / 2,
Matrix4.rotationY(data.x / gravity * pi / 2), )..multiply(
), Matrix4.rotationY(data.x / gravity * pi / 2),
),
alignment: Alignment.center, alignment: Alignment.center,
child: const FlutterLogo(size: 72), child: const FlutterLogo(size: 72),
); );

2
add_to_app/plugin/flutter_module_using_plugin/pubspec.yaml
Unescape View File

@ -4,7 +4,7 @@ description: An example Flutter module that uses a plugin.
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ^3.7.0-0 sdk: '>=3.9.0-0 <4.0.0'
dependencies: dependencies:
flutter: flutter:

2
add_to_app/prebuilt_module/flutter_module/pubspec.yaml
Unescape View File

@ -4,7 +4,7 @@ description: An example Flutter module.
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ^3.7.0-0 sdk: '>=3.9.0-0 <4.0.0'
dependencies: dependencies:
flutter: flutter:

2
analysis_defaults/pubspec.yaml
Unescape View File

@ -3,7 +3,7 @@ description: Analysis defaults for flutter/samples
publish_to: none publish_to: none
environment: environment:
sdk: ^3.7.0-0 sdk: '>=3.9.0-0 <4.0.0'
# NOTE: Code is not allowed in this package. Do not add more dependencies. # NOTE: Code is not allowed in this package. Do not add more dependencies.
# The `flutter_lints` dependency is required for `lib/flutter.yaml`. # The `flutter_lints` dependency is required for `lib/flutter.yaml`.

2
android_splash_screen/pubspec.yaml
Unescape View File

@ -6,7 +6,7 @@ publish_to: "none"
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ^3.7.0-0 sdk: '>=3.9.0-0 <4.0.0'
dependencies: dependencies:
flutter: flutter:

15
animations/lib/src/basics/fade_transition.dart
Unescape View File

@ -53,14 +53,13 @@ class _FadeTransitionDemoState extends State<FadeTransitionDemo>
), ),
ElevatedButton( ElevatedButton(
child: const Text('animate'), child: const Text('animate'),
onPressed: onPressed: () => setState(() {
() => setState(() { _controller
_controller .animateTo(1.0)
.animateTo(1.0) .then<TickerFuture>(
.then<TickerFuture>( (value) => _controller.animateBack(0.0),
(value) => _controller.animateBack(0.0), );
); }),
}),
), ),
], ],
), ),

15
animations/lib/src/misc/animated_positioned.dart
Unescape View File

@ -54,12 +54,10 @@ class _AnimatedPositionedDemoState extends State<AnimatedPositionedDemo> {
left: leftPosition, left: leftPosition,
duration: const Duration(seconds: 1), duration: const Duration(seconds: 1),
child: InkWell( child: InkWell(
onTap: onTap: () => changePosition(
() => changePosition( size.height - (appBar.preferredSize.height + topPadding + 50),
size.height - size.width - 150,
(appBar.preferredSize.height + topPadding + 50), ),
size.width - 150,
),
child: Container( child: Container(
alignment: Alignment.center, alignment: Alignment.center,
width: 150, width: 150,
@ -68,8 +66,9 @@ class _AnimatedPositionedDemoState extends State<AnimatedPositionedDemo> {
child: Text( child: Text(
'Click Me', 'Click Me',
style: TextStyle( style: TextStyle(
color: color: Theme.of(
Theme.of(context).buttonTheme.colorScheme!.onPrimary, context,
).buttonTheme.colorScheme!.onPrimary,
), ),
), ),
), ),

9
animations/lib/src/misc/animated_switcher.dart
Unescape View File

@ -48,8 +48,8 @@ class _AnimatedSwitcherDemoState extends State<AnimatedSwitcherDemo> {
title: const Text('AnimatedSwitcher'), title: const Text('AnimatedSwitcher'),
actions: [ actions: [
TextButton( TextButton(
onPressed: onPressed: () =>
() => setState(() => container = generateContainer(++keyCount)), setState(() => container = generateContainer(++keyCount)),
child: const Text('Change Widget'), child: const Text('Change Widget'),
), ),
], ],
@ -61,9 +61,8 @@ class _AnimatedSwitcherDemoState extends State<AnimatedSwitcherDemo> {
child: AnimatedSwitcher( child: AnimatedSwitcher(
duration: const Duration(seconds: 1), duration: const Duration(seconds: 1),
child: container, child: container,
transitionBuilder: transitionBuilder: (child, animation) =>
(child, animation) => ScaleTransition(scale: animation, child: child),
ScaleTransition(scale: animation, child: child),
), ),
), ),
); );

45
animations/lib/src/misc/carousel.dart
Unescape View File

@ -15,8 +15,9 @@ class CarouselDemo extends StatelessWidget {
'assets/eat_sydney_sm.jpg', 'assets/eat_sydney_sm.jpg',
]; ];
final List<Widget> images = final List<Widget> images = fileNames
fileNames.map((file) => Image.asset(file, fit: BoxFit.cover)).toList(); .map((file) => Image.asset(file, fit: BoxFit.cover))
.toList();
@override @override
Widget build(context) { Widget build(context) {
@ -79,27 +80,25 @@ class _CarouselState extends State<Carousel> {
scrollBehavior: ScrollConfiguration.of(context).copyWith( scrollBehavior: ScrollConfiguration.of(context).copyWith(
dragDevices: {ui.PointerDeviceKind.touch, ui.PointerDeviceKind.mouse}, dragDevices: {ui.PointerDeviceKind.touch, ui.PointerDeviceKind.mouse},
), ),
itemBuilder: itemBuilder: (context, index) => AnimatedBuilder(
(context, index) => AnimatedBuilder( animation: _controller,
animation: _controller, builder: (context, child) {
builder: (context, child) { var result = _pageHasChanged ? _controller.page! : _currentPage * 1.0;
var result =
_pageHasChanged ? _controller.page! : _currentPage * 1.0; // The horizontal position of the page between a 1 and 0
var value = result - index;
// The horizontal position of the page between a 1 and 0 value = (1 - (value.abs() * .5)).clamp(0.0, 1.0);
var value = result - index;
value = (1 - (value.abs() * .5)).clamp(0.0, 1.0); return Center(
child: SizedBox(
return Center( height: Curves.easeOut.transform(value) * size.height,
child: SizedBox( width: Curves.easeOut.transform(value) * size.width,
height: Curves.easeOut.transform(value) * size.height, child: child,
width: Curves.easeOut.transform(value) * size.width, ),
child: child, );
), },
); child: widget.itemBuilder(context, index),
}, ),
child: widget.itemBuilder(context, index),
),
); );
} }

26
animations/lib/src/misc/curved_animation.dart
Unescape View File

@ -91,13 +91,12 @@ class _CurvedAnimationDemoState extends State<CurvedAnimationDemo>
style: Theme.of(context).textTheme.titleLarge, style: Theme.of(context).textTheme.titleLarge,
), ),
DropdownButton<CurveChoice>( DropdownButton<CurveChoice>(
items: items: curves.map((curve) {
curves.map((curve) { return DropdownMenuItem<CurveChoice>(
return DropdownMenuItem<CurveChoice>( value: curve,
value: curve, child: Text(curve.name),
child: Text(curve.name), );
); }).toList(),
}).toList(),
onChanged: (newCurve) { onChanged: (newCurve) {
if (newCurve != null) { if (newCurve != null) {
setState(() { setState(() {
@ -114,13 +113,12 @@ class _CurvedAnimationDemoState extends State<CurvedAnimationDemo>
style: Theme.of(context).textTheme.titleLarge, style: Theme.of(context).textTheme.titleLarge,
), ),
DropdownButton<CurveChoice>( DropdownButton<CurveChoice>(
items: items: curves.map((curve) {
curves.map((curve) { return DropdownMenuItem<CurveChoice>(
return DropdownMenuItem<CurveChoice>( value: curve,
value: curve, child: Text(curve.name),
child: Text(curve.name), );
); }).toList(),
}).toList(),
onChanged: (newCurve) { onChanged: (newCurve) {
if (newCurve != null) { if (newCurve != null) {
setState(() { setState(() {

32
animations/lib/src/misc/expand_card.dart
Unescape View File

@ -52,26 +52,24 @@ class _ExpandCardState extends State<ExpandCard>
duration: duration, duration: duration,
firstCurve: Curves.easeInOutCubic, firstCurve: Curves.easeInOutCubic,
secondCurve: Curves.easeInOutCubic, secondCurve: Curves.easeInOutCubic,
crossFadeState: crossFadeState: selected
selected ? CrossFadeState.showSecond
? CrossFadeState.showSecond : CrossFadeState.showFirst,
: CrossFadeState.showFirst,
// Use Positioned.fill() to pass the constraints to its children. // Use Positioned.fill() to pass the constraints to its children.
// This allows the Images to use BoxFit.cover to cover the correct // This allows the Images to use BoxFit.cover to cover the correct
// size // size
layoutBuilder: ( layoutBuilder:
topChild, (topChild, topChildKey, bottomChild, bottomChildKey) {
topChildKey, return Stack(
bottomChild, children: [
bottomChildKey, Positioned.fill(
) { key: bottomChildKey,
return Stack( child: bottomChild,
children: [ ),
Positioned.fill(key: bottomChildKey, child: bottomChild), Positioned.fill(key: topChildKey, child: topChild),
Positioned.fill(key: topChildKey, child: topChild), ],
], );
); },
},
firstChild: Image.asset( firstChild: Image.asset(
'assets/eat_cape_town_sm.jpg', 'assets/eat_cape_town_sm.jpg',
fit: BoxFit.cover, fit: BoxFit.cover,

29
animations/lib/src/misc/flutter_animate.dart
Unescape View File

@ -18,20 +18,21 @@ class FlutterAnimateDemo extends StatelessWidget {
body: Center( body: Center(
child: Padding( child: Padding(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
child: Text( child:
"Hello Flutter Animate", Text(
style: Theme.of(context).textTheme.headlineLarge, "Hello Flutter Animate",
) style: Theme.of(context).textTheme.headlineLarge,
.animate(onPlay: (controller) => controller.repeat()) )
.then(delay: 250.ms) .animate(onPlay: (controller) => controller.repeat())
.fadeIn(duration: 500.ms) .then(delay: 250.ms)
.then(delay: 250.ms) .fadeIn(duration: 500.ms)
.shimmer(duration: 400.ms) .then(delay: 250.ms)
.then(delay: 250.ms) .shimmer(duration: 400.ms)
.slide() .then(delay: 250.ms)
.then(delay: 250.ms) .slide()
.blur(duration: 500.ms) .then(delay: 250.ms)
.then(delay: 100.ms), .blur(duration: 500.ms)
.then(delay: 100.ms),
), ),
), ),
); );

4
animations/lib/src/misc/focus_image.dart
Unescape View File

@ -31,8 +31,8 @@ class Grid extends StatelessWidget {
return (index >= 20) return (index >= 20)
? const SmallCard(imageAssetName: 'assets/eat_cape_town_sm.jpg') ? const SmallCard(imageAssetName: 'assets/eat_cape_town_sm.jpg')
: const SmallCard( : const SmallCard(
imageAssetName: 'assets/eat_new_orleans_sm.jpg', imageAssetName: 'assets/eat_new_orleans_sm.jpg',
); );
}, },
), ),
); );

7
animations/lib/src/misc/hero_animation.dart
Unescape View File

@ -17,10 +17,9 @@ class HeroAnimationDemo extends StatelessWidget {
tag: 'hero-page-child', tag: 'hero-page-child',
child: _createHeroContainer(size: 50.0, color: Colors.grey.shade300), child: _createHeroContainer(size: 50.0, color: Colors.grey.shade300),
), ),
onTap: onTap: () => Navigator.of(
() => Navigator.of(context).push<void>( context,
MaterialPageRoute(builder: (context) => const HeroPage()), ).push<void>(MaterialPageRoute(builder: (context) => const HeroPage())),
),
), ),
); );
} }

23
animations/lib/src/misc/physics_card_drag.dart
Unescape View File

@ -92,17 +92,18 @@ class _DraggableCardState extends State<DraggableCard>
final size = MediaQuery.of(context).size; final size = MediaQuery.of(context).size;
return GestureDetector( return GestureDetector(
onPanStart: (details) => _controller.stop(canceled: true), onPanStart: (details) => _controller.stop(canceled: true),
onPanUpdate: onPanUpdate: (details) => setState(
(details) => setState( () => _dragAlignment += Alignment(
() => details.delta.dx / (size.width / 2),
_dragAlignment += Alignment( details.delta.dy / (size.height / 2),
details.delta.dx / (size.width / 2), ),
details.delta.dy / (size.height / 2), ),
), onPanEnd: (details) =>
), _runAnimation(details.velocity.pixelsPerSecond, size),
onPanEnd: child: Align(
(details) => _runAnimation(details.velocity.pixelsPerSecond, size), alignment: _dragAlignment,
child: Align(alignment: _dragAlignment, child: Card(child: widget.child)), child: Card(child: widget.child),
),
); );
} }
} }

2
animations/pubspec.yaml
Unescape View File

@ -4,7 +4,7 @@ version: 1.0.0+1
publish_to: none publish_to: none
environment: environment:
sdk: ^3.7.0-0 sdk: '>=3.9.0-0 <4.0.0'
dependencies: dependencies:
flutter: flutter:

2
asset_transformation/grayscale_transformer/pubspec.yaml
Unescape View File

@ -3,7 +3,7 @@ description: A sample command-line application.
version: 1.0.0 version: 1.0.0
environment: environment:
sdk: ^3.7.0-0 sdk: '>=3.9.0-0 <4.0.0'
dependencies: dependencies:
args: ^2.4.2 args: ^2.4.2

2
asset_transformation/pubspec.yaml
Unescape View File

@ -4,7 +4,7 @@ publish_to: 'none'
version: 0.1.0 version: 0.1.0
environment: environment:
sdk: ^3.7.0-0 sdk: '>=3.9.0-0 <4.0.0'
dependencies: dependencies:
flutter: flutter:

9
background_isolate_channels/lib/main.dart
Unescape View File

@ -69,8 +69,8 @@ class _MyHomePageState extends State<MyHomePage> {
.then( .then(
(sharedPreferences) => sharedPreferences.setBool('isDebug', true), (sharedPreferences) => sharedPreferences.setBool('isDebug', true),
); );
final Future<Directory> tempDirFuture = final Future<Directory> tempDirFuture = path_provider
path_provider.getTemporaryDirectory(); .getTemporaryDirectory();
// Wait until the [SharedPreferences] value is set and the temporary // Wait until the [SharedPreferences] value is set and the temporary
// directory is received before opening the database. If // directory is received before opening the database. If
@ -130,8 +130,9 @@ class _MyHomePageState extends State<MyHomePage> {
padding: const EdgeInsets.symmetric(horizontal: 8.0), padding: const EdgeInsets.symmetric(horizontal: 8.0),
child: SearchBar( child: SearchBar(
hintText: 'Search', hintText: 'Search',
onChanged: onChanged: _database == null
_database == null ? null : (query) => _refresh(query: query), ? null
: (query) => _refresh(query: query),
trailing: const [Icon(Icons.search), SizedBox(width: 8)], trailing: const [Icon(Icons.search), SizedBox(width: 8)],
), ),
), ),

2
background_isolate_channels/pubspec.yaml
Unescape View File

@ -6,7 +6,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ^3.7.0-0 sdk: '>=3.9.0-0 <4.0.0'
dependencies: dependencies:
cupertino_icons: ^1.0.2 cupertino_icons: ^1.0.2

2
code_sharing/client/pubspec.yaml
Unescape View File

@ -4,7 +4,7 @@ publish_to: "none"
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ^3.7.0-0 sdk: '>=3.9.0-0 <4.0.0'
dependencies: dependencies:
cupertino_icons: ^1.0.2 cupertino_icons: ^1.0.2

7
code_sharing/server/bin/server.dart
Unescape View File

@ -9,10 +9,9 @@ import 'package:shelf_router/shelf_router.dart';
int count = 0; int count = 0;
// Configure routes. // Configure routes.
final _router = final _router = Router()
Router() ..post('/', _incrementHandler)
..post('/', _incrementHandler) ..get('/', _getValueHandler);
..get('/', _getValueHandler);
Future<Response> _incrementHandler(Request request) async { Future<Response> _incrementHandler(Request request) async {
final incr = Increment.fromJson(json.decode(await request.readAsString())); final incr = Increment.fromJson(json.decode(await request.readAsString()));

2
code_sharing/server/pubspec.yaml
Unescape View File

@ -4,7 +4,7 @@ version: 1.0.0
publish_to: "none" publish_to: "none"
environment: environment:
sdk: ^3.7.0-0 sdk: '>=3.9.0-0 <4.0.0'
dependencies: dependencies:
args: ^2.0.0 args: ^2.0.0

29
code_sharing/shared/lib/src/models.freezed.dart
Unescape View File

@ -52,11 +52,10 @@ class _$IncrementCopyWithImpl<$Res, $Val extends Increment>
$Res call({Object? by = null}) { $Res call({Object? by = null}) {
return _then( return _then(
_value.copyWith( _value.copyWith(
by: by: null == by
null == by ? _value.by
? _value.by : by // ignore: cast_nullable_to_non_nullable
: by // ignore: cast_nullable_to_non_nullable as int,
as int,
) )
as $Val, as $Val,
); );
@ -89,11 +88,10 @@ class __$$IncrementImplCopyWithImpl<$Res>
$Res call({Object? by = null}) { $Res call({Object? by = null}) {
return _then( return _then(
_$IncrementImpl( _$IncrementImpl(
by: by: null == by
null == by ? _value.by
? _value.by : by // ignore: cast_nullable_to_non_nullable
: by // ignore: cast_nullable_to_non_nullable as int,
as int,
), ),
); );
} }
@ -189,11 +187,10 @@ class _$CountCopyWithImpl<$Res, $Val extends Count>
$Res call({Object? value = null}) { $Res call({Object? value = null}) {
return _then( return _then(
_value.copyWith( _value.copyWith(
value: value: null == value
null == value ? _value.value
? _value.value : value // ignore: cast_nullable_to_non_nullable
: value // ignore: cast_nullable_to_non_nullable as int,
as int,
) )
as $Val, as $Val,
); );
@ -228,7 +225,7 @@ class __$$CountImplCopyWithImpl<$Res>
null == value null == value
? _value.value ? _value.value
: value // ignore: cast_nullable_to_non_nullable : value // ignore: cast_nullable_to_non_nullable
as int, as int,
), ),
); );
} }

2
code_sharing/shared/pubspec.yaml
Unescape View File

@ -3,7 +3,7 @@ description: Common data models required by our client and server
version: 1.0.0 version: 1.0.0
environment: environment:
sdk: ^3.7.0-0 sdk: '>=3.9.0-0 <4.0.0'
dependencies: dependencies:
freezed_annotation: ">=2.1.0 <4.0.0" freezed_annotation: ">=2.1.0 <4.0.0"

94
compass_app/app/lib/config/dependencies.dart
Unescape View File

@ -36,12 +36,11 @@ import '../domain/use_cases/booking/booking_share_use_case.dart';
List<SingleChildWidget> _sharedProviders = [ List<SingleChildWidget> _sharedProviders = [
Provider( Provider(
lazy: true, lazy: true,
create: create: (context) => BookingCreateUseCase(
(context) => BookingCreateUseCase( destinationRepository: context.read(),
destinationRepository: context.read(), activityRepository: context.read(),
activityRepository: context.read(), bookingRepository: context.read(),
bookingRepository: context.read(), ),
),
), ),
Provider( Provider(
lazy: true, lazy: true,
@ -57,46 +56,40 @@ List<SingleChildWidget> get providersRemote {
Provider(create: (context) => ApiClient()), Provider(create: (context) => ApiClient()),
Provider(create: (context) => SharedPreferencesService()), Provider(create: (context) => SharedPreferencesService()),
ChangeNotifierProvider( ChangeNotifierProvider(
create: create: (context) =>
(context) => AuthRepositoryRemote(
AuthRepositoryRemote( authApiClient: context.read(),
authApiClient: context.read(), apiClient: context.read(),
apiClient: context.read(), sharedPreferencesService: context.read(),
sharedPreferencesService: context.read(), )
) as AuthRepository,
as AuthRepository,
), ),
Provider( Provider(
create: create: (context) =>
(context) => DestinationRepositoryRemote(apiClient: context.read())
DestinationRepositoryRemote(apiClient: context.read()) as DestinationRepository,
as DestinationRepository,
), ),
Provider( Provider(
create: create: (context) =>
(context) => ContinentRepositoryRemote(apiClient: context.read())
ContinentRepositoryRemote(apiClient: context.read()) as ContinentRepository,
as ContinentRepository,
), ),
Provider( Provider(
create: create: (context) =>
(context) => ActivityRepositoryRemote(apiClient: context.read())
ActivityRepositoryRemote(apiClient: context.read()) as ActivityRepository,
as ActivityRepository,
), ),
Provider.value( Provider.value(
value: ItineraryConfigRepositoryMemory() as ItineraryConfigRepository, value: ItineraryConfigRepositoryMemory() as ItineraryConfigRepository,
), ),
Provider( Provider(
create: create: (context) =>
(context) => BookingRepositoryRemote(apiClient: context.read())
BookingRepositoryRemote(apiClient: context.read()) as BookingRepository,
as BookingRepository,
), ),
Provider( Provider(
create: create: (context) =>
(context) => UserRepositoryRemote(apiClient: context.read()) as UserRepository,
UserRepositoryRemote(apiClient: context.read()) as UserRepository,
), ),
..._sharedProviders, ..._sharedProviders,
]; ];
@ -110,37 +103,32 @@ List<SingleChildWidget> get providersLocal {
ChangeNotifierProvider.value(value: AuthRepositoryDev() as AuthRepository), ChangeNotifierProvider.value(value: AuthRepositoryDev() as AuthRepository),
Provider.value(value: LocalDataService()), Provider.value(value: LocalDataService()),
Provider( Provider(
create: create: (context) =>
(context) => DestinationRepositoryLocal(localDataService: context.read())
DestinationRepositoryLocal(localDataService: context.read()) as DestinationRepository,
as DestinationRepository,
), ),
Provider( Provider(
create: create: (context) =>
(context) => ContinentRepositoryLocal(localDataService: context.read())
ContinentRepositoryLocal(localDataService: context.read()) as ContinentRepository,
as ContinentRepository,
), ),
Provider( Provider(
create: create: (context) =>
(context) => ActivityRepositoryLocal(localDataService: context.read())
ActivityRepositoryLocal(localDataService: context.read()) as ActivityRepository,
as ActivityRepository,
), ),
Provider( Provider(
create: create: (context) =>
(context) => BookingRepositoryLocal(localDataService: context.read())
BookingRepositoryLocal(localDataService: context.read()) as BookingRepository,
as BookingRepository,
), ),
Provider.value( Provider.value(
value: ItineraryConfigRepositoryMemory() as ItineraryConfigRepository, value: ItineraryConfigRepositoryMemory() as ItineraryConfigRepository,
), ),
Provider( Provider(
create: create: (context) =>
(context) => UserRepositoryLocal(localDataService: context.read())
UserRepositoryLocal(localDataService: context.read()) as UserRepository,
as UserRepository,
), ),
..._sharedProviders, ..._sharedProviders,
]; ];

7
compass_app/app/lib/data/repositories/activity/activity_repository_local.dart
Unescape View File

@ -18,10 +18,9 @@ class ActivityRepositoryLocal implements ActivityRepository {
@override @override
Future<Result<List<Activity>>> getByDestination(String ref) async { Future<Result<List<Activity>>> getByDestination(String ref) async {
try { try {
final activities = final activities = (await _localDataService.getActivities())
(await _localDataService.getActivities()) .where((activity) => activity.destinationRef == ref)
.where((activity) => activity.destinationRef == ref) .toList();
.toList();
return Result.ok(activities); return Result.ok(activities);
} on Exception catch (error) { } on Exception catch (error) {

9
compass_app/app/lib/data/repositories/booking/booking_repository_local.dart
Unescape View File

@ -68,11 +68,10 @@ class BookingRepositoryLocal implements BookingRepository {
// create a default booking the first time // create a default booking the first time
if (_bookings.isEmpty) { if (_bookings.isEmpty) {
final destination = (await _localDataService.getDestinations()).first; final destination = (await _localDataService.getDestinations()).first;
final activities = final activities = (await _localDataService.getActivities())
(await _localDataService.getActivities()) .where((activity) => activity.destinationRef == destination.ref)
.where((activity) => activity.destinationRef == destination.ref) .take(4)
.take(4) .toList();
.toList();
_bookings.add( _bookings.add(
Booking( Booking(

12
compass_app/app/lib/data/repositories/booking/booking_repository_remote.dart
Unescape View File

@ -27,8 +27,9 @@ class BookingRepositoryRemote implements BookingRepository {
endDate: booking.endDate, endDate: booking.endDate,
name: '${booking.destination.name}, ${booking.destination.continent}', name: '${booking.destination.name}, ${booking.destination.continent}',
destinationRef: booking.destination.ref, destinationRef: booking.destination.ref,
activitiesRef: activitiesRef: booking.activity
booking.activity.map((activity) => activity.ref).toList(), .map((activity) => activity.ref)
.toList(),
); );
return _apiClient.postBooking(bookingApiModel); return _apiClient.postBooking(bookingApiModel);
} on Exception catch (e) { } on Exception catch (e) {
@ -72,10 +73,9 @@ class BookingRepositoryRemote implements BookingRepository {
return Result.error(resultActivities.error); return Result.error(resultActivities.error);
case Ok<List<Activity>>(): case Ok<List<Activity>>():
} }
final activities = final activities = resultActivities.value
resultActivities.value .where((activity) => booking.activitiesRef.contains(activity.ref))
.where((activity) => booking.activitiesRef.contains(activity.ref)) .toList();
.toList();
return Result.ok( return Result.ok(
Booking( Booking(

10
compass_app/app/lib/data/services/api/api_client.dart
Unescape View File

@ -95,8 +95,9 @@ class ApiClient {
if (response.statusCode == 200) { if (response.statusCode == 200) {
final stringData = await response.transform(utf8.decoder).join(); final stringData = await response.transform(utf8.decoder).join();
final json = jsonDecode(stringData) as List<dynamic>; final json = jsonDecode(stringData) as List<dynamic>;
final activities = final activities = json
json.map((element) => Activity.fromJson(element)).toList(); .map((element) => Activity.fromJson(element))
.toList();
return Result.ok(activities); return Result.ok(activities);
} else { } else {
return const Result.error(HttpException("Invalid response")); return const Result.error(HttpException("Invalid response"));
@ -117,8 +118,9 @@ class ApiClient {
if (response.statusCode == 200) { if (response.statusCode == 200) {
final stringData = await response.transform(utf8.decoder).join(); final stringData = await response.transform(utf8.decoder).join();
final json = jsonDecode(stringData) as List<dynamic>; final json = jsonDecode(stringData) as List<dynamic>;
final bookings = final bookings = json
json.map((element) => BookingApiModel.fromJson(element)).toList(); .map((element) => BookingApiModel.fromJson(element))
.toList();
return Result.ok(bookings); return Result.ok(bookings);
} else { } else {
return const Result.error(HttpException("Invalid response")); return const Result.error(HttpException("Invalid response"));

108
compass_app/app/lib/data/services/api/model/booking/booking_api_model.freezed.dart
Unescape View File

@ -91,36 +91,30 @@ class _$BookingApiModelCopyWithImpl<$Res, $Val extends BookingApiModel>
}) { }) {
return _then( return _then(
_value.copyWith( _value.copyWith(
id: id: freezed == id
freezed == id ? _value.id
? _value.id : id // ignore: cast_nullable_to_non_nullable
: id // ignore: cast_nullable_to_non_nullable as int?,
as int?, startDate: null == startDate
startDate: ? _value.startDate
null == startDate : startDate // ignore: cast_nullable_to_non_nullable
? _value.startDate as DateTime,
: startDate // ignore: cast_nullable_to_non_nullable endDate: null == endDate
as DateTime, ? _value.endDate
endDate: : endDate // ignore: cast_nullable_to_non_nullable
null == endDate as DateTime,
? _value.endDate name: null == name
: endDate // ignore: cast_nullable_to_non_nullable ? _value.name
as DateTime, : name // ignore: cast_nullable_to_non_nullable
name: as String,
null == name destinationRef: null == destinationRef
? _value.name ? _value.destinationRef
: name // ignore: cast_nullable_to_non_nullable : destinationRef // ignore: cast_nullable_to_non_nullable
as String, as String,
destinationRef: activitiesRef: null == activitiesRef
null == destinationRef ? _value.activitiesRef
? _value.destinationRef : activitiesRef // ignore: cast_nullable_to_non_nullable
: destinationRef // ignore: cast_nullable_to_non_nullable as List<String>,
as String,
activitiesRef:
null == activitiesRef
? _value.activitiesRef
: activitiesRef // ignore: cast_nullable_to_non_nullable
as List<String>,
) )
as $Val, as $Val,
); );
@ -169,36 +163,30 @@ class __$$BookingApiModelImplCopyWithImpl<$Res>
}) { }) {
return _then( return _then(
_$BookingApiModelImpl( _$BookingApiModelImpl(
id: id: freezed == id
freezed == id ? _value.id
? _value.id : id // ignore: cast_nullable_to_non_nullable
: id // ignore: cast_nullable_to_non_nullable as int?,
as int?, startDate: null == startDate
startDate: ? _value.startDate
null == startDate : startDate // ignore: cast_nullable_to_non_nullable
? _value.startDate as DateTime,
: startDate // ignore: cast_nullable_to_non_nullable endDate: null == endDate
as DateTime, ? _value.endDate
endDate: : endDate // ignore: cast_nullable_to_non_nullable
null == endDate as DateTime,
? _value.endDate name: null == name
: endDate // ignore: cast_nullable_to_non_nullable ? _value.name
as DateTime, : name // ignore: cast_nullable_to_non_nullable
name: as String,
null == name destinationRef: null == destinationRef
? _value.name ? _value.destinationRef
: name // ignore: cast_nullable_to_non_nullable : destinationRef // ignore: cast_nullable_to_non_nullable
as String, as String,
destinationRef: activitiesRef: null == activitiesRef
null == destinationRef ? _value._activitiesRef
? _value.destinationRef : activitiesRef // ignore: cast_nullable_to_non_nullable
: destinationRef // ignore: cast_nullable_to_non_nullable as List<String>,
as String,
activitiesRef:
null == activitiesRef
? _value._activitiesRef
: activitiesRef // ignore: cast_nullable_to_non_nullable
as List<String>,
), ),
); );
} }

5
compass_app/app/lib/data/services/api/model/booking/booking_api_model.g.dart
Unescape View File

@ -14,8 +14,9 @@ _$BookingApiModelImpl _$$BookingApiModelImplFromJson(
endDate: DateTime.parse(json['endDate'] as String), endDate: DateTime.parse(json['endDate'] as String),
name: json['name'] as String, name: json['name'] as String,
destinationRef: json['destinationRef'] as String, destinationRef: json['destinationRef'] as String,
activitiesRef: activitiesRef: (json['activitiesRef'] as List<dynamic>)
(json['activitiesRef'] as List<dynamic>).map((e) => e as String).toList(), .map((e) => e as String)
.toList(),
); );
Map<String, dynamic> _$$BookingApiModelImplToJson( Map<String, dynamic> _$$BookingApiModelImplToJson(

36
compass_app/app/lib/data/services/api/model/login_request/login_request.freezed.dart
Unescape View File

@ -64,16 +64,14 @@ class _$LoginRequestCopyWithImpl<$Res, $Val extends LoginRequest>
$Res call({Object? email = null, Object? password = null}) { $Res call({Object? email = null, Object? password = null}) {
return _then( return _then(
_value.copyWith( _value.copyWith(
email: email: null == email
null == email ? _value.email
? _value.email : email // ignore: cast_nullable_to_non_nullable
: email // ignore: cast_nullable_to_non_nullable as String,
as String, password: null == password
password: ? _value.password
null == password : password // ignore: cast_nullable_to_non_nullable
? _value.password as String,
: password // ignore: cast_nullable_to_non_nullable
as String,
) )
as $Val, as $Val,
); );
@ -108,16 +106,14 @@ class __$$LoginRequestImplCopyWithImpl<$Res>
$Res call({Object? email = null, Object? password = null}) { $Res call({Object? email = null, Object? password = null}) {
return _then( return _then(
_$LoginRequestImpl( _$LoginRequestImpl(
email: email: null == email
null == email ? _value.email
? _value.email : email // ignore: cast_nullable_to_non_nullable
: email // ignore: cast_nullable_to_non_nullable as String,
as String, password: null == password
password: ? _value.password
null == password : password // ignore: cast_nullable_to_non_nullable
? _value.password as String,
: password // ignore: cast_nullable_to_non_nullable
as String,
), ),
); );
} }

36
compass_app/app/lib/data/services/api/model/login_response/login_response.freezed.dart
Unescape View File

@ -64,16 +64,14 @@ class _$LoginResponseCopyWithImpl<$Res, $Val extends LoginResponse>
$Res call({Object? token = null, Object? userId = null}) { $Res call({Object? token = null, Object? userId = null}) {
return _then( return _then(
_value.copyWith( _value.copyWith(
token: token: null == token
null == token ? _value.token
? _value.token : token // ignore: cast_nullable_to_non_nullable
: token // ignore: cast_nullable_to_non_nullable as String,
as String, userId: null == userId
userId: ? _value.userId
null == userId : userId // ignore: cast_nullable_to_non_nullable
? _value.userId as String,
: userId // ignore: cast_nullable_to_non_nullable
as String,
) )
as $Val, as $Val,
); );
@ -108,16 +106,14 @@ class __$$LoginResponseImplCopyWithImpl<$Res>
$Res call({Object? token = null, Object? userId = null}) { $Res call({Object? token = null, Object? userId = null}) {
return _then( return _then(
_$LoginResponseImpl( _$LoginResponseImpl(
token: token: null == token
null == token ? _value.token
? _value.token : token // ignore: cast_nullable_to_non_nullable
: token // ignore: cast_nullable_to_non_nullable as String,
as String, userId: null == userId
userId: ? _value.userId
null == userId : userId // ignore: cast_nullable_to_non_nullable
? _value.userId as String,
: userId // ignore: cast_nullable_to_non_nullable
as String,
), ),
); );
} }

72
compass_app/app/lib/data/services/api/model/user/user_api_model.freezed.dart
Unescape View File

@ -75,26 +75,22 @@ class _$UserApiModelCopyWithImpl<$Res, $Val extends UserApiModel>
}) { }) {
return _then( return _then(
_value.copyWith( _value.copyWith(
id: id: null == id
null == id ? _value.id
? _value.id : id // ignore: cast_nullable_to_non_nullable
: id // ignore: cast_nullable_to_non_nullable as String,
as String, name: null == name
name: ? _value.name
null == name : name // ignore: cast_nullable_to_non_nullable
? _value.name as String,
: name // ignore: cast_nullable_to_non_nullable email: null == email
as String, ? _value.email
email: : email // ignore: cast_nullable_to_non_nullable
null == email as String,
? _value.email picture: null == picture
: email // ignore: cast_nullable_to_non_nullable ? _value.picture
as String, : picture // ignore: cast_nullable_to_non_nullable
picture: as String,
null == picture
? _value.picture
: picture // ignore: cast_nullable_to_non_nullable
as String,
) )
as $Val, as $Val,
); );
@ -134,26 +130,22 @@ class __$$UserApiModelImplCopyWithImpl<$Res>
}) { }) {
return _then( return _then(
_$UserApiModelImpl( _$UserApiModelImpl(
id: id: null == id
null == id ? _value.id
? _value.id : id // ignore: cast_nullable_to_non_nullable
: id // ignore: cast_nullable_to_non_nullable as String,
as String, name: null == name
name: ? _value.name
null == name : name // ignore: cast_nullable_to_non_nullable
? _value.name as String,
: name // ignore: cast_nullable_to_non_nullable email: null == email
as String, ? _value.email
email: : email // ignore: cast_nullable_to_non_nullable
null == email as String,
? _value.email picture: null == picture
: email // ignore: cast_nullable_to_non_nullable ? _value.picture
as String, : picture // ignore: cast_nullable_to_non_nullable
picture: as String,
null == picture
? _value.picture
: picture // ignore: cast_nullable_to_non_nullable
as String,
), ),
); );
} }

180
compass_app/app/lib/domain/models/activity/activity.freezed.dart
Unescape View File

@ -109,56 +109,46 @@ class _$ActivityCopyWithImpl<$Res, $Val extends Activity>
}) { }) {
return _then( return _then(
_value.copyWith( _value.copyWith(
name: name: null == name
null == name ? _value.name
? _value.name : name // ignore: cast_nullable_to_non_nullable
: name // ignore: cast_nullable_to_non_nullable as String,
as String, description: null == description
description: ? _value.description
null == description : description // ignore: cast_nullable_to_non_nullable
? _value.description as String,
: description // ignore: cast_nullable_to_non_nullable locationName: null == locationName
as String, ? _value.locationName
locationName: : locationName // ignore: cast_nullable_to_non_nullable
null == locationName as String,
? _value.locationName duration: null == duration
: locationName // ignore: cast_nullable_to_non_nullable ? _value.duration
as String, : duration // ignore: cast_nullable_to_non_nullable
duration: as int,
null == duration timeOfDay: null == timeOfDay
? _value.duration ? _value.timeOfDay
: duration // ignore: cast_nullable_to_non_nullable : timeOfDay // ignore: cast_nullable_to_non_nullable
as int, as TimeOfDay,
timeOfDay: familyFriendly: null == familyFriendly
null == timeOfDay ? _value.familyFriendly
? _value.timeOfDay : familyFriendly // ignore: cast_nullable_to_non_nullable
: timeOfDay // ignore: cast_nullable_to_non_nullable as bool,
as TimeOfDay, price: null == price
familyFriendly: ? _value.price
null == familyFriendly : price // ignore: cast_nullable_to_non_nullable
? _value.familyFriendly as int,
: familyFriendly // ignore: cast_nullable_to_non_nullable destinationRef: null == destinationRef
as bool, ? _value.destinationRef
price: : destinationRef // ignore: cast_nullable_to_non_nullable
null == price as String,
? _value.price ref: null == ref
: price // ignore: cast_nullable_to_non_nullable ? _value.ref
as int, : ref // ignore: cast_nullable_to_non_nullable
destinationRef: as String,
null == destinationRef imageUrl: null == imageUrl
? _value.destinationRef ? _value.imageUrl
: destinationRef // ignore: cast_nullable_to_non_nullable : imageUrl // ignore: cast_nullable_to_non_nullable
as String, as String,
ref:
null == ref
? _value.ref
: ref // ignore: cast_nullable_to_non_nullable
as String,
imageUrl:
null == imageUrl
? _value.imageUrl
: imageUrl // ignore: cast_nullable_to_non_nullable
as String,
) )
as $Val, as $Val,
); );
@ -215,56 +205,46 @@ class __$$ActivityImplCopyWithImpl<$Res>
}) { }) {
return _then( return _then(
_$ActivityImpl( _$ActivityImpl(
name: name: null == name
null == name ? _value.name
? _value.name : name // ignore: cast_nullable_to_non_nullable
: name // ignore: cast_nullable_to_non_nullable as String,
as String, description: null == description
description: ? _value.description
null == description : description // ignore: cast_nullable_to_non_nullable
? _value.description as String,
: description // ignore: cast_nullable_to_non_nullable locationName: null == locationName
as String, ? _value.locationName
locationName: : locationName // ignore: cast_nullable_to_non_nullable
null == locationName as String,
? _value.locationName duration: null == duration
: locationName // ignore: cast_nullable_to_non_nullable ? _value.duration
as String, : duration // ignore: cast_nullable_to_non_nullable
duration: as int,
null == duration timeOfDay: null == timeOfDay
? _value.duration ? _value.timeOfDay
: duration // ignore: cast_nullable_to_non_nullable : timeOfDay // ignore: cast_nullable_to_non_nullable
as int, as TimeOfDay,
timeOfDay: familyFriendly: null == familyFriendly
null == timeOfDay ? _value.familyFriendly
? _value.timeOfDay : familyFriendly // ignore: cast_nullable_to_non_nullable
: timeOfDay // ignore: cast_nullable_to_non_nullable as bool,
as TimeOfDay, price: null == price
familyFriendly: ? _value.price
null == familyFriendly : price // ignore: cast_nullable_to_non_nullable
? _value.familyFriendly as int,
: familyFriendly // ignore: cast_nullable_to_non_nullable destinationRef: null == destinationRef
as bool, ? _value.destinationRef
price: : destinationRef // ignore: cast_nullable_to_non_nullable
null == price as String,
? _value.price ref: null == ref
: price // ignore: cast_nullable_to_non_nullable ? _value.ref
as int, : ref // ignore: cast_nullable_to_non_nullable
destinationRef: as String,
null == destinationRef imageUrl: null == imageUrl
? _value.destinationRef ? _value.imageUrl
: destinationRef // ignore: cast_nullable_to_non_nullable : imageUrl // ignore: cast_nullable_to_non_nullable
as String, as String,
ref:
null == ref
? _value.ref
: ref // ignore: cast_nullable_to_non_nullable
as String,
imageUrl:
null == imageUrl
? _value.imageUrl
: imageUrl // ignore: cast_nullable_to_non_nullable
as String,
), ),
); );
} }

90
compass_app/app/lib/domain/models/booking/booking.freezed.dart
Unescape View File

@ -85,31 +85,26 @@ class _$BookingCopyWithImpl<$Res, $Val extends Booking>
}) { }) {
return _then( return _then(
_value.copyWith( _value.copyWith(
id: id: freezed == id
freezed == id ? _value.id
? _value.id : id // ignore: cast_nullable_to_non_nullable
: id // ignore: cast_nullable_to_non_nullable as int?,
as int?, startDate: null == startDate
startDate: ? _value.startDate
null == startDate : startDate // ignore: cast_nullable_to_non_nullable
? _value.startDate as DateTime,
: startDate // ignore: cast_nullable_to_non_nullable endDate: null == endDate
as DateTime, ? _value.endDate
endDate: : endDate // ignore: cast_nullable_to_non_nullable
null == endDate as DateTime,
? _value.endDate destination: null == destination
: endDate // ignore: cast_nullable_to_non_nullable ? _value.destination
as DateTime, : destination // ignore: cast_nullable_to_non_nullable
destination: as Destination,
null == destination activity: null == activity
? _value.destination ? _value.activity
: destination // ignore: cast_nullable_to_non_nullable : activity // ignore: cast_nullable_to_non_nullable
as Destination, as List<Activity>,
activity:
null == activity
? _value.activity
: activity // ignore: cast_nullable_to_non_nullable
as List<Activity>,
) )
as $Val, as $Val,
); );
@ -168,31 +163,26 @@ class __$$BookingImplCopyWithImpl<$Res>
}) { }) {
return _then( return _then(
_$BookingImpl( _$BookingImpl(
id: id: freezed == id
freezed == id ? _value.id
? _value.id : id // ignore: cast_nullable_to_non_nullable
: id // ignore: cast_nullable_to_non_nullable as int?,
as int?, startDate: null == startDate
startDate: ? _value.startDate
null == startDate : startDate // ignore: cast_nullable_to_non_nullable
? _value.startDate as DateTime,
: startDate // ignore: cast_nullable_to_non_nullable endDate: null == endDate
as DateTime, ? _value.endDate
endDate: : endDate // ignore: cast_nullable_to_non_nullable
null == endDate as DateTime,
? _value.endDate destination: null == destination
: endDate // ignore: cast_nullable_to_non_nullable ? _value.destination
as DateTime, : destination // ignore: cast_nullable_to_non_nullable
destination: as Destination,
null == destination activity: null == activity
? _value.destination ? _value._activity
: destination // ignore: cast_nullable_to_non_nullable : activity // ignore: cast_nullable_to_non_nullable
as Destination, as List<Activity>,
activity:
null == activity
? _value._activity
: activity // ignore: cast_nullable_to_non_nullable
as List<Activity>,
), ),
); );
} }

7
compass_app/app/lib/domain/models/booking/booking.g.dart
Unescape View File

@ -14,10 +14,9 @@ _$BookingImpl _$$BookingImplFromJson(Map<String, dynamic> json) =>
destination: Destination.fromJson( destination: Destination.fromJson(
json['destination'] as Map<String, dynamic>, json['destination'] as Map<String, dynamic>,
), ),
activity: activity: (json['activity'] as List<dynamic>)
(json['activity'] as List<dynamic>) .map((e) => Activity.fromJson(e as Map<String, dynamic>))
.map((e) => Activity.fromJson(e as Map<String, dynamic>)) .toList(),
.toList(),
); );
Map<String, dynamic> _$$BookingImplToJson(_$BookingImpl instance) => Map<String, dynamic> _$$BookingImplToJson(_$BookingImpl instance) =>

72
compass_app/app/lib/domain/models/booking/booking_summary.freezed.dart
Unescape View File

@ -75,26 +75,22 @@ class _$BookingSummaryCopyWithImpl<$Res, $Val extends BookingSummary>
}) { }) {
return _then( return _then(
_value.copyWith( _value.copyWith(
id: id: null == id
null == id ? _value.id
? _value.id : id // ignore: cast_nullable_to_non_nullable
: id // ignore: cast_nullable_to_non_nullable as int,
as int, name: null == name
name: ? _value.name
null == name : name // ignore: cast_nullable_to_non_nullable
? _value.name as String,
: name // ignore: cast_nullable_to_non_nullable startDate: null == startDate
as String, ? _value.startDate
startDate: : startDate // ignore: cast_nullable_to_non_nullable
null == startDate as DateTime,
? _value.startDate endDate: null == endDate
: startDate // ignore: cast_nullable_to_non_nullable ? _value.endDate
as DateTime, : endDate // ignore: cast_nullable_to_non_nullable
endDate: as DateTime,
null == endDate
? _value.endDate
: endDate // ignore: cast_nullable_to_non_nullable
as DateTime,
) )
as $Val, as $Val,
); );
@ -134,26 +130,22 @@ class __$$BookingSummaryImplCopyWithImpl<$Res>
}) { }) {
return _then( return _then(
_$BookingSummaryImpl( _$BookingSummaryImpl(
id: id: null == id
null == id ? _value.id
? _value.id : id // ignore: cast_nullable_to_non_nullable
: id // ignore: cast_nullable_to_non_nullable as int,
as int, name: null == name
name: ? _value.name
null == name : name // ignore: cast_nullable_to_non_nullable
? _value.name as String,
: name // ignore: cast_nullable_to_non_nullable startDate: null == startDate
as String, ? _value.startDate
startDate: : startDate // ignore: cast_nullable_to_non_nullable
null == startDate as DateTime,
? _value.startDate endDate: null == endDate
: startDate // ignore: cast_nullable_to_non_nullable ? _value.endDate
as DateTime, : endDate // ignore: cast_nullable_to_non_nullable
endDate: as DateTime,
null == endDate
? _value.endDate
: endDate // ignore: cast_nullable_to_non_nullable
as DateTime,
), ),
); );
} }

36
compass_app/app/lib/domain/models/continent/continent.freezed.dart
Unescape View File

@ -62,16 +62,14 @@ class _$ContinentCopyWithImpl<$Res, $Val extends Continent>
$Res call({Object? name = null, Object? imageUrl = null}) { $Res call({Object? name = null, Object? imageUrl = null}) {
return _then( return _then(
_value.copyWith( _value.copyWith(
name: name: null == name
null == name ? _value.name
? _value.name : name // ignore: cast_nullable_to_non_nullable
: name // ignore: cast_nullable_to_non_nullable as String,
as String, imageUrl: null == imageUrl
imageUrl: ? _value.imageUrl
null == imageUrl : imageUrl // ignore: cast_nullable_to_non_nullable
? _value.imageUrl as String,
: imageUrl // ignore: cast_nullable_to_non_nullable
as String,
) )
as $Val, as $Val,
); );
@ -106,16 +104,14 @@ class __$$ContinentImplCopyWithImpl<$Res>
$Res call({Object? name = null, Object? imageUrl = null}) { $Res call({Object? name = null, Object? imageUrl = null}) {
return _then( return _then(
_$ContinentImpl( _$ContinentImpl(
name: name: null == name
null == name ? _value.name
? _value.name : name // ignore: cast_nullable_to_non_nullable
: name // ignore: cast_nullable_to_non_nullable as String,
as String, imageUrl: null == imageUrl
imageUrl: ? _value.imageUrl
null == imageUrl : imageUrl // ignore: cast_nullable_to_non_nullable
? _value.imageUrl as String,
: imageUrl // ignore: cast_nullable_to_non_nullable
as String,
), ),
); );
} }

126
compass_app/app/lib/domain/models/destination/destination.freezed.dart
Unescape View File

@ -95,41 +95,34 @@ class _$DestinationCopyWithImpl<$Res, $Val extends Destination>
}) { }) {
return _then( return _then(
_value.copyWith( _value.copyWith(
ref: ref: null == ref
null == ref ? _value.ref
? _value.ref : ref // ignore: cast_nullable_to_non_nullable
: ref // ignore: cast_nullable_to_non_nullable as String,
as String, name: null == name
name: ? _value.name
null == name : name // ignore: cast_nullable_to_non_nullable
? _value.name as String,
: name // ignore: cast_nullable_to_non_nullable country: null == country
as String, ? _value.country
country: : country // ignore: cast_nullable_to_non_nullable
null == country as String,
? _value.country continent: null == continent
: country // ignore: cast_nullable_to_non_nullable ? _value.continent
as String, : continent // ignore: cast_nullable_to_non_nullable
continent: as String,
null == continent knownFor: null == knownFor
? _value.continent ? _value.knownFor
: continent // ignore: cast_nullable_to_non_nullable : knownFor // ignore: cast_nullable_to_non_nullable
as String, as String,
knownFor: tags: null == tags
null == knownFor ? _value.tags
? _value.knownFor : tags // ignore: cast_nullable_to_non_nullable
: knownFor // ignore: cast_nullable_to_non_nullable as List<String>,
as String, imageUrl: null == imageUrl
tags: ? _value.imageUrl
null == tags : imageUrl // ignore: cast_nullable_to_non_nullable
? _value.tags as String,
: tags // ignore: cast_nullable_to_non_nullable
as List<String>,
imageUrl:
null == imageUrl
? _value.imageUrl
: imageUrl // ignore: cast_nullable_to_non_nullable
as String,
) )
as $Val, as $Val,
); );
@ -180,41 +173,34 @@ class __$$DestinationImplCopyWithImpl<$Res>
}) { }) {
return _then( return _then(
_$DestinationImpl( _$DestinationImpl(
ref: ref: null == ref
null == ref ? _value.ref
? _value.ref : ref // ignore: cast_nullable_to_non_nullable
: ref // ignore: cast_nullable_to_non_nullable as String,
as String, name: null == name
name: ? _value.name
null == name : name // ignore: cast_nullable_to_non_nullable
? _value.name as String,
: name // ignore: cast_nullable_to_non_nullable country: null == country
as String, ? _value.country
country: : country // ignore: cast_nullable_to_non_nullable
null == country as String,
? _value.country continent: null == continent
: country // ignore: cast_nullable_to_non_nullable ? _value.continent
as String, : continent // ignore: cast_nullable_to_non_nullable
continent: as String,
null == continent knownFor: null == knownFor
? _value.continent ? _value.knownFor
: continent // ignore: cast_nullable_to_non_nullable : knownFor // ignore: cast_nullable_to_non_nullable
as String, as String,
knownFor: tags: null == tags
null == knownFor ? _value._tags
? _value.knownFor : tags // ignore: cast_nullable_to_non_nullable
: knownFor // ignore: cast_nullable_to_non_nullable as List<String>,
as String, imageUrl: null == imageUrl
tags: ? _value.imageUrl
null == tags : imageUrl // ignore: cast_nullable_to_non_nullable
? _value._tags as String,
: tags // ignore: cast_nullable_to_non_nullable
as List<String>,
imageUrl:
null == imageUrl
? _value.imageUrl
: imageUrl // ignore: cast_nullable_to_non_nullable
as String,
), ),
); );
} }

108
compass_app/app/lib/domain/models/itinerary_config/itinerary_config.freezed.dart
Unescape View File

@ -90,36 +90,30 @@ class _$ItineraryConfigCopyWithImpl<$Res, $Val extends ItineraryConfig>
}) { }) {
return _then( return _then(
_value.copyWith( _value.copyWith(
continent: continent: freezed == continent
freezed == continent ? _value.continent
? _value.continent : continent // ignore: cast_nullable_to_non_nullable
: continent // ignore: cast_nullable_to_non_nullable as String?,
as String?, startDate: freezed == startDate
startDate: ? _value.startDate
freezed == startDate : startDate // ignore: cast_nullable_to_non_nullable
? _value.startDate as DateTime?,
: startDate // ignore: cast_nullable_to_non_nullable endDate: freezed == endDate
as DateTime?, ? _value.endDate
endDate: : endDate // ignore: cast_nullable_to_non_nullable
freezed == endDate as DateTime?,
? _value.endDate guests: freezed == guests
: endDate // ignore: cast_nullable_to_non_nullable ? _value.guests
as DateTime?, : guests // ignore: cast_nullable_to_non_nullable
guests: as int?,
freezed == guests destination: freezed == destination
? _value.guests ? _value.destination
: guests // ignore: cast_nullable_to_non_nullable : destination // ignore: cast_nullable_to_non_nullable
as int?, as String?,
destination: activities: null == activities
freezed == destination ? _value.activities
? _value.destination : activities // ignore: cast_nullable_to_non_nullable
: destination // ignore: cast_nullable_to_non_nullable as List<String>,
as String?,
activities:
null == activities
? _value.activities
: activities // ignore: cast_nullable_to_non_nullable
as List<String>,
) )
as $Val, as $Val,
); );
@ -168,36 +162,30 @@ class __$$ItineraryConfigImplCopyWithImpl<$Res>
}) { }) {
return _then( return _then(
_$ItineraryConfigImpl( _$ItineraryConfigImpl(
continent: continent: freezed == continent
freezed == continent ? _value.continent
? _value.continent : continent // ignore: cast_nullable_to_non_nullable
: continent // ignore: cast_nullable_to_non_nullable as String?,
as String?, startDate: freezed == startDate
startDate: ? _value.startDate
freezed == startDate : startDate // ignore: cast_nullable_to_non_nullable
? _value.startDate as DateTime?,
: startDate // ignore: cast_nullable_to_non_nullable endDate: freezed == endDate
as DateTime?, ? _value.endDate
endDate: : endDate // ignore: cast_nullable_to_non_nullable
freezed == endDate as DateTime?,
? _value.endDate guests: freezed == guests
: endDate // ignore: cast_nullable_to_non_nullable ? _value.guests
as DateTime?, : guests // ignore: cast_nullable_to_non_nullable
guests: as int?,
freezed == guests destination: freezed == destination
? _value.guests ? _value.destination
: guests // ignore: cast_nullable_to_non_nullable : destination // ignore: cast_nullable_to_non_nullable
as int?, as String?,
destination: activities: null == activities
freezed == destination ? _value._activities
? _value.destination : activities // ignore: cast_nullable_to_non_nullable
: destination // ignore: cast_nullable_to_non_nullable as List<String>,
as String?,
activities:
null == activities
? _value._activities
: activities // ignore: cast_nullable_to_non_nullable
as List<String>,
), ),
); );
} }

14
compass_app/app/lib/domain/models/itinerary_config/itinerary_config.g.dart
Unescape View File

@ -10,14 +10,12 @@ _$ItineraryConfigImpl _$$ItineraryConfigImplFromJson(
Map<String, dynamic> json, Map<String, dynamic> json,
) => _$ItineraryConfigImpl( ) => _$ItineraryConfigImpl(
continent: json['continent'] as String?, continent: json['continent'] as String?,
startDate: startDate: json['startDate'] == null
json['startDate'] == null ? null
? null : DateTime.parse(json['startDate'] as String),
: DateTime.parse(json['startDate'] as String), endDate: json['endDate'] == null
endDate: ? null
json['endDate'] == null : DateTime.parse(json['endDate'] as String),
? null
: DateTime.parse(json['endDate'] as String),
guests: (json['guests'] as num?)?.toInt(), guests: (json['guests'] as num?)?.toInt(),
destination: json['destination'] as String?, destination: json['destination'] as String?,
activities: activities:

36
compass_app/app/lib/domain/models/user/user.freezed.dart
Unescape View File

@ -61,16 +61,14 @@ class _$UserCopyWithImpl<$Res, $Val extends User>
$Res call({Object? name = null, Object? picture = null}) { $Res call({Object? name = null, Object? picture = null}) {
return _then( return _then(
_value.copyWith( _value.copyWith(
name: name: null == name
null == name ? _value.name
? _value.name : name // ignore: cast_nullable_to_non_nullable
: name // ignore: cast_nullable_to_non_nullable as String,
as String, picture: null == picture
picture: ? _value.picture
null == picture : picture // ignore: cast_nullable_to_non_nullable
? _value.picture as String,
: picture // ignore: cast_nullable_to_non_nullable
as String,
) )
as $Val, as $Val,
); );
@ -102,16 +100,14 @@ class __$$UserImplCopyWithImpl<$Res>
$Res call({Object? name = null, Object? picture = null}) { $Res call({Object? name = null, Object? picture = null}) {
return _then( return _then(
_$UserImpl( _$UserImpl(
name: name: null == name
null == name ? _value.name
? _value.name : name // ignore: cast_nullable_to_non_nullable
: name // ignore: cast_nullable_to_non_nullable as String,
as String, picture: null == picture
picture: ? _value.picture
null == picture : picture // ignore: cast_nullable_to_non_nullable
? _value.picture as String,
: picture // ignore: cast_nullable_to_non_nullable
as String,
), ),
); );
} }

9
compass_app/app/lib/domain/use_cases/booking/booking_create_use_case.dart
Unescape View File

@ -63,12 +63,9 @@ class BookingCreateUseCase {
return Result.error(activitiesResult.error); return Result.error(activitiesResult.error);
case Ok<List<Activity>>(): case Ok<List<Activity>>():
} }
final activities = final activities = activitiesResult.value
activitiesResult.value .where((activity) => itineraryConfig.activities.contains(activity.ref))
.where( .toList();
(activity) => itineraryConfig.activities.contains(activity.ref),
)
.toList();
_log.fine('Activities loaded (${activities.length})'); _log.fine('Activities loaded (${activities.length})');
// Check if dates are set // Check if dates are set

38
compass_app/app/lib/ui/activities/view_models/activities_viewmodel.dart
Unescape View File

@ -67,26 +67,24 @@ class ActivitiesViewModel extends ChangeNotifier {
switch (resultActivities) { switch (resultActivities) {
case Ok(): case Ok():
{ {
_daytimeActivities = _daytimeActivities = resultActivities.value
resultActivities.value .where(
.where( (activity) => [
(activity) => [ TimeOfDay.any,
TimeOfDay.any, TimeOfDay.morning,
TimeOfDay.morning, TimeOfDay.afternoon,
TimeOfDay.afternoon, ].contains(activity.timeOfDay),
].contains(activity.timeOfDay), )
) .toList();
.toList();
_eveningActivities = resultActivities.value
_eveningActivities = .where(
resultActivities.value (activity) => [
.where( TimeOfDay.evening,
(activity) => [ TimeOfDay.night,
TimeOfDay.evening, ].contains(activity.timeOfDay),
TimeOfDay.night, )
].contains(activity.timeOfDay), .toList();
)
.toList();
_log.fine( _log.fine(
'Activities (daytime: ${_daytimeActivities.length}, ' 'Activities (daytime: ${_daytimeActivities.length}, '

14
compass_app/app/lib/ui/activities/widgets/activities_screen.dart
Unescape View File

@ -71,10 +71,9 @@ class _ActivitiesScreenState extends State<ActivitiesScreen> {
Expanded( Expanded(
child: Center( child: Center(
child: ErrorIndicator( child: ErrorIndicator(
title: title: AppLocalization.of(
AppLocalization.of( context,
context, ).errorWhileLoadingActivities,
).errorWhileLoadingActivities,
label: AppLocalization.of(context).tryAgain, label: AppLocalization.of(context).tryAgain,
onPressed: widget.viewModel.loadActivities.execute, onPressed: widget.viewModel.loadActivities.execute,
), ),
@ -171,10 +170,9 @@ class _BottomArea extends StatelessWidget {
), ),
FilledButton( FilledButton(
key: const Key(confirmButtonKey), key: const Key(confirmButtonKey),
onPressed: onPressed: viewModel.selectedActivities.isNotEmpty
viewModel.selectedActivities.isNotEmpty ? viewModel.saveActivities.execute
? viewModel.saveActivities.execute : null,
: null,
child: Text(AppLocalization.of(context).confirm), child: Text(AppLocalization.of(context).confirm),
), ),
], ],

9
compass_app/app/lib/ui/auth/login/widgets/login_screen.dart
Unescape View File

@ -99,11 +99,10 @@ class _LoginScreenState extends State<LoginScreen> {
content: Text(AppLocalization.of(context).errorWhileLogin), content: Text(AppLocalization.of(context).errorWhileLogin),
action: SnackBarAction( action: SnackBarAction(
label: AppLocalization.of(context).tryAgain, label: AppLocalization.of(context).tryAgain,
onPressed: onPressed: () => widget.viewModel.login.execute((
() => widget.viewModel.login.execute(( _email.value.text,
_email.value.text, _password.value.text,
_password.value.text, )),
)),
), ),
), ),
); );

4
compass_app/app/lib/ui/booking/view_models/booking_viewmodel.dart
Unescape View File

@ -50,8 +50,8 @@ class BookingViewModel extends ChangeNotifier {
Future<Result<void>> _createBooking() async { Future<Result<void>> _createBooking() async {
_log.fine('Loading booking'); _log.fine('Loading booking');
final itineraryConfig = final itineraryConfig = await _itineraryConfigRepository
await _itineraryConfigRepository.getItineraryConfig(); .getItineraryConfig();
switch (itineraryConfig) { switch (itineraryConfig) {
case Ok<ItineraryConfig>(): case Ok<ItineraryConfig>():
_log.fine('Loaded stored ItineraryConfig'); _log.fine('Loaded stored ItineraryConfig');

23
compass_app/app/lib/ui/booking/widgets/booking_header.dart
Unescape View File

@ -90,18 +90,17 @@ class _Tags extends StatelessWidget {
child: Wrap( child: Wrap(
spacing: 6, spacing: 6,
runSpacing: 6, runSpacing: 6,
children: children: booking.destination.tags
booking.destination.tags .map(
.map( (tag) => TagChip(
(tag) => TagChip( tag: tag,
tag: tag, fontSize: 16,
fontSize: 16, height: 32,
height: 32, chipColor: chipColor,
chipColor: chipColor, onChipColor: Theme.of(context).colorScheme.onSurface,
onChipColor: Theme.of(context).colorScheme.onSurface, ),
), )
) .toList(),
.toList(),
), ),
); );
} }

22
compass_app/app/lib/ui/booking/widgets/booking_screen.dart
Unescape View File

@ -44,18 +44,16 @@ class _BookingScreenState extends State<BookingScreen> {
child: Scaffold( child: Scaffold(
floatingActionButton: ListenableBuilder( floatingActionButton: ListenableBuilder(
listenable: widget.viewModel, listenable: widget.viewModel,
builder: builder: (context, _) => FloatingActionButton.extended(
(context, _) => FloatingActionButton.extended( // Workaround for https://github.com/flutter/flutter/issues/115358#issuecomment-2117157419
// Workaround for https://github.com/flutter/flutter/issues/115358#issuecomment-2117157419 heroTag: null,
heroTag: null, key: const ValueKey('share-button'),
key: const ValueKey('share-button'), onPressed: widget.viewModel.booking != null
onPressed: ? widget.viewModel.shareBooking.execute
widget.viewModel.booking != null : null,
? widget.viewModel.shareBooking.execute label: Text(AppLocalization.of(context).shareTrip),
: null, icon: const Icon(Icons.share_outlined),
label: Text(AppLocalization.of(context).shareTrip), ),
icon: const Icon(Icons.share_outlined),
),
), ),
body: ListenableBuilder( body: ListenableBuilder(
// Listen to changes in both commands // Listen to changes in both commands

11
compass_app/app/lib/ui/core/themes/dimens.dart
Unescape View File

@ -35,12 +35,11 @@ abstract final class Dimens {
static const Dimens mobile = _DimensMobile(); static const Dimens mobile = _DimensMobile();
/// Get dimensions definition based on screen size /// Get dimensions definition based on screen size
factory Dimens.of(BuildContext context) => switch (MediaQuery.sizeOf( factory Dimens.of(BuildContext context) =>
context, switch (MediaQuery.sizeOf(context).width) {
).width) { > 600 && < 840 => desktop,
> 600 && < 840 => desktop, _ => mobile,
_ => mobile, };
};
} }
/// Mobile dimensions /// Mobile dimensions

7
compass_app/app/lib/ui/core/ui/custom_checkbox.dart
Unescape View File

@ -28,10 +28,9 @@ class CustomCheckbox extends StatelessWidget {
), ),
child: Material( child: Material(
borderRadius: BorderRadius.circular(24), borderRadius: BorderRadius.circular(24),
color: color: value
value ? Theme.of(context).colorScheme.primary
? Theme.of(context).colorScheme.primary : Colors.transparent,
: Colors.transparent,
child: SizedBox( child: SizedBox(
width: 24, width: 24,
height: 24, height: 24,

46
compass_app/app/lib/ui/home/widgets/home_screen.dart
Unescape View File

@ -93,31 +93,29 @@ class _HomeScreenState extends State<HomeScreen> {
), ),
SliverList.builder( SliverList.builder(
itemCount: widget.viewModel.bookings.length, itemCount: widget.viewModel.bookings.length,
itemBuilder: itemBuilder: (_, index) => _Booking(
(_, index) => _Booking( key: ValueKey(widget.viewModel.bookings[index].id),
key: ValueKey(widget.viewModel.bookings[index].id), booking: widget.viewModel.bookings[index],
booking: widget.viewModel.bookings[index], onTap: () => context.push(
onTap: Routes.bookingWithId(
() => context.push( widget.viewModel.bookings[index].id,
Routes.bookingWithId(
widget.viewModel.bookings[index].id,
),
),
confirmDismiss: (_) async {
// wait for command to complete
await widget.viewModel.deleteBooking.execute(
widget.viewModel.bookings[index].id,
);
// if command completed successfully, return true
if (widget.viewModel.deleteBooking.completed) {
// removes the dismissable from the list
return true;
} else {
// the dismissable stays in the list
return false;
}
},
), ),
),
confirmDismiss: (_) async {
// wait for command to complete
await widget.viewModel.deleteBooking.execute(
widget.viewModel.bookings[index].id,
);
// if command completed successfully, return true
if (widget.viewModel.deleteBooking.completed) {
// removes the dismissable from the list
return true;
} else {
// the dismissable stays in the list
return false;
}
},
),
), ),
], ],
); );

11
compass_app/app/lib/ui/home/widgets/home_title.dart
Unescape View File

@ -61,12 +61,11 @@ class _Title extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return ShaderMask( return ShaderMask(
blendMode: BlendMode.srcIn, blendMode: BlendMode.srcIn,
shaderCallback: shaderCallback: (bounds) => RadialGradient(
(bounds) => RadialGradient( center: Alignment.bottomLeft,
center: Alignment.bottomLeft, radius: 2,
radius: 2, colors: [Colors.purple.shade700, Colors.purple.shade400],
colors: [Colors.purple.shade700, Colors.purple.shade400], ).createShader(Rect.fromLTWH(0, 0, bounds.width, bounds.height)),
).createShader(Rect.fromLTWH(0, 0, bounds.width, bounds.height)),
child: Text( child: Text(
text, text,
style: GoogleFonts.rubik( style: GoogleFonts.rubik(

13
compass_app/app/lib/ui/results/view_models/results_viewmodel.dart
Unescape View File

@ -67,13 +67,12 @@ class ResultsViewModel extends ChangeNotifier {
case Ok(): case Ok():
{ {
// If the result is Ok, update the list of destinations // If the result is Ok, update the list of destinations
_destinations = _destinations = result.value
result.value .where(
.where( (destination) =>
(destination) => destination.continent == _itineraryConfig!.continent,
destination.continent == _itineraryConfig!.continent, )
) .toList();
.toList();
_log.fine('Destinations (${_destinations.length}) loaded'); _log.fine('Destinations (${_destinations.length}) loaded');
} }
case Error(): case Error():

5
compass_app/app/lib/ui/results/widgets/result_card.dart
Unescape View File

@ -42,8 +42,9 @@ class ResultCard extends StatelessWidget {
spacing: 4.0, spacing: 4.0,
runSpacing: 4.0, runSpacing: 4.0,
direction: Axis.horizontal, direction: Axis.horizontal,
children: children: destination.tags
destination.tags.map((e) => TagChip(tag: e)).toList(), .map((e) => TagChip(tag: e))
.toList(),
), ),
], ],
), ),

7
compass_app/app/lib/ui/results/widgets/results_screen.dart
Unescape View File

@ -67,10 +67,9 @@ class _ResultsScreenState extends State<ResultsScreen> {
Expanded( Expanded(
child: Center( child: Center(
child: ErrorIndicator( child: ErrorIndicator(
title: title: AppLocalization.of(
AppLocalization.of( context,
context, ).errorWhileLoadingDestinations,
).errorWhileLoadingDestinations,
label: AppLocalization.of(context).tryAgain, label: AppLocalization.of(context).tryAgain,
onPressed: widget.viewModel.search.execute, onPressed: widget.viewModel.search.execute,
), ),

14
compass_app/app/lib/ui/search_form/widgets/search_form_guests.dart
Unescape View File

@ -75,14 +75,12 @@ class _QuantitySelector extends StatelessWidget {
), ),
ListenableBuilder( ListenableBuilder(
listenable: viewModel, listenable: viewModel,
builder: builder: (context, _) => Text(
(context, _) => Text( viewModel.guests.toString(),
viewModel.guests.toString(), style: viewModel.guests == 0
style: ? Theme.of(context).inputDecorationTheme.hintStyle
viewModel.guests == 0 : Theme.of(context).textTheme.bodyMedium,
? Theme.of(context).inputDecorationTheme.hintStyle ),
: Theme.of(context).textTheme.bodyMedium,
),
), ),
InkWell( InkWell(
key: const ValueKey(addGuestsKey), key: const ValueKey(addGuestsKey),

7
compass_app/app/lib/ui/search_form/widgets/search_form_submit.dart
Unescape View File

@ -65,10 +65,9 @@ class _SearchFormSubmitState extends State<SearchFormSubmit> {
builder: (context, child) { builder: (context, child) {
return FilledButton( return FilledButton(
key: const ValueKey(searchFormSubmitButtonKey), key: const ValueKey(searchFormSubmitButtonKey),
onPressed: onPressed: widget.viewModel.valid
widget.viewModel.valid ? widget.viewModel.updateItineraryConfig.execute
? widget.viewModel.updateItineraryConfig.execute : null,
: null,
child: child, child: child,
); );
}, },

2
compass_app/app/pubspec.yaml
Unescape View File

@ -5,7 +5,7 @@ publish_to: none
version: 0.1.0 version: 0.1.0
environment: environment:
sdk: ^3.7.0-0 sdk: '>=3.9.0-0 <4.0.0'
dependencies: dependencies:
cached_network_image: ^3.4.1 cached_network_image: ^3.4.1

13
compass_app/server/bin/compass_server.dart
Unescape View File

@ -15,13 +15,12 @@ import 'package:shelf/shelf_io.dart';
import 'package:shelf_router/shelf_router.dart'; import 'package:shelf_router/shelf_router.dart';
// Configure routes. // Configure routes.
final _router = final _router = Router()
Router() ..get('/continent', continentHandler)
..get('/continent', continentHandler) ..mount('/destination', DestinationApi().router.call)
..mount('/destination', DestinationApi().router.call) ..mount('/booking', BookingApi().router.call)
..mount('/booking', BookingApi().router.call) ..mount('/user', UserApi().router.call)
..mount('/user', UserApi().router.call) ..mount('/login', LoginApi().router.call);
..mount('/login', LoginApi().router.call);
void main(List<String> args) async { void main(List<String> args) async {
// Use any available host or container IP (usually `0.0.0.0`). // Use any available host or container IP (usually `0.0.0.0`).

180
compass_app/server/lib/model/activity/activity.freezed.dart
Unescape View File

@ -109,56 +109,46 @@ class _$ActivityCopyWithImpl<$Res, $Val extends Activity>
}) { }) {
return _then( return _then(
_value.copyWith( _value.copyWith(
name: name: null == name
null == name ? _value.name
? _value.name : name // ignore: cast_nullable_to_non_nullable
: name // ignore: cast_nullable_to_non_nullable as String,
as String, description: null == description
description: ? _value.description
null == description : description // ignore: cast_nullable_to_non_nullable
? _value.description as String,
: description // ignore: cast_nullable_to_non_nullable locationName: null == locationName
as String, ? _value.locationName
locationName: : locationName // ignore: cast_nullable_to_non_nullable
null == locationName as String,
? _value.locationName duration: null == duration
: locationName // ignore: cast_nullable_to_non_nullable ? _value.duration
as String, : duration // ignore: cast_nullable_to_non_nullable
duration: as int,
null == duration timeOfDay: null == timeOfDay
? _value.duration ? _value.timeOfDay
: duration // ignore: cast_nullable_to_non_nullable : timeOfDay // ignore: cast_nullable_to_non_nullable
as int, as TimeOfDay,
timeOfDay: familyFriendly: null == familyFriendly
null == timeOfDay ? _value.familyFriendly
? _value.timeOfDay : familyFriendly // ignore: cast_nullable_to_non_nullable
: timeOfDay // ignore: cast_nullable_to_non_nullable as bool,
as TimeOfDay, price: null == price
familyFriendly: ? _value.price
null == familyFriendly : price // ignore: cast_nullable_to_non_nullable
? _value.familyFriendly as int,
: familyFriendly // ignore: cast_nullable_to_non_nullable destinationRef: null == destinationRef
as bool, ? _value.destinationRef
price: : destinationRef // ignore: cast_nullable_to_non_nullable
null == price as String,
? _value.price ref: null == ref
: price // ignore: cast_nullable_to_non_nullable ? _value.ref
as int, : ref // ignore: cast_nullable_to_non_nullable
destinationRef: as String,
null == destinationRef imageUrl: null == imageUrl
? _value.destinationRef ? _value.imageUrl
: destinationRef // ignore: cast_nullable_to_non_nullable : imageUrl // ignore: cast_nullable_to_non_nullable
as String, as String,
ref:
null == ref
? _value.ref
: ref // ignore: cast_nullable_to_non_nullable
as String,
imageUrl:
null == imageUrl
? _value.imageUrl
: imageUrl // ignore: cast_nullable_to_non_nullable
as String,
) )
as $Val, as $Val,
); );
@ -215,56 +205,46 @@ class __$$ActivityImplCopyWithImpl<$Res>
}) { }) {
return _then( return _then(
_$ActivityImpl( _$ActivityImpl(
name: name: null == name
null == name ? _value.name
? _value.name : name // ignore: cast_nullable_to_non_nullable
: name // ignore: cast_nullable_to_non_nullable as String,
as String, description: null == description
description: ? _value.description
null == description : description // ignore: cast_nullable_to_non_nullable
? _value.description as String,
: description // ignore: cast_nullable_to_non_nullable locationName: null == locationName
as String, ? _value.locationName
locationName: : locationName // ignore: cast_nullable_to_non_nullable
null == locationName as String,
? _value.locationName duration: null == duration
: locationName // ignore: cast_nullable_to_non_nullable ? _value.duration
as String, : duration // ignore: cast_nullable_to_non_nullable
duration: as int,
null == duration timeOfDay: null == timeOfDay
? _value.duration ? _value.timeOfDay
: duration // ignore: cast_nullable_to_non_nullable : timeOfDay // ignore: cast_nullable_to_non_nullable
as int, as TimeOfDay,
timeOfDay: familyFriendly: null == familyFriendly
null == timeOfDay ? _value.familyFriendly
? _value.timeOfDay : familyFriendly // ignore: cast_nullable_to_non_nullable
: timeOfDay // ignore: cast_nullable_to_non_nullable as bool,
as TimeOfDay, price: null == price
familyFriendly: ? _value.price
null == familyFriendly : price // ignore: cast_nullable_to_non_nullable
? _value.familyFriendly as int,
: familyFriendly // ignore: cast_nullable_to_non_nullable destinationRef: null == destinationRef
as bool, ? _value.destinationRef
price: : destinationRef // ignore: cast_nullable_to_non_nullable
null == price as String,
? _value.price ref: null == ref
: price // ignore: cast_nullable_to_non_nullable ? _value.ref
as int, : ref // ignore: cast_nullable_to_non_nullable
destinationRef: as String,
null == destinationRef imageUrl: null == imageUrl
? _value.destinationRef ? _value.imageUrl
: destinationRef // ignore: cast_nullable_to_non_nullable : imageUrl // ignore: cast_nullable_to_non_nullable
as String, as String,
ref:
null == ref
? _value.ref
: ref // ignore: cast_nullable_to_non_nullable
as String,
imageUrl:
null == imageUrl
? _value.imageUrl
: imageUrl // ignore: cast_nullable_to_non_nullable
as String,
), ),
); );
} }

108
compass_app/server/lib/model/booking/booking.freezed.dart
Unescape View File

@ -88,36 +88,30 @@ class _$BookingCopyWithImpl<$Res, $Val extends Booking>
}) { }) {
return _then( return _then(
_value.copyWith( _value.copyWith(
id: id: freezed == id
freezed == id ? _value.id
? _value.id : id // ignore: cast_nullable_to_non_nullable
: id // ignore: cast_nullable_to_non_nullable as int?,
as int?, startDate: null == startDate
startDate: ? _value.startDate
null == startDate : startDate // ignore: cast_nullable_to_non_nullable
? _value.startDate as DateTime,
: startDate // ignore: cast_nullable_to_non_nullable endDate: null == endDate
as DateTime, ? _value.endDate
endDate: : endDate // ignore: cast_nullable_to_non_nullable
null == endDate as DateTime,
? _value.endDate name: null == name
: endDate // ignore: cast_nullable_to_non_nullable ? _value.name
as DateTime, : name // ignore: cast_nullable_to_non_nullable
name: as String,
null == name destinationRef: null == destinationRef
? _value.name ? _value.destinationRef
: name // ignore: cast_nullable_to_non_nullable : destinationRef // ignore: cast_nullable_to_non_nullable
as String, as String,
destinationRef: activitiesRef: null == activitiesRef
null == destinationRef ? _value.activitiesRef
? _value.destinationRef : activitiesRef // ignore: cast_nullable_to_non_nullable
: destinationRef // ignore: cast_nullable_to_non_nullable as List<String>,
as String,
activitiesRef:
null == activitiesRef
? _value.activitiesRef
: activitiesRef // ignore: cast_nullable_to_non_nullable
as List<String>,
) )
as $Val, as $Val,
); );
@ -165,36 +159,30 @@ class __$$BookingImplCopyWithImpl<$Res>
}) { }) {
return _then( return _then(
_$BookingImpl( _$BookingImpl(
id: id: freezed == id
freezed == id ? _value.id
? _value.id : id // ignore: cast_nullable_to_non_nullable
: id // ignore: cast_nullable_to_non_nullable as int?,
as int?, startDate: null == startDate
startDate: ? _value.startDate
null == startDate : startDate // ignore: cast_nullable_to_non_nullable
? _value.startDate as DateTime,
: startDate // ignore: cast_nullable_to_non_nullable endDate: null == endDate
as DateTime, ? _value.endDate
endDate: : endDate // ignore: cast_nullable_to_non_nullable
null == endDate as DateTime,
? _value.endDate name: null == name
: endDate // ignore: cast_nullable_to_non_nullable ? _value.name
as DateTime, : name // ignore: cast_nullable_to_non_nullable
name: as String,
null == name destinationRef: null == destinationRef
? _value.name ? _value.destinationRef
: name // ignore: cast_nullable_to_non_nullable : destinationRef // ignore: cast_nullable_to_non_nullable
as String, as String,
destinationRef: activitiesRef: null == activitiesRef
null == destinationRef ? _value._activitiesRef
? _value.destinationRef : activitiesRef // ignore: cast_nullable_to_non_nullable
: destinationRef // ignore: cast_nullable_to_non_nullable as List<String>,
as String,
activitiesRef:
null == activitiesRef
? _value._activitiesRef
: activitiesRef // ignore: cast_nullable_to_non_nullable
as List<String>,
), ),
); );
} }

7
compass_app/server/lib/model/booking/booking.g.dart
Unescape View File

@ -13,10 +13,9 @@ _$BookingImpl _$$BookingImplFromJson(Map<String, dynamic> json) =>
endDate: DateTime.parse(json['endDate'] as String), endDate: DateTime.parse(json['endDate'] as String),
name: json['name'] as String, name: json['name'] as String,
destinationRef: json['destinationRef'] as String, destinationRef: json['destinationRef'] as String,
activitiesRef: activitiesRef: (json['activitiesRef'] as List<dynamic>)
(json['activitiesRef'] as List<dynamic>) .map((e) => e as String)
.map((e) => e as String) .toList(),
.toList(),
); );
Map<String, dynamic> _$$BookingImplToJson(_$BookingImpl instance) => Map<String, dynamic> _$$BookingImplToJson(_$BookingImpl instance) =>

36
compass_app/server/lib/model/continent/continent.freezed.dart
Unescape View File

@ -62,16 +62,14 @@ class _$ContinentCopyWithImpl<$Res, $Val extends Continent>
$Res call({Object? name = null, Object? imageUrl = null}) { $Res call({Object? name = null, Object? imageUrl = null}) {
return _then( return _then(
_value.copyWith( _value.copyWith(
name: name: null == name
null == name ? _value.name
? _value.name : name // ignore: cast_nullable_to_non_nullable
: name // ignore: cast_nullable_to_non_nullable as String,
as String, imageUrl: null == imageUrl
imageUrl: ? _value.imageUrl
null == imageUrl : imageUrl // ignore: cast_nullable_to_non_nullable
? _value.imageUrl as String,
: imageUrl // ignore: cast_nullable_to_non_nullable
as String,
) )
as $Val, as $Val,
); );
@ -106,16 +104,14 @@ class __$$ContinentImplCopyWithImpl<$Res>
$Res call({Object? name = null, Object? imageUrl = null}) { $Res call({Object? name = null, Object? imageUrl = null}) {
return _then( return _then(
_$ContinentImpl( _$ContinentImpl(
name: name: null == name
null == name ? _value.name
? _value.name : name // ignore: cast_nullable_to_non_nullable
: name // ignore: cast_nullable_to_non_nullable as String,
as String, imageUrl: null == imageUrl
imageUrl: ? _value.imageUrl
null == imageUrl : imageUrl // ignore: cast_nullable_to_non_nullable
? _value.imageUrl as String,
: imageUrl // ignore: cast_nullable_to_non_nullable
as String,
), ),
); );
} }

126
compass_app/server/lib/model/destination/destination.freezed.dart
Unescape View File

@ -95,41 +95,34 @@ class _$DestinationCopyWithImpl<$Res, $Val extends Destination>
}) { }) {
return _then( return _then(
_value.copyWith( _value.copyWith(
ref: ref: null == ref
null == ref ? _value.ref
? _value.ref : ref // ignore: cast_nullable_to_non_nullable
: ref // ignore: cast_nullable_to_non_nullable as String,
as String, name: null == name
name: ? _value.name
null == name : name // ignore: cast_nullable_to_non_nullable
? _value.name as String,
: name // ignore: cast_nullable_to_non_nullable country: null == country
as String, ? _value.country
country: : country // ignore: cast_nullable_to_non_nullable
null == country as String,
? _value.country continent: null == continent
: country // ignore: cast_nullable_to_non_nullable ? _value.continent
as String, : continent // ignore: cast_nullable_to_non_nullable
continent: as String,
null == continent knownFor: null == knownFor
? _value.continent ? _value.knownFor
: continent // ignore: cast_nullable_to_non_nullable : knownFor // ignore: cast_nullable_to_non_nullable
as String, as String,
knownFor: tags: null == tags
null == knownFor ? _value.tags
? _value.knownFor : tags // ignore: cast_nullable_to_non_nullable
: knownFor // ignore: cast_nullable_to_non_nullable as List<String>,
as String, imageUrl: null == imageUrl
tags: ? _value.imageUrl
null == tags : imageUrl // ignore: cast_nullable_to_non_nullable
? _value.tags as String,
: tags // ignore: cast_nullable_to_non_nullable
as List<String>,
imageUrl:
null == imageUrl
? _value.imageUrl
: imageUrl // ignore: cast_nullable_to_non_nullable
as String,
) )
as $Val, as $Val,
); );
@ -180,41 +173,34 @@ class __$$DestinationImplCopyWithImpl<$Res>
}) { }) {
return _then( return _then(
_$DestinationImpl( _$DestinationImpl(
ref: ref: null == ref
null == ref ? _value.ref
? _value.ref : ref // ignore: cast_nullable_to_non_nullable
: ref // ignore: cast_nullable_to_non_nullable as String,
as String, name: null == name
name: ? _value.name
null == name : name // ignore: cast_nullable_to_non_nullable
? _value.name as String,
: name // ignore: cast_nullable_to_non_nullable country: null == country
as String, ? _value.country
country: : country // ignore: cast_nullable_to_non_nullable
null == country as String,
? _value.country continent: null == continent
: country // ignore: cast_nullable_to_non_nullable ? _value.continent
as String, : continent // ignore: cast_nullable_to_non_nullable
continent: as String,
null == continent knownFor: null == knownFor
? _value.continent ? _value.knownFor
: continent // ignore: cast_nullable_to_non_nullable : knownFor // ignore: cast_nullable_to_non_nullable
as String, as String,
knownFor: tags: null == tags
null == knownFor ? _value._tags
? _value.knownFor : tags // ignore: cast_nullable_to_non_nullable
: knownFor // ignore: cast_nullable_to_non_nullable as List<String>,
as String, imageUrl: null == imageUrl
tags: ? _value.imageUrl
null == tags : imageUrl // ignore: cast_nullable_to_non_nullable
? _value._tags as String,
: tags // ignore: cast_nullable_to_non_nullable
as List<String>,
imageUrl:
null == imageUrl
? _value.imageUrl
: imageUrl // ignore: cast_nullable_to_non_nullable
as String,
), ),
); );
} }

36
compass_app/server/lib/model/login_request/login_request.freezed.dart
Unescape View File

@ -64,16 +64,14 @@ class _$LoginRequestCopyWithImpl<$Res, $Val extends LoginRequest>
$Res call({Object? email = null, Object? password = null}) { $Res call({Object? email = null, Object? password = null}) {
return _then( return _then(
_value.copyWith( _value.copyWith(
email: email: null == email
null == email ? _value.email
? _value.email : email // ignore: cast_nullable_to_non_nullable
: email // ignore: cast_nullable_to_non_nullable as String,
as String, password: null == password
password: ? _value.password
null == password : password // ignore: cast_nullable_to_non_nullable
? _value.password as String,
: password // ignore: cast_nullable_to_non_nullable
as String,
) )
as $Val, as $Val,
); );
@ -108,16 +106,14 @@ class __$$LoginRequestImplCopyWithImpl<$Res>
$Res call({Object? email = null, Object? password = null}) { $Res call({Object? email = null, Object? password = null}) {
return _then( return _then(
_$LoginRequestImpl( _$LoginRequestImpl(
email: email: null == email
null == email ? _value.email
? _value.email : email // ignore: cast_nullable_to_non_nullable
: email // ignore: cast_nullable_to_non_nullable as String,
as String, password: null == password
password: ? _value.password
null == password : password // ignore: cast_nullable_to_non_nullable
? _value.password as String,
: password // ignore: cast_nullable_to_non_nullable
as String,
), ),
); );
} }

36
compass_app/server/lib/model/login_response/login_response.freezed.dart
Unescape View File

@ -64,16 +64,14 @@ class _$LoginResponseCopyWithImpl<$Res, $Val extends LoginResponse>
$Res call({Object? token = null, Object? userId = null}) { $Res call({Object? token = null, Object? userId = null}) {
return _then( return _then(
_value.copyWith( _value.copyWith(
token: token: null == token
null == token ? _value.token
? _value.token : token // ignore: cast_nullable_to_non_nullable
: token // ignore: cast_nullable_to_non_nullable as String,
as String, userId: null == userId
userId: ? _value.userId
null == userId : userId // ignore: cast_nullable_to_non_nullable
? _value.userId as String,
: userId // ignore: cast_nullable_to_non_nullable
as String,
) )
as $Val, as $Val,
); );
@ -108,16 +106,14 @@ class __$$LoginResponseImplCopyWithImpl<$Res>
$Res call({Object? token = null, Object? userId = null}) { $Res call({Object? token = null, Object? userId = null}) {
return _then( return _then(
_$LoginResponseImpl( _$LoginResponseImpl(
token: token: null == token
null == token ? _value.token
? _value.token : token // ignore: cast_nullable_to_non_nullable
: token // ignore: cast_nullable_to_non_nullable as String,
as String, userId: null == userId
userId: ? _value.userId
null == userId : userId // ignore: cast_nullable_to_non_nullable
? _value.userId as String,
: userId // ignore: cast_nullable_to_non_nullable
as String,
), ),
); );
} }

72
compass_app/server/lib/model/user/user.freezed.dart
Unescape View File

@ -72,26 +72,22 @@ class _$UserCopyWithImpl<$Res, $Val extends User>
}) { }) {
return _then( return _then(
_value.copyWith( _value.copyWith(
id: id: null == id
null == id ? _value.id
? _value.id : id // ignore: cast_nullable_to_non_nullable
: id // ignore: cast_nullable_to_non_nullable as String,
as String, name: null == name
name: ? _value.name
null == name : name // ignore: cast_nullable_to_non_nullable
? _value.name as String,
: name // ignore: cast_nullable_to_non_nullable email: null == email
as String, ? _value.email
email: : email // ignore: cast_nullable_to_non_nullable
null == email as String,
? _value.email picture: null == picture
: email // ignore: cast_nullable_to_non_nullable ? _value.picture
as String, : picture // ignore: cast_nullable_to_non_nullable
picture: as String,
null == picture
? _value.picture
: picture // ignore: cast_nullable_to_non_nullable
as String,
) )
as $Val, as $Val,
); );
@ -128,26 +124,22 @@ class __$$UserImplCopyWithImpl<$Res>
}) { }) {
return _then( return _then(
_$UserImpl( _$UserImpl(
id: id: null == id
null == id ? _value.id
? _value.id : id // ignore: cast_nullable_to_non_nullable
: id // ignore: cast_nullable_to_non_nullable as String,
as String, name: null == name
name: ? _value.name
null == name : name // ignore: cast_nullable_to_non_nullable
? _value.name as String,
: name // ignore: cast_nullable_to_non_nullable email: null == email
as String, ? _value.email
email: : email // ignore: cast_nullable_to_non_nullable
null == email as String,
? _value.email picture: null == picture
: email // ignore: cast_nullable_to_non_nullable ? _value.picture
as String, : picture // ignore: cast_nullable_to_non_nullable
picture: as String,
null == picture
? _value.picture
: picture // ignore: cast_nullable_to_non_nullable
as String,
), ),
); );
} }

19
compass_app/server/lib/routes/booking.dart
Unescape View File

@ -22,11 +22,10 @@ class BookingApi {
BookingApi() { BookingApi() {
// Create a default booking // Create a default booking
final destination = Assets.destinations.first; final destination = Assets.destinations.first;
final activitiesRef = final activitiesRef = Assets.activities
Assets.activities .where((activity) => activity.destinationRef == destination.ref)
.where((activity) => activity.destinationRef == destination.ref) .map((activity) => activity.ref)
.map((activity) => activity.ref) .toList();
.toList();
_bookings.add( _bookings.add(
Booking( Booking(
id: _sequentialId++, id: _sequentialId++,
@ -60,8 +59,9 @@ class BookingApi {
// Get a booking by id // Get a booking by id
router.get('/<id>', (Request request, String id) { router.get('/<id>', (Request request, String id) {
final bookingId = int.parse(id); final bookingId = int.parse(id);
final booking = final booking = _bookings
_bookings.where((booking) => booking.id == bookingId).firstOrNull; .where((booking) => booking.id == bookingId)
.firstOrNull;
if (booking == null) { if (booking == null) {
return Response.notFound('Invalid id'); return Response.notFound('Invalid id');
@ -102,8 +102,9 @@ class BookingApi {
// Delete booking // Delete booking
router.delete('/<id>', (Request request, String id) async { router.delete('/<id>', (Request request, String id) async {
final bookingId = int.parse(id); final bookingId = int.parse(id);
final booking = final booking = _bookings
_bookings.where((booking) => booking.id == bookingId).firstOrNull; .where((booking) => booking.id == bookingId)
.firstOrNull;
if (booking == null) { if (booking == null) {
return Response.notFound('Invalid id'); return Response.notFound('Invalid id');
} }

7
compass_app/server/lib/routes/destination.dart
Unescape View File

@ -21,10 +21,9 @@ class DestinationApi {
}); });
router.get('/<id>/activity', (Request request, String id) { router.get('/<id>/activity', (Request request, String id) {
final list = final list = Assets.activities
Assets.activities .where((activity) => activity.destinationRef == id)
.where((activity) => activity.destinationRef == id) .toList();
.toList();
return Response.ok( return Response.ok(
json.encode(list), json.encode(list),
headers: {'Content-Type': 'application/json'}, headers: {'Content-Type': 'application/json'},

2
compass_app/server/pubspec.yaml
Unescape View File

@ -4,7 +4,7 @@ publish_to: 'none'
version: 1.0.0 version: 1.0.0
environment: environment:
sdk: ^3.7.0-0 sdk: '>=3.9.0-0 <4.0.0'
dependencies: dependencies:
args: ^2.4.0 args: ^2.4.0

15
context_menus/lib/cascading_menu_page.dart
Unescape View File

@ -234,14 +234,13 @@ class _MyCascadingContextMenuState extends State<_MyCascadingContextMenu> {
// already hidden. // already hidden.
MenuEntry( MenuEntry(
label: 'Reset', label: 'Reset',
onPressed: onPressed: widget.showingMessage
widget.showingMessage ? () {
? () { ContextMenuController.removeAny();
ContextMenuController.removeAny(); widget.onChangeSelection('Reset');
widget.onChangeSelection('Reset'); widget.onToggleMessageVisibility();
widget.onToggleMessageVisibility(); }
} : null,
: null,
shortcut: const SingleActivator(LogicalKeyboardKey.escape), shortcut: const SingleActivator(LogicalKeyboardKey.escape),
), ),
MenuEntry( MenuEntry(

39
context_menus/lib/custom_buttons_page.dart
Unescape View File

@ -52,26 +52,27 @@ class CustomButtonsPage extends StatelessWidget {
// Build the default buttons, but make them look custom. // Build the default buttons, but make them look custom.
// Note that in a real project you may want to build // Note that in a real project you may want to build
// different buttons depending on the platform. // different buttons depending on the platform.
children: children: editableTextState.contextMenuButtonItems.map((
editableTextState.contextMenuButtonItems.map((buttonItem) { buttonItem,
return CupertinoButton( ) {
borderRadius: null, return CupertinoButton(
color: const Color(0xffaaaa00), borderRadius: null,
disabledColor: const Color(0xffaaaaff), color: const Color(0xffaaaa00),
onPressed: buttonItem.onPressed, disabledColor: const Color(0xffaaaaff),
padding: const EdgeInsets.all(10.0), onPressed: buttonItem.onPressed,
pressedOpacity: 0.7, padding: const EdgeInsets.all(10.0),
child: SizedBox( pressedOpacity: 0.7,
width: 200.0, child: SizedBox(
child: Text( width: 200.0,
CupertinoTextSelectionToolbarButton.getButtonLabel( child: Text(
context, CupertinoTextSelectionToolbarButton.getButtonLabel(
buttonItem, context,
), buttonItem,
),
), ),
); ),
}).toList(), ),
);
}).toList(),
); );
}, },
), ),

9
context_menus/lib/custom_menu_page.dart
Unescape View File

@ -47,11 +47,10 @@ class CustomMenuPage extends StatelessWidget {
contextMenuBuilder: (context, editableTextState) { contextMenuBuilder: (context, editableTextState) {
return _MyContextMenu( return _MyContextMenu(
anchor: editableTextState.contextMenuAnchors.primaryAnchor, anchor: editableTextState.contextMenuAnchors.primaryAnchor,
children: children: AdaptiveTextSelectionToolbar.getAdaptiveButtons(
AdaptiveTextSelectionToolbar.getAdaptiveButtons( context,
context, editableTextState.contextMenuButtonItems,
editableTextState.contextMenuButtonItems, ).toList(),
).toList(),
); );
}, },
), ),

5
context_menus/lib/email_button_page.dart
Unescape View File

@ -22,9 +22,8 @@ class EmailButtonPage extends StatelessWidget {
DialogRoute _showDialog(BuildContext context) { DialogRoute _showDialog(BuildContext context) {
return DialogRoute<void>( return DialogRoute<void>(
context: context, context: context,
builder: builder: (context) =>
(context) => const AlertDialog(title: Text('You clicked send email!')),
const AlertDialog(title: Text('You clicked send email!')),
); );
} }

9
context_menus/lib/field_types_page.dart
Unescape View File

@ -85,11 +85,10 @@ class FieldTypesPage extends StatelessWidget {
contextMenuBuilder: (context, editableTextState) { contextMenuBuilder: (context, editableTextState) {
return DesktopTextSelectionToolbar( return DesktopTextSelectionToolbar(
anchor: editableTextState.contextMenuAnchors.primaryAnchor, anchor: editableTextState.contextMenuAnchors.primaryAnchor,
children: children: AdaptiveTextSelectionToolbar.getAdaptiveButtons(
AdaptiveTextSelectionToolbar.getAdaptiveButtons( context,
context, editableTextState.contextMenuButtonItems,
editableTextState.contextMenuButtonItems, ).toList(),
).toList(),
); );
}, },
), ),

37
context_menus/lib/full_page.dart
Unescape View File

@ -126,26 +126,25 @@ class FullPage extends StatelessWidget {
// Build the default buttons, but make them look crazy. // Build the default buttons, but make them look crazy.
// Note that in a real project you may want to build // Note that in a real project you may want to build
// different buttons depending on the platform. // different buttons depending on the platform.
children: children: buttonItems.map((buttonItem) {
buttonItems.map((buttonItem) { return CupertinoButton(
return CupertinoButton( borderRadius: null,
borderRadius: null, color: const Color(0xffaaaa00),
color: const Color(0xffaaaa00), disabledColor: const Color(0xffaaaaff),
disabledColor: const Color(0xffaaaaff), onPressed: buttonItem.onPressed,
onPressed: buttonItem.onPressed, padding: const EdgeInsets.all(10.0),
padding: const EdgeInsets.all(10.0), pressedOpacity: 0.7,
pressedOpacity: 0.7, child: SizedBox(
child: SizedBox( width: 200.0,
width: 200.0, child: Text(
child: Text( CupertinoTextSelectionToolbarButton.getButtonLabel(
CupertinoTextSelectionToolbarButton.getButtonLabel( context,
context, buttonItem,
buttonItem,
),
),
), ),
); ),
}).toList(), ),
);
}).toList(),
); );
}, },
), ),

6
context_menus/lib/image_page.dart
Unescape View File

@ -19,10 +19,8 @@ class ImagePage extends StatelessWidget {
DialogRoute _showDialog(BuildContext context) { DialogRoute _showDialog(BuildContext context) {
return DialogRoute<void>( return DialogRoute<void>(
context: context, context: context,
builder: builder: (context) =>
(context) => const AlertDialog( const AlertDialog(title: Text('Image saved! (not really though)')),
title: Text('Image saved! (not really though)'),
),
); );
} }

54
context_menus/lib/main.dart
Unescape View File

@ -64,36 +64,30 @@ class _MyAppState extends State<MyApp> {
initialRoute: '/', initialRoute: '/',
routes: <String, Widget Function(BuildContext)>{ routes: <String, Widget Function(BuildContext)>{
'/': (context) => MyHomePage(onChangedPlatform: onChangedPlatform), '/': (context) => MyHomePage(onChangedPlatform: onChangedPlatform),
AnywherePage.route: AnywherePage.route: (context) =>
(context) => AnywherePage(onChangedPlatform: onChangedPlatform), AnywherePage(onChangedPlatform: onChangedPlatform),
CustomButtonsPage.route: CustomButtonsPage.route: (context) =>
(context) => CustomButtonsPage(onChangedPlatform: onChangedPlatform),
CustomButtonsPage(onChangedPlatform: onChangedPlatform), CustomMenuPage.route: (context) =>
CustomMenuPage.route: CustomMenuPage(onChangedPlatform: onChangedPlatform),
(context) => CustomMenuPage(onChangedPlatform: onChangedPlatform), ReorderedButtonsPage.route: (context) =>
ReorderedButtonsPage.route: ReorderedButtonsPage(onChangedPlatform: onChangedPlatform),
(context) => EmailButtonPage.route: (context) =>
ReorderedButtonsPage(onChangedPlatform: onChangedPlatform), EmailButtonPage(onChangedPlatform: onChangedPlatform),
EmailButtonPage.route: ImagePage.route: (context) =>
(context) => EmailButtonPage(onChangedPlatform: onChangedPlatform), ImagePage(onChangedPlatform: onChangedPlatform),
ImagePage.route: FieldTypesPage.route: (context) =>
(context) => ImagePage(onChangedPlatform: onChangedPlatform), FieldTypesPage(onChangedPlatform: onChangedPlatform),
FieldTypesPage.route: FullPage.route: (context) =>
(context) => FieldTypesPage(onChangedPlatform: onChangedPlatform), FullPage(onChangedPlatform: onChangedPlatform),
FullPage.route: ModifiedActionPage.route: (context) =>
(context) => FullPage(onChangedPlatform: onChangedPlatform), ModifiedActionPage(onChangedPlatform: onChangedPlatform),
ModifiedActionPage.route: GlobalSelectionPage.route: (context) =>
(context) => GlobalSelectionPage(onChangedPlatform: onChangedPlatform),
ModifiedActionPage(onChangedPlatform: onChangedPlatform), DefaultValuesPage.route: (context) =>
GlobalSelectionPage.route: DefaultValuesPage(onChangedPlatform: onChangedPlatform),
(context) => CascadingMenuPage.route: (context) =>
GlobalSelectionPage(onChangedPlatform: onChangedPlatform), CascadingMenuPage(onChangedPlatform: onChangedPlatform),
DefaultValuesPage.route:
(context) =>
DefaultValuesPage(onChangedPlatform: onChangedPlatform),
CascadingMenuPage.route:
(context) =>
CascadingMenuPage(onChangedPlatform: onChangedPlatform),
}, },
); );
} }

7
context_menus/lib/modified_action_page.dart
Unescape View File

@ -22,10 +22,9 @@ class ModifiedActionPage extends StatelessWidget {
DialogRoute _showDialog(BuildContext context) { DialogRoute _showDialog(BuildContext context) {
return DialogRoute<void>( return DialogRoute<void>(
context: context, context: context,
builder: builder: (context) => const AlertDialog(
(context) => const AlertDialog( title: Text('Copied, but also showed this dialog.'),
title: Text('Copied, but also showed this dialog.'), ),
),
); );
} }

25
context_menus/lib/platform_selector.dart
Unescape View File

@ -37,19 +37,18 @@ class _PlatformSelectorState extends State<PlatformSelector> {
widget.onChangedPlatform(value); widget.onChangedPlatform(value);
setState(() {}); setState(() {});
}, },
items: items: TargetPlatform.values.map((platform) {
TargetPlatform.values.map((platform) { return DropdownMenuItem<TargetPlatform>(
return DropdownMenuItem<TargetPlatform>( value: platform,
value: platform, child: Row(
child: Row( children: <Widget>[
children: <Widget>[ if (platform == originaPlatform)
if (platform == originaPlatform) const Icon(Icons.home, color: Color(0xff616161)),
const Icon(Icons.home, color: Color(0xff616161)), Text(_platformToString(platform)),
Text(_platformToString(platform)), ],
], ),
), );
); }).toList(),
}).toList(),
), ),
); );
} }

2
context_menus/pubspec.yaml
Unescape View File

@ -20,7 +20,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ^3.7.0-0 sdk: '>=3.9.0-0 <4.0.0'
# Dependencies specify other packages that your package needs in order to work. # Dependencies specify other packages that your package needs in order to work.
# To automatically upgrade your package dependencies to the latest versions # To automatically upgrade your package dependencies to the latest versions

2
date_planner/pubspec.yaml
Unescape View File

@ -4,7 +4,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 0.1.0 version: 0.1.0
environment: environment:
sdk: ^3.7.0 sdk: '>=3.9.0-0 <4.0.0'
dependencies: dependencies:
flutter: flutter:

7
deeplink_store_example/lib/product_category_list.dart
Unescape View File

@ -30,10 +30,9 @@ class ProductCategoryList extends StatelessWidget {
value.toString().contains(state.pathParameters['category']!), value.toString().contains(state.pathParameters['category']!),
orElse: () => Category.all, orElse: () => Category.all,
); );
final List<Widget> children = final List<Widget> children = ProductsRepository.loadProducts(
ProductsRepository.loadProducts( category: category,
category: category, ).map<Widget>((Product p) => RowItem(product: p)).toList();
).map<Widget>((Product p) => RowItem(product: p)).toList();
return Scaffold( return Scaffold(
backgroundColor: Styles.scaffoldBackground, backgroundColor: Styles.scaffoldBackground,
body: CustomScrollView( body: CustomScrollView(

7
deeplink_store_example/lib/product_list.dart
Unescape View File

@ -23,10 +23,9 @@ class ProductList extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final List<Widget> children = final List<Widget> children = ProductsRepository.loadProducts()
ProductsRepository.loadProducts() .map<Widget>((Product p) => RowItem(product: p))
.map<Widget>((Product p) => RowItem(product: p)) .toList();
.toList();
return Scaffold( return Scaffold(
backgroundColor: Styles.scaffoldBackground, backgroundColor: Styles.scaffoldBackground,
body: CustomScrollView( body: CustomScrollView(

2
deeplink_store_example/pubspec.yaml
Unescape View File

@ -19,7 +19,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ^3.7.0-0 sdk: '>=3.9.0-0 <4.0.0'
# Dependencies specify other packages that your package needs in order to work. # Dependencies specify other packages that your package needs in order to work.
# To automatically upgrade your package dependencies to the latest versions # To automatically upgrade your package dependencies to the latest versions

20
desktop_photo_search/fluent_ui/lib/main.dart
Unescape View File

@ -39,8 +39,8 @@ void main() {
runApp( runApp(
ChangeNotifierProvider<PhotoSearchModel>( ChangeNotifierProvider<PhotoSearchModel>(
create: create: (context) =>
(context) => PhotoSearchModel(Unsplash(accessKey: unsplashAccessKey)), PhotoSearchModel(Unsplash(accessKey: unsplashAccessKey)),
child: const UnsplashSearchApp(), child: const UnsplashSearchApp(),
), ),
); );
@ -84,9 +84,8 @@ class UnsplashHomePage extends StatelessWidget {
onSelected: () { onSelected: () {
showDialog<void>( showDialog<void>(
context: context, context: context,
builder: builder: (context) =>
(context) => PhotoSearchDialog(callback: photoSearchModel.addSearch),
PhotoSearchDialog(callback: photoSearchModel.addSearch),
); );
}, },
), ),
@ -118,12 +117,11 @@ class UnsplashHomePage extends StatelessWidget {
return UnsplashNotice( return UnsplashNotice(
child: Container( child: Container(
color: Colors.white, color: Colors.white,
child: child: photoSearchModel.entries.isNotEmpty
photoSearchModel.entries.isNotEmpty ? const UnsplashSearchContent()
? const UnsplashSearchContent() : const Center(
: const Center( child: Text('Search for Photos using the Search menu'),
child: Text('Search for Photos using the Search menu'), ),
),
), ),
); );
} }

5
desktop_photo_search/fluent_ui/lib/src/unsplash/api_error.g.dart
Unescape View File

@ -106,8 +106,9 @@ class _$ApiError extends ApiError {
@override @override
String toString() { String toString() {
return (newBuiltValueToStringHelper(r'ApiError') return (newBuiltValueToStringHelper(
..add('errors', errors)).toString(); r'ApiError',
)..add('errors', errors)).toString();
} }
} }

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save