Refactor navigation structure and update asset references
- Swapped routes for Profile and Notification branches in the app's navigation structure. - Updated the current index for navigation items in TabletNavigationWidget and related pages to reflect the new routing. - Added a new logo SVG asset to the asset manager for branding consistency. - Adjusted the pubspec.lock file to downgrade several package versions for compatibility.
This commit is contained in:
@@ -70,7 +70,7 @@ class _TabletNotificationPageState extends State<TabletNotificationPage>
|
||||
key: key,
|
||||
context: context,
|
||||
),
|
||||
drawer: const TabletNavigationWidget(currentIndex: 3),
|
||||
drawer: const TabletNavigationWidget(currentIndex: 2),
|
||||
body: Center(
|
||||
child: SizedBox(
|
||||
width: 720,
|
||||
|
||||
@@ -75,7 +75,7 @@ class _TabletProfilePageState extends State<TabletProfilePage> {
|
||||
context: context,
|
||||
),
|
||||
|
||||
drawer: const TabletNavigationWidget(currentIndex: 4),
|
||||
drawer: const TabletNavigationWidget(currentIndex: 3),
|
||||
body: SafeArea(
|
||||
child: Padding(
|
||||
padding: EdgeInsets.symmetric(
|
||||
|
||||
@@ -65,27 +65,27 @@ class TabletNavigationWidget extends StatelessWidget {
|
||||
iconPath: AssetsManager.tenders,
|
||||
activeIconPath: AssetsManager.tendersActive,
|
||||
),
|
||||
_navigationItem(
|
||||
context: context,
|
||||
text: ProfileStrings.contracts,
|
||||
isActive: currentIndex == 2,
|
||||
onTap: () {
|
||||
if (currentIndex == 2) {
|
||||
return;
|
||||
} else {
|
||||
// context.pop();
|
||||
// Router.neglect(context, () => ProfileRouteData().go(context));
|
||||
}
|
||||
},
|
||||
iconPath: AssetsManager.contracts,
|
||||
activeIconPath: AssetsManager.contracts,
|
||||
),
|
||||
// _navigationItem(
|
||||
// context: context,
|
||||
// text: ProfileStrings.contracts,
|
||||
// isActive: currentIndex == 2,
|
||||
// onTap: () {
|
||||
// if (currentIndex == 2) {
|
||||
// return;
|
||||
// } else {
|
||||
// // context.pop();
|
||||
// // Router.neglect(context, () => ProfileRouteData().go(context));
|
||||
// }
|
||||
// },
|
||||
// iconPath: AssetsManager.contracts,
|
||||
// activeIconPath: AssetsManager.contracts,
|
||||
// ),
|
||||
_navigationItem(
|
||||
context: context,
|
||||
text: ProfileStrings.notifications,
|
||||
isActive: currentIndex == 3,
|
||||
isActive: currentIndex == 2,
|
||||
onTap: () {
|
||||
if (currentIndex == 3) {
|
||||
if (currentIndex == 2) {
|
||||
return;
|
||||
} else {
|
||||
context.pop();
|
||||
@@ -93,7 +93,7 @@ class TabletNavigationWidget extends StatelessWidget {
|
||||
context,
|
||||
() => const NotificationRouteData().go(context),
|
||||
);
|
||||
context.read<TabNavigationService>().onTabSelected(3);
|
||||
context.read<TabNavigationService>().onTabSelected(2);
|
||||
}
|
||||
},
|
||||
iconPath: AssetsManager.notify,
|
||||
@@ -102,9 +102,9 @@ class TabletNavigationWidget extends StatelessWidget {
|
||||
_navigationItem(
|
||||
context: context,
|
||||
text: ProfileStrings.profileTitle,
|
||||
isActive: currentIndex == 4,
|
||||
isActive: currentIndex == 3,
|
||||
onTap: () {
|
||||
if (currentIndex == 4) {
|
||||
if (currentIndex == 3) {
|
||||
return;
|
||||
} else {
|
||||
context.pop();
|
||||
|
||||
Reference in New Issue
Block a user