diff --git a/assets/2.0x/family_plan_leave.png b/assets/2.0x/family_plan_leave.png new file mode 100644 index 000000000..faf3df971 Binary files /dev/null and b/assets/2.0x/family_plan_leave.png differ diff --git a/assets/2.0x/gallery_locked.png b/assets/2.0x/gallery_locked.png new file mode 100644 index 000000000..2d0924ca7 Binary files /dev/null and b/assets/2.0x/gallery_locked.png differ diff --git a/assets/2.0x/loading_photos_background.png b/assets/2.0x/loading_photos_background.png new file mode 100644 index 000000000..862a957a6 Binary files /dev/null and b/assets/2.0x/loading_photos_background.png differ diff --git a/assets/2.0x/loading_photos_background_dark.png b/assets/2.0x/loading_photos_background_dark.png new file mode 100644 index 000000000..2628fcbc7 Binary files /dev/null and b/assets/2.0x/loading_photos_background_dark.png differ diff --git a/assets/2.0x/onboarding_lock.png b/assets/2.0x/onboarding_lock.png new file mode 100644 index 000000000..241517bbb Binary files /dev/null and b/assets/2.0x/onboarding_lock.png differ diff --git a/assets/2.0x/onboarding_safe.png b/assets/2.0x/onboarding_safe.png new file mode 100644 index 000000000..06f85e0ba Binary files /dev/null and b/assets/2.0x/onboarding_safe.png differ diff --git a/assets/2.0x/onboarding_sync.png b/assets/2.0x/onboarding_sync.png new file mode 100644 index 000000000..fd733e44d Binary files /dev/null and b/assets/2.0x/onboarding_sync.png differ diff --git a/assets/2.0x/storage_card_background.png b/assets/2.0x/storage_card_background.png new file mode 100644 index 000000000..26be3d8fc Binary files /dev/null and b/assets/2.0x/storage_card_background.png differ diff --git a/assets/3.0x/family_plan_leave.png b/assets/3.0x/family_plan_leave.png new file mode 100644 index 000000000..0949dbf0e Binary files /dev/null and b/assets/3.0x/family_plan_leave.png differ diff --git a/assets/3.0x/gallery_locked.png b/assets/3.0x/gallery_locked.png new file mode 100644 index 000000000..e8d0645c3 Binary files /dev/null and b/assets/3.0x/gallery_locked.png differ diff --git a/assets/3.0x/loading_photos_background.png b/assets/3.0x/loading_photos_background.png new file mode 100644 index 000000000..35b8abfbb Binary files /dev/null and b/assets/3.0x/loading_photos_background.png differ diff --git a/assets/3.0x/loading_photos_background_dark.png b/assets/3.0x/loading_photos_background_dark.png new file mode 100644 index 000000000..ff947b48e Binary files /dev/null and b/assets/3.0x/loading_photos_background_dark.png differ diff --git a/assets/3.0x/onboarding_lock.png b/assets/3.0x/onboarding_lock.png new file mode 100644 index 000000000..a15af44b0 Binary files /dev/null and b/assets/3.0x/onboarding_lock.png differ diff --git a/assets/3.0x/onboarding_safe.png b/assets/3.0x/onboarding_safe.png new file mode 100644 index 000000000..350675112 Binary files /dev/null and b/assets/3.0x/onboarding_safe.png differ diff --git a/assets/3.0x/onboarding_sync.png b/assets/3.0x/onboarding_sync.png new file mode 100644 index 000000000..b7177ec4a Binary files /dev/null and b/assets/3.0x/onboarding_sync.png differ diff --git a/assets/3.0x/storage_card_background.png b/assets/3.0x/storage_card_background.png new file mode 100644 index 000000000..8dfb56cd9 Binary files /dev/null and b/assets/3.0x/storage_card_background.png differ diff --git a/assets/card_background.png b/assets/card_background.png deleted file mode 100644 index e243c9c73..000000000 Binary files a/assets/card_background.png and /dev/null differ diff --git a/assets/family sharing.png b/assets/family sharing.png deleted file mode 100644 index e67a5392e..000000000 Binary files a/assets/family sharing.png and /dev/null differ diff --git a/assets/family_plan_leave.png b/assets/family_plan_leave.png new file mode 100644 index 000000000..050c61862 Binary files /dev/null and b/assets/family_plan_leave.png differ diff --git a/assets/gallery.png b/assets/gallery.png deleted file mode 100644 index 3018b36ec..000000000 Binary files a/assets/gallery.png and /dev/null differ diff --git a/assets/gallery_locked.png b/assets/gallery_locked.png new file mode 100644 index 000000000..8c5918bbe Binary files /dev/null and b/assets/gallery_locked.png differ diff --git a/assets/loading_photos_background.png b/assets/loading_photos_background.png new file mode 100644 index 000000000..1a6143bc0 Binary files /dev/null and b/assets/loading_photos_background.png differ diff --git a/assets/loading_photos_background_dark.png b/assets/loading_photos_background_dark.png new file mode 100644 index 000000000..dba07741c Binary files /dev/null and b/assets/loading_photos_background_dark.png differ diff --git a/assets/loading_photos_dark.png b/assets/loading_photos_dark.png deleted file mode 100644 index 460e76cf8..000000000 Binary files a/assets/loading_photos_dark.png and /dev/null differ diff --git a/assets/loading_photos_light.png b/assets/loading_photos_light.png deleted file mode 100644 index ed6e255ec..000000000 Binary files a/assets/loading_photos_light.png and /dev/null differ diff --git a/assets/onboarding_lock.png b/assets/onboarding_lock.png new file mode 100644 index 000000000..c5f2db2be Binary files /dev/null and b/assets/onboarding_lock.png differ diff --git a/assets/onboarding_safe.png b/assets/onboarding_safe.png new file mode 100644 index 000000000..d8174de79 Binary files /dev/null and b/assets/onboarding_safe.png differ diff --git a/assets/onboarding_sync.png b/assets/onboarding_sync.png new file mode 100644 index 000000000..04764a0d3 Binary files /dev/null and b/assets/onboarding_sync.png differ diff --git a/assets/preserved.png b/assets/preserved.png deleted file mode 100644 index 1888ad6f1..000000000 Binary files a/assets/preserved.png and /dev/null differ diff --git a/assets/protected.png b/assets/protected.png deleted file mode 100644 index 551004a88..000000000 Binary files a/assets/protected.png and /dev/null differ diff --git a/assets/storage_card_background.png b/assets/storage_card_background.png new file mode 100644 index 000000000..724b8beb1 Binary files /dev/null and b/assets/storage_card_background.png differ diff --git a/assets/synced.png b/assets/synced.png deleted file mode 100644 index cc5070968..000000000 Binary files a/assets/synced.png and /dev/null differ diff --git a/lib/ui/free_space_page.dart b/lib/ui/free_space_page.dart index ca5e321a6..55f8a241d 100644 --- a/lib/ui/free_space_page.dart +++ b/lib/ui/free_space_page.dart @@ -60,11 +60,11 @@ class _FreeSpacePageState extends State { children: [ isLightMode ? Image.asset( - 'assets/loading_photos_light.png', + 'assets/loading_photos_background.png', color: Colors.white.withOpacity(0.4), colorBlendMode: BlendMode.modulate, ) - : Image.asset('assets/loading_photos_dark.png'), + : Image.asset('assets/loading_photos_background_dark.png'), Image.asset( "assets/backed_up_gallery.png", height: 160, diff --git a/lib/ui/grant_permissions_widget.dart b/lib/ui/grant_permissions_widget.dart index 5a288240c..215b29c87 100644 --- a/lib/ui/grant_permissions_widget.dart +++ b/lib/ui/grant_permissions_widget.dart @@ -26,14 +26,15 @@ class GrantPermissionsWidget extends StatelessWidget { children: [ isLightMode ? Image.asset( - 'assets/loading_photos_light.png', + 'assets/loading_photos_background.png', color: Colors.white.withOpacity(0.4), colorBlendMode: BlendMode.modulate, ) - : Image.asset('assets/loading_photos_dark.png'), + : Image.asset( + 'assets/loading_photos_background_dark.png'), Center( child: Image.asset( - "assets/gallery.png", + "assets/gallery_locked.png", height: 160, ), ), diff --git a/lib/ui/home_widget.dart b/lib/ui/home_widget.dart index cb84426f2..9bbd48d45 100644 --- a/lib/ui/home_widget.dart +++ b/lib/ui/home_widget.dart @@ -21,7 +21,6 @@ import 'package:photos/events/subscription_purchased_event.dart'; import 'package:photos/events/sync_status_update_event.dart'; import 'package:photos/events/tab_changed_event.dart'; import 'package:photos/events/trigger_logout_event.dart'; -import 'package:photos/events/user_details_changed_event.dart'; import 'package:photos/events/user_logged_out_event.dart'; import 'package:photos/models/file_load_result.dart'; import 'package:photos/models/galleryType.dart'; @@ -447,7 +446,7 @@ class _HomeWidgetState extends State { Padding( padding: const EdgeInsets.only(top: 64), child: Image.asset( - "assets/preserved.png", + "assets/onboarding_safe.png", height: 206, ), ), diff --git a/lib/ui/landing_page_widget.dart b/lib/ui/landing_page_widget.dart index 0e3abd989..75f11d893 100644 --- a/lib/ui/landing_page_widget.dart +++ b/lib/ui/landing_page_widget.dart @@ -120,19 +120,19 @@ class _LandingPageWidgetState extends State { child: PageView( children: [ FeatureItemWidget( - "assets/protected.png", + "assets/onboarding_lock.png", "Private backups", "for your memories", "End-to-end encrypted by default", ), FeatureItemWidget( - "assets/preserved.png", + "assets/onboarding_safe.png", "Safely stored", "at a fallout shelter", "Designed to outlive", ), FeatureItemWidget( - "assets/synced.png", + "assets/onboarding_lock.png", "Available", "everywhere", Platform.isAndroid diff --git a/lib/ui/loading_photos_widget.dart b/lib/ui/loading_photos_widget.dart index 4a8101c52..18513b969 100644 --- a/lib/ui/loading_photos_widget.dart +++ b/lib/ui/loading_photos_widget.dart @@ -95,12 +95,12 @@ class _LoadingPhotosWidgetState extends State { children: [ isLightMode ? Image.asset( - 'assets/loading_photos_light.png', + 'assets/loading_photos_background.png', color: Colors.white.withOpacity(0.5), colorBlendMode: BlendMode.modulate, ) : Image.asset( - 'assets/loading_photos_light.png', + 'assets/loading_photos_background_dark.png', color: Colors.white.withOpacity(0.25), colorBlendMode: BlendMode.modulate, ), diff --git a/lib/ui/lock_screen.dart b/lib/ui/lock_screen.dart index e19a43cd3..fa5623acb 100644 --- a/lib/ui/lock_screen.dart +++ b/lib/ui/lock_screen.dart @@ -34,8 +34,8 @@ class _LockScreenState extends State { children: [ Image.asset( MediaQuery.of(context).platformBrightness == Brightness.light - ? 'assets/loading_photos_light.png' - : 'assets/loading_photos_dark.png', + ? 'assets/loading_photos_background.png' + : 'assets/loading_photos_background_dark.png', ), SizedBox( width: 172, diff --git a/lib/ui/payment/child_subscription_widget.dart b/lib/ui/payment/child_subscription_widget.dart index 0c092badb..0a48b0d09 100644 --- a/lib/ui/payment/child_subscription_widget.dart +++ b/lib/ui/payment/child_subscription_widget.dart @@ -56,7 +56,7 @@ class ChildSubscriptionWidget extends StatelessWidget { padding: const EdgeInsets.symmetric(vertical: 8), ), Image.asset( - "assets/family sharing.png", + "assets/family_plan_leave.png", height: 256, ), Padding( diff --git a/lib/ui/settings/details_section_widget.dart b/lib/ui/settings/details_section_widget.dart index 6aa84be21..c5be8a7c1 100644 --- a/lib/ui/settings/details_section_widget.dart +++ b/lib/ui/settings/details_section_widget.dart @@ -39,7 +39,7 @@ class _DetailsSectionWidgetState extends State { } }); _background = Image( - image: AssetImage("assets/card_background.png"), + image: AssetImage("assets/storage_card_background.png"), fit: BoxFit.fill, ); }