π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Share date and time picker
Neeraj Guptab3ea0487a2cf
diff --git a/mobile/apps/locker/lib/ui/sharing/add_email_bottom_sheet.dart b/mobile/apps/locker/lib/ui/sharing/add_email_bottom_sheet.dartindex 28dbfb54c5..de04d957ad 100644--- a/mobile/apps/locker/lib/ui/sharing/add_email_bottom_sheet.dart+++ b/mobile/apps/locker/lib/ui/sharing/add_email_bottom_sheet.dart@@ -7,13 +7,13 @@ import "package:ente_sharing/models/user.dart";import "package:ente_sharing/user_avator_widget.dart";import "package:ente_sharing/verify_identity_dialog.dart";import "package:ente_strings/ente_strings.dart";+import "package:ente_ui/components/date_time_picker.dart";import "package:flutter/material.dart";import "package:intl/intl.dart";import "package:locker/services/collections/collections_service.dart";import "package:locker/services/collections/models/collection.dart";import "package:locker/services/configuration.dart";import "package:locker/ui/components/custom_list_scrollbar.dart";-import "package:locker/ui/viewer/date/date_time_picker.dart";import "package:locker/utils/collection_actions.dart";Future<void> showAddEmailSheet(@@ -294,10 +294,10 @@ class _AddEmailSheetState extends State<AddEmailSheet> {Future<void> _selectDate() async {final initialDate =_scheduledDate ?? DateTime.now().add(const Duration(days: 1));- final pickedDate = await showDatePickerSheet(+ final pickedDate = await showDateTimePickerSheet(context,- initialDate: initialDate,- minDate: DateTime.now(),+ initialDateTime: initialDate,+ minDateTime: DateTime.now(),);if (pickedDate != null && mounted) {setState(() {diff --git a/mobile/apps/locker/lib/ui/sharing/pickers/link_expiry_picker_page.dart b/mobile/apps/locker/lib/ui/sharing/pickers/link_expiry_picker_page.dartindex b9e8ea69c1..6351f30ef2 100644--- a/mobile/apps/locker/lib/ui/sharing/pickers/link_expiry_picker_page.dart+++ b/mobile/apps/locker/lib/ui/sharing/pickers/link_expiry_picker_page.dart@@ -1,9 +1,9 @@import 'package:ente_components/ente_components.dart';import "package:ente_strings/ente_strings.dart";+import "package:ente_ui/components/date_time_picker.dart";import 'package:flutter/material.dart';import "package:locker/services/collections/collections_api_client.dart";import "package:locker/services/collections/models/collection.dart";-import "package:locker/ui/viewer/date/date_time_picker.dart";import "package:locker/utils/error_sheet.dart";import "package:tuple/tuple.dart";@@ -84,10 +84,10 @@ class _ItemsWidgetState extends State<ItemsWidget> {// need to manually select timeif (expireAfterInMicroseconds < 0) {final now = DateTime.now();- final DateTime? picked = await showDatePickerSheet(+ final DateTime? picked = await showDateTimePickerSheet(context,- initialDate: now,- minDate: now,+ initialDateTime: now,+ minDateTime: now,);final timeInMicrosecondsFromEpoch = picked?.microsecondsSinceEpoch;if (timeInMicrosecondsFromEpoch != null) {diff --git a/mobile/apps/locker/lib/ui/viewer/date/date_time_picker.dart b/mobile/apps/locker/lib/ui/viewer/date/date_time_picker.dartdeleted file mode 100644index b2d2beb4dd..0000000000--- a/mobile/apps/locker/lib/ui/viewer/date/date_time_picker.dart+++ /dev/null@@ -1,223 +0,0 @@-import "package:ente_components/ente_components.dart";-import "package:ente_strings/ente_strings.dart";-import "package:flutter/cupertino.dart";--Future<DateTime?> showDatePickerSheet(- BuildContext context, {- required DateTime initialDate,- DateTime? maxDate,- DateTime? minDate,- bool startWithTime = false,-}) {- final colors = context.componentColors;- return showBottomSheetComponent<DateTime?>(- context: context,- builder: (sheetContext) => Container(- decoration: BoxDecoration(- color: colors.fillLight,- borderRadius: const BorderRadius.only(- topLeft: Radius.circular(20),- topRight: Radius.circular(20),- ),- ),- child: SafeArea(- top: false,- child: Padding(- padding: const EdgeInsets.all(8.0),- child: DateTimePickerWidget(- (DateTime dateTime) {- Navigator.of(sheetContext).pop(dateTime);- },- () {- Navigator.of(sheetContext).pop(null);- },- initialDate,- minDateTime: minDate,- maxDateTime: maxDate,- startWithTime: startWithTime,- ),- ),- ),- ),- );-}--class DateTimePickerWidget extends StatefulWidget {- final Function(DateTime) onDateTimeSelected;- final Function() onCancel;- final DateTime initialDateTime;- final DateTime? maxDateTime;- final DateTime? minDateTime;- final bool startWithTime;-- const DateTimePickerWidget(- this.onDateTimeSelected,- this.onCancel,- this.initialDateTime, {- this.maxDateTime,- this.minDateTime,- this.startWithTime = false,- super.key,- });-- @override- State<DateTimePickerWidget> createState() => _DateTimePickerWidgetState();-}--class _DateTimePickerWidgetState extends State<DateTimePickerWidget> {- late DateTime _selectedDateTime;- bool _showTimePicker = false;-- @override- void initState() {- super.initState();- _showTimePicker = widget.startWithTime;- _selectedDateTime = widget.initialDateTime;- }-- @override- Widget build(BuildContext context) {- final colors = context.componentColors;- return Container(- color: colors.fillLight,- child: Column(- mainAxisSize: MainAxisSize.min,- children: [- // Header- Padding(- padding: const EdgeInsets.symmetric(vertical: 16),- child: Align(- alignment: Alignment.centerLeft,- child: Text(- _showTimePicker- ? context.strings.selectTime- : context.strings.selectDate,- style: TextStyle(color: colors.textBase, fontSize: 16),- ),- ),- ),-- // Date/Time Picker- Container(- height: 220,- decoration: BoxDecoration(- color: colors.fillLight,- borderRadius: BorderRadius.circular(12),- ),- child: CupertinoTheme(- data: CupertinoThemeData(- brightness: Brightness.dark,- textTheme: CupertinoTextThemeData(- dateTimePickerTextStyle: TextStyle(- color: colors.textBase,- fontSize: 22,- ),- ),- ),- child: CupertinoDatePicker(- key: ValueKey(_showTimePicker),- mode: _showTimePicker- ? CupertinoDatePickerMode.time- : CupertinoDatePickerMode.date,- initialDateTime: _selectedDateTime,- minimumDate: widget.minDateTime ?? DateTime(1800),- maximumDate: widget.maxDateTime ?? DateTime(2200),- use24hFormat: MediaQuery.of(context).alwaysUse24HourFormat,- showDayOfWeek: !_showTimePicker,- onDateTimeChanged: (DateTime newDateTime) {- setState(() {- if (_showTimePicker) {- // Keep the date but update the time- _selectedDateTime = DateTime(- _selectedDateTime.year,- _selectedDateTime.month,- _selectedDateTime.day,- newDateTime.hour,- newDateTime.minute,- );- } else {- // Keep the time but update the date- _selectedDateTime = DateTime(- newDateTime.year,- newDateTime.month,- newDateTime.day,- _selectedDateTime.hour,- _selectedDateTime.minute,- );- }-- // Ensure the selected date doesn't exceed maxDateTime or minDateTime- if (widget.minDateTime != null &&- _selectedDateTime.isBefore(widget.minDateTime!)) {- _selectedDateTime = widget.minDateTime!;- }- if (widget.maxDateTime != null &&- _selectedDateTime.isAfter(widget.maxDateTime!)) {- _selectedDateTime = widget.maxDateTime!;- }- });- },- ),- ),- ),-- // Buttons- Padding(- padding: const EdgeInsets.symmetric(vertical: 12.0),- child: Row(- mainAxisAlignment: MainAxisAlignment.spaceBetween,- children: [- // Cancel Button- CupertinoButton(- padding: EdgeInsets.zero,- child: Text(- _showTimePicker- ? context.strings.previous- : context.strings.cancel,- style: TextStyle(color: colors.textBase, fontSize: 14),- ),- onPressed: () {- if (_showTimePicker) {- // Go back to date picker- setState(() {- _showTimePicker = false;- });- } else {- widget.onCancel();- }- },- ),-- // Next/Done Button- CupertinoButton(- padding: EdgeInsets.zero,- child: Text(- _showTimePicker- ? context.strings.done- : context.strings.next,- style: TextStyle(- color: colors.primary,- fontSize: 14,- fontWeight: FontWeight.bold,- ),- ),- onPressed: () {- if (_showTimePicker) {- // We're done, call the callback- widget.onDateTimeSelected(_selectedDateTime);- } else {- // Move to time picker- setState(() {- _showTimePicker = true;- });- }- },- ),- ],- ),- ),- ],- ),- );- }-}diff --git a/mobile/apps/photos/lib/ui/sharing/manage_links_widget.dart b/mobile/apps/photos/lib/ui/sharing/manage_links_widget.dartindex c7d65f8b24..4c47b17d5e 100644--- a/mobile/apps/photos/lib/ui/sharing/manage_links_widget.dart+++ b/mobile/apps/photos/lib/ui/sharing/manage_links_widget.dart@@ -7,6 +7,7 @@ import 'package:ente_crypto/ente_crypto.dart';import 'package:ente_pure_utils/ente_pure_utils.dart';import 'package:ente_qr_ui/ente_qr_ui.dart';import "package:ente_strings/ente_strings.dart";+import 'package:ente_ui/components/date_time_picker.dart';import 'package:flutter/material.dart';import "package:flutter/services.dart";import 'package:hugeicons/hugeicons.dart';@@ -23,7 +24,6 @@ import 'package:photos/ui/notification/toast.dart';import 'package:photos/ui/payment/subscription.dart';import 'package:photos/ui/sharing/pickers/layout_picker_page.dart';import 'package:photos/ui/sharing/share_components.dart';-import 'package:photos/ui/viewer/date/date_time_picker.dart';import 'package:photos/utils/dialog_util.dart';import 'package:photos/utils/public_link_layout_util.dart';import "package:photos/utils/share_util.dart";@@ -439,10 +439,10 @@ class _ManageSharedLinkWidgetState extends State<ManageSharedLinkWidget> {Future<void> _pickCustomExpiry(BuildContext context) async {final now = DateTime.now();- final DateTime? picked = await showDatePickerSheet(+ final DateTime? picked = await showDateTimePickerSheet(context,- initialDate: now,- minDate: now,+ initialDateTime: now,+ minDateTime: now,);final timeInMicrosecondsFromEpoch = picked?.microsecondsSinceEpoch;if (timeInMicrosecondsFromEpoch == null) {diff --git a/mobile/apps/photos/lib/ui/viewer/date/date_time_picker.dart b/mobile/apps/photos/lib/ui/viewer/date/date_time_picker.dartdeleted file mode 100644index 9597393796..0000000000--- a/mobile/apps/photos/lib/ui/viewer/date/date_time_picker.dart+++ /dev/null@@ -1,228 +0,0 @@-import "package:ente_strings/ente_strings.dart";-import "package:flutter/cupertino.dart";-import "package:flutter/material.dart";-import "package:photos/theme/ente_theme.dart";--Future<DateTime?> showDatePickerSheet(- BuildContext context, {- required DateTime initialDate,- DateTime? maxDate,- DateTime? minDate,- bool startWithTime = false,-}) async {- final colorScheme = getEnteColorScheme(context);- final sheet = Container(- decoration: BoxDecoration(- color: colorScheme.backgroundElevated,- borderRadius: const BorderRadius.only(- topLeft: Radius.circular(12),- topRight: Radius.circular(12),- ),- ),- child: Padding(- padding: const EdgeInsets.all(8.0),- child: DateTimePickerWidget(- (DateTime dateTime) {- Navigator.of(context).pop(dateTime);- },- () {- Navigator.of(context).pop(null);- },- initialDate,- minDateTime: minDate,- maxDateTime: maxDate,- ),- ),- );- final newDate = await showModalBottomSheet<DateTime?>(- context: context,- isScrollControlled: true,- builder: (context) => sheet,- );- return newDate;-}--class DateTimePickerWidget extends StatefulWidget {- final Function(DateTime) onDateTimeSelected;- final Function() onCancel;- final DateTime initialDateTime;- final DateTime? maxDateTime;- final DateTime? minDateTime;- final bool startWithTime;-- const DateTimePickerWidget(- this.onDateTimeSelected,- this.onCancel,- this.initialDateTime, {- this.maxDateTime,- this.minDateTime,- this.startWithTime = false,- super.key,- });-- @override- State<DateTimePickerWidget> createState() => _DateTimePickerWidgetState();-}--class _DateTimePickerWidgetState extends State<DateTimePickerWidget> {- late DateTime _selectedDateTime;- bool _showTimePicker = false;-- @override- void initState() {- super.initState();- _showTimePicker = widget.startWithTime;- _selectedDateTime = widget.initialDateTime;- }-- @override- Widget build(BuildContext context) {- final colorScheme = getEnteColorScheme(context);- return SafeArea(- child: Container(- color: colorScheme.backgroundElevated,- child: Column(- mainAxisSize: MainAxisSize.min,- children: [- // Header- Padding(- padding: const EdgeInsets.symmetric(vertical: 16),- child: Align(- alignment: Alignment.centerLeft,- child: Text(- _showTimePicker- ? context.strings.selectTime- : context.strings.selectDate,- style: TextStyle(color: colorScheme.textBase, fontSize: 16),- ),- ),- ),-- // Date/Time Picker- Container(- height: 220,- decoration: BoxDecoration(- color: colorScheme.backgroundElevated2,- borderRadius: BorderRadius.circular(12),- ),- child: CupertinoTheme(- data: CupertinoThemeData(- brightness: Brightness.dark,- textTheme: CupertinoTextThemeData(- dateTimePickerTextStyle: TextStyle(- color: colorScheme.textBase,- fontSize: 22,- ),- ),- ),- child: CupertinoDatePicker(- key: ValueKey(_showTimePicker),- mode: _showTimePicker- ? CupertinoDatePickerMode.time- : CupertinoDatePickerMode.date,- initialDateTime: _selectedDateTime,- minimumDate: widget.minDateTime ?? DateTime(1800),- maximumDate: widget.maxDateTime ?? DateTime(2200),- use24hFormat: MediaQuery.of(context).alwaysUse24HourFormat,- showDayOfWeek: !_showTimePicker,- onDateTimeChanged: (DateTime newDateTime) {- setState(() {- if (_showTimePicker) {- // Keep the date but update the time- _selectedDateTime = DateTime(- _selectedDateTime.year,- _selectedDateTime.month,- _selectedDateTime.day,- newDateTime.hour,- newDateTime.minute,- );- } else {- // Keep the time but update the date- _selectedDateTime = DateTime(- newDateTime.year,- newDateTime.month,- newDateTime.day,- _selectedDateTime.hour,- _selectedDateTime.minute,- );- }-- // Ensure the selected date doesn't exceed maxDateTime or minDateTime- if (widget.minDateTime != null &&- _selectedDateTime.isBefore(widget.minDateTime!)) {- _selectedDateTime = widget.minDateTime!;- }- if (widget.maxDateTime != null &&- _selectedDateTime.isAfter(widget.maxDateTime!)) {- _selectedDateTime = widget.maxDateTime!;- }- });- },- ),- ),- ),-- // Buttons- Padding(- padding: const EdgeInsets.symmetric(vertical: 12.0),- child: Row(- mainAxisAlignment: MainAxisAlignment.spaceBetween,- children: [- // Cancel Button- CupertinoButton(- padding: EdgeInsets.zero,- child: Text(- _showTimePicker- ? context.strings.previous- : context.strings.cancel,- style: TextStyle(- color: colorScheme.textBase,- fontSize: 14,- ),- ),- onPressed: () {- if (_showTimePicker) {- // Go back to date picker- setState(() {- _showTimePicker = false;- });- } else {- widget.onCancel();- }- },- ),-- // Next/Done Button- CupertinoButton(- padding: EdgeInsets.zero,- child: Text(- _showTimePicker- ? context.strings.done- : context.strings.next,- style: TextStyle(- color: colorScheme.primary700,- fontSize: 14,- fontWeight: FontWeight.bold,- ),- ),- onPressed: () {- if (_showTimePicker) {- // We're done, call the callback- widget.onDateTimeSelected(_selectedDateTime);- } else {- // Move to time picker- setState(() {- _showTimePicker = true;- });- }- },- ),- ],- ),- ),- ],- ),- ),- );- }-}diff --git a/mobile/apps/photos/lib/ui/viewer/date/edit_date_sheet.dart b/mobile/apps/photos/lib/ui/viewer/date/edit_date_sheet.dartindex 4d6dc764c2..d5ce936924 100644--- a/mobile/apps/photos/lib/ui/viewer/date/edit_date_sheet.dart+++ b/mobile/apps/photos/lib/ui/viewer/date/edit_date_sheet.dart@@ -1,11 +1,11 @@import "package:ente_strings/ente_strings.dart";+import "package:ente_ui/components/date_time_picker.dart";import 'package:flutter/material.dart';import 'package:intl/intl.dart';import "package:photos/models/file/file.dart";import "package:photos/theme/ente_theme.dart";import "package:photos/ui/components/buttons/button_widget.dart";import "package:photos/ui/components/models/button_type.dart";-import "package:photos/ui/viewer/date/date_time_picker.dart";import "package:photos/ui/viewer/file/thumbnail_widget.dart";import "package:photos/utils/magic_util.dart";@@ -145,19 +145,19 @@ class _EditDateSheetState extends State<EditDateSheet> {},),if (selectingDate || selectingTime)- DateTimePickerWidget(- (DateTime dateTime) {+ DateTimePicker(+ initialDateTime: selectedDate,+ onDateTimeSelected: (dateTime) {selectedDate = dateTime;selectingDate = false;selectingTime = false;setState(() {});},- () {+ onCancel: () {selectingDate = false;selectingTime = false;setState(() {});},- selectedDate,maxDateTime: maxDate,startWithTime: selectingTime,),diff --git a/mobile/packages/ui/lib/components/date_time_picker.dart b/mobile/packages/ui/lib/components/date_time_picker.dartnew file mode 100644index 0000000000..d6a0c75540--- /dev/null+++ b/mobile/packages/ui/lib/components/date_time_picker.dart@@ -0,0 +1,206 @@+import "package:ente_components/ente_components.dart";+import "package:ente_strings/ente_strings.dart";+import "package:flutter/cupertino.dart";++Future<DateTime?> showDateTimePickerSheet(+ BuildContext context, {+ required DateTime initialDateTime,+ DateTime? minDateTime,+ DateTime? maxDateTime,+ bool startWithTime = false,+}) {+ final colors = context.componentColors;+ return showBottomSheetComponent<DateTime?>(+ context: context,+ builder: (sheetContext) => Container(+ decoration: BoxDecoration(+ color: colors.fillLight,+ borderRadius: const BorderRadius.only(+ topLeft: Radius.circular(20),+ topRight: Radius.circular(20),+ ),+ ),+ child: Padding(+ padding: const EdgeInsets.all(8),+ child: DateTimePicker(+ initialDateTime: initialDateTime,+ onDateTimeSelected: (dateTime) =>+ Navigator.of(sheetContext).pop(dateTime),+ onCancel: () => Navigator.of(sheetContext).pop(),+ minDateTime: minDateTime,+ maxDateTime: maxDateTime,+ startWithTime: startWithTime,+ ),+ ),+ ),+ );+}++class DateTimePicker extends StatefulWidget {+ const DateTimePicker({+ required this.initialDateTime,+ required this.onDateTimeSelected,+ required this.onCancel,+ this.minDateTime,+ this.maxDateTime,+ this.startWithTime = false,+ super.key,+ });++ final ValueChanged<DateTime> onDateTimeSelected;+ final VoidCallback onCancel;+ final DateTime initialDateTime;+ final DateTime? maxDateTime;+ final DateTime? minDateTime;+ final bool startWithTime;++ @override+ State<DateTimePicker> createState() => _DateTimePickerState();+}++class _DateTimePickerState extends State<DateTimePicker> {+ late DateTime _selectedDateTime;+ late bool _showTimePicker;++ @override+ void initState() {+ super.initState();+ _showTimePicker = widget.startWithTime;+ _selectedDateTime = widget.initialDateTime;+ }++ @override+ Widget build(BuildContext context) {+ final colors = context.componentColors;+ return SafeArea(+ top: false,+ child: Container(+ color: colors.fillLight,+ child: Column(+ mainAxisSize: MainAxisSize.min,+ children: [+ Padding(+ padding: const EdgeInsets.symmetric(vertical: 16),+ child: Align(+ alignment: Alignment.centerLeft,+ child: Text(+ _showTimePicker+ ? context.strings.selectTime+ : context.strings.selectDate,+ style: TextStyle(color: colors.textBase, fontSize: 16),+ ),+ ),+ ),+ Container(+ height: 220,+ decoration: BoxDecoration(+ color: colors.fillLight,+ borderRadius: BorderRadius.circular(12),+ ),+ child: CupertinoTheme(+ data: CupertinoThemeData(+ brightness: Brightness.dark,+ textTheme: CupertinoTextThemeData(+ dateTimePickerTextStyle: TextStyle(+ color: colors.textBase,+ fontSize: 22,+ ),+ ),+ ),+ child: CupertinoDatePicker(+ key: ValueKey(_showTimePicker),+ mode: _showTimePicker+ ? CupertinoDatePickerMode.time+ : CupertinoDatePickerMode.date,+ initialDateTime: _selectedDateTime,+ minimumDate: widget.minDateTime ?? DateTime(1800),+ maximumDate: widget.maxDateTime ?? DateTime(2200),+ use24hFormat: MediaQuery.alwaysUse24HourFormatOf(context),+ showDayOfWeek: !_showTimePicker,+ onDateTimeChanged: _onDateTimeChanged,+ ),+ ),+ ),+ Padding(+ padding: const EdgeInsets.symmetric(vertical: 12),+ child: Row(+ mainAxisAlignment: MainAxisAlignment.spaceBetween,+ children: [+ CupertinoButton(+ padding: EdgeInsets.zero,+ onPressed: _handleBackOrCancel,+ child: Text(+ _showTimePicker+ ? context.strings.previous+ : context.strings.cancel,+ style: TextStyle(color: colors.textBase, fontSize: 14),+ ),+ ),+ CupertinoButton(+ padding: EdgeInsets.zero,+ onPressed: _handleNextOrDone,+ child: Text(+ _showTimePicker+ ? context.strings.done+ : context.strings.next,+ style: TextStyle(+ color: colors.primary,+ fontSize: 14,+ fontWeight: FontWeight.bold,+ ),+ ),+ ),+ ],+ ),+ ),+ ],+ ),+ ),+ );+ }++ void _onDateTimeChanged(DateTime dateTime) {+ setState(() {+ _selectedDateTime = _showTimePicker+ ? DateTime(+ _selectedDateTime.year,+ _selectedDateTime.month,+ _selectedDateTime.day,+ dateTime.hour,+ dateTime.minute,+ )+ : DateTime(+ dateTime.year,+ dateTime.month,+ dateTime.day,+ _selectedDateTime.hour,+ _selectedDateTime.minute,+ );++ final minDateTime = widget.minDateTime;+ if (minDateTime != null && _selectedDateTime.isBefore(minDateTime)) {+ _selectedDateTime = minDateTime;+ }+ final maxDateTime = widget.maxDateTime;+ if (maxDateTime != null && _selectedDateTime.isAfter(maxDateTime)) {+ _selectedDateTime = maxDateTime;+ }+ });+ }++ void _handleBackOrCancel() {+ if (_showTimePicker) {+ setState(() => _showTimePicker = false);+ } else {+ widget.onCancel();+ }+ }++ void _handleNextOrDone() {+ if (_showTimePicker) {+ widget.onDateTimeSelected(_selectedDateTime);+ } else {+ setState(() => _showTimePicker = true);+ }+ }+}