move to null-safety

Author: avdosev

lib/app_error.dart

@@ -3,23 +3,23 @@ enum ErrorType {
   BadResponse,
   ServerError,
   NotFound,
-  NotCached
+  NotCached,
 }
 
 class AppError {
   final ErrorType errCode;
-  final String message;
+  final String? message;
 
   const AppError({
-    this.errCode,
+    required this.errCode,
     this.message,
   });
 
   @override
   String toString() {
-    if (message == null || message.isEmpty) {
+    if (message == null || message!.isEmpty) {
       return errCode.toString();
     }
     return "$errCode: $message";
   }
-}
+}

lib/habr/api.dart

@@ -33,7 +33,7 @@ class Habr {
 
   Future<Either<AppError, PostPreviews>> findPosts(String query,
       {int page = 1, Order order = Order.Relevance}) async {
-    String ordString = orderToText[order];
+    String ordString = orderToText[order]!;
     final url =
         "$api_url_v2/articles/?query=$query&order=$ordString&fl=ru&hl=ru&page=$page";
     final response = await safe(http.get(Uri.parse(url)));

lib/habr/json_parsing.dart

@@ -2,7 +2,7 @@ import 'package:habr_app/models/author_info.dart';
 import 'package:habr_app/models/models.dart';
 import 'package:html/parser.dart' show parseFragment;
 
-AuthorAvatarInfo prepareAvatarUrl(String url) {
+AuthorAvatarInfo prepareAvatarUrl(String? url) {
   if (url == null) return AuthorAvatarInfo(url: null);
   if (url.startsWith("//")) url = url.replaceFirst("//", "https://");
   return AuthorAvatarInfo(url: url);
@@ -70,11 +70,11 @@ PostPreviews parsePostPreviewsFromJson(Map<String, dynamic> data) {
           corporative: article['isCorporative'],
           title: _prepareHtmlString(article['titleHtml']),
           hubs: article['hubs']
-              .map<String>((flow) => flow['title'] as String)
+              .map<String>((flow) => flow['title'] as String?)
               .toList(),
           htmlPreview: "<div>${article['leadData']['textHtml']}</div>",
           flows: article['flows']
-              .map<String>((flow) => flow['title'] as String)
+              .map<String>((flow) => flow['title'] as String?)
               .toList(),
           publishDate: DateTime.parse(article['timePublished']),
           author: parseAuthorFromJson(article['author']),
@@ -99,5 +99,5 @@ AuthorInfo parseAuthorInfoFromJson(Map<String, dynamic> data) {
 }
 
 String _prepareHtmlString(String str) {
-  return parseFragment(str).text.trim();
+  return parseFragment(str).text?.trim() ?? '';
 }

lib/models/author.dart

@@ -3,14 +3,14 @@ import 'author_avatar_info.dart';
 class Author {
   final String id;
   final String alias;
-  final String fullName;
-  final String speciality;
+  final String? fullName;
+  final String? speciality;
   final AuthorAvatarInfo avatar;
 
   const Author({
-    this.id,
-    this.alias,
-    this.avatar,
+    required this.id,
+    required this.alias,
+    required this.avatar,
     this.speciality,
     this.fullName,
   });

lib/models/author_avatar_info.dart

@@ -1,8 +1,8 @@
 class AuthorAvatarInfo {
-  final String url;
+  final String? url;
   final bool cached;
   const AuthorAvatarInfo({this.url, this.cached = false});
 
-  bool get isDefault => url == null || url.isEmpty;
+  bool get isDefault => url == null || url!.isEmpty;
   bool get isNotDefault => !isDefault;
 }

lib/models/author_info.dart

@@ -3,33 +3,33 @@ import 'package:habr_app/models/author_avatar_info.dart';
 
 class AuthorInfo {
   final String alias;
-  final String fullName;
-  final String speciality;
-  final String about;
-  final AuthorAvatarInfo avatar;
+  final String? fullName;
+  final String? speciality;
+  final String? about;
+  final AuthorAvatarInfo? avatar;
 
   final int postCount;
-  final int followCount;
-  final int folowersCount;
+  final int? followCount;
+  final int? folowersCount;
 
   final DateTime lastActivityTime;
   final DateTime registerTime;
 
-  final int rating;
+  final int? rating;
 
-  final num karma;
+  final num? karma;
 
   const AuthorInfo({
-    this.alias,
+    required this.alias,
     this.fullName,
     this.speciality,
     this.about,
     this.avatar,
-    this.postCount,
+    required this.postCount,
     this.followCount,
     this.folowersCount,
-    this.lastActivityTime,
-    this.registerTime,
+    required this.lastActivityTime,
+    required this.registerTime,
     this.rating,
     this.karma,
   });

lib/models/cached_image_info.dart

@@ -1,5 +1,5 @@
 class CachedImageInfo {
-  CachedImageInfo({this.url, this.path});
+  CachedImageInfo({required this.url, required this.path});
 
   String url;
   String path;

lib/models/cached_post.dart

@@ -8,17 +8,18 @@ class CachedPost {
   final DateTime insertDate;
   final String authorId;
 
-  const CachedPost(
-      {this.id,
-      this.title,
-      this.body,
-      this.publishDate,
-      this.authorId,
-      this.insertDate});
+  const CachedPost({
+    required this.id,
+    required this.title,
+    required this.body,
+    required this.publishDate,
+    required this.authorId,
+    required this.insertDate,
+  });
 
   CachedPost.fromPost(
     Post post, {
-    this.insertDate,
+    required this.insertDate,
   })  : id = post.id,
         title = post.title,
         body = post.body,

lib/models/comment.dart

@@ -2,39 +2,39 @@ import 'author.dart';
 
 class Comment {
   final int id;
-  final int parentId;
-  final int level;
+  final int? parentId;
+  final int? level;
   final bool banned;
-  final DateTime timePublished;
-  final DateTime timeChanged;
-  final List<int> children;
-  final Author author;
-  final String message;
+  final DateTime? timePublished;
+  final DateTime? timeChanged;
+  final List<int>? children;
+  final Author? author;
+  final String? message;
 
-  bool get notBanned => !banned;
+  bool get notBanned => banned;
 
   Comment({
-    this.id,
+    required this.id,
     this.parentId,
     this.level,
     this.timePublished,
     this.timeChanged,
     this.children,
     this.author,
     this.message,
-    this.banned,
+    required this.banned,
   });
 
   Comment copyWith({
-    int id,
-    int parentId,
-    int level,
-    bool banned,
-    DateTime timePublished,
-    DateTime timeChanged,
-    List<int> children,
-    Author author,
-    String message,
+    int? id,
+    int? parentId,
+    int? level,
+    bool? banned,
+    DateTime? timePublished,
+    DateTime? timeChanged,
+    List<int>? children,
+    Author? author,
+    String? message,
   }) {
     return Comment(
       id: id ?? this.id,
@@ -55,7 +55,7 @@ class Comments {
   final List<int> threads;
 
   Comments({
-    this.comments,
-    this.threads,
+    required this.comments,
+    required this.threads,
   });
 }

lib/models/post.dart

@@ -15,7 +15,13 @@ class Post implements PostInfo {
   final DateTime publishDate;
   final Author author;
 
-  const Post({this.id, this.title, this.body, this.publishDate, this.author});
+  const Post({
+    required this.id,
+    required this.title,
+    required this.body,
+    required this.publishDate,
+    required this.author,
+  });
 }
 
 class ParsedPost implements PostInfo {
@@ -26,10 +32,10 @@ class ParsedPost implements PostInfo {
   final Author author;
 
   const ParsedPost({
-    this.id,
-    this.title,
-    this.parsedBody,
-    this.publishDate,
-    this.author,
+    required this.id,
+    required this.title,
+    required this.parsedBody,
+    required this.publishDate,
+    required this.author,
   });
 }