Merge branch 'redesign' of github.com:ente-io/frame into redesign

lib/ui/collection_page.dart

@@ -41,15 +41,28 @@ class CollectionPage extends StatelessWidget {
       selectedFiles: _selectedFiles,
       initialFiles: initialFiles,
       smallerTodayFont: true,
+      albumName: c.collection.name,
     );
     return Scaffold(
       appBar: PreferredSize(
-        preferredSize: Size.fromHeight(50.0),
-        child: GalleryAppBarWidget(
-          appBarType,
-          c.collection.name,
-          _selectedFiles,
-          collection: c.collection,
+        preferredSize: Size.fromHeight(108),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            GalleryAppBarWidget(
+              appBarType,
+              c.collection.name,
+              _selectedFiles,
+              collection: c.collection,
+            ),
+            Padding(
+              padding: const EdgeInsets.fromLTRB(12, 12, 0, 0),
+              child: Text(
+                c.collection.name,
+                style: Theme.of(context).textTheme.headline5,
+              ),
+            ),
+          ],
         ),
       ),
       body: gallery,

lib/ui/collections_gallery_widget.dart

@@ -129,7 +129,8 @@ class _CollectionsGalleryWidgetState extends State<CollectionsGalleryWidget>
   Widget _getCollectionsGalleryWidget(CollectionItems items) {
     const double horizontalPaddingOfGridRow = 16;
     const double crossAxisSpacingOfGrid = 5;
-    TextStyle trashAndHiddenTextStyle = Theme.of(context).textTheme.subtitle1;
+    final TextStyle trashAndHiddenTextStyle =
+        Theme.of(context).textTheme.subtitle1;
     Size size = MediaQuery.of(context).size;
     int albumsCountInOneRow = max(size.width ~/ 220.0, 2);
     final double sideOfThumbnail = (size.width / 2) -
@@ -175,8 +176,8 @@ class _CollectionsGalleryWidgetState extends State<CollectionsGalleryWidget>
                       ),
                     ),
                   ),
-            Padding(padding: EdgeInsets.all(4)),
-            Divider(),
+            const Padding(padding: EdgeInsets.all(4)),
+            const Divider(),
             Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               crossAxisAlignment: CrossAxisAlignment.end,
@@ -210,9 +211,9 @@ class _CollectionsGalleryWidgetState extends State<CollectionsGalleryWidget>
                   )
                 : nothingToSeeHere(
                     textColor: Theme.of(context).colorScheme.defaultTextColor),
-            SizedBox(height: 20),
-            Divider(),
-            Padding(padding: EdgeInsets.all(8)),
+            const SizedBox(height: 20),
+            const Divider(),
+            const Padding(padding: EdgeInsets.all(8)),
             Padding(
               padding: const EdgeInsets.symmetric(horizontal: 16),
               child: Column(

lib/ui/gallery.dart

@@ -25,13 +25,14 @@ class Gallery extends StatefulWidget {
   final GalleryLoader asyncLoader;
   final List<File> initialFiles;
   final Stream<FilesUpdatedEvent> reloadEvent;
-  final bool smallerTodayFont;
   final List<Stream<Event>> forceReloadEvents;
   final Set<EventType> removalEventTypes;
   final SelectedFiles selectedFiles;
   final String tagPrefix;
   final Widget header;
   final Widget footer;
+  final bool smallerTodayFont;
+  final String albumName;
 
   Gallery({
     @required this.asyncLoader,
@@ -44,6 +45,7 @@ class Gallery extends StatefulWidget {
     this.header,
     this.footer,
     this.smallerTodayFont = false,
+    this.albumName = '',
     Key key,
   }) : super(key: key);
 

lib/ui/memories_widget.dart

@@ -284,15 +284,6 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
         ),
         backgroundColor: Color(0x00000000),
         elevation: 0,
-        actions: [
-          IconButton(
-            key: shareButtonKey,
-            icon: Icon(Icons.share),
-            onPressed: () {
-              share(context, [file], shareButtonKey: shareButtonKey);
-            },
-          ),
-        ],
       ),
       extendBodyBehindAppBar: true,
       body: Container(

lib/utils/date_time_util.dart

@@ -166,7 +166,7 @@ bool isLeapYear(DateTime dateTime) {
 Widget getDayWidget(
     BuildContext context, int timestamp, bool smallerTodayFont) {
   return Container(
-    padding: const EdgeInsets.fromLTRB(10, 14, 0, 12),
+    padding: const EdgeInsets.fromLTRB(12, 14, 0, 12),
     alignment: Alignment.centerLeft,
     child: Text(
       getDayTitle(timestamp),