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

Merge pull request 'added notification some design and added item to navbar' (#119) from notification_design into main

Browse Source 
Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/119
This commit is contained in:
a.ghabeli
2025-09-13 12:19:21 +03:30
parent 58909aa9c3 f9f61ef5b2
commit d065316113
20 changed files with 578 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/core/constants/assets.dart
+5 -1
View File
@@ -12,6 +12,9 @@ class AssetsManager {
static const tendersActive = 'assets/icons/task-square_active.svg';
static const profile = 'assets/icons/profile-circle.svg';
static const profileActive = 'assets/icons/profile-circle_active.svg';
static const contracts = 'assets/icons/icon_contracts.svg';
static const notify = 'assets/icons/notify_icon.svg';
static const notifyActive = 'assets/icons/notify_icon_active.svg';
// login page
static const logo = 'assets/pngs/logo.png';
@@ -45,6 +48,7 @@ class AssetsManager {
static const edit = 'assets/icons/edit.svg';
static const arrowRight = 'assets/icons/arrow-right.svg';
static const notification = 'assets/icons/notification.svg';
static const danger = 'assets/icons/danger.svg';
static const calendar = 'assets/icons/calendar.svg';
static const menu = 'assets/icons/menu.svg';
static const thumbLike = 'assets/icons/thumb_like.svg';
@@ -62,6 +66,6 @@ class AssetsManager {
//Liked tenders
static const trash = 'assets/icons/trash.svg';
static const arrowdownSmall = 'assets/icons/arrow_down_small.svg';
static const arrowDownSmall = 'assets/icons/arrow_down_small.svg';
}
lib/core/routes/app_shell/mobile_shell_page.dart
+23 -3
View File
@@ -48,6 +48,22 @@ class MobileShellPage extends StatelessWidget {
iconPath: AssetsManager.tenders,
activeIconPath: AssetsManager.tendersActive,
),
_bottomNavigationItem(
context: context,
text: TendersStrings.contracts,
isActive: navigationShell.currentIndex == 4,
onTap: () => onTap(4),
iconPath: AssetsManager.contracts,
activeIconPath: AssetsManager.contracts,
),
_bottomNavigationItem(
context: context,
text: TendersStrings.notifications,
isActive: navigationShell.currentIndex == 3,
onTap: () => onTap(3),
iconPath: AssetsManager.notify,
activeIconPath: AssetsManager.notifyActive,
),
_bottomNavigationItem(
context: context,
text: ProfileStrings.profileTitle,
@@ -76,7 +92,10 @@ class MobileShellPage extends StatelessWidget {
width: 64.0.w(),
height: 72.0.h(),
child: Padding(
padding: EdgeInsets.only(top: 12.0.h(), bottom: 14.0.h()),
padding:
iconPath != AssetsManager.notify
? EdgeInsets.only(top: 12.0.h(), bottom: 14.0.h())
: EdgeInsets.only(top: 6.0.h(), bottom: 12.0.h()),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
@@ -84,10 +103,11 @@ class MobileShellPage extends StatelessWidget {
Text(
text,
maxLines: 1,
style: TextStyle(
fontSize: 12.0.sp(),
fontSize:
iconPath == AssetsManager.notify ? 11.0.sp() : 12.0.sp(),
fontWeight: FontWeight.w400,
color: isActive ? AppColors.primaryColor : AppColors.grey60,
),
),
lib/views/home/pages/t_home_page.dart
+2 -1
View File
@@ -128,7 +128,8 @@ class TabletHomePage extends StatelessWidget {
width: double.infinity,
height: 148,
onTap: () {
YourTendersRouteData().push(context);
//YourTendersRouteData().push(context);
NotificationRouteData().push(context);
},
),
),
lib/views/liked_tenders/pages/liked_tenders_desktop_page.dart
+3 -1
View File
@@ -165,6 +165,7 @@ class _LikedTendersDesktopPageState extends State<LikedTendersDesktopPage> {
context: context,
builder: (context) {
return AlertDialog(
backgroundColor: AppColors.backgroundColor,
title: const Text(
LikedTendersStrings.selectPage,
),
@@ -217,7 +218,8 @@ class _LikedTendersDesktopPageState extends State<LikedTendersDesktopPage> {
),
SizedBox(width: 5.0.w()),
SvgPicture.asset(
AssetsManager.arrowdownSmall,
AssetsManager.arrowDownSmall,
color: AppColors.grey80,
),
SizedBox(width: 5.0.w()),
],
lib/views/liked_tenders/pages/liked_tenders_tablet_page.dart
+3 -1
View File
@@ -175,6 +175,7 @@ class _LikedTendersTabletPageState extends State<LikedTendersTabletPage> {
context: context,
builder: (context) {
return AlertDialog(
backgroundColor: AppColors.backgroundColor,
title: const Text(
LikedTendersStrings.selectPage,
),
@@ -227,7 +228,8 @@ class _LikedTendersTabletPageState extends State<LikedTendersTabletPage> {
),
SizedBox(width: 5.0.w()),
SvgPicture.asset(
AssetsManager.arrowdownSmall,
AssetsManager.arrowDownSmall,
color: AppColors.grey80,
),
SizedBox(width: 5.0.w()),
],
lib/views/notification/pages/d_notification_page.dart
+201 -2
View File
@@ -1,10 +1,209 @@
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:tm_app/core/constants/assets.dart';
import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.dart';
import 'package:tm_app/views/notification/strings/notification_strings.dart';
import 'package:tm_app/views/shared/desktop_navigation_widget.dart';
class DesktopNotificationPage extends StatelessWidget {
import '../../shared/main_tab_bar.dart';
import '../widgets/notification_all_tab.dart';
import '../widgets/notification_important_tab.dart';
import '../widgets/notification_unread_tab.dart';
class DesktopNotificationPage extends StatefulWidget {
const DesktopNotificationPage({super.key});
@override
State<DesktopNotificationPage> createState() =>
_DesktopNotificationPageState();
}
class _DesktopNotificationPageState extends State<DesktopNotificationPage>
with SingleTickerProviderStateMixin {
late TabController controller;
@override
void initState() {
super.initState();
controller = TabController(length: 3, vsync: this);
}
@override
void dispose() {
controller.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
return const Scaffold();
return Scaffold(
backgroundColor: AppColors.backgroundColor,
body: Column(
children: [
DesktopNavigationWidget(currentIndex: 3),
SizedBox(height: 60.0.h()),
Expanded(
child: Center(
child: SizedBox(
width: 740,
child: Column(
children: [
MainTabBar(
controller: controller,
titles: [
NotificationStrings.all,
NotificationStrings.unread,
NotificationStrings.important,
],
),
SizedBox(height: 12.0.h()),
Padding(
padding: EdgeInsetsDirectional.only(end: 24.0.w()),
child: Align(
alignment: Alignment.centerRight,
child: InkWell(
onTap: () {},
borderRadius: BorderRadius.circular(99),
child: Container(
width: 132.0.w(),
height: 32.0.h(),
decoration: BoxDecoration(
color: AppColors.primary20,
borderRadius: BorderRadius.circular(99),
),
child: Center(
child: Text(
NotificationStrings.markAllAsReadButton,
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w500,
color: AppColors.mainBlue,
),
),
),
),
),
),
),
SizedBox(height: 12.0.h()),
Expanded(
child: TabBarView(
controller: controller,
children: const [
NotificationAllTab(),
NotificationUnreadTab(),
NotificationImportantTab(),
],
),
),
SizedBox(height: 10.0.h()),
Row(
children: [
const Spacer(),
Text(
'page',
style: TextStyle(
fontSize: 13.0.sp(),
fontWeight: FontWeight.w300,
color: AppColors.grey60,
),
),
SizedBox(width: 10.0.w()),
InkWell(
onTap: () async {
final _ = await showDialog<int>(
context: context,
builder: (context) {
return AlertDialog(
backgroundColor: AppColors.backgroundColor,
title: const Text('selectPage'),
content: SizedBox(
width: 200,
height: 300,
child: ListView.builder(
itemCount: 1,
itemBuilder: (context, index) {
final pageNumber = index + 1;
return ListTile(
title: Text(
'{LikedTendersStrings.page} $pageNumber',
),
onTap:
() => Navigator.pop(
context,
pageNumber,
),
);
},
),
),
);
},
);
},
child: Container(
decoration: BoxDecoration(
border: Border.all(
color: AppColors.grey30,
width: 1,
),
borderRadius: BorderRadius.circular(4),
),
child: Row(
children: [
SizedBox(width: 5.0.w()),
Text(
'currentPage',
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w500,
color: AppColors.grey70,
),
),
SizedBox(width: 5.0.w()),
SvgPicture.asset(
AssetsManager.arrowDownSmall,
color: AppColors.grey80,
),
SizedBox(width: 5.0.w()),
],
),
),
),
SizedBox(width: 5.0.w()),
Text(
'of',
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w400,
color: AppColors.grey60,
),
),
SizedBox(width: 5.0.w()),
Text(
'totalPages',
style: TextStyle(
fontSize: 13.0.sp(),
fontWeight: FontWeight.w400,
color: AppColors.grey60,
),
),
],
),
SizedBox(height: 30.0.h()),
],
),
),
),
),
],
),
);
}
}
lib/views/notification/pages/t_notification_page.dart
+192 -2
View File
@@ -1,10 +1,200 @@
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:tm_app/core/constants/assets.dart';
import 'package:tm_app/core/theme/colors.dart';
import 'package:tm_app/core/utils/size_config.dart';
import 'package:tm_app/views/notification/strings/notification_strings.dart';
import 'package:tm_app/views/shared/tablet_navigation_widget.dart';
import 'package:tm_app/views/shared/tender_app_bar.dart';
class TabletNotificationPage extends StatelessWidget {
import '../../shared/main_tab_bar.dart';
import '../widgets/notification_all_tab.dart';
import '../widgets/notification_important_tab.dart';
import '../widgets/notification_unread_tab.dart';
class TabletNotificationPage extends StatefulWidget {
const TabletNotificationPage({super.key});
@override
State<TabletNotificationPage> createState() => _TabletNotificationPageState();
}
class _TabletNotificationPageState extends State<TabletNotificationPage>
with SingleTickerProviderStateMixin {
late TabController controller;
@override
void initState() {
super.initState();
controller = TabController(length: 3, vsync: this);
}
@override
void dispose() {
controller.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
return const Scaffold();
final GlobalKey<ScaffoldState> key = GlobalKey();
return Scaffold(
key: key,
backgroundColor: AppColors.backgroundColor,
appBar: tabletAppBar(
title: NotificationStrings.notificationTitle,
key: key,
),
drawer: TabletNavigationWidget(currentIndex: 3),
body: Center(
child: SizedBox(
width: 720,
child: Column(
children: [
MainTabBar(
controller: controller,
titles: [
NotificationStrings.all,
NotificationStrings.unread,
NotificationStrings.important,
],
),
SizedBox(height: 12.0.h()),
Padding(
padding: EdgeInsetsDirectional.only(end: 24.0.w()),
child: Align(
alignment: Alignment.centerRight,
child: InkWell(
onTap: () {},
borderRadius: BorderRadius.circular(99),
child: Container(
width: 132.0.w(),
height: 32.0.h(),
decoration: BoxDecoration(
color: AppColors.primary20,
borderRadius: BorderRadius.circular(99),
),
child: Center(
child: Text(
NotificationStrings.markAllAsReadButton,
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w500,
color: AppColors.mainBlue,
),
),
),
),
),
),
),
SizedBox(height: 12.0.h()),
Expanded(
child: TabBarView(
controller: controller,
children: [
NotificationAllTab(),
NotificationUnreadTab(),
NotificationImportantTab(),
],
),
),
SizedBox(height: 10.0.h()),
Row(
children: [
const Spacer(),
Text(
'page',
style: TextStyle(
fontSize: 13.0.sp(),
fontWeight: FontWeight.w300,
color: AppColors.grey60,
),
),
SizedBox(width: 10.0.w()),
InkWell(
onTap: () async {
final _ = await showDialog<int>(
context: context,
builder: (context) {
return AlertDialog(
backgroundColor: AppColors.backgroundColor,
title: const Text('selectPage'),
content: SizedBox(
width: 200,
height: 300,
child: ListView.builder(
itemCount: 1,
itemBuilder: (context, index) {
final pageNumber = index + 1;
return ListTile(
title: Text(
'{LikedTendersStrings.page} $pageNumber',
),
onTap:
() =>
Navigator.pop(context, pageNumber),
);
},
),
),
);
},
);
},
child: Container(
decoration: BoxDecoration(
border: Border.all(color: AppColors.grey30, width: 1),
borderRadius: BorderRadius.circular(4),
),
child: Row(
children: [
SizedBox(width: 5.0.w()),
Text(
'currentPage',
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w500,
color: AppColors.grey70,
),
),
SizedBox(width: 5.0.w()),
SvgPicture.asset(
AssetsManager.arrowDownSmall,
color: AppColors.grey80,
),
SizedBox(width: 5.0.w()),
],
),
),
),
SizedBox(width: 5.0.w()),
Text(
'of',
style: TextStyle(
fontSize: 14.0.sp(),
fontWeight: FontWeight.w400,
color: AppColors.grey60,
),
),
SizedBox(width: 5.0.w()),
Text(
'totalPages',
style: TextStyle(
fontSize: 13.0.sp(),
fontWeight: FontWeight.w400,
color: AppColors.grey60,
),
),
],
),
SizedBox(height: 30.0.h()),
],
),
),
),
);
}
}
lib/views/notification/widgets/notification_card.dart
+21 -3
View File
@@ -18,16 +18,34 @@ class NotificationCard extends StatelessWidget {
margin: EdgeInsets.symmetric(horizontal: 24.0.w()),
padding: EdgeInsets.symmetric(horizontal: 16.0.w(), vertical: 16.0.h()),
decoration: BoxDecoration(
color: AppColors.mainBlue.withValues(alpha: 0.03),
color:
notification.title == 'Tender Submitted'
? AppColors.orange10
: notification.title == 'New Tender Invitation'
? AppColors.mainBlue.withValues(alpha: 0.03)
: AppColors.green0,
borderRadius: BorderRadius.circular(4),
border: Border.all(color: AppColors.mainBlue.withValues(alpha: 0.15)),
border: Border.all(
color:
notification.title == 'Tender Submitted'
? AppColors.warningColor
: notification.title == 'New Tender Invitation'
? AppColors.mainBlue.withValues(alpha: 0.15)
: AppColors.green20,
),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
SvgPicture.asset(AssetsManager.notification),
SvgPicture.asset(
notification.title == 'Tender Submitted'
? AssetsManager.danger
: notification.title == 'New Tender Invitation'
? AssetsManager.notification
: AssetsManager.tickCircle,
),
SizedBox(width: 8.0.w()),
Text(
notification.title,
lib/views/profile/pages/d_profile_page.dart
+1 -1
View File
@@ -67,7 +67,7 @@ class _DesktopProfilePageState extends State<DesktopProfilePage> {
return Column(
children: [
DesktopNavigationWidget(
currentIndex: 2, // Tenders index
currentIndex: 4, // Tenders index
),
SizedBox(
width: 740,
lib/views/profile/pages/t_profile_page.dart
+1 -1
View File
@@ -70,7 +70,7 @@ class _TabletProfilePageState extends State<TabletProfilePage> {
backgroundColor: AppColors.backgroundColor,
appBar: tabletAppBar(title: ProfileStrings.profileTitle, key: key),
drawer: TabletNavigationWidget(currentIndex: 2),
drawer: TabletNavigationWidget(currentIndex: 4),
body: Padding(
padding: EdgeInsets.symmetric(
horizontal: 24.0.w(),
lib/views/profile/strings/profile_strings.dart
+2
View File
@@ -11,4 +11,6 @@ class ProfileStrings {
static const String businessType = 'Business Type';
static const String founded = 'Founded';
static const String logout = 'Logout';
static const String contracts = 'Contracts';
static const String notifications = 'Notifications';
}
lib/views/shared/desktop_navigation_widget.dart
+37 -2
View File
@@ -66,11 +66,46 @@ class DesktopNavigationWidget extends StatelessWidget {
SizedBox(width: 24),
_navigationItem(
context: context,
text: ProfileStrings.profileTitle,
text: TendersStrings.contracts,
isActive: currentIndex == 2,
onTap: () {
if (currentIndex == 2) {
return;
} else {
// Router.neglect(context, () => TendersRouteData().go(context));
// context.read<TendersViewModel>().getTenders();
}
},
iconPath: AssetsManager.contracts,
activeIconPath: AssetsManager.contracts,
),
SizedBox(width: 24),
_navigationItem(
context: context,
text: TendersStrings.notifications,
isActive: currentIndex == 3,
onTap: () {
if (currentIndex == 3) {
return;
} else {
Router.neglect(
context,
() => NotificationRouteData().go(context),
);
//context.read<notificationViewModel>().getTenders();
}
},
iconPath: AssetsManager.notify,
activeIconPath: AssetsManager.notifyActive,
),
SizedBox(width: 24),
_navigationItem(
context: context,
text: ProfileStrings.profileTitle,
isActive: currentIndex == 4,
onTap: () {
if (currentIndex == 4) {
return;
} else {
Router.neglect(context, () => ProfileRouteData().go(context));
}
@@ -96,7 +131,7 @@ class DesktopNavigationWidget extends StatelessWidget {
return InkWell(
onTap: onTap,
child: SizedBox(
width: 100.0,
width: 115.0,
height: 64,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
lib/views/shared/tablet_navigation_widget.dart
+31 -1
View File
@@ -59,11 +59,41 @@ class TabletNavigationWidget extends StatelessWidget {
),
_navigationItem(
context: context,
text: ProfileStrings.profileTitle,
text: ProfileStrings.contracts,
isActive: currentIndex == 2,
onTap: () {
if (currentIndex == 2) {
return;
} else {
// context.pop();
// Router.neglect(context, () => ProfileRouteData().go(context));
}
},
iconPath: AssetsManager.contracts,
activeIconPath: AssetsManager.contracts,
),
_navigationItem(
context: context,
text: ProfileStrings.notifications,
isActive: currentIndex == 3,
onTap: () {
if (currentIndex == 3) {
return;
} else {
context.pop();
Router.neglect(context, () => NotificationRouteData().go(context));
}
},
iconPath: AssetsManager.notify,
activeIconPath: AssetsManager.notifyActive,
),
_navigationItem(
context: context,
text: ProfileStrings.profileTitle,
isActive: currentIndex == 4,
onTap: () {
if (currentIndex == 4) {
return;
} else {
context.pop();
Router.neglect(context, () => ProfileRouteData().go(context));
lib/views/tenders/strings/tenders_strings.dart
+2
View File
@@ -8,4 +8,6 @@ class TendersStrings {
static const String dislike = 'Dislike';
static const String like = 'Like';
static const String tenderDeadlineLabel = 'Deadline';
static const String contracts = 'Contracts';
static const String notifications = 'Notifications';
}