Krow/Krow-workspace
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor: Move detailed shift UI from card to ShiftDetailsPage

Browse Source
This commit is contained in:
Suriya
2026-02-16 20:28:43 +05:30
parent 690d4f4213
commit 40fa4ebdfa
2 changed files with 339 additions and 686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

190
apps/mobile/packages/features/staff/shifts/lib/src/presentation/pages/shift_details_page.dart
View File

@@ -1,5 +1,5 @@
import 'package:core_localization/core_localization.dart'; import 'package:core_localization/core_localization.dart';
import 'package:design_system/design_system.dart'; // Re-added for UiIcons/Colors as they are used in expanded logic import 'package:design_system/design_system.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_modular/flutter_modular.dart'; import 'package:flutter_modular/flutter_modular.dart';
@@ -10,6 +10,7 @@ import 'package:krow_domain/krow_domain.dart';
import '../blocs/shift_details/shift_details_bloc.dart'; import '../blocs/shift_details/shift_details_bloc.dart';
import '../blocs/shift_details/shift_details_event.dart'; import '../blocs/shift_details/shift_details_event.dart';
import '../blocs/shift_details/shift_details_state.dart'; import '../blocs/shift_details/shift_details_state.dart';
import '../widgets/shift_location_map.dart';
class ShiftDetailsPage extends StatefulWidget { class ShiftDetailsPage extends StatefulWidget {
final String shiftId; final String shiftId;
@@ -65,10 +66,10 @@ class _ShiftDetailsPageState extends State<ShiftDetailsPage> {
Widget _buildStatCard(IconData icon, String value, String label) { Widget _buildStatCard(IconData icon, String value, String label) {
return Container( return Container(
padding: const EdgeInsets.symmetric(vertical: UiConstants.space4), padding: const EdgeInsets.symmetric(vertical: UiConstants.space3),
decoration: BoxDecoration( decoration: BoxDecoration(
color: UiColors.background, color: UiColors.background,
borderRadius: BorderRadius.circular(UiConstants.radiusBase), borderRadius: BorderRadius.circular(UiConstants.radiusMdValue),
border: Border.all(color: UiColors.border), border: Border.all(color: UiColors.border),
), ),
child: Column( child: Column(
@@ -80,12 +81,12 @@ class _ShiftDetailsPageState extends State<ShiftDetailsPage> {
color: UiColors.white, color: UiColors.white,
shape: BoxShape.circle, shape: BoxShape.circle,
), ),
child: Icon(icon, size: 20, color: UiColors.iconSecondary), child: Icon(icon, size: 20, color: UiColors.textSecondary),
), ),
const SizedBox(height: UiConstants.space2), const SizedBox(height: UiConstants.space2),
Text( Text(
value, value,
style: UiTypography.title1m.textPrimary, style: UiTypography.title1m.copyWith(fontWeight: FontWeight.w700).textPrimary,
), ),
Text( Text(
label, label,
@@ -98,21 +99,22 @@ class _ShiftDetailsPageState extends State<ShiftDetailsPage> {
Widget _buildTimeBox(String label, String time) { Widget _buildTimeBox(String label, String time) {
return Container( return Container(
padding: const EdgeInsets.all(UiConstants.space4), padding: const EdgeInsets.all(UiConstants.space3),
decoration: BoxDecoration( decoration: BoxDecoration(
color: UiColors.background, color: UiColors.background,
borderRadius: BorderRadius.circular(UiConstants.radiusBase), borderRadius: BorderRadius.circular(UiConstants.radiusMdValue),
), ),
child: Column( child: Column(
children: [ children: [
Text( Text(
label, label,
style: UiTypography.titleUppercase4b.textSecondary, style: UiTypography.footnote2b.copyWith(
color: UiColors.textSecondary, letterSpacing: 0.5),
), ),
const SizedBox(height: UiConstants.space1), const SizedBox(height: UiConstants.space1),
Text( Text(
_formatTime(time), _formatTime(time),
style: UiTypography.headline2m.textPrimary, style: UiTypography.title1m.copyWith(fontWeight: FontWeight.w700).textPrimary,
), ),
], ],
), ),
@@ -267,45 +269,49 @@ class _ShiftDetailsPageState extends State<ShiftDetailsPage> {
), ),
const SizedBox(height: UiConstants.space6), const SizedBox(height: UiConstants.space6),
// Worker Capacity / Open Slots // Stats Row (New)
if ((displayShift.requiredSlots ?? 0) > 0) Row(
Container(
padding: const EdgeInsets.all(UiConstants.space4),
decoration: BoxDecoration(
color: UiColors.success.withValues(alpha: 0.1),
borderRadius: BorderRadius.circular(UiConstants.radiusBase),
),
child: Row(
children: [ children: [
const Icon( Expanded(
UiIcons.users, child: _buildStatCard(
size: 16, UiIcons.dollar,
color: UiColors.success, "\$${estimatedTotal.toStringAsFixed(0)}",
"Total",
),
),
const SizedBox(width: UiConstants.space4),
Expanded(
child: _buildStatCard(
UiIcons.dollar,
"\$${displayShift.hourlyRate.toStringAsFixed(0)}",
"Hourly Rate",
),
),
const SizedBox(width: UiConstants.space4),
Expanded(
child: _buildStatCard(
UiIcons.clock,
"${duration.toStringAsFixed(1)}",
"Hours",
), ),
const SizedBox(width: UiConstants.space2),
Text(
i18n.slots_remaining(count: openSlots),
style: UiTypography.footnote1m.textSuccess,
), ),
], ],
), ),
),
const SizedBox(height: UiConstants.space6), const SizedBox(height: UiConstants.space6),
// Time Section // Time Section (New)
Row( Row(
children: [ children: [
Expanded( Expanded(
child: _buildTimeBox( child: _buildTimeBox(
i18n.start_time, "CLOCK IN TIME",
displayShift.startTime, displayShift.startTime,
), ),
), ),
const SizedBox(width: UiConstants.space4), const SizedBox(width: UiConstants.space4),
Expanded( Expanded(
child: _buildTimeBox( child: _buildTimeBox(
i18n.end_time, "CLOCK OUT TIME",
displayShift.endTime, displayShift.endTime,
), ),
), ),
@@ -313,97 +319,79 @@ class _ShiftDetailsPageState extends State<ShiftDetailsPage> {
), ),
const SizedBox(height: UiConstants.space6), const SizedBox(height: UiConstants.space6),
// Quick Info Grid
Row(
children: [
Expanded(
child: _buildStatCard(
UiIcons.dollar,
"\$${displayShift.hourlyRate.toStringAsFixed(0)}/hr",
i18n.base_rate,
),
),
const SizedBox(width: UiConstants.space4),
Expanded(
child: _buildStatCard(
UiIcons.clock,
i18n.hours_label(count: duration.toInt()),
i18n.duration,
),
),
const SizedBox(width: UiConstants.space4),
Expanded(
child: _buildStatCard(
UiIcons.wallet,
"\$${estimatedTotal.toStringAsFixed(0)}",
i18n.est_total,
),
),
],
),
const SizedBox(height: UiConstants.space8),
// Location Section // Location Section (New with Map)
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
i18n.location, "LOCATION",
style: UiTypography.titleUppercase4b.textSecondary, style: UiTypography.titleUppercase4b.textSecondary,
), ),
const SizedBox(height: UiConstants.space3), const SizedBox(height: UiConstants.space3),
Container(
padding: const EdgeInsets.all(UiConstants.space4),
decoration: BoxDecoration(
color: UiColors.white,
borderRadius: BorderRadius.circular(UiConstants.radiusBase),
border: Border.all(color: UiColors.border),
),
child: Column(
children: [
Row( Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [ children: [
const Icon( Expanded(
UiIcons.mapPin, child: Text(
color: UiColors.primary, displayShift.location.isEmpty
size: 20, ? "TBD"
: displayShift.location,
style: UiTypography.title1m.textPrimary,
overflow: TextOverflow.ellipsis,
),
), ),
const SizedBox(width: UiConstants.space3), const SizedBox(width: UiConstants.space3),
Expanded( OutlinedButton.icon(
child: Column( onPressed: () {
crossAxisAlignment: ScaffoldMessenger.of(
CrossAxisAlignment.start, context,
children: [ ).showSnackBar(
Text( SnackBar(
displayShift.location, content: Text(
style: UiTypography.body2b.textPrimary, displayShift!.locationAddress.isNotEmpty
? displayShift!.locationAddress
: displayShift!.location,
), ),
Text( duration: const Duration(
displayShift.locationAddress, seconds: 3,
style: UiTypography.body3r.textSecondary,
),
],
), ),
), ),
], );
), },
const SizedBox(height: UiConstants.space4),
const Divider(),
const SizedBox(height: UiConstants.space2),
TextButton.icon(
onPressed: () {},
icon: const Icon( icon: const Icon(
UiIcons.arrowRight, UiIcons.navigation,
size: 16, size: UiConstants.iconXs,
), ),
label: Text(i18n.open_in_maps), label: const Text(
style: TextButton.styleFrom( "Get direction",
foregroundColor: UiColors.primary, ),
padding: EdgeInsets.zero, style: OutlinedButton.styleFrom(
foregroundColor:
UiColors.textPrimary,
side: const BorderSide(
color: UiColors.border,
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(
UiConstants.radiusBase,
),
),
padding: const EdgeInsets.symmetric(
horizontal: UiConstants.space3,
vertical: 0,
),
minimumSize: const Size(0, 32),
), ),
), ),
], ],
), ),
const SizedBox(height: UiConstants.space3),
ShiftLocationMap(
shift: displayShift,
height: 160,
borderRadius: UiConstants.radiusBase,
), ),
], ],
), ),

359
apps/mobile/packages/features/staff/shifts/lib/src/presentation/widgets/my_shift_card.dart
View File

@@ -4,7 +4,6 @@ import 'package:intl/intl.dart';
import 'package:krow_domain/krow_domain.dart'; import 'package:krow_domain/krow_domain.dart';
import 'package:design_system/design_system.dart'; import 'package:design_system/design_system.dart';
import 'package:core_localization/core_localization.dart'; import 'package:core_localization/core_localization.dart';
import 'shift_location_map.dart';
import 'package:krow_core/core.dart'; // For modular navigation import 'package:krow_core/core.dart'; // For modular navigation
class MyShiftCard extends StatefulWidget { class MyShiftCard extends StatefulWidget {
@@ -27,8 +26,7 @@ class MyShiftCard extends StatefulWidget {
State<MyShiftCard> createState() => _MyShiftCardState(); State<MyShiftCard> createState() => _MyShiftCardState();
} }
class _MyShiftCardState extends State<MyShiftCard> with TickerProviderStateMixin { class _MyShiftCardState extends State<MyShiftCard> {
bool _isExpanded = false;
String _formatTime(String time) { String _formatTime(String time) {
if (time.isEmpty) return ''; if (time.isEmpty) return '';
@@ -104,7 +102,6 @@ class _MyShiftCardState extends State<MyShiftCard> with TickerProviderStateMixin
IconData? statusIcon; IconData? statusIcon;
// Fallback localization if keys missing // Fallback localization if keys missing
// Assuming t.staff_shifts.status.* exists as per previous file content
try { try {
if (status == 'confirmed') { if (status == 'confirmed') {
statusText = t.staff_shifts.status.confirmed; statusText = t.staff_shifts.status.confirmed;
@@ -137,9 +134,13 @@ class _MyShiftCardState extends State<MyShiftCard> with TickerProviderStateMixin
} }
return GestureDetector( return GestureDetector(
onTap: () => setState(() => _isExpanded = !_isExpanded), onTap: () {
child: AnimatedContainer( Modular.to.pushNamed(
duration: const Duration(milliseconds: 300), StaffPaths.shiftDetails(widget.shift.id),
arguments: widget.shift,
);
},
child: Container(
margin: const EdgeInsets.only(bottom: UiConstants.space3), margin: const EdgeInsets.only(bottom: UiConstants.space3),
decoration: BoxDecoration( decoration: BoxDecoration(
color: UiColors.white, color: UiColors.white,
@@ -153,10 +154,7 @@ class _MyShiftCardState extends State<MyShiftCard> with TickerProviderStateMixin
), ),
], ],
), ),
child: Column( child: Padding(
children: [
// Collapsed Content
Padding(
padding: const EdgeInsets.all(UiConstants.space4), padding: const EdgeInsets.all(UiConstants.space4),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@@ -193,7 +191,7 @@ class _MyShiftCardState extends State<MyShiftCard> with TickerProviderStateMixin
letterSpacing: 0.5, letterSpacing: 0.5,
), ),
), ),
// Shift Type Badge for available/pending shifts // Shift Type Badge
if (status == 'open' || status == 'pending') ...[ if (status == 'open' || status == 'pending') ...[
const SizedBox(width: UiConstants.space2), const SizedBox(width: UiConstants.space2),
Container( Container(
@@ -256,7 +254,7 @@ class _MyShiftCardState extends State<MyShiftCard> with TickerProviderStateMixin
), ),
const SizedBox(width: UiConstants.space3), const SizedBox(width: UiConstants.space3),
// Details // Consensed Details
Expanded( Expanded(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@@ -300,10 +298,9 @@ class _MyShiftCardState extends State<MyShiftCard> with TickerProviderStateMixin
), ),
const SizedBox(height: UiConstants.space2), const SizedBox(height: UiConstants.space2),
// Date & Time - Multi-Day or Single Day // Date & Time
if (widget.shift.durationDays != null && if (widget.shift.durationDays != null &&
widget.shift.durationDays! > 1) ...[ widget.shift.durationDays! > 1) ...[
// Multi-Day Schedule Display
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@@ -326,8 +323,6 @@ class _MyShiftCardState extends State<MyShiftCard> with TickerProviderStateMixin
], ],
), ),
const SizedBox(height: UiConstants.space1), const SizedBox(height: UiConstants.space1),
// Mock loop for demo purposes, as we don't have all schedule dates in the model
// In real app, we might need to fetch schedule or iterate if model changes
Padding( Padding(
padding: const EdgeInsets.only(bottom: 2), padding: const EdgeInsets.only(bottom: 2),
child: Text( child: Text(
@@ -343,7 +338,6 @@ class _MyShiftCardState extends State<MyShiftCard> with TickerProviderStateMixin
], ],
), ),
] else ...[ ] else ...[
// Single Day Display
Row( Row(
children: [ children: [
const Icon( const Icon(
@@ -400,335 +394,6 @@ class _MyShiftCardState extends State<MyShiftCard> with TickerProviderStateMixin
], ],
), ),
), ),
// Expanded Content
AnimatedSize(
duration: const Duration(milliseconds: 300),
child: _isExpanded
? Column(
children: [
const Divider(height: 1, color: UiColors.border),
Padding(
padding: const EdgeInsets.all(UiConstants.space4),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// Stats Row
Row(
children: [
Expanded(
child: _buildStatCard(
UiIcons.dollar,
"\$${estimatedTotal.toStringAsFixed(0)}",
"Total",
),
),
const SizedBox(width: UiConstants.space3),
Expanded(
child: _buildStatCard(
UiIcons.dollar,
"\$${widget.shift.hourlyRate}",
"Hourly Rate",
),
),
const SizedBox(width: UiConstants.space3),
Expanded(
child: _buildStatCard(
UiIcons.clock,
"${duration}",
"Hours",
),
),
],
),
const SizedBox(height: UiConstants.space5),
// In/Out Time
Row(
children: [
Expanded(
child: _buildTimeBox(
"CLOCK IN TIME",
widget.shift.startTime,
),
),
const SizedBox(width: UiConstants.space3),
Expanded(
child: _buildTimeBox(
"CLOCK OUT TIME",
widget.shift.endTime,
),
),
],
),
const SizedBox(height: UiConstants.space5),
// Location
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
"LOCATION",
style: UiTypography.footnote2b.copyWith(
color: UiColors.textSecondary,
letterSpacing: 0.5),
),
const SizedBox(height: UiConstants.space2),
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Expanded(
child: Text(
widget.shift.location.isEmpty
? "TBD"
: widget.shift.location,
style: UiTypography.title1m.textPrimary,
overflow: TextOverflow.ellipsis,
),
),
const SizedBox(width: UiConstants.space3),
OutlinedButton.icon(
onPressed: () {
ScaffoldMessenger.of(
context,
).showSnackBar(
SnackBar(
content: Text(
widget.shift.locationAddress ??
widget.shift.location,
),
duration: const Duration(
seconds: 3,
),
),
);
},
icon: const Icon(
UiIcons.navigation,
size: UiConstants.iconXs,
),
label: const Text(
"Get direction",
),
style: OutlinedButton.styleFrom(
foregroundColor:
UiColors.textPrimary,
side: const BorderSide(
color: UiColors.border,
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(
UiConstants.radiusBase,
),
),
padding: const EdgeInsets.symmetric(
horizontal: UiConstants.space3,
vertical: 0,
),
minimumSize: const Size(0, 32),
),
),
],
),
const SizedBox(height: UiConstants.space3),
ShiftLocationMap(
shift: widget.shift,
height: 128,
borderRadius: UiConstants.radiusBase,
),
],
),
const SizedBox(height: UiConstants.space5),
// Additional Info
if (widget.shift.description != null) ...[
SizedBox(
width: double.infinity,
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Text(
"ADDITIONAL INFO",
style: UiTypography.footnote2b.copyWith(
color: UiColors.textSecondary,
letterSpacing: 0.5),
),
const SizedBox(height: UiConstants.space2),
Text(
widget.shift.description!,
style: UiTypography.body2m.textPrimary,
),
],
),
),
const SizedBox(height: UiConstants.space5),
],
// Actions
if (!widget.historyMode)
Padding(
padding: const EdgeInsets.only(top: UiConstants.space2),
child: _buildActions(status),
),
],
),
),
],
)
: const SizedBox.shrink(),
),
],
),
),
);
}
Widget _buildActions(String? status) {
if (status == 'confirmed') {
return SizedBox(
width: double.infinity,
height: 48,
child: OutlinedButton.icon(
onPressed: widget.onRequestSwap,
icon: const Icon(
UiIcons.swap,
size: UiConstants.iconSm,
),
label: const Text("Request Swap"),
style: OutlinedButton.styleFrom(
foregroundColor: UiColors.primary,
side: const BorderSide(
color: UiColors.primary,
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(
UiConstants.radiusBase,
),
),
),
),
);
} else if (status == 'swap') {
return Container(
width: double.infinity,
height: 48,
decoration: BoxDecoration(
color: UiColors.tagPending,
border: Border.all(
color: UiColors.textWarning,
),
borderRadius: BorderRadius.circular(UiConstants.radiusBase),
),
child: Row(
mainAxisAlignment:
MainAxisAlignment.center,
children: [
const Icon(
UiIcons.swap,
size: UiConstants.iconSm,
color: UiColors.textWarning,
),
const SizedBox(width: UiConstants.space2),
Text(
"Swap Pending",
style: UiTypography.body2b.copyWith(
color: UiColors.textWarning,
),
),
],
),
);
} else {
// status == 'open' || status == 'pending' or others
return Column(
children: [
SizedBox(
width: double.infinity,
height: 48,
child: ElevatedButton(
onPressed: widget.onAccept,
style: ElevatedButton.styleFrom(
backgroundColor: UiColors.primary,
foregroundColor: UiColors.white,
shape: RoundedRectangleBorder(
borderRadius:
BorderRadius.circular(UiConstants.radiusBase),
),
),
child: widget.onAccept == null
? const SizedBox(
height: 20,
width: 20,
child: CircularProgressIndicator(color: Colors.white, strokeWidth: 2)
) // Loading state if callback null? or just Text
: const Text(
"Book Shift",
style: TextStyle(
fontWeight: FontWeight.w600,
),
),
),
),
],
);
}
}
Widget _buildStatCard(IconData icon, String value, String label) {
return Container(
padding: const EdgeInsets.symmetric(vertical: UiConstants.space3),
decoration: BoxDecoration(
color: UiColors.background,
borderRadius: BorderRadius.circular(UiConstants.radiusMdValue),
border: Border.all(color: UiColors.border),
),
child: Column(
children: [
Container(
width: 40,
height: 40,
decoration: const BoxDecoration(
color: UiColors.white,
shape: BoxShape.circle,
),
child: Icon(icon, size: 20, color: UiColors.textSecondary),
),
const SizedBox(height: UiConstants.space2),
Text(
value,
style: UiTypography.title1m.copyWith(fontWeight: FontWeight.w700).textPrimary,
),
Text(
label,
style: UiTypography.footnote2r.textSecondary,
),
],
),
);
}
Widget _buildTimeBox(String label, String time) {
return Container(
padding: const EdgeInsets.all(UiConstants.space3),
decoration: BoxDecoration(
color: UiColors.background,
borderRadius: BorderRadius.circular(UiConstants.radiusMdValue),
),
child: Column(
children: [
Text(
label,
style: UiTypography.footnote2b.copyWith(
color: UiColors.textSecondary, letterSpacing: 0.5),
),
const SizedBox(height: UiConstants.space1),
Text(
_formatTime(time),
style: UiTypography.title1m.copyWith(fontWeight: FontWeight.w700).textPrimary,
),
],
), ),
); );
} }