From 335cf908fbb71ffbf209493f13e41e57f4f7279c Mon Sep 17 00:00:00 2001
From: vishnukvmd <vishnu@ente.io>
Date: Wed, 6 Oct 2021 16:18:38 +0530
Subject: [PATCH 1/4] Fix lint warnings

---
 lib/ui/video_widget.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ui/video_widget.dart b/lib/ui/video_widget.dart
index 28aa470de..07e77615a 100644
--- a/lib/ui/video_widget.dart
+++ b/lib/ui/video_widget.dart
@@ -32,7 +32,7 @@ class VideoWidget extends StatefulWidget {
 }
 
 class _VideoWidgetState extends State<VideoWidget> {
-  Logger _logger = Logger("VideoWidget");
+  final _logger = Logger("VideoWidget");
   VideoPlayerController _videoPlayerController;
   ChewieController _chewieController;
   double _progress;
@@ -98,7 +98,7 @@ class _VideoWidgetState extends State<VideoWidget> {
   }
 
   VideoPlayerController _setVideoPlayerController({String url, io.File file}) {
-    var videoPlayerController;
+    VideoPlayerController videoPlayerController;
     if (url != null) {
       videoPlayerController = VideoPlayerController.network(url);
     } else {

From b46288ccc8bfa33caf1e9f7ffbca72fcab569b03 Mon Sep 17 00:00:00 2001
From: vishnukvmd <vishnu@ente.io>
Date: Wed, 6 Oct 2021 16:18:54 +0530
Subject: [PATCH 2/4] Push toggle full screen action to the end of the build
 queue

---
 lib/ui/detail_page.dart | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/ui/detail_page.dart b/lib/ui/detail_page.dart
index 82d494908..dcf7a651d 100644
--- a/lib/ui/detail_page.dart
+++ b/lib/ui/detail_page.dart
@@ -145,7 +145,9 @@ class _DetailPageState extends State<DetailPage> {
           },
           playbackCallback: (isPlaying) {
             _shouldHideAppBar = isPlaying;
-            _toggleFullScreen();
+            Future.delayed(Duration.zero, () {
+              _toggleFullScreen();
+            });
           },
         );
         _preloadFiles(index);

From 018f270271a8d4cff609ecd85cfb0b0105a59f5b Mon Sep 17 00:00:00 2001
From: vishnukvmd <vishnu@ente.io>
Date: Wed, 6 Oct 2021 16:47:26 +0530
Subject: [PATCH 3/4] Fix lint warning

---
 lib/ui/gallery_footer_widget.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ui/gallery_footer_widget.dart b/lib/ui/gallery_footer_widget.dart
index a2a6f914f..d071ed339 100644
--- a/lib/ui/gallery_footer_widget.dart
+++ b/lib/ui/gallery_footer_widget.dart
@@ -34,7 +34,7 @@ class GalleryFooterWidget extends StatelessWidget {
               mainAxisAlignment: MainAxisAlignment.center,
               crossAxisAlignment: CrossAxisAlignment.center,
               mainAxisSize: MainAxisSize.min,
-              children: [
+              children: const [
                 Icon(
                   Icons.cloud_upload,
                   color: Colors.white,

From 37fb296683b93501d65b7e84cbd6ec6ba34b5122 Mon Sep 17 00:00:00 2001
From: vishnukvmd <vishnu@ente.io>
Date: Wed, 6 Oct 2021 16:47:31 +0530
Subject: [PATCH 4/4] Upgrade photo_manager

---
 pubspec.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index 947ef6fee..6845f0e81 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -737,10 +737,10 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: c72bdb286eb29e3228e84406f4fa2b7d5bc8d73b
+      resolved-ref: "474fe1df8504307f98a8390032693203f2f47997"
       url: "https://github.com/ente-io/flutter_photo_manager.git"
     source: git
-    version: "1.3.4"
+    version: "1.3.6"
   photo_view:
     dependency: "direct main"
     description: