From fa73b0997ca5c45d362a97796885796e1bb7a055 Mon Sep 17 00:00:00 2001 From: Mangat Toor Date: Thu, 30 Jan 2025 19:56:59 -0800 Subject: [PATCH 1/2] fix(album-viewer): retain edited title when album updates ensure `AlbumViewerEditableTitle` keeps user input while editing, even when the album updates from another provider. fall back to `albumName` only when not in edit mode. --- mobile/lib/widgets/album/album_viewer_editable_title.dart | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mobile/lib/widgets/album/album_viewer_editable_title.dart b/mobile/lib/widgets/album/album_viewer_editable_title.dart index 7547dff932f03..dbbd75f187506 100644 --- a/mobile/lib/widgets/album/album_viewer_editable_title.dart +++ b/mobile/lib/widgets/album/album_viewer_editable_title.dart @@ -16,7 +16,13 @@ class AlbumViewerEditableTitle extends HookConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - final titleTextEditController = useTextEditingController(text: albumName); + final albumViewerState = ref.watch(albumViewerProvider); + + final titleTextEditController = useTextEditingController( + text: albumViewerState.isEditAlbum && albumViewerState.editTitleText.isNotEmpty + ? albumViewerState.editTitleText + : albumName, + ); void onFocusModeChange() { if (!titleFocusNode.hasFocus && titleTextEditController.text.isEmpty) { From fd87f034da59181aaf80b6d16d551e3243a7321e Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 31 Jan 2025 09:13:00 -0600 Subject: [PATCH 2/2] linting --- mobile/lib/widgets/album/album_viewer_editable_title.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mobile/lib/widgets/album/album_viewer_editable_title.dart b/mobile/lib/widgets/album/album_viewer_editable_title.dart index dbbd75f187506..72fdfe070d886 100644 --- a/mobile/lib/widgets/album/album_viewer_editable_title.dart +++ b/mobile/lib/widgets/album/album_viewer_editable_title.dart @@ -19,7 +19,8 @@ class AlbumViewerEditableTitle extends HookConsumerWidget { final albumViewerState = ref.watch(albumViewerProvider); final titleTextEditController = useTextEditingController( - text: albumViewerState.isEditAlbum && albumViewerState.editTitleText.isNotEmpty + text: albumViewerState.isEditAlbum && + albumViewerState.editTitleText.isNotEmpty ? albumViewerState.editTitleText : albumName, );