2026-04-15
This commit is contained in:
1 parent
d01e5ba860
commit
96de59e9be
46 files changed
+1299
-1191
No files matched your search
@@ -71,7 +71,7 @@ class _EmployeeProfileListState extends ConsumerState<EmployeeProfileList> {
|
||||
"KYC Details",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontFamily: "Gilroy",
|
||||
fontWeight: FontWeight
|
||||
.w600, // equivalent to 400 (Normal)
|
||||
fontStyle: FontStyle.normal,
|
||||
@@ -117,7 +117,7 @@ class _EmployeeProfileListState extends ConsumerState<EmployeeProfileList> {
|
||||
const Text(
|
||||
"Personal Details",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontFamily: "Gilroy",
|
||||
fontSize: 20,
|
||||
color: Color(0xFF111827),
|
||||
),
|
||||
@@ -202,7 +202,7 @@ class _EmployeeProfileListState extends ConsumerState<EmployeeProfileList> {
|
||||
Text(
|
||||
title,
|
||||
style: const TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontFamily: "Gilroy",
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: 14,
|
||||
height: 1.3,
|
||||
@@ -216,7 +216,7 @@ class _EmployeeProfileListState extends ConsumerState<EmployeeProfileList> {
|
||||
softWrap: true,
|
||||
overflow: TextOverflow.visible,
|
||||
style: const TextStyle(
|
||||
fontFamily: 'Gilroy-Regular',
|
||||
fontFamily: "Gilroy",
|
||||
fontWeight: FontWeight.w400,
|
||||
fontSize: 14,
|
||||
height: 1.3,
|
||||
|
||||
@@ -22,6 +22,12 @@ class _EmployeeProfileScreenState extends ConsumerState<EmployeeProfileScreen> {
|
||||
String? selectedItem;
|
||||
bool _isLoggingOut = false;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
selectedItem = 'profile'; // Default selection
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final profileAsync = ref.watch(employeeProfileProvider);
|
||||
@@ -110,7 +116,7 @@ class _EmployeeProfileScreenState extends ConsumerState<EmployeeProfileScreen> {
|
||||
Text(
|
||||
data?.name ?? 'No Company Name',
|
||||
style: const TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontFamily: "Gilroy",
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: 20,
|
||||
color: Colors.black,
|
||||
@@ -244,7 +250,7 @@ class _EmployeeProfileScreenState extends ConsumerState<EmployeeProfileScreen> {
|
||||
const Text(
|
||||
"Note",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontFamily: "Gilroy",
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: 20,
|
||||
color: Colors.black,
|
||||
@@ -254,7 +260,7 @@ class _EmployeeProfileScreenState extends ConsumerState<EmployeeProfileScreen> {
|
||||
"Are you sure you want to log out?",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontFamily: "Gilroy",
|
||||
fontWeight: FontWeight.w500,
|
||||
fontSize: 15,
|
||||
color: Colors.black87,
|
||||
@@ -270,7 +276,7 @@ class _EmployeeProfileScreenState extends ConsumerState<EmployeeProfileScreen> {
|
||||
style: TextStyle(
|
||||
color: Color(0xFF535A5B),
|
||||
fontSize: 16,
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontFamily: "Gilroy",
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
),
|
||||
@@ -321,7 +327,7 @@ class _EmployeeProfileScreenState extends ConsumerState<EmployeeProfileScreen> {
|
||||
style: TextStyle(
|
||||
color: Color(0xFF5F297B),
|
||||
fontSize: 16,
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontFamily: "Gilroy",
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
),
|
||||
@@ -384,7 +390,7 @@ class _EmployeeProfileScreenState extends ConsumerState<EmployeeProfileScreen> {
|
||||
child: Text(
|
||||
title,
|
||||
style: const TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
fontFamily: "Gilroy",
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Colors.black87,
|
||||
|
||||
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:taxglide/consts/app_asstes.dart';
|
||||
import 'package:taxglide/consts/app_style.dart';
|
||||
import 'package:taxglide/consts/download_helper.dart';
|
||||
import 'package:taxglide/controller/api_consts.dart';
|
||||
import 'package:taxglide/controller/api_contoller.dart';
|
||||
@@ -65,7 +66,7 @@ class _KycDetailsListState extends ConsumerState<KycDetailsList> {
|
||||
"KYC Details",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontFamily: "Gilroy",
|
||||
fontWeight: FontWeight
|
||||
.w600, // equivalent to 400 (Normal)
|
||||
fontStyle: FontStyle.normal,
|
||||
@@ -115,7 +116,7 @@ class _KycDetailsListState extends ConsumerState<KycDetailsList> {
|
||||
"Personal Details",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontFamily: "Gilroy",
|
||||
fontWeight: FontWeight
|
||||
.w400, // equivalent to 400 (Normal)
|
||||
fontStyle: FontStyle.normal,
|
||||
@@ -181,7 +182,7 @@ class _KycDetailsListState extends ConsumerState<KycDetailsList> {
|
||||
'Edit',
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontFamily: "Gilroy",
|
||||
fontWeight: FontWeight.w600,
|
||||
fontStyle: FontStyle.normal,
|
||||
fontSize: 16,
|
||||
@@ -277,9 +278,8 @@ class _KycDetailsListState extends ConsumerState<KycDetailsList> {
|
||||
children: [
|
||||
Text(
|
||||
title,
|
||||
style: const TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
|
||||
fontSize: 14,
|
||||
height: 1.3,
|
||||
letterSpacing: 0.64,
|
||||
@@ -291,9 +291,8 @@ class _KycDetailsListState extends ConsumerState<KycDetailsList> {
|
||||
value,
|
||||
softWrap: true,
|
||||
overflow: TextOverflow.visible,
|
||||
style: const TextStyle(
|
||||
fontFamily: 'Gilroy-Regular',
|
||||
fontWeight: FontWeight.w400,
|
||||
style: AppTextStyles.regular.copyWith(
|
||||
|
||||
fontSize: 14,
|
||||
height: 1.3,
|
||||
letterSpacing: 0.64,
|
||||
@@ -342,9 +341,9 @@ class _KycDetailsListState extends ConsumerState<KycDetailsList> {
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
textAlign: TextAlign.center,
|
||||
style: const TextStyle(
|
||||
fontFamily: 'Roboto',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
|
||||
|
||||
fontSize: 13,
|
||||
),
|
||||
),
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'dart:math' as math show sqrt;
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:taxglide/consts/app_style.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:taxglide/consts/app_asstes.dart';
|
||||
@@ -28,6 +29,7 @@ class _ProfileScreenState extends ConsumerState<ProfileScreen> {
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
selectedItem = 'profile'; // Set default selection
|
||||
_loadRole(); // <-- load role on start
|
||||
}
|
||||
|
||||
@@ -104,10 +106,9 @@ class _ProfileScreenState extends ConsumerState<ProfileScreen> {
|
||||
data!.companyName!.isNotEmpty)
|
||||
? data.companyName![0].toUpperCase()
|
||||
: "M",
|
||||
style: const TextStyle(
|
||||
style: AppTextStyles.bold.copyWith(
|
||||
color: Colors.white,
|
||||
fontSize: 40,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -120,9 +121,7 @@ class _ProfileScreenState extends ConsumerState<ProfileScreen> {
|
||||
const SizedBox(height: 60),
|
||||
Text(
|
||||
data?.companyName ?? 'No Company Name',
|
||||
style: const TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: 20,
|
||||
color: Colors.black,
|
||||
),
|
||||
@@ -271,21 +270,17 @@ class _ProfileScreenState extends ConsumerState<ProfileScreen> {
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
const Text(
|
||||
Text(
|
||||
"Note",
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
fontSize: 20,
|
||||
color: Colors.black,
|
||||
),
|
||||
),
|
||||
const Text(
|
||||
Text(
|
||||
"Are you sure you want to log out?",
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w500,
|
||||
style: AppTextStyles.medium.copyWith(
|
||||
fontSize: 15,
|
||||
color: Colors.black87,
|
||||
),
|
||||
@@ -295,13 +290,11 @@ class _ProfileScreenState extends ConsumerState<ProfileScreen> {
|
||||
children: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.pop(context),
|
||||
child: const Text(
|
||||
child: Text(
|
||||
"Cancel",
|
||||
style: TextStyle(
|
||||
color: Color(0xFF535A5B),
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
color: const Color(0xFF535A5B),
|
||||
fontSize: 16,
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -344,13 +337,11 @@ class _ProfileScreenState extends ConsumerState<ProfileScreen> {
|
||||
color: Color(0xFF5F297B),
|
||||
),
|
||||
)
|
||||
: const Text(
|
||||
: Text(
|
||||
"Log Out",
|
||||
style: TextStyle(
|
||||
color: Color(0xFF5F297B),
|
||||
style: AppTextStyles.semiBold.copyWith(
|
||||
color: const Color(0xFF5F297B),
|
||||
fontSize: 16,
|
||||
fontFamily: 'Gilroy-SemiBold',
|
||||
fontWeight: FontWeight.w600,
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -411,10 +402,8 @@ class _ProfileScreenState extends ConsumerState<ProfileScreen> {
|
||||
Expanded(
|
||||
child: Text(
|
||||
title,
|
||||
style: const TextStyle(
|
||||
fontFamily: 'Gilroy-Medium',
|
||||
style: AppTextStyles.medium.copyWith(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Colors.black87,
|
||||
),
|
||||
),
|
||||
@@ -445,7 +434,7 @@ class _ProfileScreenState extends ConsumerState<ProfileScreen> {
|
||||
Expanded(
|
||||
child: Text(
|
||||
msg,
|
||||
style: const TextStyle(color: Colors.white, fontSize: 12),
|
||||
style: AppTextStyles.regular.copyWith(color: Colors.white, fontSize: 12),
|
||||
maxLines: 2,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
|
||||
@@ -16,7 +16,7 @@ class _StaffListScreenState extends ConsumerState<StaffListScreen> {
|
||||
final staffAsync = ref.watch(staffListProvider);
|
||||
|
||||
const commonTextStyle = TextStyle(
|
||||
fontFamily: "Gilroy-SemiBold",
|
||||
fontFamily: "Gilroy",
|
||||
fontWeight: FontWeight.w600,
|
||||
fontSize: 14.7,
|
||||
height: 1.30, // 130%
|
||||
@@ -24,7 +24,7 @@ class _StaffListScreenState extends ConsumerState<StaffListScreen> {
|
||||
color: Color(0xFF111827),
|
||||
);
|
||||
const commonTextStylevalue = TextStyle(
|
||||
fontFamily: "Gilroy-SemiBold",
|
||||
fontFamily: "Gilroy",
|
||||
fontWeight: FontWeight.w400,
|
||||
fontSize: 14.7,
|
||||
height: 1.30, // 130%
|
||||
|
||||
Reference in new issue
Block a user