diff --git a/lib/modules/cm_module/cm_detail_page.dart b/lib/modules/cm_module/cm_detail_page.dart index 7059fff1..e6f672fc 100644 --- a/lib/modules/cm_module/cm_detail_page.dart +++ b/lib/modules/cm_module/cm_detail_page.dart @@ -142,11 +142,11 @@ class _CMDetailPageState extends State { return Container( padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 6), margin: const EdgeInsets.only(left: 2), - decoration: BoxDecoration(color: AppColor.background(context) ,border: Border.all(color: AppColor.border2Color(context)), borderRadius: BorderRadius.circular(16)), + decoration: BoxDecoration(color: AppColor.background(context), border: Border.all(color: AppColor.border2Color(context)), borderRadius: BorderRadius.circular(16)), child: Row( mainAxisSize: MainAxisSize.min, children: [ - Icon(Icons.add, size: 20, color:AppColor.textStyleColor(context)), + Icon(Icons.add, size: 20, color: AppColor.textStyleColor(context)), Text( "Loan", style: AppTextStyles.bodyText2.copyWith(color: AppColor.textStyleColor(context)), @@ -187,10 +187,14 @@ class _CMDetailPageState extends State { children: [ Container( margin: EdgeInsets.only(left: 16.toScreenWidth, right: 16.toScreenWidth, top: 12.toScreenHeight), - decoration: BoxDecoration(color: context.isDark ? AppColor.neutral50 : AppColor.white10, borderRadius: BorderRadius.circular(10)), + decoration: BoxDecoration( + color: AppColor.tabBarBackground(context), + border: Border.all(color: AppColor.tabBarBorder(context)), + borderRadius: BorderRadius.circular(20), + ), child: TabBar( //controller: _tabController, - padding: EdgeInsets.symmetric(vertical: 4.toScreenHeight, horizontal: 4.toScreenWidth), + padding: EdgeInsets.symmetric(vertical: 6.toScreenHeight, horizontal: 6.toScreenWidth), labelColor: context.isDark ? AppColor.neutral30 : AppColor.black20, unselectedLabelColor: context.isDark ? AppColor.neutral30 : AppColor.black20, unselectedLabelStyle: AppTextStyles.bodyText, @@ -198,7 +202,11 @@ class _CMDetailPageState extends State { indicatorPadding: EdgeInsets.zero, indicatorSize: TabBarIndicatorSize.tab, dividerColor: Colors.transparent, - indicator: BoxDecoration(color: context.isDark ? AppColor.neutral60 : AppColor.neutral110, borderRadius: BorderRadius.circular(7)), + overlayColor: WidgetStateProperty.all(Colors.transparent), + indicator: BoxDecoration( + color: AppColor.background(context), + borderRadius: BorderRadius.circular(15), + boxShadow: [BoxShadow(color: Colors.black.withOpacity(0.03), blurRadius: 5, offset: const Offset(0, 0), spreadRadius: 0)]), onTap: (index) { // setState(() {}); }, diff --git a/lib/new_views/app_style/app_color.dart b/lib/new_views/app_style/app_color.dart index 4422e366..e5a249b0 100644 --- a/lib/new_views/app_style/app_color.dart +++ b/lib/new_views/app_style/app_color.dart @@ -96,10 +96,13 @@ class AppColor { static const Color openChartColor = Color(0xff226187); static const Color inProgressChartColor = Color(0xff3DA5E5); static const Color completeChartColor = Color(0xff92D9F8); + static const Color openColor = Color(0xff3DA5E5); static const Color inProgressColor = Color(0xffFDE19B); + static const Color completedColor = Color(0xff54C166); static const Color overdueColor = Color(0xffFFC945); static const Color highPriorityColor = red30; static const Color unassignedColor = Color(0xff9F9FA8); + static const Color lowPriorityColor = Color(0xff54C166); // static Color greenStatus(BuildContext context) => context.isDark ? const Color(0xff1FA269) : green50; static Color greenStatus(BuildContext context) => context.isDark ? const Color(0xff54C166) : green70.withOpacity(.5); @@ -116,6 +119,10 @@ class AppColor { static Color background(BuildContext context) => context.isDark ? containerDark : Colors.white; + static Color tabBarBackground(BuildContext context) => context.isDark ? disableDark : neutral90; + + static Color tabBarBorder(BuildContext context) => context.isDark ? const Color(0xffCCCCCC) : neutral30; + static Color scaffoldBackground(BuildContext context) => context.isDark ? backgroundDark : backgroundLight; static Color dropDownBackground(BuildContext context) => context.isDark ? dropDownDark : backgroundLight; diff --git a/lib/new_views/pages/land_page/my_request/my_requests_page.dart b/lib/new_views/pages/land_page/my_request/my_requests_page.dart index d076a9fb..d0d5a0ee 100644 --- a/lib/new_views/pages/land_page/my_request/my_requests_page.dart +++ b/lib/new_views/pages/land_page/my_request/my_requests_page.dart @@ -126,7 +126,7 @@ class _MyRequestsPageState extends State { padding: const EdgeInsets.only(left: 16, right: 8), alignment: Alignment.center, decoration: ShapeDecoration( - color: context.isDark ? AppColor.neutral50 : AppColor.neutral30, + color: AppColor.tabBarBackground(context), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10), ), @@ -203,9 +203,9 @@ class _MyRequestsPageState extends State { // ), decoration: ShapeDecoration( color: //selectedRequest == index ? - AppColor.background(context) ,//: AppColor.unSelectedButtonColor(context).withOpacity(snapshot.isAllLoading ? 0.7 : 1), + AppColor.background(context), //: AppColor.unSelectedButtonColor(context).withOpacity(snapshot.isAllLoading ? 0.7 : 1), shape: RoundedRectangleBorder( - side: BorderSide(width: 1, color: selectedRequest == index ? AppColor.primary10 : AppColor.borderColor(context)), + side: BorderSide(width: 1, color: selectedRequest == index ? AppColor.primary10 : AppColor.borderColor(context)), borderRadius: BorderRadius.circular(6), ), shadows: [BoxShadow(color: Colors.black.withOpacity(0.05), blurRadius: 14, offset: const Offset(0, 0), spreadRadius: 0)],