Skip to content

Issue#555 : Sort By Widget improvement #561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sanat-Jha wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Issue#555 : Sort By Widget improvement #561

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ebf14e
sorting dropdown
Sanat-Jha Jan 15, 2026
13a146a
Toggle switch widget
Sanat-Jha Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
330 changes: 184 additions & 146 deletions lib/app/modules/home/views/filter_drawer_home_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,6 @@ class FilterDrawer extends StatelessWidget {
homeController.selectedLanguage.value)
.sentences
.filterDrawerApplyFilters,
// style: GoogleFonts.poppins(
// fontWeight: TaskWarriorFonts.bold,
// color: (AppSettings.isDarkMode
// ? TaskWarriorColors.kprimaryTextColor
// : TaskWarriorColors.kLightPrimaryTextColor),
// fontSize: TaskWarriorFonts.fontSizeExtraLarge),
style: TextStyle(
fontFamily: FontFamily.poppins,
fontWeight: TaskWarriorFonts.bold,
Expand All @@ -72,8 +66,6 @@ class FilterDrawer extends StatelessWidget {
color: Color.fromARGB(0, 48, 46, 46),
),
Container(
// width: MediaQuery.of(context).size.width * 1,
// padding: const EdgeInsets.all(12),
decoration: BoxDecoration(
color: tileColor,
borderRadius: BorderRadius.circular(8),
Expand Down Expand Up @@ -251,13 +243,6 @@ class FilterDrawer extends StatelessWidget {
homeController.selectedLanguage.value)
.sentences
.filterDrawerFilterTagBy,
// style: GoogleFonts.poppins(
// color: (AppSettings.isDarkMode
// ? TaskWarriorColors.kprimaryTextColor
// : TaskWarriorColors.kLightSecondaryTextColor),
// //
// fontSize: TaskWarriorFonts.fontSizeLarge),
//textAlign: TextAlign.right,
style: TextStyle(
fontFamily: FontFamily.poppins,
fontSize: TaskWarriorFonts.fontSizeMedium,
Expand Down Expand Up @@ -295,13 +280,10 @@ class FilterDrawer extends StatelessWidget {
borderRadius: BorderRadius.circular(8),
border: Border.all(color: TaskWarriorColors.borderColor),
),
//height: 30,
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const Divider(
color: Color.fromARGB(0, 48, 46, 46),
),
const SizedBox(height: 8),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 0.0),
child: Text(
Expand All @@ -310,144 +292,200 @@ class FilterDrawer extends StatelessWidget {
homeController.selectedLanguage.value)
.sentences
.filterDrawerSortBy,
// style: GoogleFonts.poppins(
// color: (AppSettings.isDarkMode
// ? TaskWarriorColors.kprimaryTextColor
// : TaskWarriorColors.kLightPrimaryTextColor),
// fontSize: TaskWarriorFonts.fontSizeLarge),
// textAlign: TextAlign.right,
style: TextStyle(
fontFamily: FontFamily.poppins,
fontSize: TaskWarriorFonts.fontSizeMedium,
color: tColors.primaryTextColor,
)),
),
const Divider(
color: Color.fromARGB(0, 48, 46, 46),
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 8.0),
child: Wrap(
spacing: 8,
runSpacing: 4,
const SizedBox(height: 12),
// Dropdown and toggle switch row
Obx(() {
final sortOptions = [
SentenceManager(
currentLanguage:
homeController.selectedLanguage.value)
.sentences
.filterDrawerCreated,
SentenceManager(
currentLanguage:
homeController.selectedLanguage.value)
.sentences
.filterDrawerModified,
SentenceManager(
currentLanguage:
homeController.selectedLanguage.value)
.sentences
.filterDrawerStartTime,
SentenceManager(
currentLanguage:
homeController.selectedLanguage.value)
.sentences
.filterDrawerDueTill,
SentenceManager(
currentLanguage:
homeController.selectedLanguage.value)
.sentences
.filterDrawerPriority,
SentenceManager(
currentLanguage:
homeController.selectedLanguage.value)
.sentences
.filterDrawerProject,
SentenceManager(
currentLanguage:
homeController.selectedLanguage.value)
.sentences
.filterDrawerTags,
SentenceManager(
currentLanguage:
homeController.selectedLanguage.value)
.sentences
.filterDrawerUrgency,
];

// Extract current sort category and order from selectedSort
String currentSort = homeController.selectedSort.value;
String? selectedCategory;
bool isAscending = false;

if (currentSort.isNotEmpty) {
if (currentSort.endsWith('+')) {
selectedCategory =
currentSort.substring(0, currentSort.length - 1);
isAscending = true;
} else if (currentSort.endsWith('-')) {
selectedCategory =
currentSort.substring(0, currentSort.length - 1);
isAscending = false;
} else {
selectedCategory = currentSort;
}
}

// Validate selectedCategory is in sortOptions
if (selectedCategory != null &&
!sortOptions.contains(selectedCategory)) {
selectedCategory = null;
}

return Row(
children: [
for (var sort in [
SentenceManager(
currentLanguage:
homeController.selectedLanguage.value)
.sentences
.filterDrawerCreated,
SentenceManager(
currentLanguage:
homeController.selectedLanguage.value)
.sentences
.filterDrawerModified,
SentenceManager(
currentLanguage:
homeController.selectedLanguage.value)
.sentences
.filterDrawerStartTime,
SentenceManager(
currentLanguage:
homeController.selectedLanguage.value)
.sentences
.filterDrawerDueTill,
SentenceManager(
currentLanguage:
homeController.selectedLanguage.value)
.sentences
.filterDrawerPriority,
SentenceManager(
currentLanguage:
homeController.selectedLanguage.value)
.sentences
.filterDrawerProject,
SentenceManager(
currentLanguage:
homeController.selectedLanguage.value)
.sentences
.filterDrawerTags,
SentenceManager(
currentLanguage:
homeController.selectedLanguage.value)
.sentences
.filterDrawerUrgency,
])
Obx(
() => ChoiceChip(
label: (homeController.selectedSort.value
.startsWith(sort))
? Text(
homeController.selectedSort.value,
)
: Text(sort),
selected: false,
onSelected: (_) {
if (homeController.selectedSort == '$sort+') {
homeController.selectSort('$sort-');
} else if (homeController.selectedSort ==
'$sort-') {
homeController.selectSort(sort);
} else {
homeController.selectSort('$sort+');
}
},
// labelStyle: GoogleFonts.poppins(
// color: AppSettings.isDarkMode
// ? TaskWarriorColors.black
// : TaskWarriorColors.white),
// backgroundColor: AppSettings.isDarkMode
// ? TaskWarriorColors
// .kLightSecondaryBackgroundColor
// : TaskWarriorColors.ksecondaryBackgroundColor,
// Dropdown
Expanded(
child: Container(
padding:
const EdgeInsets.symmetric(horizontal: 12.0),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8),
border: Border.all(
color: TaskWarriorColors.borderColor),
),
)
child: DropdownButtonHideUnderline(
child: DropdownButton<String>(
isExpanded: true,
value: selectedCategory,
hint: Text(
SentenceManager(
currentLanguage: homeController
.selectedLanguage.value)
.sentences
.filterDrawerSortBy,
style: TextStyle(
fontFamily: FontFamily.poppins,
fontSize: TaskWarriorFonts.fontSizeSmall,
color: tColors.primaryTextColor,
),
),
dropdownColor: tileColor,
style: TextStyle(
fontFamily: FontFamily.poppins,
fontSize: TaskWarriorFonts.fontSizeSmall,
color: tColors.primaryTextColor,
),
items: sortOptions.map((String option) {
return DropdownMenuItem<String>(
value: option,
child: Text(option),
);
}).toList(),
onChanged: (String? newValue) {
if (newValue != null) {
// Default to ascending when selecting a new category
homeController.selectSort('$newValue+');
}
},
),
),
),
),
const SizedBox(width: 12),
// Toggle switch with + and - labels
Row(
children: [
Text(
'+',
style: TextStyle(
fontFamily: FontFamily.poppins,
fontSize: TaskWarriorFonts.fontSizeMedium,
fontWeight: FontWeight.bold,
color: tColors.primaryTextColor,
),
),
Switch(
value: !isAscending,
onChanged: selectedCategory != null
? (bool value) {
if (value) {
// Switch to descending (-)
homeController
.selectSort('$selectedCategory-');
} else {
// Switch to ascending (+)
homeController
.selectSort('$selectedCategory+');
}
}
: null,
),
Text(
'-',
style: TextStyle(
fontFamily: FontFamily.poppins,
fontSize: TaskWarriorFonts.fontSizeMedium,
fontWeight: FontWeight.bold,
color: tColors.primaryTextColor,
),
),
],
),
],
);
}),
const SizedBox(height: 12),
// Clear sort button
TextButton.icon(
onPressed: () {
homeController.selectSort('urgency+');
},
icon: Icon(
Icons.clear,
size: 18,
color: tColors.primaryTextColor,
),
label: Text(
SentenceManager(
currentLanguage:
homeController.selectedLanguage.value)
.sentences
.filterDrawerResetSort,
style: TextStyle(
fontFamily: FontFamily.poppins,
fontSize: TaskWarriorFonts.fontSizeMedium,
color: tColors.primaryTextColor,
)),
),
const Divider(
color: Color.fromARGB(0, 48, 46, 46),
),
Container(
width: 200,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
// color: AppSettings.isDarkMode
// ? TaskWarriorColors.kLightSecondaryBackgroundColor
// : TaskWarriorColors.ksecondaryBackgroundColor,
),
child: TextButton(
onPressed: () {
if (homeController.selectedSort.value.endsWith('+') ||
homeController.selectedSort.value.endsWith('-')) {
homeController.selectSort(
homeController.selectedSort.value.substring(
0,
homeController.selectedSort.value.length -
1));
}
},
child: Text(
SentenceManager(
currentLanguage:
homeController.selectedLanguage.value)
.sentences
.filterDrawerResetSort,
// style: GoogleFonts.poppins(
// fontSize: TaskWarriorFonts.fontSizeMedium,
// color: AppSettings.isDarkMode
// ? TaskWarriorColors.kLightSecondaryTextColor
// : TaskWarriorColors.ksecondaryTextColor),
style: TextStyle(
fontFamily: FontFamily.poppins,
fontSize: TaskWarriorFonts.fontSizeMedium,
color: tColors.primaryTextColor,
)),
),
),
const Divider(
color: Color.fromARGB(0, 48, 46, 46),
),
const SizedBox(height: 8),
],
),
)
Expand Down