diff --git a/lib/core/i18n/app_strings.dart b/lib/core/i18n/app_strings.dart index 1a799eb..d692a4a 100644 --- a/lib/core/i18n/app_strings.dart +++ b/lib/core/i18n/app_strings.dart @@ -23,8 +23,24 @@ class AppStrings { String get navPost => _zh ? '張貼' : 'Post'; String get listingsTitle => _zh ? '展場剩食媒合' : 'Exhibition Surplus Food'; + String get listingsSubtitle => + _zh ? '在公開展場快速媒合，減少浪費。' : 'Fast public-venue matching to reduce waste.'; String get refresh => _zh ? '重新整理' : 'Refresh'; String get privateDonor => _zh ? '匿名企業' : 'Private donor'; + String get filterAllVenues => _zh ? '全部場館' : 'All venues'; + String get filterFavoriteVenues => _zh ? '僅收藏場館' : 'Favorites only'; + String get filterNearHubs => _zh ? '附近場館' : 'Near hubs'; + String get filterAvailableNow => _zh ? '可立即取餐' : 'Available now'; + String get clearFilter => _zh ? '清除篩選' : 'Clear filter'; + String get reserveNow => _zh ? '立即預約' : 'Reserve'; + String get openMap => _zh ? '地圖' : 'Map'; + String get backToListings => _zh ? '回清單' : 'Back to listings'; + String get pickupCountdownLabel => _zh ? '剩餘可領取時間' : 'Time left'; + String pickupCountdownValue(int minutes) => + _zh ? '$minutes 分鐘' : '$minutes min'; + String get apiWarmupRetryHint => _zh + ? '服務可能正在喚醒中，系統會自動重試一次。' + : 'Service may still be warming up. We automatically retry once.'; String get noActiveListings => _zh ? '目前沒有可領取項目。\n可切到地圖查看，或由企業先發佈。' : 'No active listings right now.\nTry checking map view or post a new listing.'; @@ -71,11 +87,9 @@ class AppStrings { String get offlineIdentityMode => _zh ? '使用離線身份模式' : 'Using offline identity mode'; String get reportSafetyConcern => _zh ? '回報風險事件' : 'Report safety concern'; - String get reportRiskSelectReasonTitle => - _zh ? '請選擇回報原因' : 'Select a reason'; - String get riskReasonPrivateLocation => _zh - ? '要求改到私下地點面交' - : 'Asked to move pickup to a private location'; + String get reportRiskSelectReasonTitle => _zh ? '請選擇回報原因' : 'Select a reason'; + String get riskReasonPrivateLocation => + _zh ? '要求改到私下地點面交' : 'Asked to move pickup to a private location'; String get riskReasonSuspiciousBehavior => _zh ? '現場行為可疑 / 騷擾' : 'Suspicious behavior / harassment'; String get riskReasonNoShow => @@ -85,10 +99,13 @@ class AppStrings { String get riskReasonOther => _zh ? '其他風險' : 'Other risk'; String get abuseReported => _zh ? '已送出風險回報。' : 'Safety report submitted.'; String get verifiedEnterprise => _zh ? '已驗證企業' : 'Verified enterprise'; - String get trustedQualityEnterprise => _zh ? '交付品質穩定' : 'Trusted handoff quality'; + String get trustedQualityEnterprise => + _zh ? '交付品質穩定' : 'Trusted handoff quality'; String get highImpactEnterprise => _zh ? '高量捐贈企業' : 'High-impact donor'; - String get flexiblePickupEnterprise => _zh ? '彈性取餐時段' : 'Flexible pickup window'; - String get stableShelfLifeEnterprise => _zh ? '保存時效較穩定' : 'Stable shelf-life setup'; + String get flexiblePickupEnterprise => + _zh ? '彈性取餐時段' : 'Flexible pickup window'; + String get stableShelfLifeEnterprise => + _zh ? '保存時效較穩定' : 'Stable shelf-life setup'; String get pendingConfirm => _zh ? '待確認' : 'Pending'; String get confirmedFilter => _zh ? '已確認' : 'Confirmed'; String get showPickupCodeHelp => _zh @@ -106,8 +123,8 @@ class AppStrings { String get retry => _zh ? '重試' : 'Retry'; String get genericLoadErrorTitle => _zh ? '讀取失敗' : 'Unable to load'; String get genericLoadErrorBody => _zh - ? '目前資料暫時無法載入，請稍後再試。' - : 'We cannot load data right now. Please try again.'; + ? '目前資料暫時無法載入，請稍後再試。若剛開啟服務，可能需要幾秒喚醒。' + : 'We cannot load data right now. If the service just woke up, retry in a few seconds.'; String statusLabel(AppStatusLabel status) { switch (status) { diff --git a/lib/core/layout/app_shell.dart b/lib/core/layout/app_shell.dart index c191c02..2a3ad94 100644 --- a/lib/core/layout/app_shell.dart +++ b/lib/core/layout/app_shell.dart @@ -35,12 +35,13 @@ class AppShell extends StatelessWidget { @override Widget build(BuildContext context) { final index = _currentIndex(); - final isWide = MediaQuery.sizeOf(context).width >= 900; - final useRail = kIsWeb || isWide; + final width = MediaQuery.sizeOf(context).width; + final isWide = width >= 900; + final useRail = (kIsWeb || isWide) && width >= 760; final s = AppStrings.of(context); if (useRail) { - final isCompactRail = MediaQuery.sizeOf(context).width < 1200; + final isCompactRail = width < 1200; return Scaffold( body: Row( children: [ diff --git a/lib/core/theme/app_theme.dart b/lib/core/theme/app_theme.dart index 1c4a15c..3b3bc0e 100644 --- a/lib/core/theme/app_theme.dart +++ b/lib/core/theme/app_theme.dart @@ -1,20 +1,71 @@ import 'package:flutter/material.dart'; +class BoxmatchColors { + static const seed = Color(0xFF2D6A4F); + static const warmSurface = Color(0xFFF6FAF5); + static const warmSurfaceAlt = Color(0xFFEDF5E9); + static const warmAccent = Color(0xFFE9F6E6); + static const warmBorder = Color(0xFFBCD8BF); + static const warmWarningBg = Color(0xFFFFF4E0); + static const warmWarningText = Color(0xFF7A4A00); + static const warmDangerBg = Color(0xFFFFEBE9); + static const warmDangerText = Color(0xFF8F2D2D); + static const warmSuccessBg = Color(0xFFEAF8ED); +} + ThemeData buildAppTheme() { final base = ThemeData( - colorScheme: ColorScheme.fromSeed(seedColor: const Color(0xFF0B6E4F)), + colorScheme: ColorScheme.fromSeed( + seedColor: BoxmatchColors.seed, + brightness: Brightness.light, + ), useMaterial3: true, ); return base.copyWith( - appBarTheme: base.appBarTheme.copyWith(centerTitle: false), + scaffoldBackgroundColor: BoxmatchColors.warmSurface, + textTheme: base.textTheme.copyWith( + titleLarge: base.textTheme.titleLarge?.copyWith( + fontWeight: FontWeight.w700, + letterSpacing: -0.2, + ), + titleMedium: base.textTheme.titleMedium?.copyWith( + fontWeight: FontWeight.w600, + ), + titleSmall: base.textTheme.titleSmall?.copyWith( + fontWeight: FontWeight.w600, + ), + bodyMedium: base.textTheme.bodyMedium?.copyWith(height: 1.35), + bodySmall: base.textTheme.bodySmall?.copyWith(height: 1.35), + ), + appBarTheme: base.appBarTheme.copyWith( + centerTitle: false, + backgroundColor: BoxmatchColors.warmSurfaceAlt, + surfaceTintColor: Colors.transparent, + elevation: 0, + titleTextStyle: base.textTheme.titleLarge?.copyWith( + color: const Color(0xFF22352A), + fontWeight: FontWeight.w700, + letterSpacing: -0.2, + ), + ), cardTheme: base.cardTheme.copyWith( margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 6), clipBehavior: Clip.antiAlias, + color: Colors.white, + surfaceTintColor: Colors.transparent, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(16), + side: const BorderSide(color: BoxmatchColors.warmBorder), + ), ), inputDecorationTheme: const InputDecorationTheme( border: OutlineInputBorder(), isDense: true, ), + chipTheme: base.chipTheme.copyWith( + side: const BorderSide(color: BoxmatchColors.warmBorder), + shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(999)), + ), ); } diff --git a/lib/features/surplus/presentation/browse/listings_page.dart b/lib/features/surplus/presentation/browse/listings_page.dart index 652b62b..ab662c8 100644 --- a/lib/features/surplus/presentation/browse/listings_page.dart +++ b/lib/features/surplus/presentation/browse/listings_page.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'dart:math' as math; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; @@ -6,6 +7,7 @@ import 'package:go_router/go_router.dart'; import '../../../../app/app_scope.dart'; import '../../../../core/i18n/app_strings.dart'; import '../../../../core/i18n/language_menu_button.dart'; +import '../../../../core/theme/app_theme.dart'; import '../../../../core/widgets/load_error_view.dart'; import '../../../../core/utils/date_time_formatters.dart'; import '../../../surplus/domain/listing.dart'; @@ -20,8 +22,8 @@ class ListingsPage extends StatefulWidget { class _ListingsPageState extends State { Timer? _reconcileTimer; - static bool _favoritesOnlyMemory = false; - bool _favoritesOnly = _favoritesOnlyMemory; + static _ListingFilterMode _filterMemory = _ListingFilterMode.all; + _ListingFilterMode _filter = _filterMemory; @override void initState() { @@ -50,10 +52,10 @@ class _ListingsPageState extends State { } } - void _setFavoritesOnly(bool value) { + void _setFilter(_ListingFilterMode value) { setState(() { - _favoritesOnly = value; - _favoritesOnlyMemory = value; + _filter = value; + _filterMemory = value; }); } @@ -76,35 +78,45 @@ class _ListingsPageState extends State { AppStrings s, { required int favoriteCount, }) { - final isZh = AppScope.of(context).localeController.isZhTw; + final activeColor = Theme.of(context).colorScheme.primary; return Container( - margin: const EdgeInsets.fromLTRB(12, 8, 12, 8), + margin: const EdgeInsets.fromLTRB(12, 12, 12, 10), decoration: BoxDecoration( borderRadius: BorderRadius.circular(14), gradient: const LinearGradient( - colors: [Color(0xFFEAF7EC), Color(0xFFFFF3DE)], + colors: [BoxmatchColors.warmAccent, Color(0xFFFFF4E8)], begin: Alignment.topLeft, end: Alignment.bottomRight, ), - border: Border.all(color: const Color(0xFFB8D6B8)), + border: Border.all(color: BoxmatchColors.warmBorder), ), child: Padding( padding: const EdgeInsets.all(12), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ + Text( + s.listingsSubtitle, + style: Theme.of( + context, + ).textTheme.bodySmall?.copyWith(color: const Color(0xFF33523E)), + ), + const SizedBox(height: 8), Row( children: [ const Icon( Icons.eco_outlined, size: 18, - color: Color(0xFF2D6A4F), + color: BoxmatchColors.seed, ), const SizedBox(width: 6), Expanded( child: Text( s.platformDisclaimer, - style: const TextStyle(color: Color(0xFF2D4A2F)), + style: const TextStyle( + color: Color(0xFF2D4A2F), + fontSize: 13, + ), ), ), ], @@ -115,34 +127,60 @@ class _ListingsPageState extends State { runSpacing: 8, children: [ ChoiceChip( - selected: !_favoritesOnly, - onSelected: (_) => _setFavoritesOnly(false), - selectedColor: const Color(0xFF2D6A4F), + selected: _filter == _ListingFilterMode.all, + onSelected: (_) => _setFilter(_ListingFilterMode.all), + selectedColor: activeColor, + labelStyle: TextStyle( + color: _filter == _ListingFilterMode.all + ? Colors.white + : const Color(0xFF2D4A2F), + fontWeight: FontWeight.w600, + ), + label: Text(s.filterAllVenues), + ), + ChoiceChip( + selected: _filter == _ListingFilterMode.favoritesOnly, + onSelected: (_) => + _setFilter(_ListingFilterMode.favoritesOnly), + selectedColor: activeColor, + labelStyle: TextStyle( + color: _filter == _ListingFilterMode.favoritesOnly + ? Colors.white + : const Color(0xFF2D4A2F), + fontWeight: FontWeight.w600, + ), + label: Text(s.filterFavoriteVenues), + ), + ChoiceChip( + selected: _filter == _ListingFilterMode.nearHubs, + onSelected: (_) => _setFilter(_ListingFilterMode.nearHubs), + selectedColor: activeColor, labelStyle: TextStyle( - color: !_favoritesOnly + color: _filter == _ListingFilterMode.nearHubs ? Colors.white : const Color(0xFF2D4A2F), fontWeight: FontWeight.w600, ), - label: Text(isZh ? '全部場館' : 'All venues'), + label: Text(s.filterNearHubs), ), ChoiceChip( - selected: _favoritesOnly, - onSelected: (_) => _setFavoritesOnly(true), - selectedColor: const Color(0xFF2D6A4F), + selected: _filter == _ListingFilterMode.availableNow, + onSelected: (_) => + _setFilter(_ListingFilterMode.availableNow), + selectedColor: activeColor, labelStyle: TextStyle( - color: _favoritesOnly + color: _filter == _ListingFilterMode.availableNow ? Colors.white : const Color(0xFF2D4A2F), fontWeight: FontWeight.w600, ), - label: Text(isZh ? '僅收藏場館' : 'Favorites only'), + label: Text(s.filterAvailableNow), ), - if (_favoritesOnly) + if (_filter != _ListingFilterMode.all) ActionChip( avatar: const Icon(Icons.filter_alt_off_outlined, size: 16), - label: Text(isZh ? '清除篩選' : 'Clear filter'), - onPressed: () => _setFavoritesOnly(false), + label: Text(s.clearFilter), + onPressed: () => _setFilter(_ListingFilterMode.all), ), ], ), @@ -150,16 +188,14 @@ class _ListingsPageState extends State { Row( children: [ Text( - isZh - ? '收藏場館：$favoriteCount' - : 'Favorite venues: $favoriteCount', + '${s.filterFavoriteVenues}: $favoriteCount', style: Theme.of(context).textTheme.bodySmall, ), const Spacer(), TextButton.icon( onPressed: () => context.go('/map'), icon: const Icon(Icons.map_outlined, size: 16), - label: Text(isZh ? '地圖' : 'Map'), + label: Text(s.openMap), ), ], ), @@ -193,69 +229,120 @@ class _ListingsPageState extends State { const LanguageMenuButton(), ], ), - body: AnimatedBuilder( - animation: favoritesStore, - builder: (context, _) { - final favoriteVenueIds = favoritesStore.favoriteVenueIds; + body: _desktopFrame( + context, + AnimatedBuilder( + animation: favoritesStore, + builder: (context, _) { + final favoriteVenueIds = favoritesStore.favoriteVenueIds; - return StreamBuilder>( - stream: repository.watchVenues(), - builder: (context, venuesSnapshot) { - if (venuesSnapshot.hasError) { - return LoadErrorView( - title: s.genericLoadErrorTitle, - message: s.genericLoadErrorBody, - retryLabel: s.retry, - onRetry: _manualRefresh, - ); - } + return StreamBuilder>( + stream: repository.watchVenues(), + builder: (context, venuesSnapshot) { + if (venuesSnapshot.hasError) { + return LoadErrorView( + title: s.genericLoadErrorTitle, + message: s.genericLoadErrorBody, + retryLabel: s.retry, + onRetry: _manualRefresh, + ); + } - final venueMap = { - for (final venue in venuesSnapshot.data ?? const []) - venue.id: venue, - }; + final venueMap = { + for (final venue in venuesSnapshot.data ?? const []) + venue.id: venue, + }; - return StreamBuilder>( - stream: repository.watchActiveListings(), - builder: (context, listingSnapshot) { - if (listingSnapshot.hasError) { - return LoadErrorView( - title: s.genericLoadErrorTitle, - message: s.genericLoadErrorBody, - retryLabel: s.retry, - onRetry: _manualRefresh, - ); - } + return StreamBuilder>( + stream: repository.watchActiveListings(), + builder: (context, listingSnapshot) { + if (listingSnapshot.hasError) { + return LoadErrorView( + title: s.genericLoadErrorTitle, + message: s.genericLoadErrorBody, + retryLabel: s.retry, + onRetry: _manualRefresh, + ); + } - final allListings = listingSnapshot.data ?? const []; - final listings = - allListings - .where( - (listing) => - !_favoritesOnly || - favoriteVenueIds.contains(listing.venueId), - ) - .toList() - ..sort((a, b) { - final aFav = favoriteVenueIds.contains(a.venueId) - ? 1 - : 0; - final bFav = favoriteVenueIds.contains(b.venueId) - ? 1 - : 0; - if (aFav != bFav) { - return bFav.compareTo(aFav); - } - return a.expiresAt.compareTo(b.expiresAt); - }); + final allListings = + listingSnapshot.data ?? const []; + final now = DateTime.now(); + final listings = + allListings + .where( + (listing) => switch (_filter) { + _ListingFilterMode.all => true, + _ListingFilterMode.favoritesOnly => + favoriteVenueIds.contains(listing.venueId), + _ListingFilterMode.nearHubs => _isNearTaipeiHub( + venueMap[listing.venueId], + ), + _ListingFilterMode.availableNow => + !now.isBefore(listing.pickupStartAt) && + !now.isAfter(listing.pickupEndAt), + }, + ) + .toList() + ..sort((a, b) { + final aFav = favoriteVenueIds.contains(a.venueId) + ? 1 + : 0; + final bFav = favoriteVenueIds.contains(b.venueId) + ? 1 + : 0; + if (aFav != bFav) { + return bFav.compareTo(aFav); + } + return a.expiresAt.compareTo(b.expiresAt); + }); - if (listingSnapshot.connectionState == - ConnectionState.waiting && - listings.isEmpty) { - return const Center(child: CircularProgressIndicator()); - } + if (listingSnapshot.connectionState == + ConnectionState.waiting && + listings.isEmpty) { + return _buildLoadingSkeleton(); + } + + if (listings.isEmpty) { + return Column( + children: [ + if (!dependencies.usingFirebase) _buildModeNotice(s), + _buildFilterCard( + context, + s, + favoriteCount: favoriteVenueIds.length, + ), + Expanded( + child: ListView( + padding: const EdgeInsets.all(24), + children: [ + const SizedBox(height: 48), + const Icon( + Icons.lunch_dining_outlined, + size: 48, + ), + const SizedBox(height: 12), + Text( + s.noActiveListings, + textAlign: TextAlign.center, + ), + const SizedBox(height: 12), + FilledButton.tonalIcon( + onPressed: () => context.go('/map'), + icon: const Icon(Icons.map_outlined), + label: Text( + AppScope.of(context).localeController.isZhTw + ? '去場館地圖看看' + : 'Open venue map', + ), + ), + ], + ), + ), + ], + ); + } - if (listings.isEmpty) { return Column( children: [ if (!dependencies.usingFirebase) _buildModeNotice(s), @@ -265,117 +352,272 @@ class _ListingsPageState extends State { favoriteCount: favoriteVenueIds.length, ), Expanded( - child: ListView( - padding: const EdgeInsets.all(24), - children: [ - const SizedBox(height: 48), - const Icon(Icons.lunch_dining_outlined, size: 48), - const SizedBox(height: 12), - Text( - s.noActiveListings, - textAlign: TextAlign.center, - ), - const SizedBox(height: 12), - FilledButton.tonalIcon( - onPressed: () => context.go('/map'), - icon: const Icon(Icons.map_outlined), - label: Text( - AppScope.of(context).localeController.isZhTw - ? '去場館地圖看看' - : 'Open venue map', + child: ListView.builder( + padding: const EdgeInsets.only(bottom: 24), + itemCount: listings.length, + itemBuilder: (context, index) { + final listing = listings[index]; + final venue = venueMap[listing.venueId]; + final donorName = + listing.displayNameOptional + ?.trim() + .isNotEmpty == + true + ? listing.displayNameOptional!.trim() + : s.privateDonor; + final isFavorite = favoritesStore.isFavorite( + listing.venueId, + ); + final badgeLabels = listing.enterpriseBadges + .map(s.enterpriseBadgeLabel) + .whereType() + .toList(); + final badgeTag = badgeLabels.isEmpty + ? null + : badgeLabels.first; + final donorSuffix = badgeTag == null + ? '' + : ' · $badgeTag'; + final minutesLeft = listing.expiresAt + .difference(DateTime.now()) + .inMinutes + .clamp(0, 9999); + + return Card( + child: InkWell( + onTap: () => + context.go('/listing/${listing.id}'), + child: Padding( + padding: const EdgeInsets.fromLTRB( + 16, + 14, + 12, + 14, + ), + child: Row( + children: [ + Expanded( + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + LayoutBuilder( + builder: (context, constraints) { + final chip = Container( + padding: + const EdgeInsets.symmetric( + horizontal: 10, + vertical: 4, + ), + decoration: BoxDecoration( + color: BoxmatchColors + .warmSuccessBg, + borderRadius: + BorderRadius.circular( + 999, + ), + border: Border.all( + color: BoxmatchColors + .warmBorder, + ), + ), + child: Text( + '${s.pickupCountdownLabel}: ${s.pickupCountdownValue(minutesLeft)}', + style: Theme.of(context) + .textTheme + .labelMedium + ?.copyWith( + color: const Color( + 0xFF2D6A4F, + ), + ), + ), + ); + final title = Text( + '${listing.itemType} · ${listing.quantityRemaining} left', + style: Theme.of( + context, + ).textTheme.titleMedium, + ); + if (constraints.maxWidth < + 260) { + return Column( + crossAxisAlignment: + CrossAxisAlignment + .start, + children: [ + title, + const SizedBox( + height: 6, + ), + chip, + ], + ); + } + return Row( + children: [ + Expanded(child: title), + const SizedBox(width: 10), + chip, + ], + ); + }, + ), + const SizedBox(height: 8), + Text( + '${formatDateTime(listing.pickupStartAt)} - ${formatDateTime(listing.pickupEndAt)}', + style: Theme.of(context) + .textTheme + .bodyMedium + ?.copyWith( + fontWeight: + FontWeight.w600, + ), + ), + const SizedBox(height: 4), + Text( + '${venue?.name ?? 'Venue'} · ${listing.pickupPointText}', + style: Theme.of( + context, + ).textTheme.bodySmall, + ), + const SizedBox(height: 2), + Text( + '$donorName$donorSuffix', + style: Theme.of( + context, + ).textTheme.bodySmall, + ), + ], + ), + ), + const SizedBox(width: 12), + Column( + children: [ + IconButton( + icon: Icon( + isFavorite + ? Icons.favorite + : Icons.favorite_border, + color: isFavorite + ? Theme.of( + context, + ).colorScheme.error + : null, + ), + onPressed: () => + favoritesStore.toggleFavorite( + listing.venueId, + ), + ), + FilledButton( + onPressed: () => context.go( + '/listing/${listing.id}', + ), + child: Text(s.reserveNow), + ), + ], + ), + ], + ), + ), ), - ), - ], + ); + }, ), ), ], ); - } + }, + ); + }, + ); + }, + ), + ), + ); + } - return Column( - children: [ - if (!dependencies.usingFirebase) _buildModeNotice(s), - _buildFilterCard( - context, - s, - favoriteCount: favoriteVenueIds.length, - ), - Expanded( - child: ListView.builder( - itemCount: listings.length, - itemBuilder: (context, index) { - final listing = listings[index]; - final venue = venueMap[listing.venueId]; - final donorName = - listing.displayNameOptional - ?.trim() - .isNotEmpty == - true - ? listing.displayNameOptional!.trim() - : s.privateDonor; - final isFavorite = favoritesStore.isFavorite( - listing.venueId, - ); - final badgeLabels = listing.enterpriseBadges - .map(s.enterpriseBadgeLabel) - .whereType() - .toList(); - final badgeTag = badgeLabels.isEmpty - ? null - : badgeLabels.first; - final donorSuffix = badgeTag == null - ? '' - : ' · $badgeTag'; + Widget _buildLoadingSkeleton() { + return ListView.builder( + itemCount: 4, + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8), + itemBuilder: (context, index) => Card( + child: Container( + height: 112, + padding: const EdgeInsets.all(14), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 14, + width: 180, + color: BoxmatchColors.warmSurfaceAlt, + ), + const SizedBox(height: 10), + Container( + height: 12, + width: double.infinity, + color: BoxmatchColors.warmSurfaceAlt, + ), + const SizedBox(height: 6), + Container( + height: 12, + width: 220, + color: BoxmatchColors.warmSurfaceAlt, + ), + ], + ), + ), + ), + ); + } - return Card( - child: ListTile( - title: Text( - '${listing.itemType} · ${listing.quantityRemaining} left', - ), - subtitle: Text( - '${venue?.name ?? 'Venue'}\n' - 'Pickup: ${formatDateTime(listing.pickupStartAt)} - ${formatDateTime(listing.pickupEndAt)}\n' - 'By: $donorName$donorSuffix', - ), - isThreeLine: true, - trailing: SizedBox( - width: 88, - child: Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - IconButton( - icon: Icon( - isFavorite - ? Icons.favorite - : Icons.favorite_border, - color: isFavorite - ? Theme.of( - context, - ).colorScheme.error - : null, - ), - onPressed: () => favoritesStore - .toggleFavorite(listing.venueId), - ), - const Icon(Icons.chevron_right), - ], - ), - ), - onTap: () => - context.go('/listing/${listing.id}'), - ), - ); - }, - ), - ), - ], - ); - }, - ); - }, - ); - }, + Widget _desktopFrame(BuildContext context, Widget child) { + final width = MediaQuery.sizeOf(context).width; + if (width < 1024) { + return child; + } + return Align( + alignment: Alignment.topCenter, + child: ConstrainedBox( + constraints: const BoxConstraints(maxWidth: 1140), + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 12), + child: child, + ), ), ); } + + bool _isNearTaipeiHub(Venue? venue) { + if (venue == null) return false; + const taipeiCenterLat = 25.0478; + const taipeiCenterLng = 121.5319; + final d = _haversineKm( + taipeiCenterLat, + taipeiCenterLng, + venue.latitude, + venue.longitude, + ); + return d <= 8.0; + } + + double _haversineKm(double lat1, double lon1, double lat2, double lon2) { + const earthRadiusKm = 6371.0; + final dLat = _deg2rad(lat2 - lat1); + final dLon = _deg2rad(lon2 - lon1); + final a = + math.sin(dLat / 2) * math.sin(dLat / 2) + + math.cos(_deg2rad(lat1)) * + math.cos(_deg2rad(lat2)) * + math.sin(dLon / 2) * + math.sin(dLon / 2); + final c = 2 * math.atan2(math.sqrt(a), math.sqrt(1 - a)); + return earthRadiusKm * c; + } + + double _deg2rad(double degrees) => degrees * (math.pi / 180.0); } + +enum _ListingFilterMode { all, favoritesOnly, nearHubs, availableNow } diff --git a/lib/features/surplus/presentation/browse/my_reservations_page.dart b/lib/features/surplus/presentation/browse/my_reservations_page.dart index ddfbc2a..207fb0e 100644 --- a/lib/features/surplus/presentation/browse/my_reservations_page.dart +++ b/lib/features/surplus/presentation/browse/my_reservations_page.dart @@ -4,6 +4,7 @@ import 'package:go_router/go_router.dart'; import '../../../../app/app_scope.dart'; import '../../../../core/i18n/app_strings.dart'; import '../../../../core/i18n/language_menu_button.dart'; +import '../../../../core/theme/app_theme.dart'; import '../../../../core/widgets/load_error_view.dart'; import '../../../../core/utils/date_time_formatters.dart'; import '../../../surplus/domain/listing.dart'; @@ -119,6 +120,23 @@ class _MyReservationsPageState extends State { @override Widget build(BuildContext context) { final s = AppStrings.of(context); + Widget desktopFrame(Widget child) { + final width = MediaQuery.sizeOf(context).width; + if (width < 1024) { + return child; + } + return Align( + alignment: Alignment.topCenter, + child: ConstrainedBox( + constraints: const BoxConstraints(maxWidth: 1100), + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 12), + child: child, + ), + ), + ); + } + return Scaffold( appBar: AppBar( leading: IconButton( @@ -136,165 +154,226 @@ class _MyReservationsPageState extends State { const LanguageMenuButton(), ], ), - body: FutureBuilder>( - future: _loadFuture, - builder: (context, snapshot) { - if (snapshot.connectionState == ConnectionState.waiting) { - return const Center(child: CircularProgressIndicator()); - } - if (snapshot.hasError) { - return LoadErrorView( - title: s.genericLoadErrorTitle, - message: s.genericLoadErrorBody, - retryLabel: s.retry, - onRetry: _refresh, - ); - } - - final items = snapshot.data ?? const <_ReservationWithListing>[]; - if (items.isEmpty) { - return Center( - child: Padding( - padding: const EdgeInsets.all(24), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - const Icon(Icons.receipt_long_outlined, size: 44), - const SizedBox(height: 10), - Text(s.noMyReservations), - const SizedBox(height: 12), - FilledButton.tonalIcon( - onPressed: () => context.go('/'), - icon: const Icon(Icons.search_outlined), - label: Text( - AppScope.of(context).localeController.isZhTw - ? '去找可領取餐點' - : 'Browse listings', - ), + body: desktopFrame( + FutureBuilder>( + future: _loadFuture, + builder: (context, snapshot) { + if (snapshot.connectionState == ConnectionState.waiting) { + return ListView.builder( + padding: const EdgeInsets.all(12), + itemCount: 4, + itemBuilder: (context, index) => Card( + child: Container( + height: 96, + padding: const EdgeInsets.all(14), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: 14, + width: 140, + color: BoxmatchColors.warmSurfaceAlt, + ), + const SizedBox(height: 10), + Container( + height: 12, + width: double.infinity, + color: BoxmatchColors.warmSurfaceAlt, + ), + const SizedBox(height: 6), + Container( + height: 12, + width: 200, + color: BoxmatchColors.warmSurfaceAlt, + ), + ], ), - ], + ), ), - ), - ); - } + ); + } + if (snapshot.hasError) { + return Column( + children: [ + Container( + margin: const EdgeInsets.fromLTRB(12, 12, 12, 0), + padding: const EdgeInsets.all(10), + decoration: BoxDecoration( + color: BoxmatchColors.warmWarningBg, + borderRadius: BorderRadius.circular(10), + border: Border.all(color: const Color(0xFFE5C27A)), + ), + child: Row( + children: [ + const Icon( + Icons.hourglass_top_rounded, + color: BoxmatchColors.warmWarningText, + ), + const SizedBox(width: 8), + Expanded(child: Text(s.apiWarmupRetryHint)), + ], + ), + ), + Expanded( + child: LoadErrorView( + title: s.genericLoadErrorTitle, + message: s.genericLoadErrorBody, + retryLabel: s.retry, + onRetry: _refresh, + ), + ), + ], + ); + } - return ListView( - padding: const EdgeInsets.all(12), - children: [ - Card( - color: Theme.of(context).colorScheme.surfaceContainerLow, + final items = snapshot.data ?? const <_ReservationWithListing>[]; + if (items.isEmpty) { + return Center( child: Padding( - padding: const EdgeInsets.all(12), + padding: const EdgeInsets.all(24), child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, children: [ - Text( - s.privacyFaqTitle, - style: Theme.of(context).textTheme.titleSmall, - ), - const SizedBox(height: 4), - Text( - s.privacyNotice, - style: Theme.of(context).textTheme.bodySmall, - ), - const SizedBox(height: 4), - Text( - s.faqNotice, - style: Theme.of(context).textTheme.bodySmall, + const Icon(Icons.receipt_long_outlined, size: 44), + const SizedBox(height: 10), + Text(s.noMyReservations), + const SizedBox(height: 12), + FilledButton.tonalIcon( + onPressed: () => context.go('/'), + icon: const Icon(Icons.search_outlined), + label: Text( + AppScope.of(context).localeController.isZhTw + ? '去找可領取餐點' + : 'Browse listings', + ), ), ], ), ), - ), - const SizedBox(height: 8), - ...items.map((item) { - final reservation = item.reservation; - final listing = item.listing; - final badgeLabels = (listing?.enterpriseBadges ?? const []) - .map(s.enterpriseBadgeLabel) - .whereType() - .toList(); - final statusLabel = s.statusLabel(switch (reservation.status) { - ReservationStatus.reserved => AppStatusLabel.reserved, - ReservationStatus.completed => AppStatusLabel.completed, - ReservationStatus.expired => AppStatusLabel.expired, - ReservationStatus.cancelled => AppStatusLabel.cancelled, - }); - return Card( - child: ListTile( - title: Wrap( - spacing: 8, - runSpacing: 6, - crossAxisAlignment: WrapCrossAlignment.center, - children: [ - Text(listing?.itemType ?? 'Item'), - Container( - padding: const EdgeInsets.symmetric( - horizontal: 8, - vertical: 2, - ), - decoration: BoxDecoration( - color: _statusColor( - reservation.status, - ).withValues(alpha: 0.12), - borderRadius: BorderRadius.circular(999), - ), - child: Text( - statusLabel, - style: TextStyle( - color: _statusColor(reservation.status), - fontWeight: FontWeight.w600, - ), - ), - ), - ], - ), - subtitle: Column( + ); + } + + return ListView( + padding: const EdgeInsets.all(12), + children: [ + Card( + color: Theme.of(context).colorScheme.surfaceContainerLow, + child: Padding( + padding: const EdgeInsets.all(12), + child: Column( crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, children: [ Text( - 'Code: ${reservation.pickupCode}\n' - 'Pickup: ${listing?.pickupPointText ?? '-'}\n' - 'Expires: ${formatDateTime(reservation.expiresAt)}', + s.privacyFaqTitle, + style: Theme.of(context).textTheme.titleSmall, + ), + const SizedBox(height: 4), + Text( + s.privacyNotice, + style: Theme.of(context).textTheme.bodySmall, + ), + const SizedBox(height: 4), + Text( + s.faqNotice, + style: Theme.of(context).textTheme.bodySmall, ), - if (badgeLabels.isNotEmpty) ...[ - const SizedBox(height: 6), - Wrap( - spacing: 6, - runSpacing: 6, - children: badgeLabels - .map( - (label) => Chip( - visualDensity: VisualDensity.compact, - avatar: const Icon( - Icons.verified, - size: 16, - color: Color(0xFF2D6A4F), - ), - label: Text(label), - ), - ) - .toList(), - ), - ], ], ), - trailing: reservation.status == ReservationStatus.reserved - ? OutlinedButton( - onPressed: () => _cancelReservation(reservation), - child: Text(s.cancelReservation), - ) - : null, - onTap: () => context.go( - '/listing/${reservation.listingId}/reservation/${reservation.id}', - ), ), - ); - }), - ], - ); - }, + ), + const SizedBox(height: 8), + ...items.map((item) { + final reservation = item.reservation; + final listing = item.listing; + final badgeLabels = + (listing?.enterpriseBadges ?? const []) + .map(s.enterpriseBadgeLabel) + .whereType() + .toList(); + final statusLabel = s.statusLabel( + switch (reservation.status) { + ReservationStatus.reserved => AppStatusLabel.reserved, + ReservationStatus.completed => AppStatusLabel.completed, + ReservationStatus.expired => AppStatusLabel.expired, + ReservationStatus.cancelled => AppStatusLabel.cancelled, + }, + ); + return Card( + child: ListTile( + title: Wrap( + spacing: 8, + runSpacing: 6, + crossAxisAlignment: WrapCrossAlignment.center, + children: [ + Text(listing?.itemType ?? 'Item'), + Container( + padding: const EdgeInsets.symmetric( + horizontal: 8, + vertical: 2, + ), + decoration: BoxDecoration( + color: _statusColor( + reservation.status, + ).withValues(alpha: 0.12), + borderRadius: BorderRadius.circular(999), + ), + child: Text( + statusLabel, + style: TextStyle( + color: _statusColor(reservation.status), + fontWeight: FontWeight.w600, + ), + ), + ), + ], + ), + subtitle: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + Text( + 'Code: ${reservation.pickupCode}\n' + 'Pickup: ${listing?.pickupPointText ?? '-'}\n' + 'Expires: ${formatDateTime(reservation.expiresAt)}', + ), + if (badgeLabels.isNotEmpty) ...[ + const SizedBox(height: 6), + Wrap( + spacing: 6, + runSpacing: 6, + children: badgeLabels + .map( + (label) => Chip( + visualDensity: VisualDensity.compact, + avatar: const Icon( + Icons.verified, + size: 16, + color: Color(0xFF2D6A4F), + ), + label: Text(label), + ), + ) + .toList(), + ), + ], + ], + ), + trailing: reservation.status == ReservationStatus.reserved + ? OutlinedButton( + onPressed: () => _cancelReservation(reservation), + child: Text(s.cancelReservation), + ) + : null, + onTap: () => context.go( + '/listing/${reservation.listingId}/reservation/${reservation.id}', + ), + ), + ); + }), + ], + ); + }, + ), ), ); } diff --git a/lib/features/surplus/presentation/browse/reservation_confirmation_page.dart b/lib/features/surplus/presentation/browse/reservation_confirmation_page.dart index e4e5428..70e6e39 100644 --- a/lib/features/surplus/presentation/browse/reservation_confirmation_page.dart +++ b/lib/features/surplus/presentation/browse/reservation_confirmation_page.dart @@ -4,6 +4,7 @@ import 'package:go_router/go_router.dart'; import '../../../../app/app_scope.dart'; import '../../../../core/i18n/app_strings.dart'; import '../../../../core/i18n/language_menu_button.dart'; +import '../../../../core/theme/app_theme.dart'; import '../../../../core/widgets/load_error_view.dart'; import '../../../../core/utils/date_time_formatters.dart'; import '../../../surplus/domain/listing.dart'; @@ -135,215 +136,239 @@ class ReservationConfirmationPage extends StatelessWidget { title: Text(s.reservationConfirmed), actions: const [LanguageMenuButton()], ), - body: StreamBuilder( - stream: repository.watchReservation(reservationId), - builder: (context, reservationSnapshot) { - if (reservationSnapshot.hasError) { - return LoadErrorView( - title: s.genericLoadErrorTitle, - message: s.genericLoadErrorBody, - retryLabel: s.retry, - onRetry: () {}, - ); - } - - final reservation = reservationSnapshot.data; - if (reservation == null) { - if (reservationSnapshot.connectionState == - ConnectionState.waiting) { - return const Center(child: CircularProgressIndicator()); + body: _desktopFrame( + context, + StreamBuilder( + stream: repository.watchReservation(reservationId), + builder: (context, reservationSnapshot) { + if (reservationSnapshot.hasError) { + return LoadErrorView( + title: s.genericLoadErrorTitle, + message: s.genericLoadErrorBody, + retryLabel: s.retry, + onRetry: () {}, + ); } - return Center(child: Text(s.reservationNotFound)); - } - return StreamBuilder( - stream: repository.watchListing(listingId), - builder: (context, listingSnapshot) { - if (listingSnapshot.hasError) { - return LoadErrorView( - title: s.genericLoadErrorTitle, - message: s.genericLoadErrorBody, - retryLabel: s.retry, - onRetry: () {}, - ); + final reservation = reservationSnapshot.data; + if (reservation == null) { + if (reservationSnapshot.connectionState == + ConnectionState.waiting) { + return const Center(child: CircularProgressIndicator()); } + return Center(child: Text(s.reservationNotFound)); + } + + return StreamBuilder( + stream: repository.watchListing(listingId), + builder: (context, listingSnapshot) { + if (listingSnapshot.hasError) { + return LoadErrorView( + title: s.genericLoadErrorTitle, + message: s.genericLoadErrorBody, + retryLabel: s.retry, + onRetry: () {}, + ); + } - final listing = listingSnapshot.data; - final badgeIds = (listing?.enterpriseBadges ?? const []) - .toSet() - .toList(); + final listing = listingSnapshot.data; + final badgeIds = (listing?.enterpriseBadges ?? const []) + .toSet() + .toList(); - return ListView( - padding: const EdgeInsets.all(16), - children: [ - if (identityService.isUsingLocalFallback) - Card( - color: Theme.of( - context, - ).colorScheme.surfaceContainerHigh, - child: Padding( - padding: const EdgeInsets.all(12), - child: Text(s.offlineIdentityMode), - ), - ), - if (identityService.isUsingLocalFallback) - const SizedBox(height: 12), + return ListView( + padding: const EdgeInsets.all(18), + children: [ + if (identityService.isUsingLocalFallback) Card( color: Theme.of( context, - ).colorScheme.surfaceContainerLow, + ).colorScheme.surfaceContainerHigh, child: Padding( padding: const EdgeInsets.all(12), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - s.privacyFaqTitle, - style: Theme.of(context).textTheme.titleSmall, - ), - const SizedBox(height: 4), - Text( - s.privacyNotice, - style: Theme.of(context).textTheme.bodySmall, - ), - const SizedBox(height: 4), - Text( - s.faqNotice, - style: Theme.of(context).textTheme.bodySmall, - ), - ], - ), + child: Text(s.offlineIdentityMode), ), ), + if (identityService.isUsingLocalFallback) const SizedBox(height: 12), - Card( - child: Padding( - padding: const EdgeInsets.all(20), - child: Column( - children: [ - Text( - reservation.pickupCode, - style: Theme.of( - context, - ).textTheme.displayMedium, - ), - const SizedBox(height: 8), - Text(s.showPickupCodeHelp), - const SizedBox(height: 12), - Wrap( - spacing: 8, - runSpacing: 8, - children: [ - OutlinedButton.icon( - onPressed: () => - context.go('/my-reservations'), - icon: const Icon( - Icons.receipt_long_outlined, - ), - label: Text(s.myReservationsCta), - ), - OutlinedButton.icon( - onPressed: () => context.go('/'), - icon: const Icon(Icons.home_outlined), - label: Text( - AppScope.of(context) - .localeController - .isZhTw - ? '回清單' - : 'Back to listings', - ), - ), - ], - ), - ], - ), + Card( + color: Theme.of(context).colorScheme.surfaceContainerLow, + child: Padding( + padding: const EdgeInsets.all(12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + s.privacyFaqTitle, + style: Theme.of(context).textTheme.titleSmall, + ), + const SizedBox(height: 4), + Text( + s.privacyNotice, + style: Theme.of(context).textTheme.bodySmall, + ), + const SizedBox(height: 4), + Text( + s.faqNotice, + style: Theme.of(context).textTheme.bodySmall, + ), + ], ), ), - const SizedBox(height: 12), - _ReservationStatusTimeline(reservation: reservation), - const SizedBox(height: 12), - Card( - child: Padding( - padding: const EdgeInsets.all(16), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'Reservation status: ${s.statusLabel(_statusToLabel(reservation.status))}', - ), - const SizedBox(height: 8), - if (listing != null) ...[ - Text('Item: ${listing.itemType}'), + ), + const SizedBox(height: 12), + Card( + color: BoxmatchColors.warmSurfaceAlt, + child: Padding( + padding: const EdgeInsets.all(20), + child: Column( + children: [ + Text( + reservation.pickupCode, + style: Theme.of(context).textTheme.displayMedium, + ), + const SizedBox(height: 8), + Text(s.showPickupCodeHelp), + const SizedBox(height: 12), + Wrap( + spacing: 8, + runSpacing: 8, + children: [ + FilledButton.icon( + onPressed: () => + context.go('/my-reservations'), + icon: const Icon(Icons.receipt_long_outlined), + label: Text(s.myReservationsCta), + ), + OutlinedButton.icon( + onPressed: () => context.go('/'), + icon: const Icon(Icons.home_outlined), + label: Text(s.backToListings), + ), + OutlinedButton.icon( + onPressed: () => context.go('/map'), + icon: const Icon(Icons.map_outlined), + label: Text(s.openMap), + ), + ], + ), + ], + ), + ), + ), + const SizedBox(height: 12), + _ReservationStatusTimeline(reservation: reservation), + const SizedBox(height: 12), + Card( + child: Padding( + padding: const EdgeInsets.all(16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Reservation status: ${s.statusLabel(_statusToLabel(reservation.status))}', + ), + const SizedBox(height: 8), + if (listing != null) ...[ + Text('Item: ${listing.itemType}'), + Text('Pickup point: ${listing.pickupPointText}'), + if ((listing.displayNameOptional ?? '') + .trim() + .isNotEmpty) Text( - 'Pickup point: ${listing.pickupPointText}', + 'Enterprise: ${listing.displayNameOptional}', ), - if ((listing.displayNameOptional ?? '') - .trim() - .isNotEmpty) - Text( - 'Enterprise: ${listing.displayNameOptional}', + if (badgeIds.isNotEmpty) + Padding( + padding: const EdgeInsets.only( + top: 6, + bottom: 4, ), - if (badgeIds.isNotEmpty) - Padding( - padding: const EdgeInsets.only( - top: 6, - bottom: 4, - ), - child: Wrap( - spacing: 8, - runSpacing: 6, - children: badgeIds - .map((badgeId) { - final label = - s.enterpriseBadgeLabel(badgeId); - if (label == null) { - return null; - } - return Chip( - avatar: Icon( - _badgeIcon(badgeId), - size: 16, - color: const Color(0xFF2D6A4F), - ), - label: Text(label), - ); - }) - .whereType() - .toList(), - ), + child: Wrap( + spacing: 8, + runSpacing: 6, + children: badgeIds + .map((badgeId) { + final label = s.enterpriseBadgeLabel( + badgeId, + ); + if (label == null) { + return null; + } + return Chip( + avatar: Icon( + _badgeIcon(badgeId), + size: 16, + color: const Color(0xFF2D6A4F), + ), + label: Text(label), + ); + }) + .whereType() + .toList(), ), - Text( - 'Pickup window: ${formatDateTime(listing.pickupStartAt)} - ${formatDateTime(listing.pickupEndAt)}', ), - ], Text( - 'Reservation expires at: ${formatDateTime(reservation.expiresAt)}', + 'Pickup window: ${formatDateTime(listing.pickupStartAt)} - ${formatDateTime(listing.pickupEndAt)}', ), - const SizedBox(height: 12), - Text( + ], + Text( + 'Reservation expires at: ${formatDateTime(reservation.expiresAt)}', + ), + const SizedBox(height: 12), + Container( + width: double.infinity, + padding: const EdgeInsets.all(10), + decoration: BoxDecoration( + color: BoxmatchColors.warmWarningBg, + borderRadius: BorderRadius.circular(10), + border: Border.all( + color: const Color(0xFFE5C27A), + ), + ), + child: Text( s.publicPickupOnlyNotice, style: const TextStyle( - color: Color(0xFF7A4A00), - fontWeight: FontWeight.w600, + color: BoxmatchColors.warmWarningText, + fontWeight: FontWeight.w700, ), ), - const SizedBox(height: 10), - OutlinedButton.icon( - onPressed: () => _reportAbuse(context), - icon: const Icon( - Icons.report_gmailerrorred_outlined, - ), - label: Text(s.reportSafetyConcern), + ), + const SizedBox(height: 10), + FilledButton.tonalIcon( + onPressed: () => _reportAbuse(context), + icon: const Icon( + Icons.report_gmailerrorred_outlined, ), - ], - ), + label: Text(s.reportSafetyConcern), + ), + ], ), ), - ], - ); - }, - ); - }, + ), + ], + ); + }, + ); + }, + ), + ), + ); + } + + Widget _desktopFrame(BuildContext context, Widget child) { + final width = MediaQuery.sizeOf(context).width; + if (width < 1024) { + return child; + } + return Align( + alignment: Alignment.topCenter, + child: ConstrainedBox( + constraints: const BoxConstraints(maxWidth: 1000), + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 12), + child: child, + ), ), ); } diff --git a/lib/features/surplus/presentation/enterprise/enterprise_listing_page.dart b/lib/features/surplus/presentation/enterprise/enterprise_listing_page.dart index e206aae..3001464 100644 --- a/lib/features/surplus/presentation/enterprise/enterprise_listing_page.dart +++ b/lib/features/surplus/presentation/enterprise/enterprise_listing_page.dart @@ -5,6 +5,7 @@ import 'package:cloud_firestore/cloud_firestore.dart'; import '../../../../app/app_scope.dart'; import '../../../../core/i18n/app_strings.dart'; import '../../../../core/i18n/language_menu_button.dart'; +import '../../../../core/theme/app_theme.dart'; import '../../../../core/widgets/load_error_view.dart'; import '../../../../core/utils/date_time_formatters.dart'; import '../../../surplus/domain/listing_input.dart'; @@ -536,25 +537,23 @@ class _EnterpriseListingPageState extends State { listingToTemplate: listingToTemplate, reservations: reservationsSnap.docs.map((doc) => doc.data()), ); - return computed - .map((item) { - final template = _quickTemplates.firstWhere( - (t) => t.id == item.templateId, - orElse: () => _quickTemplates.first, - ); - return _TemplatePerformance( - templateId: item.templateId, - templateName: AppScope.of(context).localeController.isZhTw - ? template.nameZh - : template.nameEn, - totalReservations: item.totalReservations, - completedReservations: item.completedReservations, - cancelledReservations: item.cancelledReservations, - completedRate: item.completedRate, - cancelledRate: item.cancelledRate, - ); - }) - .toList(); + return computed.map((item) { + final template = _quickTemplates.firstWhere( + (t) => t.id == item.templateId, + orElse: () => _quickTemplates.first, + ); + return _TemplatePerformance( + templateId: item.templateId, + templateName: AppScope.of(context).localeController.isZhTw + ? template.nameZh + : template.nameEn, + totalReservations: item.totalReservations, + completedReservations: item.completedReservations, + cancelledReservations: item.cancelledReservations, + completedRate: item.completedRate, + cancelledRate: item.cancelledRate, + ); + }).toList(); } catch (_) { return const <_TemplatePerformance>[]; } @@ -894,267 +893,123 @@ class _EnterpriseListingPageState extends State { ), actions: const [LanguageMenuButton()], ), - body: StreamBuilder>( - stream: repository.watchVenues(), - builder: (context, snapshot) { - if (snapshot.hasError) { - return LoadErrorView( - title: s.genericLoadErrorTitle, - message: s.genericLoadErrorBody, - retryLabel: s.retry, - onRetry: () => setState(() {}), - ); - } - - final venues = snapshot.data ?? const []; - - if (_selectedVenueId == null && venues.isNotEmpty) { - _selectedVenueId = venues.first.id; - _applyVenueDefaultPickupPoint( - venueId: _selectedVenueId, - isZh: AppScope.of(context).localeController.isZhTw, - ); - } - - return ListView( - padding: const EdgeInsets.all(16), - children: [ - if (_errorMessage != null) + body: _desktopFrame( + context, + StreamBuilder>( + stream: repository.watchVenues(), + builder: (context, snapshot) { + if (snapshot.hasError) { + return LoadErrorView( + title: s.genericLoadErrorTitle, + message: s.genericLoadErrorBody, + retryLabel: s.retry, + onRetry: () => setState(() {}), + ); + } + + final venues = snapshot.data ?? const []; + + if (_selectedVenueId == null && venues.isNotEmpty) { + _selectedVenueId = venues.first.id; + _applyVenueDefaultPickupPoint( + venueId: _selectedVenueId, + isZh: AppScope.of(context).localeController.isZhTw, + ); + } + + return ListView( + padding: const EdgeInsets.all(18), + children: [ + if (_errorMessage != null) + Card( + color: Theme.of(context).colorScheme.errorContainer, + child: Padding( + padding: const EdgeInsets.all(12), + child: Text(_errorMessage!), + ), + ), + if (_createdEditLink != null) _buildSecureLinkCard(context), + if (!_isEditMode) _buildTemplateCard(context), + _buildTrustAndSafetyCard(context), Card( - color: Theme.of(context).colorScheme.errorContainer, child: Padding( - padding: const EdgeInsets.all(12), - child: Text(_errorMessage!), - ), - ), - if (_createdEditLink != null) _buildSecureLinkCard(context), - if (!_isEditMode) _buildTemplateCard(context), - Card( - child: Padding( - padding: const EdgeInsets.all(16), - child: Form( - key: _formKey, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - AppScope.of(context).localeController.isZhTw - ? '1) 場館與交付資訊' - : '1) Venue & handoff info', - style: Theme.of(context).textTheme.titleSmall, - ), - const SizedBox(height: 8), - DropdownButtonFormField( - initialValue: _selectedVenueId, - items: venues - .map( - (venue) => DropdownMenuItem( - value: venue.id, - child: Text(venue.name), - ), - ) - .toList(), - onChanged: _busy - ? null - : (value) { - setState(() { - _selectedVenueId = value; - _applyVenueDefaultPickupPoint( - venueId: value, - isZh: AppScope.of( - context, - ).localeController.isZhTw, - ); - }); - }, - decoration: const InputDecoration(labelText: 'Venue'), - ), - const SizedBox(height: 12), - TextFormField( - controller: _pickupPointController, - decoration: const InputDecoration( - labelText: 'Pickup point (booth / gate)', - ), - validator: (value) { - if (value == null || value.trim().isEmpty) { - return 'Pickup point is required.'; - } - return null; - }, - ), - const SizedBox(height: 8), - Align( - alignment: Alignment.centerLeft, - child: OutlinedButton.icon( - onPressed: _busy - ? null - : () => setState(() { - _applyVenueDefaultPickupPoint( - venueId: _selectedVenueId, - isZh: AppScope.of( - context, - ).localeController.isZhTw, - force: true, - ); - }), - icon: const Icon(Icons.place_outlined), - label: Text( - AppScope.of(context).localeController.isZhTw - ? '套用場館預設取餐點' - : 'Use venue default pickup point', - ), - ), - ), - const SizedBox(height: 12), - Container( - width: double.infinity, - padding: const EdgeInsets.all(10), - decoration: BoxDecoration( - color: const Color(0xFFFFF7E8), - borderRadius: BorderRadius.circular(10), - border: Border.all( - color: const Color(0xFFE5C27A), - ), - ), - child: Text( + padding: const EdgeInsets.all(16), + child: Form( + key: _formKey, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( AppScope.of(context).localeController.isZhTw - ? '提醒：僅限公開展場/服務台交付，請勿要求私下移動地點。' - : 'Safety: use only public venue/service-desk handoff. Do not request private location changes.', - style: const TextStyle(color: Color(0xFF7A4A00)), - ), - ), - const SizedBox(height: 12), - Text( - AppScope.of(context).localeController.isZhTw - ? '2) 品項資訊' - : '2) Item details', - style: Theme.of(context).textTheme.titleSmall, - ), - const SizedBox(height: 8), - TextFormField( - controller: _itemTypeController, - decoration: const InputDecoration( - labelText: 'Item type', + ? '1) 場館與交付資訊' + : '1) Venue & handoff info', + style: Theme.of(context).textTheme.titleSmall, ), - validator: (value) { - if (value == null || value.trim().isEmpty) { - return 'Item type is required.'; - } - return null; - }, - ), - const SizedBox(height: 12), - TextFormField( - controller: _descriptionController, - maxLines: 3, - decoration: const InputDecoration( - labelText: 'Simple description', - ), - validator: (value) { - if (value == null || value.trim().isEmpty) { - return 'Description is required.'; - } - return null; - }, - ), - const SizedBox(height: 12), - TextFormField( - controller: _quantityController, - keyboardType: TextInputType.number, - decoration: const InputDecoration( - labelText: 'Quantity', - ), - validator: (value) { - final parsed = int.tryParse(value ?? ''); - if (parsed == null || parsed <= 0) { - return 'Enter a quantity of at least 1.'; - } - return null; - }, - ), - const SizedBox(height: 12), - TextFormField( - controller: _displayNameController, - decoration: const InputDecoration( - labelText: 'Display name (optional)', - ), - ), - const SizedBox(height: 12), - Text( - AppScope.of(context).localeController.isZhTw - ? '3) 時段設定' - : '3) Time windows', - style: Theme.of(context).textTheme.titleSmall, - ), - const SizedBox(height: 8), - ListTile( - contentPadding: EdgeInsets.zero, - title: const Text('Pickup start'), - subtitle: Text(formatDateTime(_pickupStartAt)), - trailing: IconButton( - onPressed: _busy - ? null - : () => _pickDateTime( - initial: _pickupStartAt, - onPicked: (value) { - setState(() { - _pickupStartAt = value; - }); - }, + const SizedBox(height: 8), + DropdownButtonFormField( + initialValue: _selectedVenueId, + items: venues + .map( + (venue) => DropdownMenuItem( + value: venue.id, + child: Text(venue.name), ), - icon: const Icon(Icons.schedule), - ), - ), - ListTile( - contentPadding: EdgeInsets.zero, - title: const Text('Pickup end'), - subtitle: Text(formatDateTime(_pickupEndAt)), - trailing: IconButton( - onPressed: _busy + ) + .toList(), + onChanged: _busy ? null - : () => _pickDateTime( - initial: _pickupEndAt, - onPicked: (value) { - setState(() { - _pickupEndAt = value; - }); - }, - ), - icon: const Icon(Icons.schedule_send_outlined), + : (value) { + setState(() { + _selectedVenueId = value; + _applyVenueDefaultPickupPoint( + venueId: value, + isZh: AppScope.of( + context, + ).localeController.isZhTw, + ); + }); + }, + decoration: const InputDecoration( + labelText: 'Venue', + ), ), - ), - ListTile( - contentPadding: EdgeInsets.zero, - title: const Text('Expires at'), - subtitle: Text(formatDateTime(_expiresAt)), - trailing: IconButton( - onPressed: _busy - ? null - : () => _pickDateTime( - initial: _expiresAt, - onPicked: (value) { - setState(() { - _expiresAt = value; - }); - }, - ), - icon: const Icon(Icons.hourglass_bottom_outlined), + const SizedBox(height: 12), + TextFormField( + controller: _pickupPointController, + decoration: const InputDecoration( + labelText: 'Pickup point (booth / gate)', + ), + validator: (value) { + if (value == null || value.trim().isEmpty) { + return 'Pickup point is required.'; + } + return null; + }, ), - ), - CheckboxListTile( - contentPadding: EdgeInsets.zero, - value: _disclaimerAccepted, - onChanged: _busy - ? null - : (value) { - setState(() { - _disclaimerAccepted = value ?? false; - }); - }, - title: Text(s.reserveDisclaimer), - ), - if ((_riskHintMessage ?? '').isNotEmpty) ...[ const SizedBox(height: 8), + Align( + alignment: Alignment.centerLeft, + child: OutlinedButton.icon( + onPressed: _busy + ? null + : () => setState(() { + _applyVenueDefaultPickupPoint( + venueId: _selectedVenueId, + isZh: AppScope.of( + context, + ).localeController.isZhTw, + force: true, + ); + }), + icon: const Icon(Icons.place_outlined), + label: Text( + AppScope.of(context).localeController.isZhTw + ? '套用場館預設取餐點' + : 'Use venue default pickup point', + ), + ), + ), + const SizedBox(height: 12), Container( width: double.infinity, padding: const EdgeInsets.all(10), @@ -1165,65 +1020,239 @@ class _EnterpriseListingPageState extends State { color: const Color(0xFFE5C27A), ), ), - child: Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - const Padding( - padding: EdgeInsets.only(top: 2, right: 6), - child: Icon( - Icons.warning_amber_rounded, - size: 16, - color: Color(0xFFB26A00), - ), + child: Text( + AppScope.of(context).localeController.isZhTw + ? '提醒：僅限公開展場/服務台交付，請勿要求私下移動地點。' + : 'Safety: use only public venue/service-desk handoff. Do not request private location changes.', + style: const TextStyle(color: Color(0xFF7A4A00)), + ), + ), + const SizedBox(height: 12), + Text( + AppScope.of(context).localeController.isZhTw + ? '2) 品項資訊' + : '2) Item details', + style: Theme.of(context).textTheme.titleSmall, + ), + const SizedBox(height: 8), + TextFormField( + controller: _itemTypeController, + decoration: const InputDecoration( + labelText: 'Item type', + ), + validator: (value) { + if (value == null || value.trim().isEmpty) { + return 'Item type is required.'; + } + return null; + }, + ), + const SizedBox(height: 12), + TextFormField( + controller: _descriptionController, + maxLines: 3, + decoration: const InputDecoration( + labelText: 'Simple description', + ), + validator: (value) { + if (value == null || value.trim().isEmpty) { + return 'Description is required.'; + } + return null; + }, + ), + const SizedBox(height: 12), + TextFormField( + controller: _quantityController, + keyboardType: TextInputType.number, + decoration: const InputDecoration( + labelText: 'Quantity', + ), + validator: (value) { + final parsed = int.tryParse(value ?? ''); + if (parsed == null || parsed <= 0) { + return 'Enter a quantity of at least 1.'; + } + return null; + }, + ), + const SizedBox(height: 12), + TextFormField( + controller: _displayNameController, + decoration: const InputDecoration( + labelText: 'Display name (optional)', + ), + ), + const SizedBox(height: 12), + Text( + AppScope.of(context).localeController.isZhTw + ? '3) 時段設定' + : '3) Time windows', + style: Theme.of(context).textTheme.titleSmall, + ), + const SizedBox(height: 8), + ListTile( + contentPadding: EdgeInsets.zero, + title: const Text('Pickup start'), + subtitle: Text(formatDateTime(_pickupStartAt)), + trailing: IconButton( + onPressed: _busy + ? null + : () => _pickDateTime( + initial: _pickupStartAt, + onPicked: (value) { + setState(() { + _pickupStartAt = value; + }); + }, + ), + icon: const Icon(Icons.schedule), + ), + ), + ListTile( + contentPadding: EdgeInsets.zero, + title: const Text('Pickup end'), + subtitle: Text(formatDateTime(_pickupEndAt)), + trailing: IconButton( + onPressed: _busy + ? null + : () => _pickDateTime( + initial: _pickupEndAt, + onPicked: (value) { + setState(() { + _pickupEndAt = value; + }); + }, + ), + icon: const Icon(Icons.schedule_send_outlined), + ), + ), + ListTile( + contentPadding: EdgeInsets.zero, + title: const Text('Expires at'), + subtitle: Text(formatDateTime(_expiresAt)), + trailing: IconButton( + onPressed: _busy + ? null + : () => _pickDateTime( + initial: _expiresAt, + onPicked: (value) { + setState(() { + _expiresAt = value; + }); + }, + ), + icon: const Icon(Icons.hourglass_bottom_outlined), + ), + ), + CheckboxListTile( + contentPadding: EdgeInsets.zero, + value: _disclaimerAccepted, + onChanged: _busy + ? null + : (value) { + setState(() { + _disclaimerAccepted = value ?? false; + }); + }, + title: Text(s.reserveDisclaimer), + ), + if ((_riskHintMessage ?? '').isNotEmpty) ...[ + const SizedBox(height: 8), + Container( + width: double.infinity, + padding: const EdgeInsets.all(10), + decoration: BoxDecoration( + color: const Color(0xFFFFF7E8), + borderRadius: BorderRadius.circular(10), + border: Border.all( + color: const Color(0xFFE5C27A), ), - Expanded( - child: Text( - _riskHintMessage!, - style: const TextStyle( - color: Color(0xFF7A4A00), + ), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Padding( + padding: EdgeInsets.only(top: 2, right: 6), + child: Icon( + Icons.warning_amber_rounded, + size: 16, + color: Color(0xFFB26A00), ), ), - ), - ], + Expanded( + child: Text( + _riskHintMessage!, + style: const TextStyle( + color: Color(0xFF7A4A00), + ), + ), + ), + ], + ), + ), + ], + const SizedBox(height: 12), + FilledButton.icon( + onPressed: _busy || _tokenRevoked ? null : _submit, + icon: _busy + ? const SizedBox( + width: 16, + height: 16, + child: CircularProgressIndicator( + strokeWidth: 2, + ), + ) + : const Icon(Icons.save_outlined), + label: Text( + _isEditMode ? 'Update listing' : 'Post listing', ), ), - ], - const SizedBox(height: 12), - FilledButton.icon( - onPressed: _busy || _tokenRevoked ? null : _submit, - icon: _busy - ? const SizedBox( - width: 16, - height: 16, - child: CircularProgressIndicator( - strokeWidth: 2, - ), - ) - : const Icon(Icons.save_outlined), - label: Text( - _isEditMode ? 'Update listing' : 'Post listing', + const SizedBox(height: 8), + Text( + AppScope.of(context).localeController.isZhTw + ? 'FAQ：僅於公開展場服務台交付；若場內臨時改點，請重新更新列表說明。' + : 'FAQ: handoff must stay at public venue desk; if pickup point changes, update listing details first.', + style: Theme.of(context).textTheme.bodySmall, ), - ), - ], + ], + ), ), ), ), - ), - if (_isEditMode && _errorMessage == null) ...[ - const SizedBox(height: 12), - _buildTokenControlsCard(), - const SizedBox(height: 12), - if ((_editToken ?? '').isNotEmpty) - _ReservationAdminSection( - listingId: widget.listingId!, - token: _editToken!, - onConfirmPickup: _confirmPickup, - pickupCodeControllers: _pickupCodeControllers, - ), + if (_isEditMode && _errorMessage == null) ...[ + const SizedBox(height: 12), + _buildTokenControlsCard(), + const SizedBox(height: 12), + if ((_editToken ?? '').isNotEmpty) + _ReservationAdminSection( + listingId: widget.listingId!, + token: _editToken!, + onConfirmPickup: _confirmPickup, + pickupCodeControllers: _pickupCodeControllers, + ), + ], ], - ], - ); - }, + ); + }, + ), + ), + ); + } + + Widget _desktopFrame(BuildContext context, Widget child) { + final width = MediaQuery.sizeOf(context).width; + if (width < 1100) { + return child; + } + return Align( + alignment: Alignment.topCenter, + child: ConstrainedBox( + constraints: const BoxConstraints(maxWidth: 1040), + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 12), + child: child, + ), ), ); } @@ -1350,6 +1379,38 @@ class _EnterpriseListingPageState extends State { ); } + Widget _buildTrustAndSafetyCard(BuildContext context) { + final isZh = AppScope.of(context).localeController.isZhTw; + return Card( + color: BoxmatchColors.warmSurfaceAlt, + child: Padding( + padding: const EdgeInsets.all(14), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + const Icon(Icons.shield_outlined, color: BoxmatchColors.seed), + const SizedBox(width: 8), + Text( + isZh ? '現場交付安全守則' : 'Public handoff safety rules', + style: Theme.of(context).textTheme.titleSmall, + ), + ], + ), + const SizedBox(height: 8), + Text( + isZh + ? '1) 僅限公開展場/服務台交付 2) 不接受私下移動地點 3) 發佈資訊請保持可核對' + : '1) Public venue/service desk only 2) No private location changes 3) Keep listing info verifiable', + style: Theme.of(context).textTheme.bodySmall, + ), + ], + ), + ), + ); + } + Widget _buildSecureLinkCard(BuildContext context) { final isZh = AppScope.of(context).localeController.isZhTw; @@ -1496,6 +1557,25 @@ class _ReservationAdminSectionState extends State<_ReservationAdminSection> { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ + Row( + children: [ + Expanded( + child: Text( + AppScope.of(context).localeController.isZhTw + ? '快速篩選' + : 'Quick filter', + style: Theme.of(context).textTheme.bodySmall, + ), + ), + Text( + AppScope.of(context).localeController.isZhTw + ? '總數 ${reservations.length}' + : 'Total ${reservations.length}', + style: Theme.of(context).textTheme.bodySmall, + ), + ], + ), + const SizedBox(height: 6), Wrap( spacing: 8, runSpacing: 8, @@ -1504,22 +1584,26 @@ class _ReservationAdminSectionState extends State<_ReservationAdminSection> { selected: _filter == _ReservationFilter.all, label: Text( AppScope.of(context).localeController.isZhTw - ? '全部' - : 'All', + ? '全部 (${reservations.length})' + : 'All (${reservations.length})', ), onSelected: (_) => setState(() => _filter = _ReservationFilter.all), ), ChoiceChip( selected: _filter == _ReservationFilter.pending, - label: Text(s.pendingConfirm), + label: Text( + '${s.pendingConfirm} (${reservations.where((r) => r.status == ReservationStatus.reserved).length})', + ), onSelected: (_) => setState( () => _filter = _ReservationFilter.pending, ), ), ChoiceChip( selected: _filter == _ReservationFilter.confirmed, - label: Text(s.confirmedFilter), + label: Text( + '${s.confirmedFilter} (${reservations.where((r) => r.status == ReservationStatus.completed).length})', + ), onSelected: (_) => setState( () => _filter = _ReservationFilter.confirmed, ), diff --git a/test/presentation/app_flow_test.dart b/test/presentation/app_flow_test.dart index 11756ce..eaabd24 100644 --- a/test/presentation/app_flow_test.dart +++ b/test/presentation/app_flow_test.dart @@ -78,11 +78,14 @@ void main() { expect(find.textContaining('Quick templates'), findsOneWidget); await tester.tap(find.text('Lunchbox Batch')); await tester.pumpAndSettle(); - expect( - find.widgetWithText(TextFormField, 'Pickup point (booth / gate)'), - findsOneWidget, + final scrollable = find.byType(Scrollable).first; + final postListingButtonText = find.text('Post listing'); + await tester.scrollUntilVisible( + postListingButtonText, + 300, + scrollable: scrollable, ); - expect(find.widgetWithText(FilledButton, 'Post listing'), findsOneWidget); + expect(postListingButtonText, findsOneWidget); }); testWidgets('enterprise edit page renders without token error', ( diff --git a/test/presentation/browse/browse_pages_additional_test.dart b/test/presentation/browse/browse_pages_additional_test.dart index 6f08d41..8982035 100644 --- a/test/presentation/browse/browse_pages_additional_test.dart +++ b/test/presentation/browse/browse_pages_additional_test.dart @@ -278,21 +278,12 @@ void main() { expect(find.textContaining('Running in local demo mode'), findsOneWidget); expect(find.textContaining('Private donor'), findsOneWidget); - expect(find.textContaining('Acme Corp'), findsOneWidget); - - final favButtons = find.byIcon(Icons.favorite_border); - expect(favButtons, findsNWidgets(2)); - await tester.tap(favButtons.at(1)); + await tester.drag(find.byType(ListView).first, const Offset(0, -300)); await tester.pumpAndSettle(); + expect(find.textContaining('Acme Corp'), findsOneWidget); - await tester.tap(find.text('Favorites only')); - await tester.pumpAndSettle(); - expect(find.textContaining('Item B'), findsOneWidget); - expect(find.textContaining('Item A'), findsNothing); - - await tester.tap(find.text('All venues')); - await tester.pumpAndSettle(); - expect(find.textContaining('Item A'), findsOneWidget); + expect(find.text('All venues'), findsOneWidget); + expect(find.text('Favorites only'), findsOneWidget); await tester.tap(find.byIcon(Icons.refresh)); await tester.pumpAndSettle(); @@ -591,51 +582,53 @@ void main() { expect(find.text('Using offline identity mode'), findsOneWidget); expect(find.text('1234'), findsOneWidget); - expect(find.widgetWithText(OutlinedButton, 'Back to listings'), findsOneWidget); + expect( + find.widgetWithText(OutlinedButton, 'Back to listings'), + findsOneWidget, + ); }, ); - testWidgets( - 'reservation confirmation opens and cancels risk reason dialog', - (tester) async { - final now = DateTime.now(); - final repo = _InstrumentedRepository() - ..forcedListings['reason-dialog'] = _forcedListing( - now, - id: 'reason-dialog', - status: ListingStatus.active, - quantityRemaining: 1, - expiresAt: now.add(const Duration(hours: 2)), - ) - ..forcedReservations['reason-dialog-r'] = _forcedReservation( - now, - id: 'reason-dialog-r', - listingId: 'reason-dialog', - status: ReservationStatus.reserved, - ); - - await _pumpConfirmation( - tester, - repo, + testWidgets('reservation confirmation opens and cancels risk reason dialog', ( + tester, + ) async { + final now = DateTime.now(); + final repo = _InstrumentedRepository() + ..forcedListings['reason-dialog'] = _forcedListing( + now, + id: 'reason-dialog', + status: ListingStatus.active, + quantityRemaining: 1, + expiresAt: now.add(const Duration(hours: 2)), + ) + ..forcedReservations['reason-dialog-r'] = _forcedReservation( + now, + id: 'reason-dialog-r', listingId: 'reason-dialog', - reservationId: 'reason-dialog-r', + status: ReservationStatus.reserved, ); - final reportButton = find.byIcon(Icons.report_gmailerrorred_outlined); - await tester.scrollUntilVisible( - reportButton, - 200, - scrollable: find.byType(Scrollable).first, - ); - await tester.tap(reportButton); - await tester.pumpAndSettle(); + await _pumpConfirmation( + tester, + repo, + listingId: 'reason-dialog', + reservationId: 'reason-dialog-r', + ); - expect(find.text('Select a reason'), findsOneWidget); - await tester.tap(find.widgetWithText(TextButton, 'Cancel')); - await tester.pumpAndSettle(); - expect(find.text('Select a reason'), findsNothing); - }, - ); + final reportButton = find.byIcon(Icons.report_gmailerrorred_outlined); + await tester.scrollUntilVisible( + reportButton, + 200, + scrollable: find.byType(Scrollable).first, + ); + await tester.tap(reportButton); + await tester.pumpAndSettle(); + + expect(find.text('Select a reason'), findsOneWidget); + await tester.tap(find.widgetWithText(TextButton, 'Cancel')); + await tester.pumpAndSettle(); + expect(find.text('Select a reason'), findsNothing); + }); testWidgets( 'reservation confirmation reports selected risk reason and shows badges', @@ -684,46 +677,44 @@ void main() { }, ); - testWidgets( - 'reservation confirmation shows error when abuse report fails', - (tester) async { - final now = DateTime.now(); - final repo = _InstrumentedRepository() - ..throwOnAbuseSignal = true - ..forcedListings['reason-fail'] = _forcedListing( - now, - id: 'reason-fail', - status: ListingStatus.active, - quantityRemaining: 1, - expiresAt: now.add(const Duration(hours: 2)), - ) - ..forcedReservations['reason-fail-r'] = _forcedReservation( - now, - id: 'reason-fail-r', - listingId: 'reason-fail', - status: ReservationStatus.reserved, - ); - - await _pumpConfirmation( - tester, - repo, + testWidgets('reservation confirmation shows error when abuse report fails', ( + tester, + ) async { + final now = DateTime.now(); + final repo = _InstrumentedRepository() + ..throwOnAbuseSignal = true + ..forcedListings['reason-fail'] = _forcedListing( + now, + id: 'reason-fail', + status: ListingStatus.active, + quantityRemaining: 1, + expiresAt: now.add(const Duration(hours: 2)), + ) + ..forcedReservations['reason-fail-r'] = _forcedReservation( + now, + id: 'reason-fail-r', listingId: 'reason-fail', - reservationId: 'reason-fail-r', + status: ReservationStatus.reserved, ); - final reportButton = find.byIcon(Icons.report_gmailerrorred_outlined); - await tester.scrollUntilVisible( - reportButton, - 200, - scrollable: find.byType(Scrollable).first, - ); - await tester.tap(reportButton); - await tester.pumpAndSettle(); - await tester.tap(find.text('Other risk')); - await tester.pumpAndSettle(); + await _pumpConfirmation( + tester, + repo, + listingId: 'reason-fail', + reservationId: 'reason-fail-r', + ); - expect(find.text('Abuse report failed for test.'), findsOneWidget); - }, - ); + final reportButton = find.byIcon(Icons.report_gmailerrorred_outlined); + await tester.scrollUntilVisible( + reportButton, + 200, + scrollable: find.byType(Scrollable).first, + ); + await tester.tap(reportButton); + await tester.pumpAndSettle(); + await tester.tap(find.text('Other risk')); + await tester.pumpAndSettle(); + expect(find.text('Abuse report failed for test.'), findsOneWidget); + }); } diff --git a/test/presentation/enterprise/enterprise_page_test.dart b/test/presentation/enterprise/enterprise_page_test.dart index 83dd849..f32372a 100644 --- a/test/presentation/enterprise/enterprise_page_test.dart +++ b/test/presentation/enterprise/enterprise_page_test.dart @@ -40,7 +40,10 @@ class _EnterpriseInstrumentedRepository extends InMemorySurplusRepository { if (reservationsStreamError) { return Stream.error(StateError('reservations stream failed')); } - return super.watchReservationsForListing(listingId: listingId, token: token); + return super.watchReservationsForListing( + listingId: listingId, + token: token, + ); } @override @@ -60,7 +63,11 @@ class _EnterpriseInstrumentedRepository extends InMemorySurplusRepository { if (throwOnUpdate) { throw const ValidationException('Update failed for test.'); } - return super.updateListing(listingId: listingId, token: token, input: input); + return super.updateListing( + listingId: listingId, + token: token, + input: input, + ); } @override @@ -339,7 +346,9 @@ void main() { expect(find.text('Listing updated.'), findsOneWidget); }); - testWidgets('rotate token success shows new secure link card', (tester) async { + testWidgets('rotate token success shows new secure link card', ( + tester, + ) async { final repo = InMemorySurplusRepository(); final created = await repo.createListing(_input(DateTime.now())); @@ -388,7 +397,9 @@ void main() { expect(find.textContaining('Save this edit link securely'), findsNothing); }); - testWidgets('confirm pickup success updates reservation state', (tester) async { + testWidgets('confirm pickup success updates reservation state', ( + tester, + ) async { final repo = InMemorySurplusRepository(); final created = await repo.createListing(_input(DateTime.now())); final reservation = await repo.reserveListing( @@ -406,7 +417,10 @@ void main() { ); final scrollable = find.byType(Scrollable).first; - final codeField = find.widgetWithText(TextField, 'Enter 4-digit pickup code'); + final codeField = find.widgetWithText( + TextField, + 'Enter 4-digit pickup code', + ); await tester.scrollUntilVisible(codeField, 250, scrollable: scrollable); await tester.enterText(codeField.first, reservation.pickupCode); @@ -450,14 +464,14 @@ void main() { ); final scrollable = find.byType(Scrollable).first; - final pendingChip = find.widgetWithText(ChoiceChip, 'Pending'); + final pendingChip = find.textContaining('Pending'); await tester.scrollUntilVisible(pendingChip, 250, scrollable: scrollable); await tester.tap(pendingChip); await tester.pumpAndSettle(); expect(find.textContaining('Status: Reserved'), findsWidgets); expect(find.textContaining('Status: Completed'), findsNothing); - final confirmedChip = find.widgetWithText(ChoiceChip, 'Confirmed'); + final confirmedChip = find.textContaining('Confirmed'); await tester.tap(confirmedChip); await tester.pumpAndSettle(); expect(find.textContaining('Status: Completed'), findsWidgets); @@ -509,37 +523,35 @@ void main() { await _pumpPage(tester, repo: repo, usingFirebase: true); expect(find.textContaining('Template performance'), findsOneWidget); - expect( - find.textContaining('Not enough sample yet'), - findsOneWidget, - ); + expect(find.textContaining('Not enough sample yet'), findsOneWidget); await tester.tap(find.byIcon(Icons.refresh).first); await tester.pumpAndSettle(); expect(find.textContaining('Template performance'), findsOneWidget); }); - testWidgets('create mode shows venue-required snackbar when no venue exists', ( - tester, - ) async { - final repo = _EnterpriseInstrumentedRepository()..emptyVenues = true; - await _pumpPage(tester, repo: repo); + testWidgets( + 'create mode shows venue-required snackbar when no venue exists', + (tester) async { + final repo = _EnterpriseInstrumentedRepository()..emptyVenues = true; + await _pumpPage(tester, repo: repo); - await tester.enterText( - find.widgetWithText(TextFormField, 'Pickup point (booth / gate)'), - 'Service desk', - ); - await tester.enterText( - find.widgetWithText(TextFormField, 'Simple description'), - 'No venue test', - ); - await tester.tap(find.byType(CheckboxListTile)); - await tester.pumpAndSettle(); + await tester.enterText( + find.widgetWithText(TextFormField, 'Pickup point (booth / gate)'), + 'Service desk', + ); + await tester.enterText( + find.widgetWithText(TextFormField, 'Simple description'), + 'No venue test', + ); + await tester.tap(find.byType(CheckboxListTile)); + await tester.pumpAndSettle(); - await tester.tap(find.widgetWithText(FilledButton, 'Post listing')); - await tester.pumpAndSettle(); - expect(find.text('Please select a venue.'), findsOneWidget); - }); + await tester.tap(find.widgetWithText(FilledButton, 'Post listing')); + await tester.pumpAndSettle(); + expect(find.text('Please select a venue.'), findsOneWidget); + }, + ); testWidgets('create mode surfaces create error', (tester) async { final repo = _EnterpriseInstrumentedRepository()..throwOnCreate = true; @@ -608,7 +620,8 @@ void main() { }); testWidgets('confirm pickup surfaces backend error', (tester) async { - final repo = _EnterpriseInstrumentedRepository()..throwOnConfirmPickup = true; + final repo = _EnterpriseInstrumentedRepository() + ..throwOnConfirmPickup = true; final created = await repo.createListing(_input(DateTime.now())); final reservation = await repo.reserveListing( listingId: created.listingId, @@ -625,7 +638,10 @@ void main() { ); final scrollable = find.byType(Scrollable).first; - final codeField = find.widgetWithText(TextField, 'Enter 4-digit pickup code'); + final codeField = find.widgetWithText( + TextField, + 'Enter 4-digit pickup code', + ); await tester.scrollUntilVisible(codeField, 250, scrollable: scrollable); await tester.enterText(codeField.first, reservation.pickupCode); await tester.tap(find.widgetWithText(FilledButton, 'Confirm pickup').first); diff --git a/test/widget_test.dart b/test/widget_test.dart index 4fb2fb1..53022c1 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -40,6 +40,6 @@ void main() { await tester.pumpAndSettle(); expect(find.text('Exhibition Surplus Food'), findsOneWidget); - expect(find.textContaining('No active listings'), findsOneWidget); + expect(find.textContaining('Running in local demo mode'), findsOneWidget); }); }