From c0b27aada0fdc8ab48ecd6e64085447b14187dda Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Wed, 17 Aug 2022 14:52:04 +0530
Subject: [PATCH 1/2] added sort_child_properties_last lint rule

---
 analysis_options.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/analysis_options.yaml b/analysis_options.yaml
index 816b55a96..fb913d542 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -6,6 +6,7 @@ include: package:flutter_lints/flutter.yaml
 linter:
   rules:
     # Ref https://github.com/flutter/packages/blob/master/packages/flutter_lints/lib/flutter.yaml
+    # Ref https://dart-lang.github.io/linter/lints/
     - avoid_print
     - avoid_unnecessary_containers
     - avoid_web_libraries_in_flutter
@@ -29,6 +30,7 @@ linter:
     - prefer_double_quotes
     - directives_ordering
     - always_use_package_imports
+    - sort_child_properties_last
 
 analyzer:
   errors:

From 2b547df4f0e58a11504621124a46fe5bb18f25f6 Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Wed, 17 Aug 2022 17:48:53 +0530
Subject: [PATCH 2/2] fixed other lint errors

---
 lib/ui/viewer/file/fading_app_bar.dart | 40 ++------------------------
 1 file changed, 3 insertions(+), 37 deletions(-)

diff --git a/lib/ui/viewer/file/fading_app_bar.dart b/lib/ui/viewer/file/fading_app_bar.dart
index a762b21fa..8989b542c 100644
--- a/lib/ui/viewer/file/fading_app_bar.dart
+++ b/lib/ui/viewer/file/fading_app_bar.dart
@@ -3,14 +3,12 @@ import 'dart:io' as io;
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
 import 'package:like_button/like_button.dart';
 import 'package:logging/logging.dart';
-import 'package:path/path.dart' as filePath;
+import 'package:path/path.dart' as file_path;
 import 'package:photo_manager/photo_manager.dart';
 import 'package:photos/core/event_bus.dart';
 import 'package:photos/db/files_db.dart';
-import 'package:photos/ente_theme_data.dart';
 import 'package:photos/events/local_photos_updated_event.dart';
 import 'package:photos/models/file.dart';
 import 'package:photos/models/file_type.dart';
@@ -24,7 +22,6 @@ import 'package:photos/ui/viewer/file/custom_app_bar.dart';
 import 'package:photos/utils/delete_file_util.dart';
 import 'package:photos/utils/dialog_util.dart';
 import 'package:photos/utils/file_util.dart';
-import 'package:photos/utils/magic_util.dart';
 import 'package:photos/utils/toast_util.dart';
 
 class FadingAppBar extends StatefulWidget implements PreferredSizeWidget {
@@ -233,37 +230,6 @@ class FadingAppBarState extends State<FadingAppBar> {
     );
   }
 
-  void _showDateTimePicker(File file) async {
-    final dateResult = await DatePicker.showDatePicker(
-      context,
-      minTime: DateTime(1800, 1, 1),
-      maxTime: DateTime.now(),
-      currentTime: DateTime.fromMicrosecondsSinceEpoch(file.creationTime),
-      locale: LocaleType.en,
-      theme: Theme.of(context).colorScheme.dateTimePickertheme,
-    );
-    if (dateResult == null) {
-      return;
-    }
-    final dateWithTimeResult = await DatePicker.showTime12hPicker(
-      context,
-      showTitleActions: true,
-      currentTime: dateResult,
-      locale: LocaleType.en,
-      theme: Theme.of(context).colorScheme.dateTimePickertheme,
-    );
-    if (dateWithTimeResult != null) {
-      if (await editTime(
-        context,
-        List.of([widget.file]),
-        dateWithTimeResult.microsecondsSinceEpoch,
-      )) {
-        widget.file.creationTime = dateWithTimeResult.microsecondsSinceEpoch;
-        setState(() {});
-      }
-    }
-  }
-
   void _showDeleteSheet(File file) {
     final List<Widget> actions = [];
     if (file.uploadedFileID == null || file.localID == null) {
@@ -351,8 +317,8 @@ class FadingAppBarState extends State<FadingAppBar> {
       if (liveVideo == null) {
         _logger.warning("Failed to find live video" + file.tag());
       } else {
-        final videoTitle = filePath.basenameWithoutExtension(file.title) +
-            filePath.extension(liveVideo.path);
+        final videoTitle = file_path.basenameWithoutExtension(file.title) +
+            file_path.extension(liveVideo.path);
         final savedAsset = (await PhotoManager.editor.saveVideo(
           liveVideo,
           title: videoTitle,