Merge branch 'release/0.5.0'

Author: OlehMarch

CHANGELOG.md

@@ -1,55 +1,59 @@
 # Changelog
 
-## [0.4.4]
+## 0.5.0
+
+* Updated to NNBD
+
+## 0.4.4
 
 * Update homepage link
 
-## [0.4.3]
+## 0.4.3
 
 * Migrated to GitHub
 * Minor refactorings
 
-## [0.4.2]
+## 0.4.2
 
 * Updated license file
 * Added license file headings
 
-## [0.4.1]
+## 0.4.1
 
 * Updated pedantic dependency
 * Minor changes due to linter
 
-## [0.4.0]
+## 0.4.0
 
 * Redesigned orientation usage for `getScreenSize` and `getContextualScreenSize`
 * Added null checks for `getMobileLayoutSize`, `getTabletLayoutSize`, `getScreenSize` and `getContextualScreenSize`
 * Fixed `README.md`
 
-## [0.3.2]
+## 0.3.2
 
 * Added descriptions for `getMobileLayoutSize`, `getTabletLayoutSize`, `getScreenSize` and `getContextualScreenSize`
 * Minor fixes 
 
-## [0.3.1]
+## 0.3.1
 
 * Added global `getMobileLayoutSize`, `getTabletLayoutSize` and two variations of  `getScreenSize` based on `width` and `getContextualScreenSize` based on `BuildContext`
 * Moved `orientation` from parameter of builder to `ScreenSize` as parameter
 
-## [0.3.0]
+## 0.3.0
 
 * Redesigned `LayoutSize`, `ScreenSizeSettings`, `ResponsiveLayoutBuilder`
 * Added `MobileLayoutSize`, `TabletLayoutSize` and `ScreenSize`
 
-## [0.2.1]
+## 0.2.1
 
 * Added `analysis_option.yaml`
 
-## [0.2.0]
+## 0.2.0
 
 * Added flag for usage of `Device Screen Size` or `All Available Screen Space`
 * Added sample of usage of `ResponsiveLayoutBuilder` widget
 
-## [0.1.0]
+## 0.1.0
 
 * Created `LayoutSize`, `ScreenSizeSettings`, `ResponsiveLayoutBuilder`
 * Created `Example`

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2020, MarchDev Toolkit
+Copyright (c) 2021, MarchDev Toolkit
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

example/ios/Flutter/flutter_export_environment.sh

@@ -1,10 +1,13 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=C:\Programming\flutter"
-export "FLUTTER_APPLICATION_PATH=C:\Programming\Projects\Repositories\Mine\responsive_layout_builder\example"
+export "FLUTTER_ROOT=D:\Programming\flutter"
+export "FLUTTER_APPLICATION_PATH=D:\Projects\Repository\march.dev.tk\responsive_layout_builder\example"
 export "FLUTTER_TARGET=lib\main.dart"
 export "FLUTTER_BUILD_DIR=build"
 export "SYMROOT=${SOURCE_ROOT}/../build\ios"
-export "FLUTTER_FRAMEWORK_DIR=C:\Programming\flutter\bin\cache\artifacts\engine\ios"
 export "FLUTTER_BUILD_NAME=1.0.0"
 export "FLUTTER_BUILD_NUMBER=1"
+export "DART_OBFUSCATION=false"
+export "TRACK_WIDGET_CREATION=false"
+export "TREE_SHAKE_ICONS=false"
+export "PACKAGE_CONFIG=.packages"

example/lib/main.dart

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, the MarchDev Toolkit project authors. Please see the AUTHORS file
+// Copyright (c) 2021, the MarchDev Toolkit project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
@@ -50,10 +50,10 @@ class _MyAppState extends State<MyApp> {
                     Text('Layout Size: ${layoutSizeEnumToString[size.size]}'),
                     if (size.mobile != null)
                       Text(
-                          'Mobile Size: ${mobileLayoutSizeEnumToString[size.mobile]}'),
+                          'Mobile Size: ${mobileLayoutSizeEnumToString[size.mobile!]}'),
                     if (size.tablet != null)
                       Text(
-                          'Tablet Size: ${tabletLayoutSizeEnumToString[size.tablet]}'),
+                          'Tablet Size: ${tabletLayoutSizeEnumToString[size.tablet!]}'),
                   ],
                 ),
               ),

example/pubspec.yaml

