some changes and fixes

This commit is contained in:
amirrezaghabeli
2025-09-06 13:18:12 +03:30
parent 2fbd8018c8
commit 5649634464
24 changed files with 691 additions and 815 deletions
@@ -8,7 +8,6 @@ import 'package:tm_app/views/your_tenders/widgets/liked_disliked_tenders_list.da
import 'package:tm_app/views/your_tenders/widgets/tablet_desktop_appbar.dart';
import 'package:tm_app/views/your_tenders/widgets/tenders_submitted.dart';
import '../../../core/routes/app_routes.dart';
import '../../shared/desktop_navigation_widget.dart';
class YourTendersDesktopPage extends StatefulWidget {
@@ -43,22 +42,6 @@ class _YourTendersDesktopPageState extends State<YourTendersDesktopPage>
children: [
DesktopNavigationWidget(
currentIndex: 1, // Tenders index
onTabChanged: (index) {
// Navigate to different screens based on index
switch (index) {
case 0:
// Navigate to home
Router.neglect(context, () => HomeRouteData().go(context));
break;
case 1:
// Already on tenders
break;
case 2:
// Navigate to profile
Router.neglect(context, () => ProfileRouteData().go(context));
break;
}
},
),
Expanded(
child: SizedBox(
@@ -68,14 +51,6 @@ class _YourTendersDesktopPageState extends State<YourTendersDesktopPage>
SizedBox(height: 64.0),
TabletDesktopAppbar(),
SizedBox(height: 20.0),
// MainTabBar(
// controller: controller,
// titles: [
// AppStrings.approvedTenders,
// AppStrings.tenderSubmitted,
// ],
// ),
FilterButton(platformType: PlatformType.tabletDesktop),
Expanded(
@@ -115,15 +90,10 @@ class _YourTendersDesktopPageState extends State<YourTendersDesktopPage>
isDesktop: true,
);
} else {
return const Center(child: Text('No data available'));
return const Center(
child: Text(YourTendersStrings.noTenders),
);
}
// return TabBarView(
// controller: controller,
// children: [
// // ApprovedTenders(tendersSubmitted: []),
// ],
// );
},
),
),
@@ -85,7 +85,9 @@ class _YourTendersMobilePageState extends State<YourTendersMobilePage> {
)
else
const Expanded(
child: Center(child: Text('No data available')),
child: Center(
child: Text(YourTendersStrings.noTenders),
),
),
],
);
@@ -1,7 +1,5 @@
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:provider/provider.dart';
import 'package:tm_app/core/routes/app_routes.dart';
import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.dart';
import 'package:tm_app/view_models/your_tenders_view_model.dart';
@@ -46,21 +44,6 @@ class _YourTendersTabletPageState extends State<YourTendersTabletPage>
appBar: tabletAppBar(title: YourTendersStrings.yourTenders, key: key),
drawer: TabletNavigationWidget(
currentIndex: 1, // Home is index 0
onTabChanged: (index) {
// Handle navigation to other tabs
switch (index) {
case 0:
Router.neglect(context, () => HomeRouteData().go(context));
break;
case 1:
break;
case 2:
// Navigate to profile
context.pop();
Router.neglect(context, () => ProfileRouteData().go(context));
break;
}
},
),
body: Center(
child: SizedBox(
@@ -114,9 +97,14 @@ class _YourTendersTabletPageState extends State<YourTendersTabletPage>
isDesctop: false,
);
} else if (viewModel.data != null) {
return TendersSubmitted(approvedTenders: viewModel.data!,isDesktop: false,);
return TendersSubmitted(
approvedTenders: viewModel.data!,
isDesktop: false,
);
} else {
return const Center(child: Text('No data available'));
return const Center(
child: Text(YourTendersStrings.noTenders),
);
}
},
),
@@ -13,4 +13,6 @@ class YourTendersStrings {
static const startDate = 'YYYY/MM/DD';
static const endDate = 'YYYY/MM/DD';
static const approvedTenders = 'Approved tenders';
static const noTenders = 'No data available';
static const selectPublicationRangeDate = 'Select publication date range';
}
@@ -115,7 +115,7 @@ class TendersFilterDialog extends StatelessWidget {
),
SizedBox(height: 16.0.h()),
Text(
'Select date range',
YourTendersStrings.selectPublicationRangeDate,
style: TextStyle(
fontSize: 16.0.sp(),
fontWeight: FontWeight.w600,