From deb227034a9021c8b8ffe4e59562ddd5657dbb77 Mon Sep 17 00:00:00 2001 From: Rafeek-Khoudare Date: Fri, 11 Jul 2025 11:44:16 +0300 Subject: [PATCH 1/5] fix Rework notes --- .../routines/create_new_routines/dropdown_menu_content.dart | 6 ++++++ lib/pages/routines/create_new_routines/space_dropdown.dart | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/pages/routines/create_new_routines/dropdown_menu_content.dart b/lib/pages/routines/create_new_routines/dropdown_menu_content.dart index 65243f53..949ee9fe 100644 --- a/lib/pages/routines/create_new_routines/dropdown_menu_content.dart +++ b/lib/pages/routines/create_new_routines/dropdown_menu_content.dart @@ -84,6 +84,12 @@ class _DropdownMenuContentState extends State { border: OutlineInputBorder( borderRadius: BorderRadius.circular(8), ), + focusedBorder: OutlineInputBorder( + borderRadius: BorderRadius.circular(8), + borderSide: const BorderSide( + color: Colors.blue, + ), + ), isDense: true, ), ), diff --git a/lib/pages/routines/create_new_routines/space_dropdown.dart b/lib/pages/routines/create_new_routines/space_dropdown.dart index 0605b7fc..b4e98bd5 100644 --- a/lib/pages/routines/create_new_routines/space_dropdown.dart +++ b/lib/pages/routines/create_new_routines/space_dropdown.dart @@ -52,7 +52,7 @@ class SpaceDropdown extends StatelessWidget { fontSize: 16, fontWeight: FontWeight.bold, color: selectedValue == space.uuid - ? ColorsManager.dialogBlueTitle + ? Colors.blue : ColorsManager.blackColor, ), ), @@ -61,7 +61,7 @@ class SpaceDropdown extends StatelessWidget { style: Theme.of(context).textTheme.bodyMedium!.copyWith( fontSize: 12, color: selectedValue == space.uuid - ? ColorsManager.dialogBlueTitle + ? Colors.blue : ColorsManager.blackColor, ), ), From 9f71bbff632fb8533d54d5e8a81e6e7dd77c302d Mon Sep 17 00:00:00 2001 From: Rafeek-Khoudare Date: Tue, 15 Jul 2025 08:26:40 +0300 Subject: [PATCH 2/5] fix color uses --- lib/pages/routines/create_new_routines/space_dropdown.dart | 4 ++-- lib/utils/color_manager.dart | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/pages/routines/create_new_routines/space_dropdown.dart b/lib/pages/routines/create_new_routines/space_dropdown.dart index b4e98bd5..ed445c61 100644 --- a/lib/pages/routines/create_new_routines/space_dropdown.dart +++ b/lib/pages/routines/create_new_routines/space_dropdown.dart @@ -52,7 +52,7 @@ class SpaceDropdown extends StatelessWidget { fontSize: 16, fontWeight: FontWeight.bold, color: selectedValue == space.uuid - ? Colors.blue + ? ColorsManager.drpoDownSelectBlue : ColorsManager.blackColor, ), ), @@ -61,7 +61,7 @@ class SpaceDropdown extends StatelessWidget { style: Theme.of(context).textTheme.bodyMedium!.copyWith( fontSize: 12, color: selectedValue == space.uuid - ? Colors.blue + ? ColorsManager.drpoDownSelectBlue : ColorsManager.blackColor, ), ), diff --git a/lib/utils/color_manager.dart b/lib/utils/color_manager.dart index 40fca1fa..9cf3482b 100644 --- a/lib/utils/color_manager.dart +++ b/lib/utils/color_manager.dart @@ -84,4 +84,5 @@ abstract class ColorsManager { static const Color minBlue = Color(0xFF93AAFD); static const Color minBlueDot = Color(0xFF023DFE); static const Color grey25 = Color(0xFFF9F9F9); + static const Color drpoDownSelectBlue = Color(0xFF2196F3); } From fe090175e3209f4078b3fd0c1d2806f5e5705ef8 Mon Sep 17 00:00:00 2001 From: Rafeek-Khoudare Date: Tue, 15 Jul 2025 11:52:57 +0300 Subject: [PATCH 3/5] fix Typo --- lib/pages/routines/create_new_routines/space_dropdown.dart | 4 ++-- lib/utils/color_manager.dart | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/pages/routines/create_new_routines/space_dropdown.dart b/lib/pages/routines/create_new_routines/space_dropdown.dart index ed445c61..012b2ae7 100644 --- a/lib/pages/routines/create_new_routines/space_dropdown.dart +++ b/lib/pages/routines/create_new_routines/space_dropdown.dart @@ -52,7 +52,7 @@ class SpaceDropdown extends StatelessWidget { fontSize: 16, fontWeight: FontWeight.bold, color: selectedValue == space.uuid - ? ColorsManager.drpoDownSelectBlue + ? ColorsManager.dropDownSelectBlue : ColorsManager.blackColor, ), ), @@ -61,7 +61,7 @@ class SpaceDropdown extends StatelessWidget { style: Theme.of(context).textTheme.bodyMedium!.copyWith( fontSize: 12, color: selectedValue == space.uuid - ? ColorsManager.drpoDownSelectBlue + ? ColorsManager.dropDownSelectBlue : ColorsManager.blackColor, ), ), diff --git a/lib/utils/color_manager.dart b/lib/utils/color_manager.dart index 9cf3482b..d6571065 100644 --- a/lib/utils/color_manager.dart +++ b/lib/utils/color_manager.dart @@ -84,5 +84,5 @@ abstract class ColorsManager { static const Color minBlue = Color(0xFF93AAFD); static const Color minBlueDot = Color(0xFF023DFE); static const Color grey25 = Color(0xFFF9F9F9); - static const Color drpoDownSelectBlue = Color(0xFF2196F3); + static const Color dropDownSelectBlue = Color(0xFF2196F3); } From 995ce480cbb6a0ac60fad73f660e01d7ba15e20b Mon Sep 17 00:00:00 2001 From: Rafeek-Khoudare Date: Thu, 17 Jul 2025 17:44:30 +0300 Subject: [PATCH 4/5] requested note --- .../routines/create_new_routines/dropdown_menu_content.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/pages/routines/create_new_routines/dropdown_menu_content.dart b/lib/pages/routines/create_new_routines/dropdown_menu_content.dart index 949ee9fe..67c19600 100644 --- a/lib/pages/routines/create_new_routines/dropdown_menu_content.dart +++ b/lib/pages/routines/create_new_routines/dropdown_menu_content.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:syncrow_web/utils/color_manager.dart'; import 'space_tree_dropdown_bloc.dart'; class DropdownMenuContent extends StatefulWidget { @@ -87,7 +88,7 @@ class _DropdownMenuContentState extends State { focusedBorder: OutlineInputBorder( borderRadius: BorderRadius.circular(8), borderSide: const BorderSide( - color: Colors.blue, + color: ColorsManager.dropDownSelectBlue, ), ), isDense: true, From b738596b504a1c2d69a71e2089b4989d5161ca67 Mon Sep 17 00:00:00 2001 From: Rafeek-Khoudare Date: Mon, 21 Jul 2025 09:14:59 +0300 Subject: [PATCH 5/5] no need for colors instead use ColorsManager --- .../create_new_routines/dropdown_menu_content.dart | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/pages/routines/create_new_routines/dropdown_menu_content.dart b/lib/pages/routines/create_new_routines/dropdown_menu_content.dart index 67c19600..4b2206ba 100644 --- a/lib/pages/routines/create_new_routines/dropdown_menu_content.dart +++ b/lib/pages/routines/create_new_routines/dropdown_menu_content.dart @@ -76,7 +76,8 @@ class _DropdownMenuContentState extends State { child: TextFormField( controller: _searchController, onChanged: _handleSearch, - style: const TextStyle(fontSize: 14, color: Colors.black), + style: const TextStyle( + fontSize: 14, color: ColorsManager.blackColor), decoration: InputDecoration( hintText: 'Search for space...', prefixIcon: const Icon(Icons.search, size: 20), @@ -124,7 +125,9 @@ class _DropdownMenuContentState extends State { title: Text( community.name, style: TextStyle( - color: isSelected ? Colors.blue : Colors.black, + color: isSelected + ? ColorsManager.dropDownSelectBlue + : ColorsManager.blackColor, fontWeight: isSelected ? FontWeight.bold : FontWeight.normal, ),