From f361d139cef437e82a740c868a11c4478147f384 Mon Sep 17 00:00:00 2001 From: Myzel394 <50424412+Myzel394@users.noreply.github.com> Date: Mon, 16 Oct 2023 09:24:43 +0200 Subject: [PATCH 1/3] feat: Add TaskChangeNameDialog.dart to allow task name change --- lib/l10n/app_en.arb | 3 + .../TaskChangeNameDialog.dart | 117 ++++++++++++++++++ .../TaskTile.dart | 21 +++- 3 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 lib/screens/locations_overview_screen_widgets/TaskChangeNameDialog.dart diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 45c99ed1..e9f79099 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -53,6 +53,7 @@ "goBack": "Go back", "closePositiveSheetAction": "Done", "closeNeutralAction": "Ok", + "closeSaveAction": "Save", "continueLabel": "Continue", "deleteLabel": "Delete", "dismissLabel": "Dismiss", @@ -170,6 +171,8 @@ "taskAction_generateLink_process_creatingURI": "Creating link...", "taskAction_generateLink_shareTextSubject": "Here's the link to see my location", "taskAction_showDetails": "Show Details", + "taskAction_changeName": "Change the Name for your Share", + "taskAction_changeName_field_label": "Name", "tasks_action_stopAll": "Stop tasks", "tasks_action_startAll": "Start tasks", "tasks_examples_weekend": "Weekend Getaway", diff --git a/lib/screens/locations_overview_screen_widgets/TaskChangeNameDialog.dart b/lib/screens/locations_overview_screen_widgets/TaskChangeNameDialog.dart new file mode 100644 index 00000000..31f74dfb --- /dev/null +++ b/lib/screens/locations_overview_screen_widgets/TaskChangeNameDialog.dart @@ -0,0 +1,117 @@ +import 'package:basic_utils/basic_utils.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; +import 'package:flutter_platform_widgets/flutter_platform_widgets.dart'; +import 'package:locus/utils/theme.dart'; + +class TaskChangeNameDialog extends StatefulWidget { + final String initialName; + final Function(String) onNameChanged; + + const TaskChangeNameDialog({ + required this.initialName, + required this.onNameChanged, + super.key, + }); + + @override + State createState() => _TaskChangeNameDialogState(); +} + +class _TaskChangeNameDialogState extends State { + final formKey = GlobalKey(); + final nameController = TextEditingController(); + final nameFocusNode = FocusNode(); + + late bool showClearButton; + + @override + void initState() { + super.initState(); + + nameController.text = widget.initialName; + nameController.addListener(() { + setState(() { + showClearButton = nameController.text.isNotEmpty; + }); + }); + showClearButton = nameController.text.isNotEmpty; + } + + @override + void dispose() { + nameController.dispose(); + + super.dispose(); + } + + @override + Widget build(BuildContext context) { + final l10n = AppLocalizations.of(context); + + return PlatformAlertDialog( + material: (_, __) => MaterialAlertDialogData( + icon: const Icon(Icons.edit_rounded), + ), + title: Text(l10n.taskAction_changeName), + actions: createCancellableDialogActions( + context, + [ + PlatformDialogAction( + child: Text(l10n.closeSaveAction), + cupertino: (_, __) => CupertinoDialogActionData( + isDefaultAction: true, + ), + material: (_, __) => MaterialDialogActionData( + icon: const Icon(Icons.check_rounded), + ), + onPressed: () { + if (formKey.currentState!.validate()) { + widget.onNameChanged(nameController.text); + } + }, + ) + ], + ), + content: Form( + key: formKey, + child: PlatformTextFormField( + autofillHints: const [AutofillHints.name], + controller: nameController, + autofocus: true, + focusNode: nameFocusNode, + validator: (value) { + if (value == null || value.isEmpty) { + return l10n.fields_errors_isEmpty; + } + + if (!StringUtils.isAscii(value)) { + return l10n.fields_errors_invalidCharacters; + } + + return null; + }, + textInputAction: TextInputAction.done, + keyboardType: TextInputType.name, + maxLines: 1, + material: (_, __) => MaterialTextFormFieldData( + decoration: InputDecoration( + filled: false, + labelText: l10n.taskAction_changeName_field_label, + suffixIcon: showClearButton + ? IconButton( + visualDensity: VisualDensity.compact, + icon: const Icon(Icons.clear), + onPressed: () { + nameController.clear(); + nameFocusNode.requestFocus(); + }, + ) + : null, + ), + ), + ), + ), + ); + } +} diff --git a/lib/screens/locations_overview_screen_widgets/TaskTile.dart b/lib/screens/locations_overview_screen_widgets/TaskTile.dart index 6b674cb2..1d744839 100644 --- a/lib/screens/locations_overview_screen_widgets/TaskTile.dart +++ b/lib/screens/locations_overview_screen_widgets/TaskTile.dart @@ -1,10 +1,11 @@ import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_platform_widgets/flutter_platform_widgets.dart' hide PlatformListTile; import 'package:intl/intl.dart'; import 'package:locus/screens/TaskDetailScreen.dart'; +import 'package:locus/screens/locations_overview_screen_widgets/TaskChangeNameDialog.dart'; import 'package:locus/services/task_service/index.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:locus/services/timers_service.dart'; import 'package:locus/utils/date.dart'; import 'package:locus/utils/navigation.dart'; @@ -70,6 +71,23 @@ class _TaskTileState extends State with TaskLinkGenerationMixin { setState(() {}); } + void _showChangeNameDialog() async => showPlatformDialog( + context: context, + builder: (context) => TaskChangeNameDialog( + initialName: widget.task.name, + onNameChanged: (newName) { + final taskService = context.read(); + + widget.task.name = newName; + + taskService.save(); + taskService.update(widget.task); + + Navigator.of(context).pop(); + }, + ), + ); + @override Widget build(BuildContext context) { final l10n = AppLocalizations.of(context); @@ -131,6 +149,7 @@ class _TaskTileState extends State with TaskLinkGenerationMixin { : null, ), ), + onTap: _showChangeNameDialog, ); } } From fae576e590e9564645b7267b0c11ec458965d50f Mon Sep 17 00:00:00 2001 From: Myzel394 <50424412+Myzel394@users.noreply.github.com> Date: Mon, 16 Oct 2023 09:27:31 +0200 Subject: [PATCH 2/3] fix: Improve grammar --- lib/l10n/app_en.arb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index e9f79099..bca2201e 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -171,7 +171,7 @@ "taskAction_generateLink_process_creatingURI": "Creating link...", "taskAction_generateLink_shareTextSubject": "Here's the link to see my location", "taskAction_showDetails": "Show Details", - "taskAction_changeName": "Change the Name for your Share", + "taskAction_changeName": "Change the Name of your Share", "taskAction_changeName_field_label": "Name", "tasks_action_stopAll": "Stop tasks", "tasks_action_startAll": "Start tasks", From de0b78524d235590cc2c568de806f2deb82765b5 Mon Sep 17 00:00:00 2001 From: Myzel394 <50424412+Myzel394@users.noreply.github.com> Date: Tue, 17 Oct 2023 10:16:50 +0200 Subject: [PATCH 3/3] fix: Move change name button to more menu --- ios/Podfile.lock | 16 ++++++++++++++++ lib/l10n/app_en.arb | 2 +- .../TaskChangeNameDialog.dart | 3 +++ .../TaskTile.dart | 8 +++++++- 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 80259752..084d659d 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,4 +1,6 @@ PODS: + - airplane_mode_checker (0.0.1): + - Flutter - Alamofire (5.6.2) - apple_maps_flutter (0.0.1): - Flutter @@ -61,6 +63,9 @@ PODS: - Tangram-es - flutter_secure_storage (6.0.0): - Flutter + - fluttertoast (0.0.2): + - Flutter + - Toast - geocoding_ios (1.0.5): - Flutter - geolocator_apple (1.2.0): @@ -84,6 +89,7 @@ PODS: - Flutter - SwiftyGif (5.4.4) - Tangram-es (0.17.1) + - Toast (4.0.0) - uni_links (0.0.1): - Flutter - url_launcher_ios (0.0.1): @@ -95,6 +101,7 @@ PODS: - ZIPFoundation (0.9.15) DEPENDENCIES: + - airplane_mode_checker (from `.symlinks/plugins/airplane_mode_checker/ios`) - apple_maps_flutter (from `.symlinks/plugins/apple_maps_flutter/ios`) - background_fetch (from `.symlinks/plugins/background_fetch/ios`) - background_locator_2 (from `.symlinks/plugins/background_locator_2/ios`) @@ -108,6 +115,7 @@ DEPENDENCIES: - flutter_logs (from `.symlinks/plugins/flutter_logs/ios`) - flutter_osm_plugin (from `.symlinks/plugins/flutter_osm_plugin/ios`) - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`) + - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) - geocoding_ios (from `.symlinks/plugins/geocoding_ios/ios`) - geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`) - local_auth_ios (from `.symlinks/plugins/local_auth_ios/ios`) @@ -130,9 +138,12 @@ SPEC REPOS: - SDWebImage - SwiftyGif - Tangram-es + - Toast - ZIPFoundation EXTERNAL SOURCES: + airplane_mode_checker: + :path: ".symlinks/plugins/airplane_mode_checker/ios" apple_maps_flutter: :path: ".symlinks/plugins/apple_maps_flutter/ios" background_fetch: @@ -159,6 +170,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/flutter_osm_plugin/ios" flutter_secure_storage: :path: ".symlinks/plugins/flutter_secure_storage/ios" + fluttertoast: + :path: ".symlinks/plugins/fluttertoast/ios" geocoding_ios: :path: ".symlinks/plugins/geocoding_ios/ios" geolocator_apple: @@ -185,6 +198,7 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/wakelock/ios" SPEC CHECKSUMS: + airplane_mode_checker: 9b8bad217c83930f615c116da57127646d123471 Alamofire: d368e1ff8a298e6dde360e35a3e68e6c610e7204 apple_maps_flutter: c59725efea39e13e703cde52a1d2b14866ad68a8 background_fetch: bc9b44b0bf8b434e282a2ac9be8662800a0296ed @@ -201,6 +215,7 @@ SPEC CHECKSUMS: flutter_logs: 5d0dca26963e0f30b11a995a764744ef77d5d428 flutter_osm_plugin: 029b14f54485ced3190bb2c4444616b76e10c6a8 flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be + fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c geocoding_ios: a389ea40f6f548de6e63006a2e31bf66ff80769a geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401 local_auth_ios: c6cf091ded637a88f24f86a8875d8b0f526e2605 @@ -213,6 +228,7 @@ SPEC CHECKSUMS: share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028 SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f Tangram-es: 628b634f7fc09d2217469b9914de00d9de49ff9d + Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 uni_links: d97da20c7701486ba192624d99bffaaffcfc298a url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4 vibration: 7d883d141656a1c1a6d8d238616b2042a51a1241 diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index bca2201e..7359d9ff 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -171,7 +171,7 @@ "taskAction_generateLink_process_creatingURI": "Creating link...", "taskAction_generateLink_shareTextSubject": "Here's the link to see my location", "taskAction_showDetails": "Show Details", - "taskAction_changeName": "Change the Name of your Share", + "taskAction_changeName": "Change name", "taskAction_changeName_field_label": "Name", "tasks_action_stopAll": "Stop tasks", "tasks_action_startAll": "Start tasks", diff --git a/lib/screens/locations_overview_screen_widgets/TaskChangeNameDialog.dart b/lib/screens/locations_overview_screen_widgets/TaskChangeNameDialog.dart index 31f74dfb..496b06ce 100644 --- a/lib/screens/locations_overview_screen_widgets/TaskChangeNameDialog.dart +++ b/lib/screens/locations_overview_screen_widgets/TaskChangeNameDialog.dart @@ -94,6 +94,9 @@ class _TaskChangeNameDialogState extends State { textInputAction: TextInputAction.done, keyboardType: TextInputType.name, maxLines: 1, + cupertino: (_, __) => CupertinoTextFormFieldData( + placeholder: l10n.taskAction_changeName_field_label, + ), material: (_, __) => MaterialTextFormFieldData( decoration: InputDecoration( filled: false, diff --git a/lib/screens/locations_overview_screen_widgets/TaskTile.dart b/lib/screens/locations_overview_screen_widgets/TaskTile.dart index 1d744839..44bf3637 100644 --- a/lib/screens/locations_overview_screen_widgets/TaskTile.dart +++ b/lib/screens/locations_overview_screen_widgets/TaskTile.dart @@ -126,6 +126,13 @@ class _TaskTileState extends State with TaskLinkGenerationMixin { ), ); }, + ), + PlatformPopupMenuItem( + label: PlatformListTile( + leading: Icon(context.platformIcons.edit), + title: Text(l10n.taskAction_changeName), + ), + onPressed: _showChangeNameDialog, ) ], ), @@ -149,7 +156,6 @@ class _TaskTileState extends State with TaskLinkGenerationMixin { : null, ), ), - onTap: _showChangeNameDialog, ); } }