π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] rename memory strip widgets
Priyanshu Dangare06f3224b1d86
diff --git a/mobile/apps/photos/lib/ui/home/header_widget.dart b/mobile/apps/photos/lib/ui/home/header_widget.dartindex 56fcc8451c..01eea6cec0 100644--- a/mobile/apps/photos/lib/ui/home/header_widget.dart+++ b/mobile/apps/photos/lib/ui/home/header_widget.dart@@ -8,7 +8,7 @@ import "package:photos/events/app_mode_changed_event.dart";import 'package:photos/service_locator.dart';import "package:photos/services/wrapped/wrapped_service.dart";import "package:photos/ui/components/banners/get_started_banner.dart";-import "package:photos/ui/home/memories/memories_widget.dart";+import "package:photos/ui/home/memories/memories_strip.dart";import 'package:photos/ui/home/status_bar_widget.dart';import "package:photos/ui/wrapped/rewind_banner.dart";@@ -67,7 +67,7 @@ class _HeaderWidgetState extends State<HeaderWidget> {final List<Widget> children = <Widget>[const StatusBarWidget(),if (showGetStartedBanner) const GetStartedBanner(),- const MemoriesWidget(),+ const MemoriesStripWidget(),];if (showWrappedBanner) {children.add(RewindBanner(state: _wrappedState));diff --git a/mobile/apps/photos/lib/ui/home/memories/craft_memories.dart b/mobile/apps/photos/lib/ui/home/memories/crafting_memories_card.dartsimilarity index 96%rename from mobile/apps/photos/lib/ui/home/memories/craft_memories.dartrename to mobile/apps/photos/lib/ui/home/memories/crafting_memories_card.dartindex 34d2ccf206..83e55d4b44 100644--- a/mobile/apps/photos/lib/ui/home/memories/craft_memories.dart+++ b/mobile/apps/photos/lib/ui/home/memories/crafting_memories_card.dart@@ -5,14 +5,14 @@ import "package:hugeicons/hugeicons.dart";import "package:photos/service_locator.dart";import "package:photos/services/notification_service.dart";import "package:photos/ui/home/memories/horts.dart";-import "package:photos/ui/home/memories/memory_cover_widget.dart";+import "package:photos/ui/home/memories/memory_card.dart";-class CraftMemories extends StatelessWidget {+class CraftMemoriesCardWidget extends StatelessWidget {final double width;final double height;final VoidCallback? onNotificationsPermissionGranted;- const CraftMemories({+ const CraftMemoriesCardWidget({super.key,required this.width,required this.height,@@ -24,7 +24,7 @@ class CraftMemories extends StatelessWidget {final l10n = context.strings;return Padding(padding: const EdgeInsets.symmetric(- horizontal: MemoryCoverWidget.gap / 2.0,+ horizontal: MemoryCardWidget.gap / 2.0,),child: SizedBox(width: width,diff --git a/mobile/apps/photos/lib/ui/home/memories/memories_widget.dart b/mobile/apps/photos/lib/ui/home/memories/memories_strip.dartsimilarity index 89%rename from mobile/apps/photos/lib/ui/home/memories/memories_widget.dartrename to mobile/apps/photos/lib/ui/home/memories/memories_strip.dartindex f3b69279c7..d73f3788fd 100644--- a/mobile/apps/photos/lib/ui/home/memories/memories_widget.dart+++ b/mobile/apps/photos/lib/ui/home/memories/memories_strip.dart@@ -10,19 +10,19 @@ import "package:photos/events/memory_seen_event.dart";import "package:photos/models/memories/smart_memory.dart";import "package:photos/service_locator.dart";import "package:photos/services/notification_service.dart";-import "package:photos/ui/home/memories/craft_memories.dart";+import "package:photos/ui/home/memories/crafting_memories_card.dart";+import 'package:photos/ui/home/memories/memory_card.dart';import "package:photos/ui/home/memories/memory_cover_util.dart";-import 'package:photos/ui/home/memories/memory_cover_widget.dart';import "package:photos/ui/home/memories/memory_video_prefetcher.dart";-class MemoriesWidget extends StatefulWidget {- const MemoriesWidget({super.key});+class MemoriesStripWidget extends StatefulWidget {+ const MemoriesStripWidget({super.key});@override- State<MemoriesWidget> createState() => _MemoriesWidgetState();+ State<MemoriesStripWidget> createState() => _MemoriesStripWidgetState();}-class _MemoriesWidgetState extends State<MemoriesWidget> {+class _MemoriesStripWidgetState extends State<MemoriesStripWidget> {late StreamSubscription<MemoriesSettingChanged> _memoriesSettingSubscription;late StreamSubscription<MemoriesChangedEvent> _memoriesChangedSubscription;late StreamSubscription<MemorySeenEvent> _memorySeenSubscription;@@ -84,16 +84,16 @@ class _MemoriesWidgetState extends State<MemoriesWidget> {final screenHeight = MediaQuery.sizeOf(context).height;if (screenWidth < screenHeight) {_memoryWidth = min(- screenWidth * (MemoryCoverWidget.defaultWidth / 376.0),- MemoryCoverWidget.defaultWidth * 1.5,+ screenWidth * (MemoryCardWidget.defaultWidth / 376.0),+ MemoryCardWidget.defaultWidth * 1.5,);- _memoryheight = _memoryWidth * MemoryCoverWidget.aspectRatio;+ _memoryheight = _memoryWidth * MemoryCardWidget.aspectRatio;} else {_memoryWidth = min(screenHeight * .3,- MemoryCoverWidget.defaultWidth * 1.5,+ MemoryCardWidget.defaultWidth * 1.5,);- _memoryheight = _memoryWidth * MemoryCoverWidget.aspectRatio;+ _memoryheight = _memoryWidth * MemoryCardWidget.aspectRatio;}}@@ -222,10 +222,10 @@ class _MemoriesWidgetState extends State<MemoriesWidget> {builder: (context, snapshot) {final showCraftMemories = snapshot.data ?? false;return SizedBox(- height: _memoryheight + MemoryCoverWidget.outerStrokeWidth * 2,+ height: _memoryheight + MemoryCardWidget.outerStrokeWidth * 2,child: ListView.builder(padding: const EdgeInsets.symmetric(- horizontal: MemoryCoverWidget.gap / 2.0,+ horizontal: MemoryCardWidget.gap / 2.0,),physics: const AlwaysScrollableScrollPhysics(parent: BouncingScrollPhysics(),@@ -234,7 +234,7 @@ class _MemoriesWidgetState extends State<MemoriesWidget> {itemCount: (showCraftMemories ? 1 : 0) + memories.length,itemBuilder: (context, itemIndex) {if (showCraftMemories && itemIndex == 0) {- return CraftMemories(+ return CraftMemoriesCardWidget(width: _memoryheight * 0.5,height: _memoryheight,onNotificationsPermissionGranted: () {@@ -246,7 +246,7 @@ class _MemoriesWidgetState extends State<MemoriesWidget> {);}final memoryIndex = itemIndex - (showCraftMemories ? 1 : 0);- return MemoryCoverWidget(+ return MemoryCardWidget(smartMemory: memories[memoryIndex],allMemories: memories,height: _memoryheight,diff --git a/mobile/apps/photos/lib/ui/home/memories/memory_cover_widget.dart b/mobile/apps/photos/lib/ui/home/memories/memory_card.dartsimilarity index 94%rename from mobile/apps/photos/lib/ui/home/memories/memory_cover_widget.dartrename to mobile/apps/photos/lib/ui/home/memories/memory_card.dartindex d141338564..16fa95e381 100644--- a/mobile/apps/photos/lib/ui/home/memories/memory_cover_widget.dart+++ b/mobile/apps/photos/lib/ui/home/memories/memory_card.dart@@ -8,7 +8,7 @@ import "package:photos/ui/home/memories/all_memories_page.dart";import "package:photos/ui/home/memories/memory_cover_util.dart";import "package:photos/ui/viewer/file/thumbnail_widget.dart";-class MemoryCoverWidget extends StatefulWidget {+class MemoryCardWidget extends StatefulWidget {final SmartMemory smartMemory;final List<SmartMemory> allMemories;final double height;@@ -20,7 +20,7 @@ class MemoryCoverWidget extends StatefulWidget {static const gap = 5.0;final int currentMemoryIndex;- const MemoryCoverWidget({+ const MemoryCardWidget({required this.smartMemory,required this.allMemories,required this.height,@@ -30,10 +30,10 @@ class MemoryCoverWidget extends StatefulWidget {});@override- State<MemoryCoverWidget> createState() => _MemoryCoverWidgetState();+ State<MemoryCardWidget> createState() => _MemoryCardWidgetState();}-class _MemoryCoverWidgetState extends State<MemoryCoverWidget> {+class _MemoryCardWidgetState extends State<MemoryCardWidget> {@overrideWidget build(BuildContext context) {// The list can be empty after deleting every memory and returning here.@@ -50,7 +50,7 @@ class _MemoryCoverWidgetState extends State<MemoryCoverWidget> {return Padding(padding: const EdgeInsets.symmetric(- horizontal: MemoryCoverWidget.gap / 2.0,+ horizontal: MemoryCardWidget.gap / 2.0,),child: GestureDetector(onTap: () async {