update loaing

This commit is contained in:
Phuoc Nguyen
2025-12-02 18:09:20 +07:00
parent fc9b5e967f
commit 19d9a3dc2d
75 changed files with 216 additions and 292 deletions

View File

@@ -16,6 +16,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:go_router/go_router.dart';
import 'package:worker/core/widgets/loading_indicator.dart';
import 'package:worker/core/constants/ui_constants.dart';
import 'package:worker/core/database/hive_initializer.dart';
import 'package:worker/core/database/models/enums.dart';
@@ -360,12 +361,7 @@ class _ProfileCardSection extends ConsumerWidget {
shape: BoxShape.circle,
color: colorScheme.surfaceContainerHighest,
),
child: Center(
child: CircularProgressIndicator(
color: colorScheme.primary,
strokeWidth: 2,
),
),
child: const CustomLoadingIndicator(),
),
const SizedBox(width: AppSpacing.md),
Expanded(
@@ -492,11 +488,8 @@ class _ProfileCardSection extends ConsumerWidget {
shape: BoxShape.circle,
color: colorScheme.primaryContainer,
),
child: Center(
child: CircularProgressIndicator(
color: colorScheme.onPrimaryContainer,
strokeWidth: 2,
),
child: CustomLoadingIndicator(
color: colorScheme.onPrimaryContainer,
),
),
errorWidget: (context, url, error) => Container(
@@ -676,7 +669,7 @@ class _LogoutButton extends ConsumerWidget {
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
CircularProgressIndicator(),
CustomLoadingIndicator(),
SizedBox(height: 16),
Text('Đang đăng xuất...'),
],

View File

@@ -10,6 +10,7 @@
library;
import 'package:flutter/material.dart';
import 'package:worker/core/widgets/loading_indicator.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:go_router/go_router.dart';
@@ -450,13 +451,9 @@ class AddressFormPage extends HookConsumerWidget {
isSaving,
),
icon: isSaving.value
? SizedBox(
width: 18,
height: 18,
child: CircularProgressIndicator(
strokeWidth: 2,
color: colorScheme.onPrimary,
),
? CustomLoadingIndicator(
color: colorScheme.onPrimary,
size: 18,
)
: const FaIcon(FontAwesomeIcons.floppyDisk, size: 18),
label: Text(
@@ -800,13 +797,9 @@ class AddressFormPage extends HookConsumerWidget {
),
if (isLoading) ...[
const SizedBox(width: 8),
SizedBox(
width: 12,
height: 12,
child: CircularProgressIndicator(
strokeWidth: 2,
color: colorScheme.primary,
),
CustomLoadingIndicator(
color: colorScheme.primary,
size: 12,
),
],
],
@@ -856,13 +849,9 @@ class AddressFormPage extends HookConsumerWidget {
suffixIcon: isLoading
? Padding(
padding: const EdgeInsets.only(right: 12),
child: SizedBox(
width: 20,
height: 20,
child: CircularProgressIndicator(
strokeWidth: 2,
color: colorScheme.primary,
),
child: CustomLoadingIndicator(
color: colorScheme.primary,
size: 20,
),
)
: null,

View File

@@ -10,6 +10,7 @@
library;
import 'package:flutter/material.dart';
import 'package:worker/core/widgets/loading_indicator.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:go_router/go_router.dart';
@@ -253,7 +254,7 @@ class AddressesPage extends HookConsumerWidget {
),
],
),
loading: () => const Center(child: CircularProgressIndicator()),
loading: () => const CustomLoadingIndicator(),
error: (error, stack) => Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,

View File

@@ -9,6 +9,7 @@
library;
import 'dart:convert';
import 'package:worker/core/widgets/loading_indicator.dart';
import 'dart:io';
import 'package:flutter/material.dart';
@@ -61,21 +62,8 @@ class ProfileEditPage extends HookConsumerWidget {
),
centerTitle: false,
),
body: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
CircularProgressIndicator(color: colorScheme.primary),
const SizedBox(height: AppSpacing.md),
Text(
'Đang tải thông tin...',
style: TextStyle(
fontSize: 14,
color: colorScheme.onSurfaceVariant,
),
),
],
),
body: const CustomLoadingIndicator(
message: 'Đang tải thông tin...',
),
),
error: (error, stack) => Scaffold(

View File

@@ -67,7 +67,7 @@ Future<GetUserInfo> getUserInfoUseCase(Ref ref) async {
///
/// userInfoAsync.when(
/// data: (userInfo) => Text(userInfo.fullName),
/// loading: () => CircularProgressIndicator(),
/// loading: () => const CustomLoadingIndicator(),
/// error: (error, stack) => ErrorWidget(error),
/// );
///