Browse Source

layout and style changes to 'day/date' in gallery

ashilkn 2 years ago
parent
commit
8cb151b6c5

+ 0 - 7
.vscode/settings.json

@@ -1,7 +0,0 @@
-{
-    "workbench.colorCustomizations": {
-        "activityBar.background": "#123046",
-        "titleBar.activeBackground": "#194363",
-        "titleBar.activeForeground": "#F9FBFD"
-    }
-}

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

@@ -33,7 +33,6 @@ class LazyLoadingGallery extends StatefulWidget {
   final String tag;
   final String logTag;
   final Stream<int> currentIndexStream;
-  final bool smallerTodayFont;
 
   LazyLoadingGallery(
     this.files,
@@ -44,7 +43,6 @@ class LazyLoadingGallery extends StatefulWidget {
     this.selectedFiles,
     this.tag,
     this.currentIndexStream, {
-    this.smallerTodayFont,
     this.logTag = "",
     Key key,
   }) : super(key: key ?? UniqueKey());
@@ -190,7 +188,6 @@ class _LazyLoadingGalleryState extends State<LazyLoadingGallery> {
               child: getDayWidget(
                 context,
                 _files[0].creationTime,
-                widget.smallerTodayFont,
               ),
             ),
             ValueListenableBuilder(

+ 0 - 1
lib/ui/viewer/gallery/collection_page.dart

@@ -66,7 +66,6 @@ class CollectionPage extends StatelessWidget {
       tagPrefix: tagPrefix,
       selectedFiles: _selectedFiles,
       initialFiles: initialFiles,
-      smallerTodayFont: true,
       albumName: c.collection.name,
     );
     return Scaffold(

+ 0 - 3
lib/ui/viewer/gallery/gallery.dart

@@ -39,7 +39,6 @@ class Gallery extends StatefulWidget {
   final Widget header;
   final Widget footer;
   final Widget emptyState;
-  final bool smallerTodayFont;
   final String albumName;
   final double scrollBottomSafeArea;
 
@@ -55,7 +54,6 @@ class Gallery extends StatefulWidget {
     this.footer = const SizedBox(height: 120),
     this.emptyState = const EmptyState(),
     this.scrollBottomSafeArea = 120.0,
-    this.smallerTodayFont = false,
     this.albumName = '',
     Key key,
   }) : super(key: key);
@@ -247,7 +245,6 @@ class _GalleryState extends State<Gallery> {
               .on<GalleryIndexUpdatedEvent>()
               .where((event) => event.tag == widget.tagPrefix)
               .map((event) => event.index),
-          smallerTodayFont: widget.smallerTodayFont,
           logTag: _logTag,
         );
         if (widget.header != null && index == 0) {

+ 6 - 8
lib/utils/date_time_util.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
+import 'package:photos/theme/ente_theme.dart';
 
 const Set<int> monthWith31Days = {1, 3, 5, 7, 8, 10, 12};
 const Set<int> monthWith30Days = {4, 6, 9, 11};
@@ -194,19 +195,16 @@ bool isLeapYear(DateTime dateTime) {
 Widget getDayWidget(
   BuildContext context,
   int timestamp,
-  bool smallerTodayFont,
 ) {
+  final colorScheme = getEnteColorScheme(context);
+  final textTheme = getEnteTextTheme(context);
   return Container(
     alignment: Alignment.centerLeft,
     child: Text(
       getDayTitle(timestamp),
-      style: (getDayTitle(timestamp) == "Today" && !smallerTodayFont)
-          ? Theme.of(context).textTheme.headline5
-          : Theme.of(context).textTheme.caption?.copyWith(
-                fontSize: 16,
-                fontWeight: FontWeight.w600,
-                fontFamily: 'Inter-SemiBold',
-              ),
+      style: (getDayTitle(timestamp) == "Today")
+          ? textTheme.body
+          : textTheme.body.copyWith(color: colorScheme.textMuted),
     ),
   );
 }