tab bar ui changes

main_production_RSG
Sikander Saleem 2 months ago
parent 252a03b219
commit 7f99349067

@ -42,7 +42,11 @@ class _AssetDeliveryStageTabPageState extends State<AssetDeliveryStageTabPage> {
children: <Widget>[ children: <Widget>[
Container( Container(
margin: EdgeInsets.only(left: 16.toScreenWidth, right: 16.toScreenWidth, top: 12.toScreenHeight), 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( child: TabBar(
padding: EdgeInsets.symmetric(vertical: 4.toScreenHeight, horizontal: 4.toScreenWidth), padding: EdgeInsets.symmetric(vertical: 4.toScreenHeight, horizontal: 4.toScreenWidth),
labelColor: context.isDark ? AppColor.neutral30 : AppColor.black20, labelColor: context.isDark ? AppColor.neutral30 : AppColor.black20,
@ -52,7 +56,11 @@ class _AssetDeliveryStageTabPageState extends State<AssetDeliveryStageTabPage> {
indicatorPadding: EdgeInsets.zero, indicatorPadding: EdgeInsets.zero,
indicatorSize: TabBarIndicatorSize.tab, indicatorSize: TabBarIndicatorSize.tab,
dividerColor: Colors.transparent, 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)]),
tabs: [ tabs: [
Tab(text: context.translation.details, height: 57.toScreenHeight), Tab(text: context.translation.details, height: 57.toScreenHeight),
Tab(text: context.translation.historyLogs, height: 57.toScreenHeight), Tab(text: context.translation.historyLogs, height: 57.toScreenHeight),
@ -73,7 +81,6 @@ class _AssetDeliveryStageTabPageState extends State<AssetDeliveryStageTabPage> {
)); ));
} }
String getPageTitle({AssetDeliveryStageEnum? deliveryStage}) { String getPageTitle({AssetDeliveryStageEnum? deliveryStage}) {
if (deliveryStage == AssetDeliveryStageEnum.deliveryInspection) { if (deliveryStage == AssetDeliveryStageEnum.deliveryInspection) {
return 'Delivery Inspection'.addTranslation; return 'Delivery Inspection'.addTranslation;

@ -77,7 +77,11 @@ class _AssetInventoryPageState extends State<AssetInventoryPage> {
children: <Widget>[ children: <Widget>[
Container( Container(
margin: EdgeInsets.only(left: 16.toScreenWidth, right: 16.toScreenWidth, top: 12.toScreenHeight), 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( child: TabBar(
padding: EdgeInsets.symmetric(vertical: 4.toScreenHeight, horizontal: 4.toScreenWidth), padding: EdgeInsets.symmetric(vertical: 4.toScreenHeight, horizontal: 4.toScreenWidth),
labelColor: context.isDark ? AppColor.neutral30 : AppColor.black20, labelColor: context.isDark ? AppColor.neutral30 : AppColor.black20,
@ -87,7 +91,11 @@ class _AssetInventoryPageState extends State<AssetInventoryPage> {
indicatorPadding: EdgeInsets.zero, indicatorPadding: EdgeInsets.zero,
indicatorSize: TabBarIndicatorSize.tab, indicatorSize: TabBarIndicatorSize.tab,
dividerColor: Colors.transparent, 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) {}, onTap: (index) {},
tabs: [ tabs: [
Tab(text: 'Session Details'.addTranslation, height: 57.toScreenHeight), Tab(text: 'Session Details'.addTranslation, height: 57.toScreenHeight),

@ -70,8 +70,9 @@ class _MaintenanceRequestFormState extends State<MaintenanceRequestForm> with Si
Container( Container(
margin: EdgeInsets.only(left: 16.toScreenWidth, right: 16.toScreenWidth, top: 12.toScreenHeight), margin: EdgeInsets.only(left: 16.toScreenWidth, right: 16.toScreenWidth, top: 12.toScreenHeight),
decoration: BoxDecoration( decoration: BoxDecoration(
color: context.isDark ? AppColor.neutral50 : AppColor.white10, color: AppColor.tabBarBackground(context),
borderRadius: BorderRadius.circular(10), border: Border.all(color: AppColor.tabBarBorder(context)),
borderRadius: BorderRadius.circular(20),
), ),
child: TabBar( child: TabBar(
padding: EdgeInsets.symmetric(vertical: 4.toScreenHeight, horizontal: 4.toScreenWidth), padding: EdgeInsets.symmetric(vertical: 4.toScreenHeight, horizontal: 4.toScreenWidth),
@ -82,10 +83,11 @@ class _MaintenanceRequestFormState extends State<MaintenanceRequestForm> with Si
indicatorPadding: EdgeInsets.zero, indicatorPadding: EdgeInsets.zero,
indicatorSize: TabBarIndicatorSize.tab, indicatorSize: TabBarIndicatorSize.tab,
dividerColor: Colors.transparent, dividerColor: Colors.transparent,
overlayColor: WidgetStateProperty.all(Colors.transparent),
indicator: BoxDecoration( indicator: BoxDecoration(
color: context.isDark ? AppColor.neutral60 : AppColor.neutral110, color: AppColor.background(context),
borderRadius: BorderRadius.circular(7), borderRadius: BorderRadius.circular(15),
), boxShadow: [BoxShadow(color: Colors.black.withOpacity(0.03), blurRadius: 5, offset: const Offset(0, 0), spreadRadius: 0)]),
tabs: [ tabs: [
Tab(text: context.translation.internal, height: 57.toScreenHeight), Tab(text: context.translation.internal, height: 57.toScreenHeight),
Tab(text: context.translation.external, height: 57.toScreenHeight), Tab(text: context.translation.external, height: 57.toScreenHeight),

@ -29,7 +29,11 @@ class PullOutDetailsPage extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Container( Container(
margin: EdgeInsets.only(left: 16.toScreenWidth, right: 16.toScreenWidth, top: 12.toScreenHeight), 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( child: TabBar(
padding: EdgeInsets.symmetric(vertical: 4.toScreenHeight, horizontal: 4.toScreenWidth), padding: EdgeInsets.symmetric(vertical: 4.toScreenHeight, horizontal: 4.toScreenWidth),
labelColor: context.isDark ? AppColor.neutral30 : AppColor.black20, labelColor: context.isDark ? AppColor.neutral30 : AppColor.black20,
@ -39,7 +43,11 @@ class PullOutDetailsPage extends StatelessWidget {
indicatorPadding: EdgeInsets.zero, indicatorPadding: EdgeInsets.zero,
indicatorSize: TabBarIndicatorSize.tab, indicatorSize: TabBarIndicatorSize.tab,
dividerColor: Colors.transparent, 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) { onTap: (index) {
// setState(() {}); // setState(() {});
}, },

@ -148,8 +148,9 @@ class _UpdatePpmState extends State<UpdatePpm> with TickerProviderStateMixin {
Container( Container(
margin: EdgeInsets.only(left: 16.toScreenWidth, right: 16.toScreenWidth, top: 16.toScreenHeight, bottom: 8), margin: EdgeInsets.only(left: 16.toScreenWidth, right: 16.toScreenWidth, top: 16.toScreenHeight, bottom: 8),
decoration: BoxDecoration( decoration: BoxDecoration(
color: context.isDark ? AppColor.neutral50 : AppColor.white10, color: AppColor.tabBarBackground(context),
borderRadius: BorderRadius.circular(10), border: Border.all(color: AppColor.tabBarBorder(context)),
borderRadius: BorderRadius.circular(20),
), ),
child: TabBar( child: TabBar(
padding: EdgeInsets.symmetric(vertical: 4.toScreenHeight, horizontal: 4.toScreenWidth), padding: EdgeInsets.symmetric(vertical: 4.toScreenHeight, horizontal: 4.toScreenWidth),
@ -160,10 +161,11 @@ class _UpdatePpmState extends State<UpdatePpm> with TickerProviderStateMixin {
indicatorPadding: EdgeInsets.zero, indicatorPadding: EdgeInsets.zero,
indicatorSize: TabBarIndicatorSize.tab, indicatorSize: TabBarIndicatorSize.tab,
dividerColor: Colors.transparent, dividerColor: Colors.transparent,
overlayColor: WidgetStateProperty.all(Colors.transparent),
indicator: BoxDecoration( indicator: BoxDecoration(
color: context.isDark ? AppColor.neutral60 : AppColor.neutral110, color: AppColor.background(context),
borderRadius: BorderRadius.circular(7), borderRadius: BorderRadius.circular(15),
), boxShadow: [BoxShadow(color: Colors.black.withOpacity(0.03), blurRadius: 5, offset: const Offset(0, 0), spreadRadius: 0)]),
onTap: (index) { onTap: (index) {
tabIndex = index; tabIndex = index;
if (tabIndex == 0) { if (tabIndex == 0) {

Loading…
Cancel
Save