Merge pull request 'changed safe areas and filter string' (#180) from fixes into main
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/180
This commit is contained in:
@@ -75,14 +75,14 @@ class _TenderDetailMobilePageState extends State<TenderDetailMobilePage> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Scaffold(
|
return SafeArea(
|
||||||
|
child: Scaffold(
|
||||||
backgroundColor: AppColors.backgroundColor,
|
backgroundColor: AppColors.backgroundColor,
|
||||||
appBar: appBar(
|
appBar: appBar(
|
||||||
context: context,
|
context: context,
|
||||||
title: TenderDetailsStrings.tenderDetailTitle,
|
title: TenderDetailsStrings.tenderDetailTitle,
|
||||||
),
|
),
|
||||||
body: SafeArea(
|
body: Consumer<TenderDetailViewModel>(
|
||||||
child: Consumer<TenderDetailViewModel>(
|
|
||||||
builder: (context, tenderViewModel, child) {
|
builder: (context, tenderViewModel, child) {
|
||||||
if (tenderViewModel.isLoading) {
|
if (tenderViewModel.isLoading) {
|
||||||
return const Center(
|
return const Center(
|
||||||
|
|||||||
@@ -70,6 +70,7 @@ class _LikedTendersMobilePageState extends State<LikedTendersMobilePage> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
child: SafeArea(
|
||||||
child: Scaffold(
|
child: Scaffold(
|
||||||
backgroundColor: AppColors.backgroundColor,
|
backgroundColor: AppColors.backgroundColor,
|
||||||
appBar: PreferredSize(
|
appBar: PreferredSize(
|
||||||
@@ -156,8 +157,7 @@ class _LikedTendersMobilePageState extends State<LikedTendersMobilePage> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
||||||
body: SafeArea(
|
body: Column(
|
||||||
child: Column(
|
|
||||||
children: [
|
children: [
|
||||||
Expanded(
|
Expanded(
|
||||||
child: Consumer<LikedTendersViewModel>(
|
child: Consumer<LikedTendersViewModel>(
|
||||||
|
|||||||
@@ -35,11 +35,11 @@ class _YourTendersMobilePageState extends State<YourTendersMobilePage> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Scaffold(
|
return SafeArea(
|
||||||
|
child: Scaffold(
|
||||||
backgroundColor: AppColors.backgroundColor,
|
backgroundColor: AppColors.backgroundColor,
|
||||||
appBar: appBar(context: context, title: YourTendersStrings.yourTenders),
|
appBar: appBar(context: context, title: YourTendersStrings.yourTenders),
|
||||||
body: SafeArea(
|
body: Column(
|
||||||
child: Column(
|
|
||||||
children: [
|
children: [
|
||||||
const FilterButton(platformType: PlatformType.mobile),
|
const FilterButton(platformType: PlatformType.mobile),
|
||||||
Expanded(
|
Expanded(
|
||||||
|
|||||||
@@ -15,10 +15,11 @@ class YourTendersStrings {
|
|||||||
static const approvedTenders = 'Approved tenders';
|
static const approvedTenders = 'Approved tenders';
|
||||||
static const noTenders = 'No data available';
|
static const noTenders = 'No data available';
|
||||||
static const selectPublicationRangeDate = 'Select publication date range';
|
static const selectPublicationRangeDate = 'Select publication date range';
|
||||||
|
static const selectCreationRangeDate = 'Select Creation date range';
|
||||||
static const noLikedTenders = 'You haven’t liked any tenders yet !';
|
static const noLikedTenders = 'You haven’t liked any tenders yet !';
|
||||||
static const noDislikedTenders = 'You haven’t disliked any tenders yet !';
|
static const noDislikedTenders = 'You haven’t disliked any tenders yet !';
|
||||||
static const noTendersSubmitted = 'You haven’t submitted any tenders yet !';
|
static const noTendersSubmitted = 'You haven’t submitted any tenders yet !';
|
||||||
static const page = 'Page';
|
static const page = 'Page';
|
||||||
static const of = 'of';
|
static const of = 'of';
|
||||||
static const selectPage ='Select Page';
|
static const selectPage = 'Select Page';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ class YourTendersFilterDialog extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
SizedBox(height: 16.0.h()),
|
SizedBox(height: 16.0.h()),
|
||||||
Text(
|
Text(
|
||||||
YourTendersStrings.selectPublicationRangeDate,
|
YourTendersStrings.selectCreationRangeDate,
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontSize: 16.0.sp(),
|
fontSize: 16.0.sp(),
|
||||||
fontWeight: FontWeight.w600,
|
fontWeight: FontWeight.w600,
|
||||||
|
|||||||
Reference in New Issue
Block a user