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

Refactor widgets & imports; add krow_domain

Browse Source 
Add local krow_domain dependency to client, staff apps and client home package. Numerous UI/widget cleanups across features: add const where applicable, use explicit List<Widget> types and List<Widget>.generate, add super.key to constructors, tighten BlocProvider generics, replace some Containers with SizedBox, and simplify InputDecoration/Border constructors. Fix API error handler to return a const UnknownException. Update internal imports to package-style paths (staff_home, staff_payments, staff_main repository interface) and normalize Flutter imports (use material.dart). Add missing braces for early returns in tax form pages. Mostly formatting and small API/typing refactors with no behavioral changes intended.
This commit is contained in:
Achintha Isuru
2026-03-18 10:27:31 -04:00
parent e471fd12f2
commit 9ee8467632
34 changed files with 128 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/mobile/packages/features/client/billing/lib/src/presentation/widgets/invoices_list_skeleton.dart
View File

@@ -26,10 +26,10 @@ class InvoicesListSkeleton extends StatelessWidget {
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
children: <Widget>[
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
children: <Widget>[
UiShimmerBox(
width: 64,
height: 22,
@@ -47,10 +47,10 @@ class InvoicesListSkeleton extends StatelessWidget {
const SizedBox(height: UiConstants.space3),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
children: <Widget>[
const Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
children: <Widget>[
UiShimmerLine(width: 80, height: 10),
SizedBox(height: UiConstants.space1),
UiShimmerLine(width: 100, height: 20),

10
apps/mobile/packages/features/client/client_coverage/lib/src/presentation/widgets/coverage_page_skeleton/shift_card_skeleton.dart
View File

@@ -14,20 +14,20 @@ class ShiftCardSkeleton extends StatelessWidget {
borderRadius: UiConstants.radiusLg,
),
clipBehavior: Clip.antiAlias,
child: Column(
children: [
child: Column(
children: <Widget>[
// Shift header
Padding(
padding: const EdgeInsets.all(UiConstants.space4),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
children: <Widget>[
const UiShimmerLine(width: 180, height: 16),
const SizedBox(height: UiConstants.space2),
const UiShimmerLine(width: 120, height: 12),
const SizedBox(height: UiConstants.space2),
Row(
children: [
children: <Widget>[
const UiShimmerLine(width: 80, height: 12),
const Spacer(),
UiShimmerBox(
@@ -47,7 +47,7 @@ class ShiftCardSkeleton extends StatelessWidget {
horizontal: UiConstants.space3,
).copyWith(bottom: UiConstants.space3),
child: const Column(
children: [
children: <Widget>[
UiShimmerListItem(),
UiShimmerListItem(),
],

27
apps/mobile/packages/features/client/home/lib/src/presentation/widgets/client_home_edit_mode_body.dart
View File

@@ -1,25 +1,21 @@
import 'package:design_system/design_system.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:client_home/src/presentation/blocs/client_home_bloc.dart';
import 'package:client_home/src/presentation/blocs/client_home_event.dart';
import 'package:client_home/src/presentation/blocs/client_home_state.dart';
import 'package:client_home/src/presentation/widgets/dashboard_widget_builder.dart';
import 'package:design_system/design_system.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
/// Widget that displays the home dashboard in edit mode with drag-and-drop support.
///
/// Allows users to reorder and rearrange dashboard widgets.
class ClientHomeEditModeBody extends StatelessWidget {
/// Creates a [ClientHomeEditModeBody].
const ClientHomeEditModeBody({required this.state, super.key});
/// The current home state.
final ClientHomeState state;
/// Creates a [ClientHomeEditModeBody].
const ClientHomeEditModeBody({
required this.state,
super.key,
});
@override
Widget build(BuildContext context) {
return ReorderableListView(
@@ -30,18 +26,15 @@ class ClientHomeEditModeBody extends StatelessWidget {
100,
),
onReorder: (int oldIndex, int newIndex) {
BlocProvider.of<ClientHomeBloc>(context)
.add(ClientHomeWidgetReordered(oldIndex, newIndex));
BlocProvider.of<ClientHomeBloc>(
context,
).add(ClientHomeWidgetReordered(oldIndex, newIndex));
},
children: state.widgetOrder.map((String id) {
return Container(
key: ValueKey<String>(id),
margin: const EdgeInsets.only(bottom: UiConstants.space4),
child: DashboardWidgetBuilder(
id: id,
state: state,
isEditMode: true,
),
child: DashboardWidgetBuilder(id: id, state: state, isEditMode: true),
);
}).toList(),
);

14
apps/mobile/packages/features/client/home/lib/src/presentation/widgets/client_home_header_skeleton.dart
View File

@@ -10,7 +10,7 @@ class ClientHomeHeaderSkeleton extends StatelessWidget {
@override
Widget build(BuildContext context) {
return UiShimmer(
return const UiShimmer(
child: Padding(
padding: const EdgeInsets.fromLTRB(
UiConstants.space4,
@@ -18,14 +18,14 @@ class ClientHomeHeaderSkeleton extends StatelessWidget {
UiConstants.space4,
UiConstants.space3,
),
child: Row(
child: const Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Row(
children: <Widget>[
children: const <Widget>[
const Row(
children: const <Widget>[
const UiShimmerCircle(size: UiConstants.space10),
const SizedBox(width: UiConstants.space3),
Column(
const Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: const <Widget>[
UiShimmerLine(width: 80, height: 12),
@@ -35,7 +35,7 @@ class ClientHomeHeaderSkeleton extends StatelessWidget {
),
],
),
Row(
const Row(
spacing: UiConstants.space2,
children: const <Widget>[
UiShimmerBox(width: 36, height: 36),

2
apps/mobile/packages/features/client/home/lib/src/presentation/widgets/client_home_page_skeleton/reorder_section_skeleton.dart
View File

@@ -10,7 +10,7 @@ class ReorderSectionSkeleton extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Column(
return const Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: const <Widget>[
UiShimmerSectionHeader(),

3
apps/mobile/packages/features/client/home/pubspec.yaml
View File

@@ -20,7 +20,8 @@ dependencies:
path: ../../../design_system
core_localization:
path: ../../../core_localization
krow_domain: ^0.0.1
krow_domain:
path: ../../../domain
krow_core:
path: ../../../core

6
apps/mobile/packages/features/client/hubs/lib/src/presentation/widgets/hubs_page_skeleton.dart
View File

@@ -13,7 +13,7 @@ class HubsPageSkeleton extends StatelessWidget {
Widget build(BuildContext context) {
return UiShimmer(
child: Column(
children: List.generate(5, (int index) {
children: List<Widget>.generate(5, (int index) {
return Padding(
padding: const EdgeInsets.only(bottom: UiConstants.space3),
child: Container(
@@ -23,7 +23,7 @@ class HubsPageSkeleton extends StatelessWidget {
),
padding: const EdgeInsets.all(UiConstants.space4),
child: Row(
children: [
children: <Widget>[
// Leading icon placeholder
UiShimmerBox(
width: 52,
@@ -35,7 +35,7 @@ class HubsPageSkeleton extends StatelessWidget {
const Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
children: <Widget>[
UiShimmerLine(width: 160, height: 16),
SizedBox(height: UiConstants.space2),
UiShimmerLine(width: 200, height: 12),

2
apps/mobile/packages/features/client/reports/lib/src/presentation/pages/performance_report_page.dart
View File

@@ -24,7 +24,7 @@ class _PerformanceReportPageState extends State<PerformanceReportPage> {
@override
Widget build(BuildContext context) {
return BlocProvider(
return BlocProvider<PerformanceBloc>(
create: (BuildContext context) => Modular.get<PerformanceBloc>()
..add(LoadPerformanceReport(startDate: _startDate, endDate: _endDate)),
child: Scaffold(

22
apps/mobile/packages/features/client/reports/lib/src/presentation/widgets/report_detail_skeleton.dart
View File

@@ -15,7 +15,7 @@ class ReportDetailSkeleton extends StatelessWidget {
return UiShimmer(
child: SingleChildScrollView(
child: Column(
children: [
children: <Widget>[
// Header area (matches the blue header with back button + title)
Container(
padding: const EdgeInsets.only(
@@ -26,12 +26,12 @@ class ReportDetailSkeleton extends StatelessWidget {
),
color: UiColors.primary,
child: Row(
children: [
children: <Widget>[
const UiShimmerCircle(size: UiConstants.space10),
const SizedBox(width: UiConstants.space3),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
children: <Widget>[
UiShimmerBox(
width: 140,
height: 18,
@@ -57,10 +57,10 @@ class ReportDetailSkeleton extends StatelessWidget {
const EdgeInsets.symmetric(horizontal: UiConstants.space5),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
children: <Widget>[
// Summary stat cards row
const Row(
children: [
children: <Widget>[
Expanded(child: UiShimmerStatsCard()),
SizedBox(width: UiConstants.space3),
Expanded(child: UiShimmerStatsCard()),
@@ -78,14 +78,14 @@ class ReportDetailSkeleton extends StatelessWidget {
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
children: <Widget>[
const UiShimmerLine(width: 140, height: 14),
const SizedBox(height: UiConstants.space8),
Expanded(
child: Row(
crossAxisAlignment: CrossAxisAlignment.end,
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: List.generate(7, (int index) {
children: List<Widget>.generate(7, (int index) {
// Varying bar heights for visual interest
final double height =
40.0 + (index * 17 % 120);
@@ -113,20 +113,20 @@ class ReportDetailSkeleton extends StatelessWidget {
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
children: <Widget>[
const UiShimmerLine(width: 160, height: 14),
const SizedBox(height: UiConstants.space6),
...List.generate(3, (int index) {
...List<Widget>.generate(3, (int index) {
return Padding(
padding: const EdgeInsets.only(
bottom: UiConstants.space5,
),
child: Column(
children: [
children: <Widget>[
const Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
children: <Widget>[
UiShimmerLine(width: 100, height: 12),
UiShimmerLine(width: 60, height: 12),
],

6
apps/mobile/packages/features/client/reports/lib/src/presentation/widgets/reports_page/metrics_grid_skeleton/metric_card_skeleton.dart
View File

@@ -17,10 +17,10 @@ class MetricCardSkeleton extends StatelessWidget {
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
children: <Widget>[
// Icon + label row
Row(
children: [
const Row(
children: <Widget>[
const UiShimmerCircle(size: UiConstants.space6),
const SizedBox(width: UiConstants.space2),
const Expanded(

2
apps/mobile/packages/features/client/reports/lib/src/presentation/widgets/reports_page/metrics_grid_skeleton/metrics_grid_skeleton.dart
View File

@@ -22,7 +22,7 @@ class MetricsGridSkeleton extends StatelessWidget {
mainAxisSpacing: UiConstants.space3,
crossAxisSpacing: UiConstants.space3,
childAspectRatio: 1.32,
children: List.generate(6, (int index) {
children: List<Widget>.generate(6, (int index) {
return const MetricCardSkeleton();
}),
),

8
apps/mobile/packages/features/client/settings/lib/src/presentation/pages/edit_profile_page.dart
View File

@@ -10,7 +10,7 @@ class EditProfilePage extends StatefulWidget {
}
class _EditProfilePageState extends State<EditProfilePage> {
final _formKey = GlobalKey<FormState>();
final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
late TextEditingController _firstNameController;
late TextEditingController _lastNameController;
late TextEditingController _emailController;
@@ -50,11 +50,11 @@ class _EditProfilePageState extends State<EditProfilePage> {
key: _formKey,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
children: <Widget>[
Center(
child: Stack(
children: [
CircleAvatar(
children: <Widget>[
const CircleAvatar(
radius: 50,
backgroundColor: UiColors.bgSecondary,
child: const Icon(UiIcons.user, size: 40, color: UiColors.primary),

20
apps/mobile/packages/features/client/settings/lib/src/presentation/widgets/client_settings_page/settings_actions.dart
View File

@@ -180,7 +180,7 @@ class _NotificationsSettingsCard extends StatelessWidget {
@override
Widget build(BuildContext context) {
return BlocBuilder<ClientSettingsBloc, ClientSettingsState>(
builder: (context, state) {
builder: (BuildContext context, ClientSettingsState state) {
return Card(
elevation: 0,
shape: RoundedRectangleBorder(
@@ -202,7 +202,7 @@ class _NotificationsSettingsCard extends StatelessWidget {
icon: UiIcons.bell,
title: context.t.client_settings.preferences.push,
value: state.pushEnabled,
onChanged: (val) =>
onChanged: (bool val) =>
ReadContext(context).read<ClientSettingsBloc>().add(
ClientSettingsNotificationToggled(
type: 'push',
@@ -214,7 +214,7 @@ class _NotificationsSettingsCard extends StatelessWidget {
icon: UiIcons.mail,
title: context.t.client_settings.preferences.email,
value: state.emailEnabled,
onChanged: (val) =>
onChanged: (bool val) =>
ReadContext(context).read<ClientSettingsBloc>().add(
ClientSettingsNotificationToggled(
type: 'email',
@@ -226,7 +226,7 @@ class _NotificationsSettingsCard extends StatelessWidget {
icon: UiIcons.phone,
title: context.t.client_settings.preferences.sms,
value: state.smsEnabled,
onChanged: (val) =>
onChanged: (bool val) =>
ReadContext(context).read<ClientSettingsBloc>().add(
ClientSettingsNotificationToggled(
type: 'sms',
@@ -244,10 +244,6 @@ class _NotificationsSettingsCard extends StatelessWidget {
}
class _NotificationToggle extends StatelessWidget {
final IconData icon;
final String title;
final bool value;
final ValueChanged<bool> onChanged;
const _NotificationToggle({
required this.icon,
@@ -255,14 +251,18 @@ class _NotificationToggle extends StatelessWidget {
required this.value,
required this.onChanged,
});
final IconData icon;
final String title;
final bool value;
final ValueChanged<bool> onChanged;
@override
Widget build(BuildContext context) {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
children: <Widget>[
Row(
children: [
children: <Widget>[
Icon(icon, size: 20, color: UiColors.iconSecondary),
const SizedBox(width: UiConstants.space3),
Text(title, style: UiTypography.footnote1m.textPrimary),