Skip to content

Commit

Permalink
Merge pull request #131 from Myzel394/give-shares-own-name
Browse files Browse the repository at this point in the history
Add share name change
  • Loading branch information
Myzel394 authored Oct 17, 2023
2 parents 263c86b + de0b785 commit b83bfb6
Show file tree
Hide file tree
Showing 4 changed files with 165 additions and 1 deletion.
16 changes: 16 additions & 0 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
PODS:
- airplane_mode_checker (0.0.1):
- Flutter
- Alamofire (5.6.2)
- apple_maps_flutter (0.0.1):
- Flutter
Expand Down Expand Up @@ -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):
Expand All @@ -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):
Expand All @@ -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`)
Expand All @@ -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`)
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
3 changes: 3 additions & 0 deletions lib/l10n/app_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
"goBack": "Go back",
"closePositiveSheetAction": "Done",
"closeNeutralAction": "Ok",
"closeSaveAction": "Save",
"continueLabel": "Continue",
"deleteLabel": "Delete",
"dismissLabel": "Dismiss",
Expand Down Expand Up @@ -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 name",
"taskAction_changeName_field_label": "Name",
"tasks_action_stopAll": "Stop tasks",
"tasks_action_startAll": "Start tasks",
"tasks_examples_weekend": "Weekend Getaway",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
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<TaskChangeNameDialog> createState() => _TaskChangeNameDialogState();
}

class _TaskChangeNameDialogState extends State<TaskChangeNameDialog> {
final formKey = GlobalKey<FormState>();
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,
cupertino: (_, __) => CupertinoTextFormFieldData(
placeholder: l10n.taskAction_changeName_field_label,
),
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,
),
),
),
),
);
}
}
27 changes: 26 additions & 1 deletion lib/screens/locations_overview_screen_widgets/TaskTile.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -70,6 +71,23 @@ class _TaskTileState extends State<TaskTile> with TaskLinkGenerationMixin {
setState(() {});
}

void _showChangeNameDialog() async => showPlatformDialog(
context: context,
builder: (context) => TaskChangeNameDialog(
initialName: widget.task.name,
onNameChanged: (newName) {
final taskService = context.read<TaskService>();

widget.task.name = newName;

taskService.save();
taskService.update(widget.task);

Navigator.of(context).pop();
},
),
);

@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context);
Expand Down Expand Up @@ -108,6 +126,13 @@ class _TaskTileState extends State<TaskTile> with TaskLinkGenerationMixin {
),
);
},
),
PlatformPopupMenuItem(
label: PlatformListTile(
leading: Icon(context.platformIcons.edit),
title: Text(l10n.taskAction_changeName),
),
onPressed: _showChangeNameDialog,
)
],
),
Expand Down

0 comments on commit b83bfb6

Please sign in to comment.