Null Safety Migration #2

*Make ResponsiveWrapperData values nonnull.

Author: rayliverified

lib/responsive_value.dart

@@ -39,16 +39,16 @@ class ResponsiveValue<T> {
     }
 
     List<Condition> conditions = valueWhen;
-    List<ResponsiveBreakpointSegment?>? segments =
-        ResponsiveWrapper.of(context)!.breakpointSegments;
+    List<ResponsiveBreakpointSegment>? segments =
+        ResponsiveWrapper.of(context).breakpointSegments;
     conditions = conditions.map((e) {
       if (e.breakpoint == null) {
         return e.copyWith(
-            breakpoint: segments!
+            breakpoint: segments
                 .firstWhere(
-                    (element) => element!.responsiveBreakpoint.name == e.name,
+                    (element) => element.responsiveBreakpoint.name == e.name,
                     orElse: () =>
-                        throw ('No breakpoint named `${e.name}` found.'))!
+                        throw ('No breakpoint named `${e.name}` found.'))
                 .responsiveBreakpoint
                 .breakpoint
                 .toInt());
@@ -83,7 +83,7 @@ class ResponsiveValue<T> {
       BuildContext context, List<Condition> conditions) {
     Condition? equalsCondition = conditions.firstWhereOrNull((element) {
       if (element.condition == Conditional.EQUALS) {
-        return ResponsiveWrapper.of(context)!.activeBreakpoint?.name ==
+        return ResponsiveWrapper.of(context).activeBreakpoint.name ==
             element.name;
       }
 
@@ -96,7 +96,7 @@ class ResponsiveValue<T> {
     Condition? smallerThanCondition = conditions.firstWhereOrNull((element) {
       if (element.condition == Conditional.SMALLER_THAN) {
         if (element.name != null) {
-          return ResponsiveWrapper.of(context)!.isSmallerThan(element.name!);
+          return ResponsiveWrapper.of(context).isSmallerThan(element.name!);
         }
 
         return MediaQuery.of(context).size.width < element.breakpoint!;
@@ -111,7 +111,7 @@ class ResponsiveValue<T> {
         conditions.reversed.firstWhereOrNull((element) {
       if (element.condition == Conditional.LARGER_THAN) {
         if (element.name != null) {
-          return ResponsiveWrapper.of(context)!.isLargerThan(element.name);
+          return ResponsiveWrapper.of(context).isLargerThan(element.name);
         }
 
         return MediaQuery.of(context).size.width >= element.breakpoint!;
@@ -237,8 +237,8 @@ class ResponsiveVisibility extends StatelessWidget {
     bool? visibleValue = visible;
 
     // Combine Conditions.
-    conditions.addAll(visibleWhen?.map((e) => e.copyWith(value: true)) ?? []);
-    conditions.addAll(hiddenWhen?.map((e) => e.copyWith(value: false)) ?? []);
+    conditions.addAll(visibleWhen.map((e) => e.copyWith(value: true)));
+    conditions.addAll(hiddenWhen.map((e) => e.copyWith(value: false)));
     // Get visible value from active condition.
     visibleValue = ResponsiveValue(context,
             defaultValue: visibleValue, valueWhen: conditions)

lib/responsive_wrapper.dart

@@ -561,34 +561,34 @@ const String DESKTOP = 'DESKTOP';
 /// such as [ResponsiveWrapperData.scaledWidth].
 @immutable
 class ResponsiveWrapperData {
-  final double? screenWidth;
-  final double? screenHeight;
-  final double? scaledWidth;
-  final double? scaledHeight;
-  final List<ResponsiveBreakpoint>? breakpoints;
-  final List<ResponsiveBreakpointSegment?>? breakpointSegments;
-  final ResponsiveBreakpoint? activeBreakpoint;
-  final bool? isMobile;
-  final bool? isPhone;
-  final bool? isTablet;
-  final bool? isDesktop;
+  final double screenWidth;
+  final double screenHeight;
+  final double scaledWidth;
+  final double scaledHeight;
+  final List<ResponsiveBreakpoint> breakpoints;
+  final List<ResponsiveBreakpointSegment> breakpointSegments;
+  final ResponsiveBreakpoint activeBreakpoint;
+  final bool isMobile;
+  final bool isPhone;
+  final bool isTablet;
+  final bool isDesktop;
 
   /// Creates responsive data with explicit values.
   ///
   /// Consider using [ResponsiveWrapperData.fromResponsiveWrapper]
   /// to create data based on the [ResponsiveWrapper] state.
   const ResponsiveWrapperData({
-    this.screenWidth,
-    this.screenHeight,
-    this.scaledWidth,
-    this.scaledHeight,
-    this.breakpoints,
-    this.breakpointSegments,
-    this.activeBreakpoint,
-    this.isMobile,
-    this.isPhone,
-    this.isTablet,
-    this.isDesktop,
+    this.screenWidth = 0,
+    this.screenHeight = 0,
+    this.scaledWidth = 0,
+    this.scaledHeight = 0,
+    this.breakpoints = const [],
+    this.breakpointSegments = const [],
+    this.activeBreakpoint = const ResponsiveBreakpoint.tag(0, name: ''),
+    this.isMobile = false,
+    this.isPhone = false,
+    this.isTablet = false,
+    this.isDesktop = false,
   });
 
   /// Creates data based on the [ResponsiveWrapper] state.
@@ -624,7 +624,7 @@ class ResponsiveWrapperData {
       ', scaledHeight: ' +
       scaledHeight.toString() +
       ', breakpoints: ' +
-      (breakpoints?.asMap() ?? '').toString() +
+      breakpoints.asMap().toString() +
       ', breakpointSegments: ' +
       breakpointSegments.toString() +
       ', activeBreakpoint: ' +
@@ -639,30 +639,29 @@ class ResponsiveWrapperData {
       isDesktop.toString() +
       ')';
 
-  bool equals(String? name) => activeBreakpoint!.name == name;
+  bool equals(String? name) => activeBreakpoint.name == name;
 
   /// Is the [scaledWidth] larger than or equal to [name]?
   /// Defaults to false if the [name] cannot be found.
   bool isLargerThan(String? name) {
     // No breakpoints to match.
-    if (breakpoints!.length == 0) return false;
+    if (breakpoints.length == 0) return false;
 
     // Breakpoint is active breakpoint.
-    if (activeBreakpoint!.name == name) return false;
+    if (activeBreakpoint.name == name) return false;
 
     // Single breakpoint is active and screen width
     // is larger than default breakpoint.
-    if (breakpoints!.length == 1 &&
-        screenWidth! >= breakpoints![0].breakpoint) {
+    if (breakpoints.length == 1 && screenWidth >= breakpoints[0].breakpoint) {
       return true;
     }
     // Find first breakpoint end boundary that is larger
     // than screen width. Breakpoint names could be
     // chained so perform a full search from largest to smallest.
-    for (var i = breakpoints!.length - 2; i >= 0; i--) {
-      if (breakpoints![i].name == name &&
-          breakpoints![i + 1].name != name &&
-          screenWidth! >= breakpoints![i + 1].breakpoint) return true;
+    for (var i = breakpoints.length - 2; i >= 0; i--) {
+      if (breakpoints[i].name == name &&
+          breakpoints[i + 1].name != name &&
+          screenWidth >= breakpoints[i + 1].breakpoint) return true;
     }
 
     return false;
@@ -671,19 +670,19 @@ class ResponsiveWrapperData {
   /// Is the [screenWidth] smaller than the [name]?
   /// Defaults to false if the [name] cannot be found.
   bool isSmallerThan(String? name) =>
-      screenWidth! <
-      breakpointSegments!
-          .firstWhere((element) => element!.responsiveBreakpoint.name == name,
+      screenWidth <
+      breakpointSegments
+          .firstWhere((element) => element.responsiveBreakpoint.name == name,
               orElse: () => ResponsiveBreakpointSegment(
                   breakpoint: 0,
                   segmentType: ResponsiveBreakpointBehavior.TAG,
-                  responsiveBreakpoint: ResponsiveBreakpoint.tag(0, name: '')))!
+                  responsiveBreakpoint: ResponsiveBreakpoint.tag(0, name: '')))
           .breakpoint;
 
-  ResponsiveBreakpoint? firstBreakpointNamed(String name) => breakpointSegments!
-      .firstWhere((element) => element!.responsiveBreakpoint.name == name,
+  ResponsiveBreakpoint? firstBreakpointNamed(String name) => breakpointSegments
+      .firstWhere((element) => element.responsiveBreakpoint.name == name,
           orElse: null)
-      ?.responsiveBreakpoint;
+      .responsiveBreakpoint;
 }
 
 /// Creates an immutable widget that exposes [ResponsiveWrapperData]