fix #305

lib/src/localization/app_de.arb

@@ -459,5 +459,7 @@
     "linkPubkeyDoesNotMatch": "Der öffentliche Schlüssel im Link stimmt nicht mit dem für diesen Kontakt gespeicherten öffentlichen Schlüssel überein. Triff die Person persönlich und scanne den QR-Code direkt!",
     "startWithCameraOpen": "Mit geöffneter Kamera starten",
     "showImagePreviewWhenSending": "Bildvorschau bei der Auswahl von Empfängern anzeigen",
-    "verifiedPublicKey": "Der öffentliche Schlüssel von {username} wurde überprüft und ist gültig."
+    "verifiedPublicKey": "Der öffentliche Schlüssel von {username} wurde überprüft und ist gültig.",
+    "memoriesAYearAgo": "Vor einem Jahr",
+    "memoriesXYearsAgo": "Vor {years} Jahren"
 }

lib/src/localization/app_en.arb

@@ -489,5 +489,7 @@
   "linkPubkeyDoesNotMatch": "The public key in the link does not match the public key stored for this contact. Try to meet your friend in person and scan the QR code directly!",
   "startWithCameraOpen": "Start with camera open",
   "showImagePreviewWhenSending": "Display image preview when selecting recipients",
-  "verifiedPublicKey": "The public key of {username} has been verified and is valid."
+  "verifiedPublicKey": "The public key of {username} has been verified and is valid.",
+  "memoriesAYearAgo": "One year ago",
+  "memoriesXYearsAgo": "{years} years ago"
 }

lib/src/localization/generated/app_localizations.dart

@@ -2857,6 +2857,18 @@ abstract class AppLocalizations {
   /// In en, this message translates to:
   /// **'The public key of {username} has been verified and is valid.'**
   String verifiedPublicKey(Object username);
+
+  /// No description provided for @memoriesAYearAgo.
+  ///
+  /// In en, this message translates to:
+  /// **'One year ago'**
+  String get memoriesAYearAgo;
+
+  /// No description provided for @memoriesXYearsAgo.
+  ///
+  /// In en, this message translates to:
+  /// **'{years} years ago'**
+  String memoriesXYearsAgo(Object years);
 }
 
 class _AppLocalizationsDelegate

lib/src/localization/generated/app_localizations_de.dart

@@ -1582,4 +1582,12 @@ class AppLocalizationsDe extends AppLocalizations {
   String verifiedPublicKey(Object username) {
     return 'Der öffentliche Schlüssel von $username wurde überprüft und ist gültig.';
   }
+
+  @override
+  String get memoriesAYearAgo => 'Vor einem Jahr';
+
+  @override
+  String memoriesXYearsAgo(Object years) {
+    return 'Vor $years Jahren';
+  }
 }

lib/src/localization/generated/app_localizations_en.dart

@@ -1572,4 +1572,12 @@ class AppLocalizationsEn extends AppLocalizations {
   String verifiedPublicKey(Object username) {
     return 'The public key of $username has been verified and is valid.';
   }
+
+  @override
+  String get memoriesAYearAgo => 'One year ago';
+
+  @override
+  String memoriesXYearsAgo(Object years) {
+    return '$years years ago';
+  }
 }

lib/src/views/camera/share_image_view.dart

@@ -254,10 +254,10 @@ class _ShareImageView extends State<ShareImageView> {
                       border:
                           Border.all(color: context.color.primary, width: 3),
                       color: context.color.primary,
-                      borderRadius: BorderRadius.circular(10),
+                      borderRadius: BorderRadius.circular(12),
                     ),
                     child: ClipRRect(
-                      borderRadius: BorderRadius.circular(7),
+                      borderRadius: BorderRadius.circular(12),
                       child: Image.memory(_imageBytes!),
                     ),
                   ),

lib/src/views/memories/memories.view.dart

