some changs on design
This commit is contained in:
@@ -181,4 +181,5 @@ class AppColors {
|
|||||||
static const Color yellow4 = Color(0xFFC07A25);
|
static const Color yellow4 = Color(0xFFC07A25);
|
||||||
static const Color secondaryborder = Color(0xFFCDCDCD);
|
static const Color secondaryborder = Color(0xFFCDCDCD);
|
||||||
static const Color secondaryborder2 = Color(0xFFDADADA);
|
static const Color secondaryborder2 = Color(0xFFDADADA);
|
||||||
|
static const Color orange20 = Color(0xFFF6D7AB);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,8 +52,13 @@ class DesktopHomePage extends StatelessWidget {
|
|||||||
_progressBarsRow(homeViewModel),
|
_progressBarsRow(homeViewModel),
|
||||||
SizedBox(height: 32.0.h()),
|
SizedBox(height: 32.0.h()),
|
||||||
Padding(
|
Padding(
|
||||||
padding: EdgeInsets.symmetric(horizontal: 15.0.w()),
|
padding: EdgeInsets.symmetric(
|
||||||
child: _firstTenderCardsRow(context, homeViewModel),
|
horizontal: 15.0.w(),
|
||||||
|
),
|
||||||
|
child: _firstTenderCardsRow(
|
||||||
|
context,
|
||||||
|
homeViewModel,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 32.0.h()),
|
SizedBox(height: 32.0.h()),
|
||||||
_yourTenderText(homeViewModel),
|
_yourTenderText(homeViewModel),
|
||||||
@@ -166,8 +171,8 @@ class DesktopHomePage extends StatelessWidget {
|
|||||||
iconPath: AssetsManager.thumbLike,
|
iconPath: AssetsManager.thumbLike,
|
||||||
title: HomeStrings.likedTenders,
|
title: HomeStrings.likedTenders,
|
||||||
amount: homeViewModel.feedbackStats?.totalLikes.toString() ?? '0',
|
amount: homeViewModel.feedbackStats?.totalLikes.toString() ?? '0',
|
||||||
textColor: AppColors.grey80,
|
textColor: AppColors.grey50,
|
||||||
enableTap: true,
|
enableTap: (homeViewModel.feedbackStats?.totalLikes ?? 0) != 0,
|
||||||
width: 178,
|
width: 178,
|
||||||
height: 148,
|
height: 148,
|
||||||
onTap: () {
|
onTap: () {
|
||||||
|
|||||||
@@ -151,8 +151,8 @@ class MobileHomePage extends StatelessWidget {
|
|||||||
iconPath: AssetsManager.thumbLike,
|
iconPath: AssetsManager.thumbLike,
|
||||||
title: HomeStrings.likedTenders,
|
title: HomeStrings.likedTenders,
|
||||||
amount: homeViewModel.feedbackStats?.totalLikes.toString() ?? '0',
|
amount: homeViewModel.feedbackStats?.totalLikes.toString() ?? '0',
|
||||||
textColor: AppColors.grey80,
|
textColor: AppColors.grey50,
|
||||||
enableTap: true,
|
enableTap: (homeViewModel.feedbackStats?.totalLikes ?? 0) != 0,
|
||||||
onTap: () {
|
onTap: () {
|
||||||
const LikedTendersRouteData().push(context).then((value) {
|
const LikedTendersRouteData().push(context).then((value) {
|
||||||
homeViewModel.init();
|
homeViewModel.init();
|
||||||
|
|||||||
@@ -141,7 +141,6 @@ class TabletHomePage extends StatelessWidget {
|
|||||||
iconPath: AssetsManager.approve,
|
iconPath: AssetsManager.approve,
|
||||||
title: HomeStrings.approvedTenders,
|
title: HomeStrings.approvedTenders,
|
||||||
amount: '0',
|
amount: '0',
|
||||||
|
|
||||||
textColor: AppColors.jellyBean,
|
textColor: AppColors.jellyBean,
|
||||||
enableTap: true,
|
enableTap: true,
|
||||||
width: double.infinity,
|
width: double.infinity,
|
||||||
@@ -155,7 +154,6 @@ class TabletHomePage extends StatelessWidget {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ignore: unused_element
|
|
||||||
Widget _secondTenderCardsRow(
|
Widget _secondTenderCardsRow(
|
||||||
HomeViewModel homeViewModel,
|
HomeViewModel homeViewModel,
|
||||||
BuildContext context,
|
BuildContext context,
|
||||||
@@ -183,8 +181,8 @@ class TabletHomePage extends StatelessWidget {
|
|||||||
iconPath: AssetsManager.thumbLike,
|
iconPath: AssetsManager.thumbLike,
|
||||||
title: HomeStrings.likedTenders,
|
title: HomeStrings.likedTenders,
|
||||||
amount: homeViewModel.feedbackStats?.totalLikes.toString() ?? '0',
|
amount: homeViewModel.feedbackStats?.totalLikes.toString() ?? '0',
|
||||||
textColor: AppColors.grey80,
|
textColor: AppColors.grey50,
|
||||||
enableTap: true,
|
enableTap: (homeViewModel.feedbackStats?.totalLikes ?? 0) != 0,
|
||||||
width: double.infinity,
|
width: double.infinity,
|
||||||
height: 148,
|
height: 148,
|
||||||
onTap: () {
|
onTap: () {
|
||||||
|
|||||||
@@ -23,4 +23,5 @@ class NotificationStrings {
|
|||||||
static const String info = 'info';
|
static const String info = 'info';
|
||||||
static const String noUnreadNotifications = 'No unread notifications';
|
static const String noUnreadNotifications = 'No unread notifications';
|
||||||
static const String noImportantNotifications = 'No important notifications';
|
static const String noImportantNotifications = 'No important notifications';
|
||||||
|
static const String moreTextButton = 'More';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,28 +19,27 @@ class NotificationCard extends StatelessWidget {
|
|||||||
return Container(
|
return Container(
|
||||||
width: double.infinity,
|
width: double.infinity,
|
||||||
margin: EdgeInsets.symmetric(horizontal: 24.0.w()),
|
margin: EdgeInsets.symmetric(horizontal: 24.0.w()),
|
||||||
padding: const EdgeInsets.all(16.0),
|
padding: EdgeInsets.symmetric(horizontal: 16.0.w(), vertical: 16.0.h()),
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: AppColors.primary10Light,
|
color:
|
||||||
|
notification.priority == NotificationStrings.important.toLowerCase()
|
||||||
|
? AppColors.orange10
|
||||||
|
: AppColors.primary10Light,
|
||||||
|
|
||||||
borderRadius: BorderRadius.circular(4),
|
borderRadius: BorderRadius.circular(4),
|
||||||
border: Border.all(color: AppColors.primary20),
|
border:
|
||||||
|
notification.priority == NotificationStrings.important.toLowerCase()
|
||||||
|
? Border.all(color: AppColors.orange20)
|
||||||
|
: Border.all(color: AppColors.primary20),
|
||||||
),
|
),
|
||||||
child: Row(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
Padding(
|
|
||||||
padding: EdgeInsets.only(top: 3.0.h()),
|
|
||||||
child: SvgPicture.asset(AssetsManager.notification),
|
|
||||||
),
|
|
||||||
SizedBox(width: 5.0.w()),
|
|
||||||
Expanded(
|
|
||||||
child: Column(
|
child: Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
Row(
|
Row(
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
|
SvgPicture.asset(AssetsManager.notification),
|
||||||
|
SizedBox(width: 8.0.w()),
|
||||||
Text(
|
Text(
|
||||||
notification.title!,
|
notification.title!,
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
@@ -58,7 +57,7 @@ class NotificationCard extends StatelessWidget {
|
|||||||
width: 86.0.w(),
|
width: 86.0.w(),
|
||||||
height: 24.0.h(),
|
height: 24.0.h(),
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: AppColors.blue0,
|
color: AppColors.orange20,
|
||||||
borderRadius: BorderRadius.circular(8),
|
borderRadius: BorderRadius.circular(8),
|
||||||
),
|
),
|
||||||
alignment: Alignment.center,
|
alignment: Alignment.center,
|
||||||
@@ -67,7 +66,7 @@ class NotificationCard extends StatelessWidget {
|
|||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
fontSize: 12.0.sp(),
|
fontSize: 12.0.sp(),
|
||||||
fontWeight: FontWeight.w500,
|
fontWeight: FontWeight.w500,
|
||||||
color: AppColors.cyanTeal,
|
color: AppColors.yellow4,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -77,16 +76,24 @@ class NotificationCard extends StatelessWidget {
|
|||||||
? Container(
|
? Container(
|
||||||
width: 12.0.w(),
|
width: 12.0.w(),
|
||||||
height: 12.0.w(),
|
height: 12.0.w(),
|
||||||
decoration: const BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
shape: BoxShape.circle,
|
shape: BoxShape.circle,
|
||||||
color: AppColors.mainBlue,
|
color:
|
||||||
|
notification.priority ==
|
||||||
|
NotificationStrings.important.toLowerCase()
|
||||||
|
? AppColors.orange
|
||||||
|
: AppColors.mainBlue,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
: const SizedBox(),
|
: const SizedBox(),
|
||||||
|
SizedBox(width: 5.0.w()),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
|
||||||
SizedBox(height: 8.0.h()),
|
SizedBox(height: 8.0.h()),
|
||||||
Text(
|
Padding(
|
||||||
|
padding: EdgeInsets.only(left: 28.0.w()),
|
||||||
|
child: Text(
|
||||||
notification.message!,
|
notification.message!,
|
||||||
maxLines: 1,
|
maxLines: 1,
|
||||||
overflow: TextOverflow.ellipsis,
|
overflow: TextOverflow.ellipsis,
|
||||||
@@ -96,8 +103,11 @@ class NotificationCard extends StatelessWidget {
|
|||||||
color: AppColors.grey70,
|
color: AppColors.grey70,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 8.0.h()),
|
),
|
||||||
Row(
|
SizedBox(height: 12.0.h()),
|
||||||
|
Padding(
|
||||||
|
padding: EdgeInsets.only(left: 28.0.w()),
|
||||||
|
child: Row(
|
||||||
children: [
|
children: [
|
||||||
SvgPicture.asset(AssetsManager.calendar),
|
SvgPicture.asset(AssetsManager.calendar),
|
||||||
SizedBox(width: 4.0.w()),
|
SizedBox(width: 4.0.w()),
|
||||||
@@ -109,8 +119,30 @@ class NotificationCard extends StatelessWidget {
|
|||||||
color: AppColors.grey60,
|
color: AppColors.grey60,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
const Spacer(),
|
||||||
|
TextButton(
|
||||||
|
onPressed: () {},
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
NotificationStrings.moreTextButton,
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 14.0.sp(),
|
||||||
|
fontWeight: FontWeight.w500,
|
||||||
|
color: AppColors.mainBlue,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SizedBox(width: 4.0.w()),
|
||||||
|
SvgPicture.asset(
|
||||||
|
AssetsManager.arrowRight,
|
||||||
|
colorFilter: const ColorFilter.mode(
|
||||||
|
AppColors.mainBlue,
|
||||||
|
BlendMode.srcIn,
|
||||||
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
Reference in New Issue
Block a user