Skip to content

Commit

Permalink
[timetable] fixed picker actions
Browse files Browse the repository at this point in the history
  • Loading branch information
@liplum
liplum committed Aug 31, 2024
1 parent 5f91b38 commit 07abc54
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 57 deletions.
69 changes: 32 additions & 37 deletions lib/design/adaptive/dialog.dart
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_platform_widgets/flutter_platform_widgets.dart' hide isCupertino;
import 'package:go_router/go_router.dart';
import 'package:rettulf/rettulf.dart';
import 'package:universal_platform/universal_platform.dart';
Expand Down Expand Up @@ -173,9 +172,9 @@ extension DialogEx on BuildContext {
Future<int?> showPicker({
required int count,
String? ok,
bool Function(int? selected)? okEnabled,
double targetHeight = 240,
bool highlight = false,
bool okDefault = false,
bool okDestructive = false,
FixedExtentScrollController? controller,
List<PickerActionWidgetBuilder>? actions,
required IndexedWidgetBuilder make,
Expand All @@ -187,9 +186,9 @@ extension DialogEx on BuildContext {
count: count,
controller: controller,
ok: ok,
okEnabled: okEnabled,
targetHeight: targetHeight,
highlight: highlight,
okDefault: okDefault,
okDestructive: okDestructive,
actions: actions,
),
),
Expand All @@ -208,7 +207,8 @@ extension DialogEx on BuildContext {
String? ok,
bool Function(int? selectedA, int? selectedB)? okEnabled,
double targetHeight = 240,
bool highlight = false,
bool okDefault = false,
bool okDestructive = false,
FixedExtentScrollController? controllerA,
FixedExtentScrollController? controllerB,
List<DualPickerActionWidgetBuilder>? actions,
Expand All @@ -225,9 +225,9 @@ extension DialogEx on BuildContext {
controllerA: controllerA,
controllerB: controllerB,
ok: ok,
okEnabled: okEnabled,
targetHeight: targetHeight,
highlight: highlight,
okDefault: okDefault,
okDestructive: okDestructive,
actions: actions,
),
),
Expand All @@ -244,9 +244,9 @@ extension DialogEx on BuildContext {
class SoloPicker extends StatefulWidget {
final int count;
final String? ok;
final bool Function(int? selected)? okEnabled;
final double targetHeight;
final bool highlight;
final bool okDefault;
final bool okDestructive;
final FixedExtentScrollController? controller;
final List<PickerActionWidgetBuilder>? actions;
final IndexedWidgetBuilder make;
Expand All @@ -255,10 +255,10 @@ class SoloPicker extends StatefulWidget {
super.key,
required this.count,
this.ok,
this.okEnabled,
this.controller,
this.targetHeight = 240,
this.highlight = false,
this.okDefault = false,
this.okDestructive = false,
this.actions,
required this.make,
});
Expand Down Expand Up @@ -298,14 +298,14 @@ class _SoloPickerState extends State<SoloPicker> {
.toList(),
cancelButton: ok == null
? null
: $selected >>
(ctx, selected) => PlatformTextButton(
onPressed: widget.okEnabled?.call(selected) ?? true
? () {
Navigator.of(ctx).pop($selected.value);
}
: null,
child: ok.text(style: TextStyle(color: widget.highlight ? ctx.$red$ : null))),
: CupertinoActionSheetAction(
onPressed: () {
context.pop($selected.value);
},
isDefaultAction: widget.okDefault,
isDestructiveAction: widget.okDestructive,
child: ok.text(),
),
);
}
}
Expand All @@ -316,7 +316,8 @@ class DualPicker extends StatefulWidget {
final int countA;
final int countB;
final String? ok;
final bool Function(int? selectedA, int? selectedB)? okEnabled;
final bool okDefault;
final bool okDestructive;
final double targetHeight;
final bool highlight;
final List<DualPickerActionWidgetBuilder>? actions;
Expand All @@ -326,7 +327,6 @@ class DualPicker extends StatefulWidget {
const DualPicker({
super.key,
this.ok,
this.okEnabled,
this.actions,
this.highlight = false,
this.targetHeight = 240,
Expand All @@ -336,6 +336,8 @@ class DualPicker extends StatefulWidget {
required this.countA,
required this.countB,
required this.makeB,
this.okDefault = false,
this.okDestructive = false,
});

@override
Expand Down Expand Up @@ -386,21 +388,14 @@ class _DualPickerState extends State<DualPicker> {
actions: widget.actions?.map((e) => $selectedA >> (ctx, a) => $selectedB >> (ctx, b) => e(ctx, a, b)).toList(),
cancelButton: ok == null
? null
: $selectedA >>
(ctx, a) =>
$selectedB >>
(ctx, b) => CupertinoButton(
onPressed: widget.okEnabled?.call(a, b) ?? true
? () {
Navigator.of(ctx).pop(($selectedA.value, $selectedB.value));
}
: null,
child: ok.text(
style: TextStyle(
color: widget.highlight ? ctx.$red$ : null,
),
),
),
: CupertinoActionSheetAction(
isDefaultAction: widget.okDefault,
isDestructiveAction: widget.okDestructive,
onPressed: () {
context.pop(($selectedA.value, $selectedB.value));
},
child: ok.text(),
),
);
}
}
Expand Down
36 changes: 16 additions & 20 deletions lib/timetable/utils.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ import 'dart:convert';
import 'dart:io';

import 'package:file_picker/file_picker.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
import 'package:open_file/open_file.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:rettulf/rettulf.dart';
Expand Down Expand Up @@ -641,15 +640,13 @@ Future<int?> selectWeekInTimetable({
count: 20,
controller: controller,
ok: submitLabel,
okEnabled: (curSelected) => curSelected != initialWeekIndex,
okDefault: true,
actions: [
(ctx, curSelected) => PlatformTextButton(
onPressed: (curSelected == todayIndex)
? null
: () {
controller.animateToItem(todayIndex,
duration: const Duration(milliseconds: 500), curve: Curves.fastEaseInToSlowEaseOut);
},
(ctx, curSelected) => CupertinoActionSheetAction(
onPressed: () {
controller.animateToItem(todayIndex,
duration: const Duration(milliseconds: 500), curve: Curves.fastEaseInToSlowEaseOut);
},
child: i18n.findToday.text(),
)
],
Expand Down Expand Up @@ -681,18 +678,17 @@ Future<TimetablePos?> selectDayInTimetable({
controllerA: $week,
controllerB: $day,
ok: submitLabel,
okDefault: true,
okEnabled: (weekSelected, daySelected) => weekSelected != initialWeekIndex || daySelected != initialDayIndex,
actions: [
(ctx, week, day) => PlatformTextButton(
onPressed: (week == todayWeekIndex && day == todayDayIndex)
? null
: () {
$week.animateToItem(todayWeekIndex,
duration: const Duration(milliseconds: 500), curve: Curves.fastEaseInToSlowEaseOut);

$day.animateToItem(todayDayIndex,
duration: const Duration(milliseconds: 500), curve: Curves.fastEaseInToSlowEaseOut);
},
(ctx, week, day) => CupertinoActionSheetAction(
onPressed: () {
$week.animateToItem(todayWeekIndex,
duration: const Duration(milliseconds: 500), curve: Curves.fastEaseInToSlowEaseOut);

$day.animateToItem(todayDayIndex,
duration: const Duration(milliseconds: 500), curve: Curves.fastEaseInToSlowEaseOut);
},
child: i18n.findToday.text(),
)
],
Expand Down

0 comments on commit 07abc54

Please sign in to comment.