mazyar/tm_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged branches

Browse Source
This commit is contained in:
amirrezaghabeli
2025-08-12 09:11:26 +03:30
parent ba3becc709
commit a7e208a5de
58 changed files with 4584 additions and 2336 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/core/routes/app_shell/desktop_shell_page.dart
+10 -12
View File
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:go_router/go_router.dart';
import 'package:tm_app/core/constants/assets.dart';
import 'package:tm_app/core/constants/strings.dart';
import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.dart';
@@ -41,29 +42,29 @@ class DesktopShellPage extends StatelessWidget {
Spacer(),
_bottomNavigationItem(
context: context,
text: 'Home',
text: AppStrings.home,
isActive: navigationShell.currentIndex == 0,
onTap: () => onTap(0),
iconPath: 'assets/icons/home.svg',
iconPath: AssetsManager.home,
activeIconPath: AssetsManager.homeActive,
),
SizedBox(width: 24),
_bottomNavigationItem(
context: context,
text: 'Tenders',
text: AppStrings.tendersTitle,
isActive: navigationShell.currentIndex == 1,
onTap: () => onTap(1),
iconPath: 'assets/icons/task_square.svg',
activeIconPath: 'assets/icons/task-square_active.svg',
iconPath: AssetsManager.tenders,
activeIconPath: AssetsManager.tendersActive,
),
SizedBox(width: 24),
_bottomNavigationItem(
context: context,
text: 'Profile',
text: AppStrings.profile,
isActive: navigationShell.currentIndex == 2,
onTap: () => onTap(2),
iconPath: 'assets/icons/profile-circle.svg',
activeIconPath: 'assets/icons/profile-circle_active.svg',
iconPath: AssetsManager.profile,
activeIconPath: AssetsManager.profileActive,
),
Spacer(),
SizedBox(width: 59),
@@ -96,10 +97,7 @@ class DesktopShellPage extends StatelessWidget {
style: TextStyle(
fontSize: 12.0.sp(),
fontWeight: FontWeight.w400,
color:
isActive
? const Color(0xFF0164FF)
: const Color(0xFF777777),
color: isActive ? AppColors.primaryColor : AppColors.grey60,
),
),
],
lib/core/routes/app_shell/mobile_shell_page.dart
+11 -12
View File
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:go_router/go_router.dart';
import 'package:tm_app/core/constants/assets.dart';
import 'package:tm_app/core/constants/strings.dart';
import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.dart';
@@ -30,27 +31,27 @@ class MobileShellPage extends StatelessWidget {
children: [
_bottomNavigationItem(
context: context,
text: 'Home',
text: AppStrings.home,
isActive: navigationShell.currentIndex == 0,
onTap: () => onTap(0),
iconPath: 'assets/icons/home.svg',
iconPath: AssetsManager.home,
activeIconPath: AssetsManager.homeActive,
),
_bottomNavigationItem(
context: context,
text: 'Tenders',
text: AppStrings.tendersTitle,
isActive: navigationShell.currentIndex == 1,
onTap: () => onTap(1),
iconPath: 'assets/icons/task_square.svg',
activeIconPath: 'assets/icons/task-square_active.svg',
iconPath: AssetsManager.tenders,
activeIconPath: AssetsManager.tendersActive,
),
_bottomNavigationItem(
context: context,
text: 'Profile',
text: AppStrings.profile,
isActive: navigationShell.currentIndex == 2,
onTap: () => onTap(2),
iconPath: 'assets/icons/profile-circle.svg',
activeIconPath: 'assets/icons/profile-circle_active.svg',
iconPath: AssetsManager.profile,
activeIconPath: AssetsManager.profileActive,
),
],
),
@@ -83,10 +84,8 @@ class MobileShellPage extends StatelessWidget {
style: TextStyle(
fontSize: 12.0.sp(),
fontWeight: FontWeight.w400,
color:
isActive
? const Color(0xFF0164FF)
: const Color(0xFF777777),
color: isActive ? AppColors.primaryColor : AppColors.grey60,
),
),
],
lib/core/routes/app_shell/tablet_shell_page.dart
+5 -7
View File
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:go_router/go_router.dart';
import 'package:tm_app/core/constants/assets.dart';
import 'package:tm_app/core/constants/strings.dart';
import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.dart';
@@ -60,7 +61,7 @@ class TabletShellPage extends StatelessWidget {
SizedBox(height: 48.0.h()),
_drawerItem(
context: context,
text: 'Home',
text: AppStrings.home,
isActive: navigationShell.currentIndex == 0,
onTap: () => onTap(0),
iconPath: AssetsManager.home,
@@ -68,7 +69,7 @@ class TabletShellPage extends StatelessWidget {
),
_drawerItem(
context: context,
text: 'Tenders',
text: AppStrings.tendersTitle,
isActive: navigationShell.currentIndex == 1,
onTap: () => onTap(1),
iconPath: AssetsManager.tenders,
@@ -76,7 +77,7 @@ class TabletShellPage extends StatelessWidget {
),
_drawerItem(
context: context,
text: 'Profile',
text: AppStrings.profile,
isActive: navigationShell.currentIndex == 2,
onTap: () => onTap(2),
iconPath: AssetsManager.profile,
@@ -112,10 +113,7 @@ class TabletShellPage extends StatelessWidget {
style: TextStyle(
fontSize: 12.0.sp(),
fontWeight: FontWeight.w400,
color:
isActive
? const Color(0xFF0164FF)
: const Color(0xFF777777),
color: isActive ? AppColors.primaryColor : AppColors.grey60,
),
),
],