From b83826d5f356baeae30142749b5a2daf5c1a9464 Mon Sep 17 00:00:00 2001 From: rohansen856 Date: Mon, 18 Nov 2024 19:44:27 +0530 Subject: [PATCH 1/2] feat: added toggle switch to sidebar hide or show waiting --- .../home/views/filter_drawer_home_page.dart | 48 +++++++++++-------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/lib/app/modules/home/views/filter_drawer_home_page.dart b/lib/app/modules/home/views/filter_drawer_home_page.dart index bcf0a06c..c8511af7 100644 --- a/lib/app/modules/home/views/filter_drawer_home_page.dart +++ b/lib/app/modules/home/views/filter_drawer_home_page.dart @@ -140,27 +140,33 @@ class FilterDrawer extends StatelessWidget { ), child: Padding( padding: const EdgeInsets.all(8.0), - child: GestureDetector( - onTap: filters.toggleWaitingFilter, - child: Text( - !filters.waitingFilter - ? SentenceManager( - currentLanguage: - homeController.selectedLanguage.value) - .sentences - .filterDrawerShowWaiting - : SentenceManager( - currentLanguage: - homeController.selectedLanguage.value) - .sentences - .filterDrawerHideWaiting, - style: TextStyle( - fontFamily: FontFamily.poppins, - fontSize: TaskWarriorFonts.fontSizeMedium, - color: AppSettings.isDarkMode - ? TaskWarriorColors.kprimaryTextColor - : TaskWarriorColors.kLightSecondaryTextColor, - )), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + !filters.waitingFilter + ? SentenceManager( + currentLanguage: + homeController.selectedLanguage.value) + .sentences + .filterDrawerShowWaiting + : SentenceManager( + currentLanguage: + homeController.selectedLanguage.value) + .sentences + .filterDrawerHideWaiting, + style: TextStyle( + fontFamily: FontFamily.poppins, + fontSize: TaskWarriorFonts.fontSizeMedium, + color: AppSettings.isDarkMode + ? TaskWarriorColors.kprimaryTextColor + : TaskWarriorColors.kLightSecondaryTextColor, + )), + Switch( + value: filters.waitingFilter, + onChanged: (_) => filters.toggleWaitingFilter(), + ) + ], ), ), ), From aa00c5f22b9ac396a8f4299317eae9b67d35481e Mon Sep 17 00:00:00 2001 From: Chinmay Chaudhari <111864031+BrawlerXull@users.noreply.github.com> Date: Thu, 21 Nov 2024 22:55:04 +0530 Subject: [PATCH 2/2] Added constant padding as other widgets in the filter drawer --- lib/app/modules/home/views/filter_drawer_home_page.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/app/modules/home/views/filter_drawer_home_page.dart b/lib/app/modules/home/views/filter_drawer_home_page.dart index c8511af7..fe2f95a3 100644 --- a/lib/app/modules/home/views/filter_drawer_home_page.dart +++ b/lib/app/modules/home/views/filter_drawer_home_page.dart @@ -135,7 +135,7 @@ class FilterDrawer extends StatelessWidget { Container( decoration: BoxDecoration( color: tileColor, - borderRadius: BorderRadius.circular(2), + borderRadius: BorderRadius.circular(8), border: Border.all(color: TaskWarriorColors.borderColor), ), child: Padding(