Revert "Fix lint issues causing CI to fail (flutter#825)"

This reverts commit 3e59455.
andreidiaconu · Feb 17, 2019 · 2da5cbc · 2da5cbc
1 parent 43c4b75
commit 2da5cbc
Show file tree

Hide file tree

Showing 43 changed files with 381 additions and 394 deletions.
diff --git a/packages/android_alarm_manager/example/lib/main.dart b/packages/android_alarm_manager/example/lib/main.dart
@@ -22,14 +22,14 @@ Future<Null> ensureFirebaseUser() async {
 }
 
 class HelloMessage {
-  HelloMessage(this._now, this._msg, this._isolate, this._user, this._token);
-
   final DateTime _now;
   final String _msg;
   final int _isolate;
   final FirebaseUser _user;
   final String _token;
 
+  HelloMessage(this._now, this._msg, this._isolate, this._user, this._token);
+
   @override
   String toString() {
     return "[$_now] $_msg "

diff --git a/packages/android_intent/example/lib/main.dart b/packages/android_intent/example/lib/main.dart
@@ -80,10 +80,10 @@ class MyHomePage extends StatelessWidget {
 }
 
 class ExplicitIntentsWidget extends StatelessWidget {
-  const ExplicitIntentsWidget();
-
   static const String routeName = "/explicitIntents";
 
+  const ExplicitIntentsWidget();
+
   void _openGoogleMapsStreetView() {
     final AndroidIntent intent = AndroidIntent(
         action: 'action_view',

diff --git a/packages/android_intent/lib/android_intent.dart b/packages/android_intent/lib/android_intent.dart
@@ -12,6 +12,14 @@ const String kChannelName = 'plugins.flutter.io/android_intent';
 
 /// Flutter plugin for launching arbitrary Android Intents.
 class AndroidIntent {
+  final String action;
+  final String category;
+  final String data;
+  final Map<String, dynamic> arguments;
+  final String package;
+  final MethodChannel _channel;
+  final Platform _platform;
+
   /// Builds an Android intent with the following parameters
   /// [action] refers to the action parameter of the intent.
   /// [category] refers to the category of the intent, can be null.
@@ -30,14 +38,6 @@ class AndroidIntent {
         _channel = const MethodChannel(kChannelName),
         _platform = platform ?? const LocalPlatform();
 
-  final String action;
-  final String category;
-  final String data;
-  final Map<String, dynamic> arguments;
-  final String package;
-  final MethodChannel _channel;
-  final Platform _platform;
-
   /// Launch the intent.
   ///
   /// This works only on Android platforms. Please guard the call so that your

diff --git a/packages/camera/lib/camera.dart b/packages/camera/lib/camera.dart
@@ -54,11 +54,11 @@ Future<List<CameraDescription>> availableCameras() async {
 }
 
 class CameraDescription {
-  CameraDescription({this.name, this.lensDirection});
-
   final String name;
   final CameraLensDirection lensDirection;
 
+  CameraDescription({this.name, this.lensDirection});
+
   @override
   bool operator ==(Object o) {
     return o is CameraDescription &&
@@ -79,21 +79,21 @@ class CameraDescription {
 
 /// This is thrown when the plugin reports an error.
 class CameraException implements Exception {
-  CameraException(this.code, this.description);
-
   String code;
   String description;
 
+  CameraException(this.code, this.description);
+
   @override
   String toString() => '$runtimeType($code, $description)';
 }
 
 // Build the UI texture view of the video data with textureId.
 class CameraPreview extends StatelessWidget {
-  const CameraPreview(this.controller);
-
   final CameraController controller;
 
+  const CameraPreview(this.controller);
+
   @override
   Widget build(BuildContext context) {
     return controller.value.isInitialized
@@ -104,20 +104,6 @@ class CameraPreview extends StatelessWidget {
 
 /// The state of a [CameraController].
 class CameraValue {
-  const CameraValue({
-    this.isInitialized,
-    this.errorDescription,
-    this.previewSize,
-    this.isRecordingVideo,
-    this.isTakingPicture,
-  });
-
-  const CameraValue.uninitialized()
-      : this(
-            isInitialized: false,
-            isRecordingVideo: false,
-            isTakingPicture: false);
-
   /// True after [CameraController.initialize] has completed successfully.
   final bool isInitialized;
 
@@ -134,6 +120,20 @@ class CameraValue {
   /// Is `null` until  [isInitialized] is `true`.
   final Size previewSize;
 
+  const CameraValue({
+    this.isInitialized,
+    this.errorDescription,
+    this.previewSize,
+    this.isRecordingVideo,
+    this.isTakingPicture,
+  });
+
+  const CameraValue.uninitialized()
+      : this(
+            isInitialized: false,
+            isRecordingVideo: false,
+            isTakingPicture: false);
+
   /// Convenience getter for `previewSize.height / previewSize.width`.
   ///
   /// Can only be called when [initialize] is done.
@@ -176,9 +176,6 @@ class CameraValue {
 ///
 /// To show the camera preview on the screen use a [CameraPreview] widget.
 class CameraController extends ValueNotifier<CameraValue> {
-  CameraController(this.description, this.resolutionPreset)
-      : super(const CameraValue.uninitialized());
-
   final CameraDescription description;
   final ResolutionPreset resolutionPreset;
 
@@ -187,6 +184,9 @@ class CameraController extends ValueNotifier<CameraValue> {
   StreamSubscription<dynamic> _eventSubscription;
   Completer<Null> _creatingCompleter;
 
+  CameraController(this.description, this.resolutionPreset)
+      : super(const CameraValue.uninitialized());
+
   /// Initializes the camera on the device.
   ///
   /// Throws a [CameraException] if the initialization fails.

diff --git a/packages/cloud_firestore/lib/src/blob.dart b/packages/cloud_firestore/lib/src/blob.dart
@@ -5,9 +5,8 @@
 part of cloud_firestore;
 
 class Blob {
-  const Blob(this.bytes);
-
   final Uint8List bytes;
+  const Blob(this.bytes);
 
   @override
   bool operator ==(dynamic other) =>

diff --git a/packages/cloud_firestore/lib/src/field_value.dart b/packages/cloud_firestore/lib/src/field_value.dart
@@ -9,11 +9,11 @@ enum FieldValueType { arrayUnion, arrayRemove, delete, serverTimestamp }
 /// Sentinel values that can be used when writing document fields with set() or
 /// update().
 class FieldValue {
-  FieldValue._(this.type, this.value);
-
   final FieldValueType type;
   final dynamic value;
 
+  FieldValue._(this.type, this.value);
+
   /// Returns a special value that tells the server to union the given elements
   /// with any array value that already exists on the server.
   ///

diff --git a/packages/cloud_firestore/lib/src/firestore.dart b/packages/cloud_firestore/lib/src/firestore.dart
@@ -8,7 +8,25 @@ part of cloud_firestore;
 ///
 /// You can get an instance by calling [Firestore.instance].
 class Firestore {
-  Firestore({FirebaseApp app}) : app = app ?? FirebaseApp.instance {
+  @visibleForTesting
+  static const MethodChannel channel = MethodChannel(
+    'plugins.flutter.io/cloud_firestore',
+    StandardMethodCodec(FirestoreMessageCodec()),
+  );
+
+  static final Map<int, StreamController<QuerySnapshot>> _queryObservers =
+      <int, StreamController<QuerySnapshot>>{};
+
+  static final Map<int, StreamController<DocumentSnapshot>> _documentObservers =
+      <int, StreamController<DocumentSnapshot>>{};
+
+  static final Map<int, TransactionHandler> _transactionHandlers =
+      <int, TransactionHandler>{};
+  static int _transactionHandlerId = 0;
+
+  static bool _initialized = false;
+
+  Firestore({FirebaseApp app}) : this.app = app ?? FirebaseApp.instance {
     if (_initialized) return;
     channel.setMethodCallHandler((MethodCall call) async {
       if (call.method == 'QuerySnapshot') {
@@ -39,24 +57,6 @@ class Firestore {
   /// If null, the default [FirebaseApp] is used.
   final FirebaseApp app;
 
-  static bool _initialized = false;
-
-  @visibleForTesting
-  static const MethodChannel channel = MethodChannel(
-    'plugins.flutter.io/cloud_firestore',
-    StandardMethodCodec(FirestoreMessageCodec()),
-  );
-
-  static final Map<int, StreamController<QuerySnapshot>> _queryObservers =
-      <int, StreamController<QuerySnapshot>>{};
-
-  static final Map<int, StreamController<DocumentSnapshot>> _documentObservers =
-      <int, StreamController<DocumentSnapshot>>{};
-
-  static final Map<int, TransactionHandler> _transactionHandlers =
-      <int, TransactionHandler>{};
-  static int _transactionHandlerId = 0;
-
   @override
   bool operator ==(dynamic o) => o is Firestore && o.app == app;
 

diff --git a/packages/cloud_firestore/lib/src/geo_point.dart b/packages/cloud_firestore/lib/src/geo_point.dart
@@ -5,10 +5,9 @@
 part of cloud_firestore;
 
 class GeoPoint {
-  const GeoPoint(this.latitude, this.longitude);
-
   final double latitude;
   final double longitude;
+  const GeoPoint(this.latitude, this.longitude);
 
   @override
   bool operator ==(dynamic o) =>

diff --git a/packages/cloud_firestore/lib/src/query_snapshot.dart b/packages/cloud_firestore/lib/src/query_snapshot.dart
@@ -6,6 +6,15 @@ part of cloud_firestore;
 
 /// A QuerySnapshot contains zero or more DocumentSnapshot objects.
 class QuerySnapshot {
+  /// Gets a list of all the documents included in this snapshot
+  final List<DocumentSnapshot> documents;
+
+  /// An array of the documents that changed since the last snapshot. If this
+  /// is the first snapshot, all documents will be in the list as Added changes.
+  final List<DocumentChange> documentChanges;
+
+  final Firestore _firestore;
+
   QuerySnapshot._(Map<dynamic, dynamic> data, this._firestore)
       : documents = List<DocumentSnapshot>.generate(data['documents'].length,
             (int index) {
@@ -22,13 +31,4 @@ class QuerySnapshot {
             _firestore,
           );
         });
-
-  /// Gets a list of all the documents included in this snapshot
-  final List<DocumentSnapshot> documents;
-
-  /// An array of the documents that changed since the last snapshot. If this
-  /// is the first snapshot, all documents will be in the list as Added changes.
-  final List<DocumentChange> documentChanges;
-
-  final Firestore _firestore;
 }
diff --git a/packages/cloud_firestore/lib/src/snapshot_metadata.dart b/packages/cloud_firestore/lib/src/snapshot_metadata.dart
@@ -6,8 +6,6 @@ part of cloud_firestore;
 
 /// Metadata about a snapshot, describing the state of the snapshot.
 class SnapshotMetadata {
-  SnapshotMetadata._(this.hasPendingWrites, this.isFromCache);
-
   /// Whether the snapshot contains the result of local writes that have not yet
   /// been committed to the backend.
   ///
@@ -25,4 +23,6 @@ class SnapshotMetadata {
   /// snapshot with `isFomCache` equal to `false` once the client has received
   /// up-to-date data from the backend.
   final bool isFromCache;
+
+  SnapshotMetadata._(this.hasPendingWrites, this.isFromCache);
 }
diff --git a/packages/cloud_firestore/lib/src/transaction.dart b/packages/cloud_firestore/lib/src/transaction.dart
@@ -7,12 +7,12 @@ part of cloud_firestore;
 typedef Future<dynamic> TransactionHandler(Transaction transaction);
 
 class Transaction {
-  @visibleForTesting
-  Transaction(this._transactionId, this._firestore);
-
   int _transactionId;
   Firestore _firestore;
 
+  @visibleForTesting
+  Transaction(this._transactionId, this._firestore);
+
   Future<DocumentSnapshot> get(DocumentReference documentReference) async {
     final dynamic result = await Firestore.channel
         .invokeMethod('Transaction#get', <String, dynamic>{

diff --git a/packages/cloud_functions/lib/cloud_functions.dart b/packages/cloud_functions/lib/cloud_functions.dart
@@ -8,11 +8,11 @@ import 'package:flutter/services.dart';
 import 'package:meta/meta.dart';
 
 class CloudFunctionsException implements Exception {
-  CloudFunctionsException._(this.code, this.message, this.details);
-
   final String code;
   final String message;
   final dynamic details;
+
+  CloudFunctionsException._(this.code, this.message, this.details);
 }
 
 /// The entry point for accessing a CloudFunctions.

diff --git a/packages/device_info/lib/device_info.dart b/packages/device_info/lib/device_info.dart
@@ -8,12 +8,12 @@ import 'package:flutter/services.dart';
 
 /// Provides device and operating system information.
 class DeviceInfoPlugin {
-  DeviceInfoPlugin();
-
   /// Channel used to communicate to native code.
   static const MethodChannel channel =
       MethodChannel('plugins.flutter.io/device_info');
 
+  DeviceInfoPlugin();
+
   /// This information does not change from call to call. Cache it.
   AndroidDeviceInfo _cachedAndroidDeviceInfo;