Parcourir la source

Extract strings for days

Neeraj Gupta il y a 2 ans
Parent
commit
f48cf52de8

+ 2 - 0
lib/generated/intl/messages_en.dart

@@ -412,6 +412,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "custom": MessageLookupByLibrary.simpleMessage("Custom"),
         "custom": MessageLookupByLibrary.simpleMessage("Custom"),
         "customRadius": MessageLookupByLibrary.simpleMessage("Custom radius"),
         "customRadius": MessageLookupByLibrary.simpleMessage("Custom radius"),
         "darkTheme": MessageLookupByLibrary.simpleMessage("Dark"),
         "darkTheme": MessageLookupByLibrary.simpleMessage("Dark"),
+        "dayToday": MessageLookupByLibrary.simpleMessage("Today"),
+        "dayYesterday": MessageLookupByLibrary.simpleMessage("Yesterday"),
         "decrypting": MessageLookupByLibrary.simpleMessage("Decrypting..."),
         "decrypting": MessageLookupByLibrary.simpleMessage("Decrypting..."),
         "decryptingVideo":
         "decryptingVideo":
             MessageLookupByLibrary.simpleMessage("Decrypting video..."),
             MessageLookupByLibrary.simpleMessage("Decrypting video..."),

+ 20 - 0
lib/generated/l10n.dart

@@ -6812,6 +6812,26 @@ class S {
       args: [],
       args: [],
     );
     );
   }
   }
