From 9069975bf0dc4f8c0ce71e6ef9941c2cfd3137b9 Mon Sep 17 00:00:00 2001 From: ashilkn Date: Mon, 26 May 2025 19:22:51 +0530 Subject: [PATCH 1/3] Avoid confusion on empty widget settings pages --- .../ui/settings/widgets/albums_widget_settings.dart | 12 +++--------- .../settings/widgets/memories_widget_settings.dart | 11 +++-------- .../ui/settings/widgets/people_widget_settings.dart | 10 +++------- 3 files changed, 9 insertions(+), 24 deletions(-) diff --git a/mobile/lib/ui/settings/widgets/albums_widget_settings.dart b/mobile/lib/ui/settings/widgets/albums_widget_settings.dart index cbf250986e..76aafb7c7c 100644 --- a/mobile/lib/ui/settings/widgets/albums_widget_settings.dart +++ b/mobile/lib/ui/settings/widgets/albums_widget_settings.dart @@ -6,7 +6,6 @@ import "package:photos/models/selected_albums.dart"; import "package:photos/services/album_home_widget_service.dart"; import "package:photos/services/collections_service.dart"; import "package:photos/services/favorites_service.dart"; -import 'package:photos/theme/ente_theme.dart'; import "package:photos/ui/collections/flex_grid_view.dart"; import "package:photos/ui/common/loading_widget.dart"; import "package:photos/ui/components/buttons/button_widget.dart"; @@ -85,7 +84,6 @@ class _AlbumsWidgetSettingsState extends State { @override Widget build(BuildContext context) { - final textTheme = getEnteTextTheme(context); return Scaffold( bottomNavigationBar: hasInstalledAny ? Padding( @@ -122,7 +120,9 @@ class _AlbumsWidgetSettingsState extends State { title: S.of(context).albums, ), expandedHeight: 120, - flexibleSpaceCaption: S.of(context).albumsWidgetDesc, + flexibleSpaceCaption: hasInstalledAny + ? S.of(context).albumsWidgetDesc + : "Add an album widget to your homescreen and come back here to customize", actionIcons: [ IconButtonWidget( icon: Icons.close_outlined, @@ -150,12 +150,6 @@ class _AlbumsWidgetSettingsState extends State { "assets/albums-widget-static.png", height: 160, ), - const SizedBox(height: 20), - Text( - "Add an album widget to your homescreen and come back here to customize", - style: textTheme.smallFaint, - textAlign: TextAlign.center, - ), ], ), ), diff --git a/mobile/lib/ui/settings/widgets/memories_widget_settings.dart b/mobile/lib/ui/settings/widgets/memories_widget_settings.dart index 542e7b6ea5..8306a47c62 100644 --- a/mobile/lib/ui/settings/widgets/memories_widget_settings.dart +++ b/mobile/lib/ui/settings/widgets/memories_widget_settings.dart @@ -88,7 +88,6 @@ class _MemoriesWidgetSettingsState extends State { @override Widget build(BuildContext context) { - final textTheme = getEnteTextTheme(context); final colorScheme = getEnteColorScheme(context); return Scaffold( @@ -100,7 +99,9 @@ class _MemoriesWidgetSettingsState extends State { title: S.of(context).memories, ), expandedHeight: 120, - flexibleSpaceCaption: S.of(context).memoriesWidgetDesc, + flexibleSpaceCaption: hasInstalledAny + ? S.of(context).memoriesWidgetDesc + : "Add a memories widget to your homescreen and come back here to customize", actionIcons: [ IconButtonWidget( icon: Icons.close_outlined, @@ -128,12 +129,6 @@ class _MemoriesWidgetSettingsState extends State { "assets/memories-widget-static.png", height: 160, ), - const SizedBox(height: 20), - Text( - "Add a memories widget to your homescreen and come back here to customize", - style: textTheme.smallFaint, - textAlign: TextAlign.center, - ), ], ), ), diff --git a/mobile/lib/ui/settings/widgets/people_widget_settings.dart b/mobile/lib/ui/settings/widgets/people_widget_settings.dart index d420ebfba5..c77b1ed2e9 100644 --- a/mobile/lib/ui/settings/widgets/people_widget_settings.dart +++ b/mobile/lib/ui/settings/widgets/people_widget_settings.dart @@ -94,7 +94,9 @@ class _PeopleWidgetSettingsState extends State { title: S.of(context).people, ), expandedHeight: 120, - flexibleSpaceCaption: S.of(context).peopleWidgetDesc, + flexibleSpaceCaption: hasInstalledAny + ? S.of(context).peopleWidgetDesc + : "Add a people widget to your homescreen and come back here to customize.", actionIcons: [ IconButtonWidget( icon: Icons.close_outlined, @@ -122,12 +124,6 @@ class _PeopleWidgetSettingsState extends State { "assets/people-widget-static.png", height: 160, ), - const SizedBox(height: 20), - Text( - "Add a people widget to your homescreen and come back here to customize", - style: textTheme.smallFaint, - textAlign: TextAlign.center, - ), ], ), ), From a5b178d283f1bde241e8428ab87c9c14ca610b2a Mon Sep 17 00:00:00 2001 From: ashilkn Date: Mon, 26 May 2025 19:30:54 +0530 Subject: [PATCH 2/3] Extract strings --- mobile/lib/generated/intl/messages_en.dart | 6 ++++ mobile/lib/generated/l10n.dart | 30 +++++++++++++++++++ mobile/lib/l10n/intl_en.arb | 5 +++- .../widgets/albums_widget_settings.dart | 3 +- .../widgets/memories_widget_settings.dart | 3 +- .../widgets/people_widget_settings.dart | 3 +- 6 files changed, 46 insertions(+), 4 deletions(-) diff --git a/mobile/lib/generated/intl/messages_en.dart b/mobile/lib/generated/intl/messages_en.dart index aabe629c0d..abdf9bbf9d 100644 --- a/mobile/lib/generated/intl/messages_en.dart +++ b/mobile/lib/generated/intl/messages_en.dart @@ -349,6 +349,8 @@ class MessageLookup extends MessageLookupByLibrary { "add": MessageLookupByLibrary.simpleMessage("Add"), "addAName": MessageLookupByLibrary.simpleMessage("Add a name"), "addANewEmail": MessageLookupByLibrary.simpleMessage("Add a new email"), + "addAlbumWidgetPrompt": MessageLookupByLibrary.simpleMessage( + "Add an album widget to your homescreen and come back here to customize."), "addCollaborator": MessageLookupByLibrary.simpleMessage("Add collaborator"), "addCollaborators": m1, @@ -358,6 +360,8 @@ class MessageLookup extends MessageLookupByLibrary { "addItem": m2, "addLocation": MessageLookupByLibrary.simpleMessage("Add location"), "addLocationButton": MessageLookupByLibrary.simpleMessage("Add"), + "addMemoriesWidgetPrompt": MessageLookupByLibrary.simpleMessage( + "Add a memories widget to your homescreen and come back here to customize."), "addMore": MessageLookupByLibrary.simpleMessage("Add more"), "addName": MessageLookupByLibrary.simpleMessage("Add name"), "addNameOrMerge": @@ -370,6 +374,8 @@ class MessageLookup extends MessageLookupByLibrary { "addOns": MessageLookupByLibrary.simpleMessage("Add-ons"), "addParticipants": MessageLookupByLibrary.simpleMessage("Add participants"), + "addPeopleWidgetPrompt": MessageLookupByLibrary.simpleMessage( + "Add a people widget to your homescreen and come back here to customize."), "addPhotos": MessageLookupByLibrary.simpleMessage("Add photos"), "addSelected": MessageLookupByLibrary.simpleMessage("Add selected"), "addToAlbum": MessageLookupByLibrary.simpleMessage("Add to album"), diff --git a/mobile/lib/generated/l10n.dart b/mobile/lib/generated/l10n.dart index 7b3e405bf5..ae4f04fc68 100644 --- a/mobile/lib/generated/l10n.dart +++ b/mobile/lib/generated/l10n.dart @@ -11995,6 +11995,36 @@ class S { args: [], ); } + + /// `Add a memories widget to your homescreen and come back here to customize.` + String get addMemoriesWidgetPrompt { + return Intl.message( + 'Add a memories widget to your homescreen and come back here to customize.', + name: 'addMemoriesWidgetPrompt', + desc: '', + args: [], + ); + } + + /// `Add an album widget to your homescreen and come back here to customize.` + String get addAlbumWidgetPrompt { + return Intl.message( + 'Add an album widget to your homescreen and come back here to customize.', + name: 'addAlbumWidgetPrompt', + desc: '', + args: [], + ); + } + + /// `Add a people widget to your homescreen and come back here to customize.` + String get addPeopleWidgetPrompt { + return Intl.message( + 'Add a people widget to your homescreen and come back here to customize.', + name: 'addPeopleWidgetPrompt', + desc: '', + args: [], + ); + } } class AppLocalizationDelegate extends LocalizationsDelegate { diff --git a/mobile/lib/l10n/intl_en.arb b/mobile/lib/l10n/intl_en.arb index 3313658da3..c37630a468 100644 --- a/mobile/lib/l10n/intl_en.arb +++ b/mobile/lib/l10n/intl_en.arb @@ -1758,5 +1758,8 @@ "newPhotosEmoji": " new 📸", "sorryWeHadToPauseYourBackups": "Sorry, we had to pause your backups", "clickToInstallOurBestVersionYet": "Click to install our best version yet", - "onThisDayNotificationExplanation": "Receive reminders about memories from this day in previous years." + "onThisDayNotificationExplanation": "Receive reminders about memories from this day in previous years.", + "addMemoriesWidgetPrompt": "Add a memories widget to your homescreen and come back here to customize.", + "addAlbumWidgetPrompt": "Add an album widget to your homescreen and come back here to customize.", + "addPeopleWidgetPrompt": "Add a people widget to your homescreen and come back here to customize." } \ No newline at end of file diff --git a/mobile/lib/ui/settings/widgets/albums_widget_settings.dart b/mobile/lib/ui/settings/widgets/albums_widget_settings.dart index 76aafb7c7c..0ed9b4a967 100644 --- a/mobile/lib/ui/settings/widgets/albums_widget_settings.dart +++ b/mobile/lib/ui/settings/widgets/albums_widget_settings.dart @@ -1,6 +1,7 @@ import "package:collection/collection.dart"; import 'package:flutter/material.dart'; import "package:photos/generated/l10n.dart"; +import "package:photos/l10n/l10n.dart"; import "package:photos/models/collection/collection.dart"; import "package:photos/models/selected_albums.dart"; import "package:photos/services/album_home_widget_service.dart"; @@ -122,7 +123,7 @@ class _AlbumsWidgetSettingsState extends State { expandedHeight: 120, flexibleSpaceCaption: hasInstalledAny ? S.of(context).albumsWidgetDesc - : "Add an album widget to your homescreen and come back here to customize", + : context.l10n.addAlbumWidgetPrompt, actionIcons: [ IconButtonWidget( icon: Icons.close_outlined, diff --git a/mobile/lib/ui/settings/widgets/memories_widget_settings.dart b/mobile/lib/ui/settings/widgets/memories_widget_settings.dart index 8306a47c62..51a0d6310c 100644 --- a/mobile/lib/ui/settings/widgets/memories_widget_settings.dart +++ b/mobile/lib/ui/settings/widgets/memories_widget_settings.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import "package:flutter_svg/flutter_svg.dart"; import "package:photos/generated/l10n.dart"; +import "package:photos/l10n/l10n.dart"; import "package:photos/service_locator.dart"; import "package:photos/services/memory_home_widget_service.dart"; import 'package:photos/theme/ente_theme.dart'; @@ -101,7 +102,7 @@ class _MemoriesWidgetSettingsState extends State { expandedHeight: 120, flexibleSpaceCaption: hasInstalledAny ? S.of(context).memoriesWidgetDesc - : "Add a memories widget to your homescreen and come back here to customize", + : context.l10n.addMemoriesWidgetPrompt, actionIcons: [ IconButtonWidget( icon: Icons.close_outlined, diff --git a/mobile/lib/ui/settings/widgets/people_widget_settings.dart b/mobile/lib/ui/settings/widgets/people_widget_settings.dart index c77b1ed2e9..2cf8762f59 100644 --- a/mobile/lib/ui/settings/widgets/people_widget_settings.dart +++ b/mobile/lib/ui/settings/widgets/people_widget_settings.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import "package:photos/generated/l10n.dart"; +import "package:photos/l10n/l10n.dart"; import "package:photos/models/selected_people.dart"; import "package:photos/services/people_home_widget_service.dart"; import 'package:photos/theme/ente_theme.dart'; @@ -96,7 +97,7 @@ class _PeopleWidgetSettingsState extends State { expandedHeight: 120, flexibleSpaceCaption: hasInstalledAny ? S.of(context).peopleWidgetDesc - : "Add a people widget to your homescreen and come back here to customize.", + : context.l10n.addPeopleWidgetPrompt, actionIcons: [ IconButtonWidget( icon: Icons.close_outlined, From 53a22a8d589e9a35a48060bfe53c5288eb439721 Mon Sep 17 00:00:00 2001 From: ashilkn Date: Mon, 26 May 2025 19:32:21 +0530 Subject: [PATCH 3/3] chore --- mobile/lib/ui/settings/widgets/people_widget_settings.dart | 2 -- 1 file changed, 2 deletions(-) diff --git a/mobile/lib/ui/settings/widgets/people_widget_settings.dart b/mobile/lib/ui/settings/widgets/people_widget_settings.dart index 2cf8762f59..062797c3ea 100644 --- a/mobile/lib/ui/settings/widgets/people_widget_settings.dart +++ b/mobile/lib/ui/settings/widgets/people_widget_settings.dart @@ -3,7 +3,6 @@ import "package:photos/generated/l10n.dart"; import "package:photos/l10n/l10n.dart"; import "package:photos/models/selected_people.dart"; import "package:photos/services/people_home_widget_service.dart"; -import 'package:photos/theme/ente_theme.dart'; import "package:photos/ui/components/buttons/button_widget.dart"; import 'package:photos/ui/components/buttons/icon_button_widget.dart'; import "package:photos/ui/components/models/button_type.dart"; @@ -60,7 +59,6 @@ class _PeopleWidgetSettingsState extends State { @override Widget build(BuildContext context) { - final textTheme = getEnteTextTheme(context); return Scaffold( bottomNavigationBar: hasInstalledAny ? Padding(