@@ -3,7 +3,7 @@ author: Oleh Marchenko <oleh.marchenko.95@gmail.com>
 description: Demonstrates how to use the responsive_layout_builder package.
 
 environment:
-  sdk: ">=2.2.2 <3.0.0"
+  sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
   flutter:

lib/responsive_layout_builder.dart

@@ -1,11 +1,11 @@
-// Copyright (c) 2020, the MarchDev Toolkit project authors. Please see the AUTHORS file
+// Copyright (c) 2021, the MarchDev Toolkit project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library responsive_layout_builder;
 
-export 'src/screen_size.dart';
 export 'src/layout_size.dart';
-export 'src/size_calculations.dart';
-export 'src/screen_size_settings.dart';
 export 'src/responsive_layout_builder.dart';
+export 'src/screen_size.dart';
+export 'src/screen_size_settings.dart';
+export 'src/size_calculations.dart';

lib/src/layout_size.dart

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, the MarchDev Toolkit project authors. Please see the AUTHORS file
+// Copyright (c) 2021, the MarchDev Toolkit project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 

lib/src/responsive_layout_builder.dart

@@ -1,13 +1,13 @@
-// Copyright (c) 2020, the MarchDev Toolkit project authors. Please see the AUTHORS file
+// Copyright (c) 2021, the MarchDev Toolkit project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:flutter/widgets.dart';
 
-import 'package:responsive_layout_builder/src/layout_size.dart';
-import 'package:responsive_layout_builder/src/screen_size.dart';
-import 'package:responsive_layout_builder/src/screen_size_settings.dart';
-import 'package:responsive_layout_builder/src/size_calculations.dart';
+import 'layout_size.dart';
+import 'screen_size.dart';
+import 'screen_size_settings.dart';
+import 'size_calculations.dart';
 
 /// Signature for a function that builds a widget given an [LayoutSize].
 ///
@@ -23,15 +23,12 @@ class ResponsiveLayoutBuilder extends StatefulWidget {
   ///
   /// The [builder], [portraitSizes] and [landscapeSizes] argument must not be null.
   const ResponsiveLayoutBuilder({
-    Key key,
-    @required this.builder,
+    Key? key,
+    required this.builder,
     this.defaultSize = LayoutSize.mobile,
     this.portraitSizes = const ScreenSizeSettings.portrait(),
     this.landscapeSizes = const ScreenSizeSettings.landscape(),
-  })  : assert(builder != null),
-        assert(portraitSizes != null),
-        assert(landscapeSizes != null),
-        super(key: key);
+  }) : super(key: key);
 
   /// Builds the widgets below this widget given this widget's [LayoutSize]
   final ResponsiveLayoutWidgetBuilder builder;

lib/src/screen_size.dart

@@ -1,19 +1,20 @@
-// Copyright (c) 2020, the MarchDev Toolkit project authors. Please see the AUTHORS file
+// Copyright (c) 2021, the MarchDev Toolkit project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:flutter/widgets.dart';
-import 'package:responsive_layout_builder/src/layout_size.dart';
+
+import 'layout_size.dart';
 
 /// [ScreenSize] stores data of [LayoutSize], [MobileLayoutSize] and [TabletLayoutSize]
 class ScreenSize {
   /// Creates an instance of [ScreenSize] that stores data of [LayoutSize], [MobileLayoutSize] and [TabletLayoutSize]
   const ScreenSize({
-    @required this.size,
+    required this.size,
     this.mobile,
     this.tablet,
     this.orientation,
-  }) : assert(size != null);
+  });
 
   /// [size] is used for storing general screen type
   ///
@@ -23,15 +24,15 @@ class ScreenSize {
   /// [mobile] defines mobile screen type
   ///
   /// Could be [MobileLayoutSize.small], [MobileLayoutSize.medium] or [MobileLayoutSize.large]
-  final MobileLayoutSize mobile;
+  final MobileLayoutSize? mobile;
 
   /// [tablet] defines mobile screen type
   ///
   /// Could be [TabletLayoutSize.small] or [TabletLayoutSize.large]
-  final TabletLayoutSize tablet;
+  final TabletLayoutSize? tablet;
 
   /// [orientation] defines screen orientation
   ///
   /// Could be [Orientation.landscape] or [Orientation.portrait]
-  final Orientation orientation;
+  final Orientation? orientation;
 }

lib/src/screen_size_settings.dart

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, the MarchDev Toolkit project authors. Please see the AUTHORS file
+// Copyright (c) 2021, the MarchDev Toolkit project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.