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

Merge pull request 'Added text in ui code to your_tenders_strings' (#86) from strings_in_your_tender into main

Browse Source 
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/86
This commit is contained in:
a.ghabeli
2025-09-02 10:15:52 +03:30
parent 865d166a59 ac725b38a3
commit 1a933fdfe0
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/views/your_tenders/strings/your_tenders_strings.dart
+1
View File
@@ -13,4 +13,5 @@ class YourTendersStrings {
static const confirm = 'Confirm'; static const confirm = 'Confirm';
static const startDate = 'YYYY/MM/DD'; static const startDate = 'YYYY/MM/DD';
static const endDate = 'YYYY/MM/DD'; static const endDate = 'YYYY/MM/DD';
static const approvedTenders = 'Approved tenders';
} }
lib/views/your_tenders/widgets/filter_button.dart
+2 -1
View File
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:tm_app/views/your_tenders/strings/your_tenders_strings.dart';
import 'tenders_filter_dialog.dart'; import 'tenders_filter_dialog.dart';
@@ -56,7 +57,7 @@ class FilterButton extends StatelessWidget {
Icon(Icons.filter_list, color: Colors.blue), Icon(Icons.filter_list, color: Colors.blue),
SizedBox(width: 8), SizedBox(width: 8),
Text( Text(
'Filter', YourTendersStrings.filter,
style: TextStyle( style: TextStyle(
color: Colors.blue, color: Colors.blue,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
lib/views/your_tenders/widgets/tenders_filter_dialog.dart
+11 -10
View File
@@ -7,6 +7,7 @@ import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.dart'; import 'package:tm_app/core/utils/size_config.dart';
import 'package:tm_app/view_models/your_tenders_view_model.dart'; import 'package:tm_app/view_models/your_tenders_view_model.dart';
import 'package:tm_app/views/shared/base_button.dart'; import 'package:tm_app/views/shared/base_button.dart';
import 'package:tm_app/views/your_tenders/strings/your_tenders_strings.dart';
class TendersFilterDialog extends StatelessWidget { class TendersFilterDialog extends StatelessWidget {
const TendersFilterDialog({super.key}); const TendersFilterDialog({super.key});
@@ -63,7 +64,7 @@ class TendersFilterDialog extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Text( Text(
start == null ? 'YYYY/MM/DD' : viewModel.startDateFormatted, start == null ? YourTendersStrings.startDate : viewModel.startDateFormatted,
style: TextStyle( style: TextStyle(
fontSize: 16.0.sp(), fontSize: 16.0.sp(),
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
@@ -71,7 +72,7 @@ class TendersFilterDialog extends StatelessWidget {
), ),
), ),
Text( Text(
end == null ? 'YYYY/MM/DD' : viewModel.endDateFormatted, end == null ? YourTendersStrings.endDate : viewModel.endDateFormatted,
style: TextStyle( style: TextStyle(
fontSize: 16.0.sp(), fontSize: 16.0.sp(),
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
@@ -100,7 +101,7 @@ class TendersFilterDialog extends StatelessWidget {
children: [ children: [
Center( Center(
child: Text( child: Text(
'Filter', YourTendersStrings.filter,
style: TextStyle( style: TextStyle(
fontSize: 20.0.sp(), fontSize: 20.0.sp(),
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
@@ -121,7 +122,7 @@ class TendersFilterDialog extends StatelessWidget {
_dateRangePill(context), _dateRangePill(context),
SizedBox(height: 16.0.h()), SizedBox(height: 16.0.h()),
Text( Text(
'Status', YourTendersStrings.status,
style: TextStyle( style: TextStyle(
fontSize: 16.0.sp(), fontSize: 16.0.sp(),
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
@@ -129,11 +130,11 @@ class TendersFilterDialog extends StatelessWidget {
), ),
), ),
...[ ...[
'All', YourTendersStrings.all,
'Like tenders', YourTendersStrings.likeTenders,
'Dislike tenders', YourTendersStrings.dislikeTenders,
'Approved tenders', YourTendersStrings.approvedTenders,
'Tenders submitted', YourTendersStrings.tendersSubmitted,
].map((status) { ].map((status) {
return RadioListTile( return RadioListTile(
value: status, value: status,
@@ -158,7 +159,7 @@ class TendersFilterDialog extends StatelessWidget {
onPressed: () { onPressed: () {
context.pop(); context.pop();
}, },
text: 'Confirm', text: YourTendersStrings.confirm,
textColor: AppColors.mainBlue, textColor: AppColors.mainBlue,
backgroundColor: AppColors.primary30, backgroundColor: AppColors.primary30,
), ),