Merge pull request #86 from fluttercommunity/null-safety

Null safety

Author: WieFel

README.md

@@ -22,6 +22,8 @@
 This widget is in active development. 
 ___Any contribution, idea, criticism or feedback is welcomed.___
 
+__NOTE: If using Flutter v1.x.x, use v0.5.x pub version.__
+
 ## Quick links
 
 | | |

analysis_options.yaml

@@ -1,4 +1,4 @@
-include: package:pedantic/analysis_options.1.8.0.yaml
+include: package:pedantic/analysis_options.yaml
 
 analyzer:
   exclude: [build/**]

demo/lib/data/theme_data.dart

@@ -3,14 +3,14 @@ import 'package:flutter/material.dart';
 /// Abstract class for defining a use case that is presented within the demo app.
 abstract class UseCase {
   /// The name of the use case.
-  String name;
+  late String name;
 
   /// Description of the use case.
-  String description;
+  late String description;
 
   /// Path to the file containing the sample code of the use case.
-  String codeFile;
+  String? codeFile;
 
   /// The `Widget` representing a preview of the given use case.
-  Widget preview;
+  Widget? preview;
 }

demo/lib/data/use_case.dart

@@ -1,11 +1,11 @@
-import 'package:demo/data/theme_data.dart';
 import 'package:demo/data/use_case.dart';
 import 'package:demo/use_cases/contextual_controls/contextual_controls_use_case.dart';
 import 'package:demo/use_cases/contextual_info/contextual_info_use_case.dart';
 import 'package:demo/use_cases/filter/filter_use_case.dart';
 import 'package:demo/use_cases/navigation/navigation_use_case.dart';
 import 'package:flutter/material.dart';
 import 'package:gallerize/gallerize.dart';
+import 'package:gallerize/themes/gallerize_theme_data.dart';
 
 void main() => runApp(DemoApp());
 
@@ -15,7 +15,7 @@ class DemoApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MaterialApp(
       title: "Backdrop Gallery",
-      theme: GalleryThemeData.darkThemeData,
+      theme: GallerizeThemeData.darkThemeData,
       home: HomePage(),
     );
   }

demo/lib/main.dart

@@ -53,12 +53,12 @@ class _ContextualControlsState extends State<ContextualControls> {
               items: _COLOR_MAP.keys.map<DropdownMenuItem<Color>>((Color c) {
                 return DropdownMenuItem<Color>(
                   value: c,
-                  child: Text(_COLOR_MAP[c]),
+                  child: Text(_COLOR_MAP[c]!),
                 );
               }).toList(),
-              onChanged: (Color newValue) {
+              onChanged: (Color? newValue) {
                 setState(() {
-                  _color = newValue;
+                  _color = newValue!;
                 });
               },
             ),
@@ -99,9 +99,9 @@ class _ContextualControlsState extends State<ContextualControls> {
                   child: Text("${r.toString()} GB"),
                 );
               }).toList(),
-              onChanged: (int newValue) {
+              onChanged: (int? newValue) {
                 setState(() {
-                  _ram = newValue;
+                  _ram = newValue!;
                 });
               },
             ),
@@ -132,7 +132,7 @@ class _ContextualControlsState extends State<ContextualControls> {
                   "Laptop",
                   style: Theme.of(context)
                       .textTheme
-                      .headline3
+                      .headline3!
                       .apply(color: Colors.black),
                 ),
               ],

demo/lib/use_cases/contextual_controls/contextual_controls.dart

@@ -93,7 +93,7 @@ class ContextualInfo extends StatelessWidget {
                   "Laptop",
                   style: Theme.of(context)
                       .textTheme
-                      .headline3
+                      .headline3!
                       .apply(color: Colors.black),
                 ),
               ],
@@ -156,7 +156,7 @@ class ContextualInfo extends StatelessWidget {
               title: Text("Reviews",
                   style: Theme.of(context)
                       .textTheme
-                      .headline6
+                      .headline6!
                       .apply(color: Colors.black)),
             ),
             ListTile(

demo/lib/use_cases/contextual_info/contextual_info.dart

@@ -23,7 +23,7 @@ class _FilterState extends State<Filter> {
   ];
   Set<ItemCategory> _filteredCategories =
       Set.from([ItemCategory.Electronics, ItemCategory.Transportation]);
-  List<Item> _shownItems;
+  late List<Item> _shownItems;
 
   @override
   void initState() {
@@ -70,8 +70,8 @@ class _FilterState extends State<Filter> {
           ListView.builder(
             itemCount: _CATEGORIES.length,
             itemBuilder: (context, index) => CheckboxListTile(
-              onChanged: (bool checked) =>
-                  _addOrRemoveFilterCategory(checked, _CATEGORIES[index]),
+              onChanged: (bool? checked) =>
+                  _addOrRemoveFilterCategory(checked!, _CATEGORIES[index]),
               value: _filteredCategories.contains(_CATEGORIES[index]),
               title: Text(describeEnum(_CATEGORIES[index].toString())),
               activeColor: Colors.white,

demo/lib/use_cases/filter/filter.dart

@@ -18,26 +18,21 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
   flutter:
     sdk: flutter
 
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^0.1.3
-  google_fonts: ^1.1.0
-  flutter_highlight: ^0.6.0
-  gallerize: ^0.0.4
+  gallerize: ^0.1.0
   # Add backdrop dependency here
   backdrop:
     path: "../"
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_launcher_icons: "^0.7.3"
+  flutter_launcher_icons: ^0.9.0
 
 flutter_icons:
   android: false

demo/pubspec.yaml

@@ -2,15 +2,12 @@ name: example
 description: A new Flutter project.
 
 environment:
-  sdk: '>=2.10.0 <3.0.0'
+  sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
   flutter:
     sdk: flutter
 
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^0.1.2
   # Add backdrop dependency here
   backdrop:
     path: "../"