diff --git a/lib/ui/home/memories/memories_widget.dart b/lib/ui/home/memories/memories_widget.dart index 21ad145bc..068913318 100644 --- a/lib/ui/home/memories/memories_widget.dart +++ b/lib/ui/home/memories/memories_widget.dart @@ -6,7 +6,7 @@ import "package:photos/events/memories_setting_changed.dart"; import 'package:photos/models/memory.dart'; import 'package:photos/services/memories_service.dart'; import "package:photos/theme/ente_theme.dart"; -import "package:photos/ui/home/memories/memory_cover_widget_new.dart"; +import 'package:photos/ui/home/memories/memory_cover_widget.dart'; class MemoriesWidget extends StatefulWidget { const MemoriesWidget({Key? key}) : super(key: key); @@ -91,7 +91,7 @@ class _MemoriesWidgetState extends State { final collatedMemories = _collateMemories(memories); return SizedBox( - height: MemoryCoverWidgetNew.height, + height: MemoryCoverWidget.height, child: ListView.builder( physics: const BouncingScrollPhysics(), scrollDirection: Axis.horizontal, @@ -99,7 +99,7 @@ class _MemoriesWidgetState extends State { itemCount: collatedMemories.length, itemBuilder: (context, itemIndex) { final offsetOfItem = _widthOfItem * itemIndex; - return MemoryCoverWidgetNew( + return MemoryCoverWidget( memories: collatedMemories[itemIndex], controller: _controller, offsetOfItem: offsetOfItem, diff --git a/lib/ui/home/memories/memory_cover_widget_new.dart b/lib/ui/home/memories/memory_cover_widget.dart similarity index 94% rename from lib/ui/home/memories/memory_cover_widget_new.dart rename to lib/ui/home/memories/memory_cover_widget.dart index 304d77f5a..76e9a929a 100644 --- a/lib/ui/home/memories/memory_cover_widget_new.dart +++ b/lib/ui/home/memories/memory_cover_widget.dart @@ -6,7 +6,7 @@ import "package:photos/ui/home/memories/full_screen_memory.dart"; import "package:photos/ui/viewer/file/thumbnail_widget.dart"; import "package:photos/utils/navigation_util.dart"; -class MemoryCoverWidgetNew extends StatefulWidget { +class MemoryCoverWidget extends StatefulWidget { final List memories; final ScrollController controller; final double offsetOfItem; @@ -14,7 +14,7 @@ class MemoryCoverWidgetNew extends StatefulWidget { static const width = 85.0; static const height = 125.0; - const MemoryCoverWidgetNew({ + const MemoryCoverWidget({ required this.memories, required this.controller, required this.offsetOfItem, @@ -22,10 +22,10 @@ class MemoryCoverWidgetNew extends StatefulWidget { }); @override - State createState() => _MemoryCoverWidgetNewState(); + State createState() => _MemoryCoverWidgetState(); } -class _MemoryCoverWidgetNewState extends State { +class _MemoryCoverWidgetState extends State { @override Widget build(BuildContext context) { //memories will be empty if all memories are deleted and setState is called @@ -68,8 +68,8 @@ class _MemoryCoverWidgetNewState extends State { child: Row( children: [ Container( - height: MemoryCoverWidgetNew.height * scale, - width: MemoryCoverWidgetNew.width * scale, + height: MemoryCoverWidget.height * scale, + width: MemoryCoverWidget.width * scale, decoration: BoxDecoration( boxShadow: [ BoxShadow( @@ -78,8 +78,7 @@ class _MemoryCoverWidgetNewState extends State { ? const Color.fromRGBO(104, 104, 104, 0.32) : Colors.transparent : const Color.fromRGBO(1, 222, 77, 0.11), - spreadRadius: - MemoryCoverWidgetNew.centerStrokeWidth / 2, + spreadRadius: MemoryCoverWidget.centerStrokeWidth / 2, blurRadius: 0, ), const BoxShadow( @@ -110,7 +109,7 @@ class _MemoryCoverWidgetNewState extends State { ) : Colors.transparent : const Color.fromRGBO(1, 222, 77, 0.11), - width: MemoryCoverWidgetNew.centerStrokeWidth / 2, + width: MemoryCoverWidget.centerStrokeWidth / 2, ), borderRadius: BorderRadius.circular(5), ), @@ -179,7 +178,7 @@ class _MemoryCoverWidgetNewState extends State { child: Transform.scale( scale: scale, child: SizedBox( - width: MemoryCoverWidgetNew.width, + width: MemoryCoverWidget.width, child: Padding( padding: const EdgeInsets.symmetric( horizontal: 8.0,