Merge pull request #2 from Codelessly/ray-nullsafety

Null Safety Migration
Codelessly · Mar 15, 2021 · deac0dd · deac0dd
2 parents bf702d6 + 5fe572e
commit deac0dd
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 26 deletions.
diff --git a/lib/components/blog.dart b/lib/components/blog.dart
@@ -10,7 +10,7 @@ import 'package:minimal/routes.dart';
 class ImageWrapper extends StatelessWidget {
   final String image;
 
-  const ImageWrapper({Key key, this.image}) : super(key: key);
+  const ImageWrapper({Key? key, required this.image}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -31,7 +31,7 @@ class ImageWrapper extends StatelessWidget {
 class TagWrapper extends StatelessWidget {
   final List<Tag> tags;
 
-  const TagWrapper({Key key, this.tags}) : super(key: key);
+  const TagWrapper({Key? key, this.tags = const []}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -48,7 +48,7 @@ class TagWrapper extends StatelessWidget {
 class Tag extends StatelessWidget {
   final String tag;
 
-  const Tag({Key key, this.tag}) : super(key: key);
+  const Tag({Key? key, required this.tag}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -72,7 +72,7 @@ class Tag extends StatelessWidget {
 class ReadMoreButton extends StatelessWidget {
   final Function onPressed;
 
-  const ReadMoreButton({Key key, @required this.onPressed}) : super(key: key);
+  const ReadMoreButton({Key? key, required this.onPressed}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -83,7 +83,7 @@ class ReadMoreButton extends StatelessWidget {
         onHover: (event) => setState(() => hover = true),
         onExit: (event) => setState(() => hover = false),
         child: OutlineButton(
-          onPressed: onPressed,
+          onPressed: onPressed as void Function()?,
           highlightedBorderColor: textPrimary,
           hoverColor: textPrimary,
           borderSide: BorderSide(color: textPrimary, width: 2),
@@ -116,7 +116,8 @@ Widget dividerSmall = Container(
   ),
 );
 
-List<Widget> authorSection({String imageUrl, String name, String bio}) {
+List<Widget> authorSection(
+    {required String imageUrl, String? name, String? bio}) {
   return [
     divider,
     Container(
@@ -246,12 +247,12 @@ class Footer extends StatelessWidget {
 
 class ListItem extends StatelessWidget {
   // TODO replace with Post item model.
-  final String imageUrl;
   final String title;
-  final String description;
+  final String? imageUrl;
+  final String? description;
 
   const ListItem(
-      {Key key, this.imageUrl, @required this.title, this.description})
+      {Key? key, required this.title, this.imageUrl, this.description})
       : super(key: key);
 
   @override
@@ -261,7 +262,7 @@ class ListItem extends StatelessWidget {
         if (imageUrl != null)
           Container(
             child: ImageWrapper(
-              image: imageUrl,
+              image: imageUrl!,
             ),
           ),
         Align(
@@ -280,7 +281,7 @@ class ListItem extends StatelessWidget {
             child: Container(
               margin: marginBottom12,
               child: Text(
-                description,
+                description!,
                 style: bodyTextStyle,
               ),
             ),

diff --git a/lib/components/text.dart b/lib/components/text.dart
@@ -5,7 +5,7 @@ import 'package:minimal/components/typography.dart';
 class TextBody extends StatelessWidget {
   final String text;
 
-  const TextBody({Key key, this.text}) : super(key: key);
+  const TextBody({Key? key, required this.text}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -22,7 +22,7 @@ class TextBody extends StatelessWidget {
 class TextBodySecondary extends StatelessWidget {
   final String text;
 
-  const TextBodySecondary({Key key, this.text}) : super(key: key);
+  const TextBodySecondary({Key? key, required this.text}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -39,7 +39,7 @@ class TextBodySecondary extends StatelessWidget {
 class TextHeadlineSecondary extends StatelessWidget {
   final String text;
 
-  const TextHeadlineSecondary({Key key, this.text}) : super(key: key);
+  const TextHeadlineSecondary({Key? key, required this.text}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -56,7 +56,7 @@ class TextHeadlineSecondary extends StatelessWidget {
 class TextBlockquote extends StatelessWidget {
   final String text;
 
-  const TextBlockquote({Key key, this.text}) : super(key: key);
+  const TextBlockquote({Key? key, required this.text}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {

diff --git a/lib/main.dart b/lib/main.dart
@@ -12,7 +12,7 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MaterialApp(
       builder: (context, widget) => ResponsiveWrapper.builder(
-          BouncingScrollWrapper.builder(context, widget),
+          BouncingScrollWrapper.builder(context, widget!),
           maxWidth: 1200,
           minWidth: 450,
           defaultScale: true,
@@ -30,16 +30,12 @@ class MyApp extends StatelessWidget {
           switch (settings.name) {
             case Routes.home:
               return ListPage();
-              break;
             case Routes.post:
               return PostPage();
-              break;
             case Routes.style:
               return TypographyPage();
-              break;
             default:
-              return null;
-              break;
+              return SizedBox.shrink();
           }
         });
       },

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,9 +1,9 @@
 name: minimal
 description: A minimalistic Flutter website template for blogs and portfolios.
-version: 1.0.3
+version: 1.1.0
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
   flutter:
@@ -15,13 +15,13 @@ dependencies:
 #    git:
 #      url: https://github.com/Codelessly/ResponsiveFramework.git
 #      ref: master
-  google_fonts: ^1.1.2
-  animations: ^1.1.2
+  google_fonts: ^2.0.0
+  animations: ^2.0.0
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_launcher_icons: ^0.8.1
+  flutter_launcher_icons: ^0.9.0
 
 flutter_icons:
   android: true