+
+  /// `Today`
+  String get dayToday {
+    return Intl.message(
+      'Today',
+      name: 'dayToday',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Yesterday`
+  String get dayYesterday {
+    return Intl.message(
+      'Yesterday',
+      name: 'dayYesterday',
+      desc: '',
+      args: [],
+    );
+  }
 }
 }
 
 
 class AppLocalizationDelegate extends LocalizationsDelegate<S> {
 class AppLocalizationDelegate extends LocalizationsDelegate<S> {

+ 3 - 1
lib/l10n/intl_en.arb

@@ -948,5 +948,7 @@
   "distanceInKMUnit": "km",
   "distanceInKMUnit": "km",
   "@distanceInKMUnit": {
   "@distanceInKMUnit": {
     "description": "Unit for distance in km"
     "description": "Unit for distance in km"
-  }
+  },
+  "dayToday": "Today",
+  "dayYesterday": "Yesterday"
 }
 }

+ 3 - 2
lib/ui/huge_listview/lazy_loading_gallery.dart

@@ -22,7 +22,6 @@ import 'package:photos/ui/viewer/file/detail_page.dart';
 import 'package:photos/ui/viewer/file/thumbnail_widget.dart';
 import 'package:photos/ui/viewer/file/thumbnail_widget.dart';
 import "package:photos/ui/viewer/gallery/component/day_widget.dart";
 import "package:photos/ui/viewer/gallery/component/day_widget.dart";
 import 'package:photos/ui/viewer/gallery/gallery.dart';
 import 'package:photos/ui/viewer/gallery/gallery.dart';
-import 'package:photos/utils/date_time_util.dart';
 import 'package:photos/utils/file_util.dart';
 import 'package:photos/utils/file_util.dart';
 import 'package:photos/utils/navigation_util.dart';
 import 'package:photos/utils/navigation_util.dart';
 import 'package:visibility_detector/visibility_detector.dart';
 import 'package:visibility_detector/visibility_detector.dart';
@@ -114,7 +113,9 @@ class _LazyLoadingGalleryState extends State<LazyLoadingGallery> {
         _logger.info(
         _logger.info(
           filesUpdatedThisDay.length.toString() +
           filesUpdatedThisDay.length.toString() +
               " files were updated due to ${event.reason} on " +
               " files were updated due to ${event.reason} on " +
-              getDayTitle(galleryDate.microsecondsSinceEpoch),
+              DateTime.fromMicrosecondsSinceEpoch(
+                galleryDate.microsecondsSinceEpoch,
+              ).toIso8601String(),
         );
         );
       }
       }
       if (event.type == EventType.addedOrUpdated) {
       if (event.type == EventType.addedOrUpdated) {

+ 4 - 2
lib/ui/viewer/gallery/component/day_widget.dart

@@ -1,5 +1,6 @@
 import "package:flutter/cupertino.dart";
 import "package:flutter/cupertino.dart";
 import 'package:photos/core/constants.dart';
 import 'package:photos/core/constants.dart';
+import "package:photos/generated/l10n.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/theme/ente_theme.dart";
 import "package:photos/utils/date_time_util.dart";
 import "package:photos/utils/date_time_util.dart";
 
 
@@ -21,6 +22,7 @@ class DayWidget extends StatelessWidget {
         gridSize < photoGridSizeMax ? textTheme.body : textTheme.small;
         gridSize < photoGridSizeMax ? textTheme.body : textTheme.small;
     final double horizontalPadding = gridSize < photoGridSizeMax ? 12.0 : 8.0;
     final double horizontalPadding = gridSize < photoGridSizeMax ? 12.0 : 8.0;
     final double verticalPadding = gridSize < photoGridSizeMax ? 12.0 : 14.0;
     final double verticalPadding = gridSize < photoGridSizeMax ? 12.0 : 14.0;
+    final String dayTitle = getDayTitle(context, timestamp);
     return Padding(
     return Padding(
       padding: EdgeInsets.symmetric(
       padding: EdgeInsets.symmetric(
         horizontal: horizontalPadding,
         horizontal: horizontalPadding,
@@ -29,8 +31,8 @@ class DayWidget extends StatelessWidget {
       child: Container(
       child: Container(
         alignment: Alignment.centerLeft,
         alignment: Alignment.centerLeft,
         child: Text(
         child: Text(
-          getDayTitle(timestamp),
-          style: (getDayTitle(timestamp) == "Today")
+          dayTitle,
+          style: (dayTitle == S.of(context).dayToday)
               ? textStyle
               ? textStyle
               : textStyle.copyWith(color: colorScheme.textMuted),
               : textStyle.copyWith(color: colorScheme.textMuted),
         ),
         ),

+ 5 - 3
lib/utils/date_time_util.dart

@@ -1,5 +1,7 @@
+import "package:flutter/cupertino.dart";
 import 'package:flutter/foundation.dart';
 import 'package:flutter/foundation.dart';
 import 'package:intl/intl.dart';
 import 'package:intl/intl.dart';
+import "package:photos/generated/l10n.dart";
 
 
 const Set<int> monthWith31Days = {1, 3, 5, 7, 8, 10, 12};
 const Set<int> monthWith31Days = {1, 3, 5, 7, 8, 10, 12};
 const Set<int> monthWith30Days = {4, 6, 9, 11};
 const Set<int> monthWith30Days = {4, 6, 9, 11};
@@ -230,15 +232,15 @@ bool isLeapYear(DateTime dateTime) {
   }
   }
 }
 }
 
 
-String getDayTitle(int timestamp) {
+String getDayTitle(BuildContext context, int timestamp) {
   final date = DateTime.fromMicrosecondsSinceEpoch(timestamp);
   final date = DateTime.fromMicrosecondsSinceEpoch(timestamp);
   final now = DateTime.now();
   final now = DateTime.now();
   var title = getDayAndMonth(date);
   var title = getDayAndMonth(date);
   if (date.year == now.year && date.month == now.month) {
   if (date.year == now.year && date.month == now.month) {
     if (date.day == now.day) {
     if (date.day == now.day) {
-      title = "Today";
+      title = S.of(context).dayToday;
     } else if (date.day == now.day - 1) {
     } else if (date.day == now.day - 1) {
-      title = "Yesterday";
+      title = S.of(context).dayYesterday;
     }
     }
   }
   }
   if (date.year != DateTime.now().year) {
   if (date.year != DateTime.now().year) {