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

Merge pull request 'fixed liked tender filter bar' (#137) from like_tender_filter_bar into main

Browse Source 
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/137
This commit is contained in:
a.ghabeli
2025-09-16 12:44:42 +03:30
parent 8ad05f5c68 d804d5f26e
commit 09ac79fd79
5 changed files with 232 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/core/config/app_config.dart
+2 -2
View File
@@ -8,14 +8,14 @@ class AppConfig {
// این متد بر اساس محیط فعال، URL مناسب را برمی‌گرداند. // این متد بر اساس محیط فعال، URL مناسب را برمی‌گرداند.
static String get apiBaseUrl { static String get apiBaseUrl {
return 'http://10.0.2.2:8081'; // return 'http://10.0.2.2:8081';
// return '192.168.1.103:8081'; // return '192.168.1.103:8081';
// if (isDevelopment) { // if (isDevelopment) {
// // Handle different platforms for local development // // Handle different platforms for local development
// if (kIsWeb) { // if (kIsWeb) {
// For web, use localhost // For web, use localhost
// return 'https://app.opplens.com'; // return 'https://app.opplens.com';
// return 'http://localhost:8081'; return 'http://localhost:8081';
// } else { // } else {
// For Android emulator, use 10.0.2.2 (special IP for host machine) // For Android emulator, use 10.0.2.2 (special IP for host machine)
// return 'http://10.0.2.2:8081'; // return 'http://10.0.2.2:8081';
lib/views/final_completion_of_documents/pages/final_completion_of_documents_screen.dart
+5 -7
View File
@@ -215,13 +215,11 @@ class FormCard extends StatelessWidget {
decoration: InputDecoration( decoration: InputDecoration(
filled: true, filled: true,
fillColor: AppColors.grey0, fillColor: AppColors.grey0,
hint: Text( hintText: FinalCompletionOfDocumentsStrings.describeYourTeamHint,
FinalCompletionOfDocumentsStrings.describeYourTeamHint, hintStyle: TextStyle(
style: TextStyle( fontSize: 12.0,
fontSize: 12.0, fontWeight: FontWeight.w400,
fontWeight: FontWeight.w400, color: AppColors.grey60,
color: AppColors.grey60,
),
), ),
border: OutlineInputBorder( border: OutlineInputBorder(
borderSide: const BorderSide(color: AppColors.secondaryborder2), borderSide: const BorderSide(color: AppColors.secondaryborder2),
lib/views/liked_tenders/pages/liked_tenders_tablet_page.dart
+176 -90
View File
@@ -9,6 +9,7 @@ import 'package:tm_app/view_models/liked_tenders_view_model.dart';
import 'package:tm_app/views/liked_tenders/strings/liked_tenders_strings.dart'; import 'package:tm_app/views/liked_tenders/strings/liked_tenders_strings.dart';
import 'package:tm_app/views/liked_tenders/widgets/liked_tenders_list_item.dart'; import 'package:tm_app/views/liked_tenders/widgets/liked_tenders_list_item.dart';
import 'package:tm_app/views/shared/base_button.dart'; import 'package:tm_app/views/shared/base_button.dart';
import 'package:tm_app/views/shared/tender_app_bar.dart';
import '../../../core/utils/app_toast.dart'; import '../../../core/utils/app_toast.dart';
import '../../../data/services/model/tender_approvals_data/tender_approvals_data.dart'; import '../../../data/services/model/tender_approvals_data/tender_approvals_data.dart';
@@ -58,101 +59,186 @@ class _LikedTendersTabletPageState extends State<LikedTendersTabletPage> {
child: Scaffold( child: Scaffold(
key: key, key: key,
backgroundColor: AppColors.backgroundColor, backgroundColor: AppColors.backgroundColor,
appBar: PreferredSize( appBar:
preferredSize: const Size.fromHeight(60), // PreferredSize(
child: AppBar( // preferredSize: const Size.fromHeight(60),
backgroundColor: AppColors.backgroundColor, // child: AppBar(
elevation: 0, // backgroundColor: AppColors.backgroundColor,
titleSpacing: 0, // elevation: 0,
leading: IconButton( // titleSpacing: 0,
icon: SvgPicture.asset( // leading: IconButton(
AssetsManager.arrowLeft, // icon: SvgPicture.asset(
height: 24.0.w(), // AssetsManager.arrowLeft,
width: 24.0.w(), // height: 24.0.w(),
), // width: 24.0.w(),
onPressed: () => Navigator.pop(context), // ),
), // onPressed: () => Navigator.pop(context),
title: Text( // ),
LikedTendersStrings.likedTenders, // title: Text(
style: TextStyle( // LikedTendersStrings.likedTenders,
color: AppColors.grey70, // style: TextStyle(
fontWeight: FontWeight.w600, // color: AppColors.grey70,
fontSize: 20.0.sp(), // fontWeight: FontWeight.w600,
), // fontSize: 20.0.sp(),
), // ),
actions: [ // ),
IconButton( // actions: [
icon: SvgPicture.asset( // IconButton(
AssetsManager.filter, // icon: SvgPicture.asset(
height: 24.0.w(), // AssetsManager.filter,
width: 24.0.w(), // height: 24.0.w(),
), // width: 24.0.w(),
onPressed: () { // ),
showModalBottomSheet( // onPressed: () {
context: context, // showModalBottomSheet(
isScrollControlled: true, // context: context,
backgroundColor: AppColors.backgroundColor, // isScrollControlled: true,
shape: const RoundedRectangleBorder( // backgroundColor: AppColors.backgroundColor,
borderRadius: BorderRadius.vertical( // shape: const RoundedRectangleBorder(
top: Radius.circular(20), // borderRadius: BorderRadius.vertical(
), // top: Radius.circular(20),
), // ),
constraints: BoxConstraints( // ),
maxWidth: MediaQuery.of(context).size.width, // constraints: BoxConstraints(
maxHeight: MediaQuery.of(context).size.height, // maxWidth: MediaQuery.of(context).size.width,
), // maxHeight: MediaQuery.of(context).size.height,
builder: (context) { // ),
return SizedBox( // builder: (context) {
width: double.infinity, // return SizedBox(
child: Padding( // width: double.infinity,
padding: const EdgeInsets.all(16.0), // child: Padding(
child: Column( // padding: const EdgeInsets.all(16.0),
mainAxisSize: MainAxisSize.min, // child: Column(
children: [ // mainAxisSize: MainAxisSize.min,
SizedBox(height: 10.0.h()), // children: [
Text( // SizedBox(height: 10.0.h()),
LikedTendersStrings.filter, // Text(
style: TextStyle( // LikedTendersStrings.filter,
fontWeight: FontWeight.w600, // style: TextStyle(
color: AppColors.grey70, // fontWeight: FontWeight.w600,
fontSize: 20.0.sp(), // color: AppColors.grey70,
), // fontSize: 20.0.sp(),
), // ),
SizedBox(height: 20.0.h()), // ),
_buildFilterOption('Industry'), // SizedBox(height: 20.0.h()),
_buildFilterOption('Finance'), // _buildFilterOption('Industry'),
_buildFilterOption('Business'), // _buildFilterOption('Finance'),
_buildFilterOption('IT'), // _buildFilterOption('Business'),
_buildFilterOption('Software'), // _buildFilterOption('IT'),
SizedBox(height: 20.0.h()), // _buildFilterOption('Software'),
BaseButton( // SizedBox(height: 20.0.h()),
backgroundColor: AppColors.primary2, // BaseButton(
borderRadius: 24, // backgroundColor: AppColors.primary2,
isEnabled: true, // borderRadius: 24,
onPressed: () => Navigator.pop(context), // isEnabled: true,
text: 'Apply', // onPressed: () => Navigator.pop(context),
textColor: AppColors.textBlue, // text: 'Apply',
), // textColor: AppColors.textBlue,
], // ),
), // ],
), // ),
); // ),
}, // );
); // },
}, // );
), // },
// ),
SizedBox(width: 16.0.w()), // SizedBox(width: 16.0.w()),
], // ],
), // ),
), // ),
//tabletAppBar(title: LikedTendersStrings.likedTenders, key: key), tabletAppBar(title: LikedTendersStrings.likedTenders, key: key),
drawer: const TabletNavigationWidget(currentIndex: 1), drawer: const TabletNavigationWidget(currentIndex: 1),
body: Center( body: Center(
child: SizedBox( child: SizedBox(
width: 720, width: 720,
child: Column( child: Column(
children: [ children: [
AppBar(
backgroundColor: AppColors.backgroundColor,
elevation: 0,
titleSpacing: 0,
scrolledUnderElevation: 0,
leading: IconButton(
icon: SvgPicture.asset(
AssetsManager.arrowLeft,
height: 24.0.w(),
width: 24.0.w(),
),
onPressed: () => Navigator.pop(context),
),
title: Text(
LikedTendersStrings.likedTenders,
style: TextStyle(
color: AppColors.grey70,
fontWeight: FontWeight.w600,
fontSize: 20.0.sp(),
),
),
actions: [
IconButton(
icon: SvgPicture.asset(
AssetsManager.filter,
height: 24.0.w(),
width: 24.0.w(),
),
onPressed: () {
showModalBottomSheet(
context: context,
isScrollControlled: true,
backgroundColor: AppColors.backgroundColor,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(
top: Radius.circular(20),
),
),
constraints: BoxConstraints(
maxWidth: MediaQuery.of(context).size.width,
maxHeight: MediaQuery.of(context).size.height,
),
builder: (context) {
return SizedBox(
width: double.infinity,
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
SizedBox(height: 10.0.h()),
Text(
LikedTendersStrings.filter,
style: TextStyle(
fontWeight: FontWeight.w600,
color: AppColors.grey70,
fontSize: 20.0.sp(),
),
),
SizedBox(height: 20.0.h()),
_buildFilterOption('Industry'),
_buildFilterOption('Finance'),
_buildFilterOption('Business'),
_buildFilterOption('IT'),
_buildFilterOption('Software'),
SizedBox(height: 20.0.h()),
BaseButton(
backgroundColor: AppColors.primary2,
borderRadius: 24,
isEnabled: true,
onPressed: () => Navigator.pop(context),
text: 'Apply',
textColor: AppColors.textBlue,
),
],
),
),
);
},
);
},
),
SizedBox(width: 16.0.w()),
],
),
Expanded( Expanded(
child: Consumer<LikedTendersViewModel>( child: Consumer<LikedTendersViewModel>(
builder: (context, viewModel, child) { builder: (context, viewModel, child) {
@@ -233,7 +319,7 @@ class _LikedTendersTabletPageState extends State<LikedTendersTabletPage> {
}, },
child: LikedListItem( child: LikedListItem(
tender: item.tender!, tender: item.tender!,
approval: approval!, approval: approval,
), ),
), ),
); );
lib/views/shared/tender_app_bar.dart
+1
View File
@@ -68,6 +68,7 @@ PreferredSizeWidget tabletAppBar({
return PreferredSize( return PreferredSize(
preferredSize: const Size.fromHeight(64), preferredSize: const Size.fromHeight(64),
child: AppBar( child: AppBar(
scrolledUnderElevation: 0,
backgroundColor: AppColors.backgroundColor, backgroundColor: AppColors.backgroundColor,
elevation: 0, elevation: 0,
titleSpacing: 0, titleSpacing: 0,
pubspec.lock
+48
View File
@@ -177,6 +177,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.1.2" version: "3.1.2"
cross_file:
dependency: transitive
description:
name: cross_file
sha256: "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670"
url: "https://pub.dev"
source: hosted
version: "0.3.4+2"
crypto: crypto:
dependency: transitive dependency: transitive
description: description:
@@ -209,6 +217,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.2.0" version: "1.2.0"
dbus:
dependency: transitive
description:
name: dbus
sha256: "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c"
url: "https://pub.dev"
source: hosted
version: "0.7.11"
dio: dio:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -225,6 +241,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.1" version: "2.1.1"
dotted_border:
dependency: "direct main"
description:
name: dotted_border
sha256: "99b091ec6891ba0c5331fdc2b502993c7c108f898995739a73c6845d71dad70c"
url: "https://pub.dev"
source: hosted
version: "3.1.0"
equatable: equatable:
dependency: transitive dependency: transitive
description: description:
@@ -257,6 +281,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "7.0.1" version: "7.0.1"
file_picker:
dependency: "direct main"
description:
name: file_picker
sha256: f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f
url: "https://pub.dev"
source: hosted
version: "10.3.3"
fixnum: fixnum:
dependency: transitive dependency: transitive
description: description:
@@ -302,6 +334,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "5.0.0" version: "5.0.0"
flutter_plugin_android_lifecycle:
dependency: transitive
description:
name: flutter_plugin_android_lifecycle
sha256: b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31
url: "https://pub.dev"
source: hosted
version: "2.0.30"
flutter_svg: flutter_svg:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -989,6 +1029,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.3" version: "3.0.3"
win32:
dependency: transitive
description:
name: win32
sha256: "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba"
url: "https://pub.dev"
source: hosted
version: "5.13.0"
xdg_directories: xdg_directories:
dependency: transitive dependency: transitive
description: description: