helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2025-11-07 17:27:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve method naming

Browse source
This commit is contained in:
exelix11 2025-10-13 10:12:02 +00:00 • committed by Brandon Wees
parent e80f52e884
commit eae28d5b0c
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mobile/lib/presentation/pages/search/drift_search.page.dart
View file

@ -319,7 +319,7 @@ class DriftSearchPage extends HookConsumerWidget {
expanded: true, expanded: true,
onClear: () => datePicked(null), onClear: () => datePicked(null),
child: QuickDatePicker( child: QuickDatePicker(
currentRange: dateInputFilter.value, currentInput: dateInputFilter.value,
onRequestPicker: () { onRequestPicker: () {
context.pop(); context.pop();
showDatePicker(); showDatePicker();

19
mobile/lib/presentation/widgets/search/quick_date_picker.dart
View file

@ -7,7 +7,7 @@ sealed class DateFilterInputModel {
DateTimeRange<DateTime> asDateTimeRange(); DateTimeRange<DateTime> asDateTimeRange();
String asHumanReadable(BuildContext context) { String asHumanReadable(BuildContext context) {
// Generail implementation for arbitrary date and time ranges // General implementation for arbitrary date and time ranges
// If date range is less than 24 hours, set the end date to the end of the day // If date range is less than 24 hours, set the end date to the end of the day
final date = asDateTimeRange(); final date = asDateTimeRange();
if (date.end.difference(date.start).inHours < 24) { if (date.end.difference(date.start).inHours < 24) {
@ -85,13 +85,17 @@ class CustomDateFilter extends DateFilterInputModel {
enum _QuickPickerType { last1Month, last3Months, last9Months, year, custom } enum _QuickPickerType { last1Month, last3Months, last9Months, year, custom }
class QuickDatePicker extends HookWidget { class QuickDatePicker extends HookWidget {
QuickDatePicker({super.key, required this.currentRange, required this.onSelect, required this.onRequestPicker}) QuickDatePicker({
: _selection = _inputModelToType(currentRange), super.key,
_initialYear = _initialYearFromModel(currentRange); required DateFilterInputModel? currentInput,
required this.onSelect,
required this.onRequestPicker,
}) : _selection = _selectionFromModel(currentInput),
_initialYear = _initialYearFromModel(currentInput);
final Function() onRequestPicker; final Function() onRequestPicker;
final Function(DateFilterInputModel range) onSelect; final Function(DateFilterInputModel range) onSelect;
final DateFilterInputModel? currentRange;
final _QuickPickerType? _selection; final _QuickPickerType? _selection;
final int _initialYear; final int _initialYear;
@ -104,7 +108,7 @@ class QuickDatePicker extends HookWidget {
return model?.asDateTimeRange().start.year ?? DateTime.now().year; return model?.asDateTimeRange().start.year ?? DateTime.now().year;
} }
static _QuickPickerType? _inputModelToType(DateFilterInputModel? model) { static _QuickPickerType? _selectionFromModel(DateFilterInputModel? model) {
if (model is RecentMonthRangeFilter) { if (model is RecentMonthRangeFilter) {
switch (model.monthDelta) { switch (model.monthDelta) {
case 1: case 1:
@ -149,7 +153,8 @@ class QuickDatePicker extends HookWidget {
} }
// We want the exact date picker to always be selectable. // We want the exact date picker to always be selectable.
// Even if it's already toggled it should always open the full date picker, RadioListTiles don't allow that by default so we wrap it in a GestureDetector // Even if it's already toggled it should always open the full date picker, RadioListTiles don't do that by default
// so we wrap it in a InkWell
Widget _exactPicker(BuildContext context) => InkWell( Widget _exactPicker(BuildContext context) => InkWell(
onTap: onRequestPicker, onTap: onRequestPicker,
child: IgnorePointer( child: IgnorePointer(