Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

feat: Use the search eye animation from the POC #4833

Merged
merged 3 commits into from
Nov 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified packages/smooth_app/assets/animations/off.riv
Binary file not shown.
7 changes: 7 additions & 0 deletions packages/smooth_app/lib/l10n/app_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -1675,6 +1675,13 @@
}
}
},
"product_search_loading_message":"Your search of {search} is in progress.\n\nPlease wait a few seconds…",
"@product_search_loading_message": {
"description": "This message will be displayed when a search is in progress.",
"search": {
"type": "String"
}
},
"user_search_contributor_title": "Products I added",
"@user_search_contributor_title": {
"description": "User search (contributor): list tile title"
Expand Down
15 changes: 9 additions & 6 deletions packages/smooth_app/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import 'package:smooth_app/helpers/permission_helper.dart';
import 'package:smooth_app/pages/navigator/app_navigator.dart';
import 'package:smooth_app/pages/onboarding/onboarding_flow_navigator.dart';
import 'package:smooth_app/query/product_query.dart';
import 'package:smooth_app/resources/app_animations.dart';
import 'package:smooth_app/services/smooth_services.dart';
import 'package:smooth_app/themes/color_provider.dart';
import 'package:smooth_app/themes/contrast_provider.dart';
Expand Down Expand Up @@ -224,12 +225,14 @@ class _SmoothAppState extends State<SmoothApp> {
provide<ContinuousScanModel>(_continuousScanModel),
provide<PermissionListener>(_permissionListener),
],
child: AppNavigator(
observers: <NavigatorObserver>[
SentryNavigatorObserver(),
matomoObserver,
],
child: Builder(builder: _buildApp),
child: AnimationsLoader(
child: AppNavigator(
observers: <NavigatorObserver>[
SentryNavigatorObserver(),
matomoObserver,
],
child: Builder(builder: _buildApp),
),
),
);
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ import 'package:smooth_app/pages/personalized_ranking_page.dart';
import 'package:smooth_app/pages/product/common/product_list_item_simple.dart';
import 'package:smooth_app/pages/product/common/product_query_page_helper.dart';
import 'package:smooth_app/query/paged_product_query.dart';
import 'package:smooth_app/resources/app_animations.dart';
import 'package:smooth_app/widgets/ranking_floating_action_button.dart';
import 'package:smooth_app/widgets/smooth_app_bar.dart';
import 'package:smooth_app/widgets/smooth_scaffold.dart';
import 'package:smooth_app/widgets/smooth_text.dart';

class ProductQueryPage extends StatefulWidget {
const ProductQueryPage({
Expand Down Expand Up @@ -110,18 +112,15 @@ class _ProductQueryPageState extends State<ProductQueryPage>
);
case LoadingStatus.LOADING:
if (_model.isEmpty()) {
return _EmptyScreen(
screenSize: screenSize,
name: widget.name,
emptiness: const CircularProgressIndicator.adaptive(),
return _LoadingScreen(
title: widget.name,
);
}
break;
case LoadingStatus.LOADED:
if (_model.isEmpty()) {
// TODO(monsieurtanuki): should be tracked as well, shouldn't it?
return _EmptyScreen(
screenSize: screenSize,
name: widget.name,
emptiness: _getEmptyText(
themeData,
Expand Down Expand Up @@ -290,7 +289,6 @@ class _ProductQueryPageState extends State<ProductQueryPage>
final String errorMessage,
) {
return _EmptyScreen(
screenSize: screenSize,
name: widget.name,
emptiness: Padding(
padding: const EdgeInsets.all(SMALL_SPACE),
Expand Down Expand Up @@ -495,14 +493,12 @@ class _ProductQueryPageState extends State<ProductQueryPage>

class _EmptyScreen extends StatelessWidget {
const _EmptyScreen({
required this.screenSize,
required this.name,
required this.emptiness,
this.actions,
Key? key,
}) : super(key: key);

final Size screenSize;
final String name;
final Widget emptiness;
final List<Widget>? actions;
Expand Down Expand Up @@ -581,3 +577,38 @@ enum ProductQueryPageResult {
editProductQuery,
unknown,
}

class _LoadingScreen extends StatelessWidget {
const _LoadingScreen({
required this.title,
});

final String title;

@override
Widget build(BuildContext context) {
final AppLocalizations appLocalizations = AppLocalizations.of(context);

return _EmptyScreen(
name: title,
emptiness: FractionallySizedBox(
widthFactor: 0.75,
child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
SearchEyeAnimation(
size: MediaQuery.sizeOf(context).width * 0.2,
),
const SizedBox(height: VERY_LARGE_SPACE * 2),
TextHighlighter(
text: appLocalizations.product_search_loading_message(title),
filter: title,
softWrap: true,
textAlign: TextAlign.center,
),
],
),
),
);
}
}
Loading