ui changes

main_production_RSG
Sikander Saleem 2 months ago
parent 8e53a271c8
commit e0fda1e00a

@ -80,7 +80,7 @@ class _DeviceFilterScreenState extends State<DeviceFilterScreen> {
children: [ children: [
Text( Text(
context.translation.reset, context.translation.reset,
style: AppTextStyles.bodyText2.copyWith(color: AppColor.primary50), style: AppTextStyles.bodyText2.copyWith(color: AppColor.loadingColor(context)),
).paddingAll(8).onPress(() { ).paddingAll(8).onPress(() {
setState(() { setState(() {
startDate = null; startDate = null;

@ -159,11 +159,12 @@ class _MultipleItemDropDownMenuState<T extends Base, X extends LoadingListNotifi
padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 8.toScreenHeight), padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 8.toScreenHeight),
decoration: BoxDecoration( decoration: BoxDecoration(
color: context.isDark && (widget.enabled == false || isEmpty) color: context.isDark && (widget.enabled == false || isEmpty)
? AppColor.neutral20 ? AppColor.disableDark
: (widget.enabled == false || isEmpty) : (widget.enabled == false || isEmpty)
? AppColor.neutral40 ? AppColor.neutral40
: widget.backgroundColor ?? AppColor.background(context), : AppColor.dropDownBackground(context),
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(16),
border: Border.all(color: AppColor.border2Color(context), width: 1),
boxShadow: widget.showShadow ? [BoxShadow(color: Colors.black.withOpacity(0.05), blurRadius: 10)] : null, boxShadow: widget.showShadow ? [BoxShadow(color: Colors.black.withOpacity(0.05), blurRadius: 10)] : null,
), ),
child: Row( child: Row(
@ -174,9 +175,8 @@ class _MultipleItemDropDownMenuState<T extends Base, X extends LoadingListNotifi
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Text( Flexible(
widget.title, child: Text(widget.title, style: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: AppColor.floatingTextStyleColor(context))),
style: Theme.of(context).textTheme.bodySmall?.copyWith(color: context.isDark ? null : AppColor.neutral20, fontWeight: FontWeight.w500),
), ),
if (_selectedItem.isEmpty) if (_selectedItem.isEmpty)
Text( Text(

@ -250,9 +250,7 @@ class _SingleItemDropDownMenuState<T extends Base, X extends LoadingListNotifier
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Flexible( Flexible(
child: Text(widget.title, style: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: AppColor.floatingTextStyleColor(context)) child: Text(widget.title, style: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: AppColor.floatingTextStyleColor(context))),
// Theme.of(context).textTheme.bodySmall?.copyWith(color: context.isDark ? null : widget.titleTextColor ?? AppColor.neutral20, fontWeight: FontWeight.w500),
),
), ),
DropdownButton<T>( DropdownButton<T>(
value: _selectedItem, value: _selectedItem,

@ -34,7 +34,7 @@ class CreateRequestTypeBottomSheet extends StatelessWidget {
child: Container( child: Container(
padding: const EdgeInsets.all(16.0), padding: const EdgeInsets.all(16.0),
width: double.infinity, width: double.infinity,
color: AppColor.background(context), color: AppColor.bottomSheetColor(context),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,

@ -146,7 +146,7 @@ class _AllRequestsFilterPageState extends State<AllRequestsFilterPage> {
children: [ children: [
Text( Text(
context.translation.reset, context.translation.reset,
style: AppTextStyles.bodyText2.copyWith(color: AppColor.blueStatus(context)), style: AppTextStyles.bodyText2.copyWith(color: AppColor.loadingColor(context)),
).paddingAll(8).onPress(() { ).paddingAll(8).onPress(() {
Provider.of<AllRequestsProvider>(context, listen: false).searchedModel = null; Provider.of<AllRequestsProvider>(context, listen: false).searchedModel = null;
setState(() { setState(() {

@ -44,16 +44,7 @@ class _RequestsTypeFilterState extends State<RequestsTypeFilter> {
children: widget.items.keys children: widget.items.keys
.map( .map(
(data) => Container( (data) => Container(
padding: EdgeInsets.symmetric(vertical: 8.toScreenHeight, horizontal: (_selected.contains(widget.items[data]) ? 12 : 8).toScreenWidth), padding: EdgeInsets.symmetric(vertical: 8.toScreenHeight, horizontal: 12.toScreenWidth),
// foregroundDecoration: !_selected.contains(widget.items[data])
// ? null
// : ShapeDecoration(
// color: (context.isDark ? AppColor.neutral30 : AppColor.neutral50).withOpacity(0.1),
// shape: RoundedRectangleBorder(
// side: BorderSide(width: 1, color: AppColor.blueStatus(context)),
// borderRadius: BorderRadius.circular(7),
// ),
// ),
decoration: ShapeDecoration( decoration: ShapeDecoration(
color: AppColor.background(context), color: AppColor.background(context),
// _selected.contains(widget.items[data]) ? AppColor.selectedButtonColor(context) : AppColor.unSelectedButtonColor(context), // _selected.contains(widget.items[data]) ? AppColor.selectedButtonColor(context) : AppColor.unSelectedButtonColor(context),

@ -90,9 +90,9 @@ class ADatePicker extends StatelessWidget {
return Theme( return Theme(
data: currentTheme.copyWith( data: currentTheme.copyWith(
datePickerTheme: DatePickerThemeData( datePickerTheme: DatePickerThemeData(
headerBackgroundColor: AppColor.primary10, headerBackgroundColor: AppColor.scaffoldBackground(context),
headerForegroundColor: Colors.white, headerForegroundColor: Colors.white,
backgroundColor: currentTheme.colorScheme.surface, backgroundColor: AppColor.bottomSheetColor(context),
dayForegroundColor: MaterialStateColor.resolveWith((states) { dayForegroundColor: MaterialStateColor.resolveWith((states) {
if (states.contains(MaterialState.selected)) return Colors.white; if (states.contains(MaterialState.selected)) return Colors.white;
if (states.contains(MaterialState.disabled)) return Colors.grey.withOpacity(0.6); if (states.contains(MaterialState.disabled)) return Colors.grey.withOpacity(0.6);
@ -114,7 +114,7 @@ class ADatePicker extends StatelessWidget {
), ),
), ),
textButtonTheme: TextButtonThemeData( textButtonTheme: TextButtonThemeData(
style: TextButton.styleFrom(foregroundColor: AppColor.primary10), style: TextButton.styleFrom(foregroundColor: AppColor.loadingColor(context)),
), ),
iconTheme: IconThemeData(color: AppColor.primary10.withOpacity(0.7)), iconTheme: IconThemeData(color: AppColor.primary10.withOpacity(0.7)),
), ),

@ -80,26 +80,32 @@ class _CommissioningStatusButtonsState extends State<CommissioningStatusButtons>
padding: EdgeInsetsDirectional.only(start: 16.toScreenWidth), padding: EdgeInsetsDirectional.only(start: 16.toScreenWidth),
itemBuilder: (context, index) => Container( itemBuilder: (context, index) => Container(
margin: EdgeInsets.symmetric(horizontal: 4.toScreenWidth), margin: EdgeInsets.symmetric(horizontal: 4.toScreenWidth),
padding: EdgeInsets.symmetric(vertical: 8.toScreenHeight, horizontal: (_selectedIndex == index ? 12 : 8).toScreenWidth), padding: EdgeInsets.symmetric(vertical: 8.toScreenHeight, horizontal: 12.toScreenWidth),
alignment: Alignment.center, alignment: Alignment.center,
foregroundDecoration: _selectedIndex != index // foregroundDecoration: _selectedIndex != index
? null // ? null
: ShapeDecoration( // : ShapeDecoration(
color: (context.isDark ? AppColor.neutral30 : AppColor.neutral50).withOpacity(0.1), // color: (context.isDark ? AppColor.neutral30 : AppColor.neutral50).withOpacity(0.1),
shape: RoundedRectangleBorder( // shape: RoundedRectangleBorder(
side: BorderSide(width: 1, color: AppColor.blueStatus(context)), // side: BorderSide(width: 1, color: AppColor.blueStatus(context)),
borderRadius: BorderRadius.circular(7), // borderRadius: BorderRadius.circular(7),
), // ),
), // ),
decoration: ShapeDecoration( decoration: ShapeDecoration(
color: _selectedIndex == index ? AppColor.selectedButtonColor(context) : AppColor.unSelectedButtonColor(context), color: AppColor.background(context),
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
side: _selectedIndex == index ? BorderSide(width: 1, color: AppColor.blueStatus(context)) : BorderSide.none, side: BorderSide(width: 1, color: _selectedIndex == index ? AppColor.primary10 : AppColor.border2Color(context)),
borderRadius: BorderRadius.circular(7), // side: _selectedIndex == index ? BorderSide(width: 1, color: AppColor.blueStatus(context)) : BorderSide.none,
borderRadius: BorderRadius.circular(6),
), ),
shadows: [BoxShadow(color: Colors.black.withOpacity(0.05), blurRadius: 14, offset: const Offset(0, 0), spreadRadius: 0)], shadows: [BoxShadow(color: Colors.black.withOpacity(0.05), blurRadius: 14, offset: const Offset(0, 0), spreadRadius: 0)],
), ),
child: (index == 0 ? "All Assets" : snapshot.items[index - 1].name)!.tinyFont(context).custom(color: AppColor.filterButtonTextColor(context)), child: (index == 0 ? "All Assets" : snapshot.items[index - 1].name)!.tinyFont(context).custom(
// color: AppColor.filterButtonTextColor(context)
color: _selectedIndex == index ? AppColor.primary10 : AppColor.filterButtonTextColor(context)
),
).onPress(() { ).onPress(() {
setState(() { setState(() {
_selectedIndex = index; _selectedIndex = index;

@ -88,7 +88,7 @@ class _SelectionBottomSheetState<T extends Base> extends State<MultipleSelection
SearchBar( SearchBar(
focusNode: searchFocusNode, focusNode: searchFocusNode,
elevation: WidgetStateProperty.all<double>(0), elevation: WidgetStateProperty.all<double>(0),
backgroundColor: WidgetStateProperty.all<Color?>(context.isDark ? AppColor.neutral120 : null), backgroundColor: WidgetStateProperty.all<Color?>(AppColor.background(context)),
leading: Icon(Icons.search, color: AppColor.iconColor(context)), leading: Icon(Icons.search, color: AppColor.iconColor(context)),
textStyle: WidgetStateProperty.all<TextStyle>( textStyle: WidgetStateProperty.all<TextStyle>(
TextStyle(color: AppColor.textColor(context), fontSize: 16.0), TextStyle(color: AppColor.textColor(context), fontSize: 16.0),
@ -133,7 +133,7 @@ class _SelectionBottomSheetState<T extends Base> extends State<MultipleSelection
bool isDisabledItem = widget.disableItem != null && widget.disableItem?.identifier == filteredList![index].identifier; bool isDisabledItem = widget.disableItem != null && widget.disableItem?.identifier == filteredList![index].identifier;
return Theme( return Theme(
data: Theme.of(context).copyWith( data: Theme.of(context).copyWith(
radioTheme: RadioThemeData( checkboxTheme: CheckboxThemeData(
fillColor: MaterialStateColor.resolveWith((states) { fillColor: MaterialStateColor.resolveWith((states) {
if (states.contains(MaterialState.selected)) { if (states.contains(MaterialState.selected)) {
return AppColor.iconColor(context); // Active color return AppColor.iconColor(context); // Active color
@ -146,7 +146,7 @@ class _SelectionBottomSheetState<T extends Base> extends State<MultipleSelection
value: checkItContains(filteredList![index]), value: checkItContains(filteredList![index]),
dense: true, dense: true,
controlAffinity: ListTileControlAffinity.leading, controlAffinity: ListTileControlAffinity.leading,
activeColor: AppColor.textColor(context), activeColor: AppColor.iconColor(context),
contentPadding: const EdgeInsets.only(left: 16, right: 16), contentPadding: const EdgeInsets.only(left: 16, right: 16),
onChanged: (value) { onChanged: (value) {
// if (checkItContains(filteredList![index]) ?? false) { // if (checkItContains(filteredList![index]) ?? false) {

Loading…
Cancel
Save