ammar/syncrow-web
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/web.git synced 2025-07-10 07:07:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix UI

Browse Source
This commit is contained in:
Rafeek-Khoudare
2025-07-02 08:19:56 +03:00
parent 0a022d8a8d
commit 0847cb8a41
2 changed files with 113 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
lib/pages/routines/create_new_routines/space_dropdown.dart
View File

@ -32,15 +32,12 @@ class SpaceDropdown extends StatelessWidget {
color: ColorsManager.blackColor, color: ColorsManager.blackColor,
), ),
), ),
SizedBox( DropdownButton2<String>(
child: Container(
height: 40,
decoration: BoxDecoration(
color: ColorsManager.whiteColors,
borderRadius: BorderRadius.circular(10),
),
child: DropdownButton2<String>(
underline: const SizedBox(), underline: const SizedBox(),
buttonStyleData: ButtonStyleData(
decoration:
BoxDecoration(borderRadius: BorderRadius.circular(12)),
),
value: selectedValue, value: selectedValue,
items: spaces.map((space) { items: spaces.map((space) {
return DropdownMenuItem<String>( return DropdownMenuItem<String>(
@ -51,17 +48,21 @@ class SpaceDropdown extends StatelessWidget {
children: [ children: [
Text( Text(
' ${space.name}', ' ${space.name}',
style: style: Theme.of(context).textTheme.bodyMedium!.copyWith(
Theme.of(context).textTheme.bodyMedium!.copyWith( fontSize: 16,
fontSize: 12, fontWeight: FontWeight.bold,
color: ColorsManager.blackColor, color: selectedValue == space.uuid
? ColorsManager.dialogBlueTitle
: ColorsManager.blackColor,
), ),
), ),
Text( Text(
' ${space.lastThreeParents}', ' ${space.lastThreeParents}',
style: style: Theme.of(context).textTheme.bodyMedium!.copyWith(
Theme.of(context).textTheme.bodyMedium!.copyWith(
fontSize: 12, fontSize: 12,
color: selectedValue == space.uuid
? ColorsManager.dialogBlueTitle
: ColorsManager.blackColor,
), ),
), ),
], ],
@ -69,7 +70,10 @@ class SpaceDropdown extends StatelessWidget {
); );
}).toList(), }).toList(),
onChanged: onChanged, onChanged: onChanged,
style: TextStyle(color: Colors.black), style: TextStyle(
color: Colors.black,
fontSize: 13,
),
hint: Padding( hint: Padding(
padding: const EdgeInsets.only(left: 10), padding: const EdgeInsets.only(left: 10),
child: Text( child: Text(
@ -80,10 +84,9 @@ class SpaceDropdown extends StatelessWidget {
), ),
), ),
customButton: Container( customButton: Container(
height: 45, height: 40,
decoration: BoxDecoration( decoration: BoxDecoration(
border: border: Border.all(color: ColorsManager.textGray, width: 1.0),
Border.all(color: ColorsManager.textGray, width: 1.0),
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
), ),
child: Row( child: Row(
@ -99,8 +102,8 @@ class SpaceDropdown extends StatelessWidget {
.firstWhere((e) => e.uuid == selectedValue) .firstWhere((e) => e.uuid == selectedValue)
.name .name
: hintMessage, : hintMessage,
style: style: Theme.of(context).textTheme.bodySmall!.copyWith(
Theme.of(context).textTheme.bodySmall!.copyWith( fontSize: 13,
color: selectedValue != null color: selectedValue != null
? Colors.black ? Colors.black
: ColorsManager.textGray, : ColorsManager.textGray,
@ -139,8 +142,6 @@ class SpaceDropdown extends StatelessWidget {
height: 60, height: 60,
), ),
), ),
),
),
], ],
), ),
); );

14
lib/pages/routines/widgets/main_routine_view/routine_view_card.dart
View File

@ -121,7 +121,8 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
child: SizedBox( child: SizedBox(
width: 16, width: 16,
height: 16, height: 16,
child: CircularProgressIndicator(strokeWidth: 2), child:
CircularProgressIndicator(strokeWidth: 2),
), ),
), ),
) )
@ -159,7 +160,8 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
height: iconSize, height: iconSize,
width: iconSize, width: iconSize,
fit: BoxFit.contain, fit: BoxFit.contain,
errorBuilder: (context, error, stackTrace) => errorBuilder:
(context, error, stackTrace) =>
Image.asset( Image.asset(
Assets.logo, Assets.logo,
height: iconSize, height: iconSize,
@ -203,7 +205,8 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
maxLines: 1, maxLines: 1,
style: context.textTheme.bodySmall?.copyWith( style: context.textTheme.bodySmall?.copyWith(
color: ColorsManager.blackColor, color: ColorsManager.blackColor,
fontSize: widget.isSmallScreenSize(context) ? 10 : 12, fontSize:
widget.isSmallScreenSize(context) ? 10 : 12,
), ),
), ),
if (widget.spaceName != '') if (widget.spaceName != '')
@ -222,8 +225,9 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
maxLines: 1, maxLines: 1,
style: context.textTheme.bodySmall?.copyWith( style: context.textTheme.bodySmall?.copyWith(
color: ColorsManager.blackColor, color: ColorsManager.blackColor,
fontSize: fontSize: widget.isSmallScreenSize(context)
widget.isSmallScreenSize(context) ? 10 : 12, ? 10
: 12,
), ),
), ),
], ],