[Linting] Move models to pedantic

passwdapp · Oct 20, 2020 · 512e71f · 512e71f
1 parent 88e40f6
commit 512e71f
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 43 deletions.
diff --git a/lib/models/color_info.dart b/lib/models/color_info.dart
@@ -6,7 +6,7 @@ class ColorInfo {
   Color color;
   String localizationTag;
 
-  ColorInfo({this.color, this.localizationTag})
+  ColorInfo({@required this.color, @required this.localizationTag})
       : assert(color != null),
         assert(localizationTag != null);
 }
diff --git a/lib/models/entries.dart b/lib/models/entries.dart
@@ -17,28 +17,28 @@ class Entries {
   Entries.fromJson(Map<String, dynamic> json) {
     version = json['v'];
     if (json['e'] != null) {
-      entries = List<Entry>();
+      entries = <Entry>[];
       json['e'].forEach((v) {
         entries.add(Entry.fromJson(v.cast<String, dynamic>()));
       });
     }
     if (json['t'] != null) {
-      tags = List<Tag>();
+      tags = <Tag>[];
       json['t'].forEach((v) {
         tags.add(Tag.fromJson(v.cast<String, dynamic>()));
       });
     }
   }
 
   Map<String, dynamic> toJson() {
-    final Map<String, dynamic> data = Map<String, dynamic>();
-    if (this.entries != null) {
-      data['e'] = this.entries.map((v) => v.toJson()).toList();
+    final data = <String, dynamic>{};
+    if (entries != null) {
+      data['e'] = entries.map((v) => v.toJson()).toList();
     }
-    if (this.tags != null) {
-      data['t'] = this.tags.map((v) => v.toJson()).toList();
+    if (tags != null) {
+      data['t'] = tags.map((v) => v.toJson()).toList();
     }
-    data['v'] = this.version;
+    data['v'] = version;
     return data;
   }
 }
diff --git a/lib/models/entry.dart b/lib/models/entry.dart
@@ -48,17 +48,17 @@ class Entry {
   }
 
   Map<String, dynamic> toJson() {
-    final Map<String, dynamic> data = Map<String, dynamic>();
-    data['c'] = this.colorId;
-    data['n'] = this.name;
-    data['u'] = this.username;
-    data['p'] = this.password;
-    data['no'] = this.note;
-    data['f'] = this.favicon;
-    data['i'] = this.id;
-    data['t'] = this.tags;
-    if (this.otp != null) {
-      data['o'] = this.otp.toJson();
+    final data = <String, dynamic>{};
+    data['c'] = colorId;
+    data['n'] = name;
+    data['u'] = username;
+    data['p'] = password;
+    data['no'] = note;
+    data['f'] = favicon;
+    data['i'] = id;
+    data['t'] = tags;
+    if (otp != null) {
+      data['o'] = otp.toJson();
     }
     return data;
   }

diff --git a/lib/models/favicon.dart b/lib/models/favicon.dart
@@ -10,18 +10,18 @@ class FaviconResponse {
   FaviconResponse.fromJson(Map<String, dynamic> json) {
     domain = json['domain'];
     if (json['icons'] != null) {
-      icons = new List<Icons>();
+      icons = <Icons>[];
       json['icons'].forEach((v) {
-        icons.add(new Icons.fromJson(v));
+        icons.add(Icons.fromJson(v));
       });
     }
   }
 
   Map<String, dynamic> toJson() {
-    final Map<String, dynamic> data = Map<String, dynamic>();
-    data['domain'] = this.domain;
-    if (this.icons != null) {
-      data['icons'] = this.icons.map((v) => v.toJson()).toList();
+    final data = <String, dynamic>{};
+    data['domain'] = domain;
+    if (icons != null) {
+      data['icons'] = icons.map((v) => v.toJson()).toList();
     }
     return data;
   }
@@ -42,10 +42,10 @@ class Icons {
   }
 
   Map<String, dynamic> toJson() {
-    final Map<String, dynamic> data = Map<String, dynamic>();
-    data['src'] = this.src;
-    data['type'] = this.type;
-    data['sizes'] = this.sizes;
+    final data = <String, dynamic>{};
+    data['src'] = src;
+    data['type'] = type;
+    data['sizes'] = sizes;
     return data;
   }
 }
diff --git a/lib/models/menu_entry.dart b/lib/models/menu_entry.dart
@@ -5,7 +5,7 @@ class MenuEntry {
   final String localizationTag;
   final IconData icon;
 
-  const MenuEntry({this.icon, this.localizationTag})
+  const MenuEntry({@required this.icon, @required this.localizationTag})
       : assert(localizationTag != null),
         assert(icon != null);
 }
diff --git a/lib/models/otp.dart b/lib/models/otp.dart
@@ -30,14 +30,14 @@ class Otp {
   }
 
   Map<String, dynamic> toJson() {
-    final Map<String, dynamic> data = Map<String, dynamic>();
-    data['t'] = this.type;
-    data['i'] = this.issuer;
-    data['a'] = this.algorithm;
-    data['s'] = this.secret;
-    data['ac'] = this.account;
-    data['d'] = this.digits;
-    data['ti'] = this.timeout;
+    final data = <String, dynamic>{};
+    data['t'] = type;
+    data['i'] = issuer;
+    data['a'] = algorithm;
+    data['s'] = secret;
+    data['ac'] = account;
+    data['d'] = digits;
+    data['ti'] = timeout;
     return data;
   }
 }
diff --git a/lib/models/tag.dart b/lib/models/tag.dart
@@ -17,10 +17,10 @@ class Tag {
   }
 
   Map<String, dynamic> toJson() {
-    final Map<String, dynamic> data = new Map<String, dynamic>();
-    data['i'] = this.id;
-    data['n'] = this.name;
-    data['c'] = this.color;
+    final data = <String, dynamic>{};
+    data['i'] = id;
+    data['n'] = name;
+    data['c'] = color;
     return data;
   }
 }