@@ -18,12 +18,13 @@ class MemoriesView extends StatefulWidget {
 }
 
 class MemoriesViewState extends State<MemoriesView> {
-  bool verticalGallery = false;
   List<MemoryItem> galleryItems = [];
   Map<String, List<int>> orderedByMonth = {};
   List<String> months = [];
   StreamSubscription<List<MediaFile>>? messageSub;
 
+  final Map<int, List<MemoryItem>> _galleryItemsLastYears = {};
+
   @override
   void initState() {
     super.initState();
@@ -46,6 +47,9 @@ class MemoriesViewState extends State<MemoriesView> {
       months = [];
       var lastMonth = '';
       galleryItems = [];
+
+      final now = DateTime.now();
+
       for (final mediaFile in mediaFiles) {
         final mediaService = MediaFileService(mediaFile);
         if (!mediaService.imagePreviewAvailable) continue;
@@ -54,12 +58,21 @@ class MemoriesViewState extends State<MemoriesView> {
             await mediaService.createThumbnail();
           }
         }
-        galleryItems.add(
+        final item = MemoryItem(
-          MemoryItem(
+          mediaService: mediaService,
-            mediaService: mediaService,
+          messages: [],
-            messages: [],
-          ),
         );
+        galleryItems.add(item);
+        if (mediaFile.createdAt.month == now.month &&
+            mediaFile.createdAt.day == now.day) {
+          final diff = now.year - mediaFile.createdAt.year;
+          if (diff > 0) {
+            if (!_galleryItemsLastYears.containsKey(diff)) {
+              _galleryItemsLastYears[diff] = [];
+            }
+            _galleryItemsLastYears[diff]!.add(item);
+          }
+        }
       }
       galleryItems.sort(
         (a, b) => b.mediaService.mediaFile.createdAt.compareTo(
@@ -94,8 +107,83 @@ class MemoriesViewState extends State<MemoriesView> {
                 ),
               )
             : ListView.builder(
-                itemCount: months.length * 2,
+                itemCount: (months.length * 2) +
+                    (_galleryItemsLastYears.isEmpty ? 0 : 1),
                 itemBuilder: (context, mIndex) {
+                  if (_galleryItemsLastYears.isNotEmpty && mIndex == 0) {
+                    return SizedBox(
+                      height: 140,
+                      width: MediaQuery.sizeOf(context).width,
+                      child: ListView(
+                        scrollDirection: Axis.horizontal,
+                        children: _galleryItemsLastYears.entries.map(
+                          (item) {
+                            var text = context.lang.memoriesAYearAgo;
+                            if (item.key > 1) {
+                              text = context.lang.memoriesXYearsAgo(item.key);
+                            }
+                            return GestureDetector(
+                              onTap: () async {
+                                await open(context, item.value, 0);
+                              },
+                              child: Container(
+                                decoration: BoxDecoration(
+                                  borderRadius: BorderRadius.circular(12),
+                                  boxShadow: const [
+                                    BoxShadow(
+                                      spreadRadius: -12,
+                                      blurRadius: 12,
+                                    ),
+                                  ],
+                                ),
+                                clipBehavior: Clip.hardEdge,
+                                height: 150,
+                                width: 120,
+                                child: Stack(
+                                  children: [
+                                    Positioned.fill(
+                                      child: ClipRRect(
+                                        borderRadius: BorderRadius.circular(12),
+                                        child: Image.file(
+                                          item.value.first.mediaService
+                                              .storedPath,
+                                          fit: BoxFit.cover,
+                                        ),
+                                      ),
+                                    ),
+                                    Positioned(
+                                      bottom: 10,
+                                      left: 0,
+                                      right: 0,
+                                      child: Text(
+                                        text,
+                                        textAlign: TextAlign.center,
+                                        style: const TextStyle(
+                                          color: Colors.white,
+                                          fontWeight: FontWeight.bold,
+                                          fontSize: 20,
+                                          shadows: [
+                                            Shadow(
+                                              color:
+                                                  Color.fromARGB(122, 0, 0, 0),
+                                              blurRadius: 5,
+                                            ),
+                                          ],
+                                        ),
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            );
+                          },
+                        ).toList(),
+                      ),
+                    );
+                  }
+                  if (_galleryItemsLastYears.isNotEmpty) {
+                    mIndex -= 1;
+                  }
                   if (mIndex.isEven) {
                     return Padding(
                       padding: const EdgeInsets.all(8),
@@ -117,7 +205,7 @@ class MemoriesViewState extends State<MemoriesView> {
                       return MemoriesItemThumbnail(
                         galleryItem: galleryItems[gaIndex],
                         onTap: () async {
-                          await open(context, gaIndex);
+                          await open(context, galleryItems, gaIndex);
                         },
                       );
                     },
@@ -128,7 +216,8 @@ class MemoriesViewState extends State<MemoriesView> {
     );
   }
 
-  Future<void> open(BuildContext context, int index) async {
+  Future<void> open(
+      BuildContext context, List<MemoryItem> galleryItems, int index) async {
     await Navigator.push(
       context,
       PageRouteBuilder(
@@ -136,13 +225,7 @@ class MemoriesViewState extends State<MemoriesView> {
         pageBuilder: (context, a1, a2) => MemoriesPhotoSliderView(
           galleryItems: galleryItems,
           initialIndex: index,
-          scrollDirection: verticalGallery ? Axis.vertical : Axis.horizontal,
         ),
-        // transitionsBuilder: (context, animation, secondaryAnimation, child) {
-        //   return child;
-        // },
-        // transitionDuration: Duration.zero,
-        // reverseTransitionDuration: Duration.zero,
       ),
     ) as bool?;
     if (mounted) setState(() {});