Merge pull request #1268 from PreethikaSelvam/master

FLUT-834263 - [Others] Moved the volume 2 release to master

Author: LavanyaA

packages/syncfusion_flutter_barcodes/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Unreleased
+
+**Bugs**
+* #FB41210 - Now, the QR code generated for the input string contains 17 continuous spaces with medium [errorCorrectionLevel](https://pub.dev/documentation/syncfusion_flutter_barcodes/latest/barcodes/QRCode/errorCorrectionLevel.html), and 07 [codeVersion](https://pub.dev/documentation/syncfusion_flutter_barcodes/latest/barcodes/QRCode/codeVersion.html) will be scannable.
+
 ## [20.3.50] - 10/18/2022
 
 **Bugs**

packages/syncfusion_flutter_barcodes/lib/src/barcode_generator/base/barcode_generator.dart

@@ -92,7 +92,7 @@ class SfBarcodeGenerator extends StatefulWidget {
       this.showValue = false,
       this.textSpacing = 2,
       this.textAlign = TextAlign.center,
-      this.textStyle = const TextStyle()})
+      this.textStyle})
       : symbology = symbology ?? Code128(),
         super(key: key);
 
@@ -247,7 +247,7 @@ class SfBarcodeGenerator extends StatefulWidget {
   ///        textStyle: TextStyle(fontSize: 16));
   ///}
   /// ```dart
-  final TextStyle textStyle;
+  final TextStyle? textStyle;
 
   @override
   State<StatefulWidget> createState() {
@@ -258,7 +258,7 @@ class SfBarcodeGenerator extends StatefulWidget {
 /// Represents the barcode generator state
 class _SfBarcodeGeneratorState extends State<SfBarcodeGenerator> {
   /// Specifies the theme data
-  late SfBarcodeThemeData _barcodeTheme;
+  late SfBarcodeThemeData _barcodeThemeData;
 
   /// Specifies the text size
   Size? _textSize;
@@ -267,16 +267,31 @@ class _SfBarcodeGeneratorState extends State<SfBarcodeGenerator> {
 
   @override
   void didChangeDependencies() {
-    _barcodeTheme = SfBarcodeTheme.of(context);
+    _barcodeThemeData =
+        _updateThemeData(Theme.of(context), SfBarcodeTheme.of(context));
     super.didChangeDependencies();
   }
 
+  SfBarcodeThemeData _updateThemeData(
+      ThemeData themeData, SfBarcodeThemeData barcodeThemeData) {
+    barcodeThemeData = barcodeThemeData.copyWith(
+        textStyle: themeData.textTheme.bodyMedium!
+            .copyWith(color: barcodeThemeData.textColor)
+            .merge(barcodeThemeData.textStyle)
+            .merge(widget.textStyle));
+    return barcodeThemeData;
+  }
+
   @override
   void didUpdateWidget(SfBarcodeGenerator oldWidget) {
+    _barcodeThemeData =
+        _updateThemeData(Theme.of(context), SfBarcodeTheme.of(context));
+
     if (widget.showValue &&
         (oldWidget.value != widget.value ||
             oldWidget.textStyle != widget.textStyle)) {
-      _textSize = measureText(widget.value.toString(), widget.textStyle);
+      _textSize =
+          measureText(widget.value.toString(), _barcodeThemeData.textStyle!);
     }
 
     if (widget.symbology != oldWidget.symbology) {
@@ -327,26 +342,20 @@ class _SfBarcodeGeneratorState extends State<SfBarcodeGenerator> {
   @override
   Widget build(BuildContext context) {
     if (widget.showValue && _textSize == null) {
-      _textSize = measureText(widget.value.toString(), widget.textStyle);
+      _textSize =
+          measureText(widget.value.toString(), _barcodeThemeData.textStyle!);
     }
     _symbologyRenderer.getIsValidateInput(widget.value!);
     _symbologyRenderer.textSize = _textSize;
     return Container(
-      color: widget.backgroundColor ?? _barcodeTheme.backgroundColor,
+      color: widget.backgroundColor ?? _barcodeThemeData.backgroundColor,
       child: SfBarcodeGeneratorRenderObjectWidget(
           value: widget.value!,
           symbology: widget.symbology,
-          foregroundColor: widget.barColor ?? _barcodeTheme.barColor,
+          foregroundColor: widget.barColor ?? _barcodeThemeData.barColor,
           showText: widget.showValue,
           textSpacing: widget.textSpacing,
-          textStyle: TextStyle(
-              backgroundColor: widget.textStyle.backgroundColor,
-              color: widget.textStyle.color ?? _barcodeTheme.textColor,
-              fontSize: widget.textStyle.fontSize,
-              fontFamily: widget.textStyle.fontFamily,
-              fontStyle: widget.textStyle.fontStyle,
-              fontWeight: widget.textStyle.fontWeight,
-              textBaseline: widget.textStyle.textBaseline),
+          textStyle: _barcodeThemeData.textStyle!,
           symbologyRenderer: _symbologyRenderer,
           textSize: _textSize,
           textAlign: widget.textAlign),

packages/syncfusion_flutter_barcodes/lib/src/barcode_generator/renderers/two_dimensional/error_correction_codewords.dart

@@ -299,7 +299,7 @@ class ErrorCorrectionCodeWords {
   /// refactored to a smaller methods, but it degrades the performance.Since it
   /// uses single switch condition for calculating the error correction code
   /// word based on the provided version
-  List<String> getERCW() {
+  List<String> getERCW(String encodedText) {
     List<int> decimalRepresentation;
     List<String> errorCorrectionWord;
     _decimalValue = <int>[dataBits];
@@ -1600,7 +1600,7 @@ class ErrorCorrectionCodeWords {
 
     _gx = _getElement(_gx, _alpha);
     _binaryToDecimal(dataCodeWords);
-    decimalRepresentation = _getPolynominalDivision();
+    decimalRepresentation = _getPolynominalDivision(encodedText);
     errorCorrectionWord = _convertDecimalToBinary(decimalRepresentation);
     return errorCorrectionWord;
   }
@@ -1633,7 +1633,7 @@ class ErrorCorrectionCodeWords {
   }
 
   /// Calculates the polynomial value
-  List<int> _getPolynominalDivision() {
+  List<int> _getPolynominalDivision(String encodedText) {
     Map<int, int> messagePolynom = <int, int>{};
     for (int i = 0; i < _decimalValue.length; i++) {
       messagePolynom[_decimalValue.length - 1 - i] = _decimalValue[i];
@@ -1665,8 +1665,11 @@ class ErrorCorrectionCodeWords {
 
     generatorPolynom = tempMessagePolynom;
     Map<int, int> leadTermSource = messagePolynom;
+    final bool isLargeText = encodedText.length > 75;
     for (int i = 0; i < messagePolynom.length; i++) {
-      final int largestExponent = _getLargestExponent(leadTermSource);
+      final int largestExponent = isLargeText
+          ? _getLargestExponentsKey(leadTermSource)
+          : _getLargestExponent(leadTermSource);
       if (leadTermSource[largestExponent] == 0) {
         leadTermSource.remove(largestExponent);
       } else {
@@ -1772,6 +1775,20 @@ class ErrorCorrectionCodeWords {
     return largeExponent;
   }
 
+  /// Finds the largest exponential numbers key.
+  int _getLargestExponentsKey(Map<int, int> polynom) {
+    int largeExponent = 0;
+    int key = 0;
+    for (int i = 0; i < polynom.length; i++) {
+      final MapEntry<int, int> currentEntry = polynom.entries.elementAt(i);
+      if (currentEntry.key > largeExponent) {
+        largeExponent = currentEntry.value;
+        key = polynom.keys.elementAt(i);
+      }
+    }
+    return key;
+  }
+
   /// Returns the integer value
   int _getIntValFromAlphaExp(int element, List<int> alpha) {
     if (element > 255) {

packages/syncfusion_flutter_barcodes/lib/src/barcode_generator/renderers/two_dimensional/qr_code_renderer.dart

@@ -1819,15 +1819,15 @@ class QRCodeRenderer extends SymbologyRenderer {
 
     for (int i = 0; i < _blocks![0]; i++) {
       errorCorrectionCodeWord.dataCodeWords = ds1[count];
-      polynomial[count++] = errorCorrectionCodeWord.getERCW();
+      polynomial[count++] = errorCorrectionCodeWord.getERCW(_encodedText);
     }
     if (_blocks!.length == 6) {
       errorCorrectionCodeWord.dataBits =
           (_dataBits - _blocks![0] * _blocks![2]) ~/ _blocks![3];
 
       for (int i = 0; i < _blocks![3]; i++) {
         errorCorrectionCodeWord.dataCodeWords = ds1[count];
-        polynomial[count++] = errorCorrectionCodeWord.getERCW();
+        polynomial[count++] = errorCorrectionCodeWord.getERCW(_encodedText);
       }
     }
 

packages/syncfusion_flutter_barcodes/pubspec.yaml

@@ -1,15 +1,15 @@
 name: syncfusion_flutter_barcodes
 description: Flutter Barcodes generator library is used to generate and display data in the machine-readable, industry-standard 1D and 2D barcodes.
-version: 21.1.35
+version: 22.1.34
 homepage: https://github.com/syncfusion/flutter-widgets/tree/master/packages/syncfusion_flutter_barcodes
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
+  sdk: ">=2.17.0 <4.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  syncfusion_flutter_core: ^21.1.35
+  syncfusion_flutter_core: ^22.1.34
 
 dev_dependencies:
   flutter_test:

packages/syncfusion_flutter_calendar/README.md

@@ -105,7 +105,7 @@ The Flutter Calendar widget has built-in configurable views such as day, week, w
 
 ![appearance_customization](https://cdn.syncfusion.com/content/images/FTControl/Flutter/Appearance+customization.png)
 
-* **Localization and Gloablization** - Display the current date and time by following the globalized date and time formats, and localize all available static texts in calendar.
+* **Localization and Globalization** - Display the current date and time by following the globalized date and time formats, and localize all available static texts in calendar.
 
 ![localization](https://cdn.syncfusion.com/content/images/FTControl/Flutter/calendar/localization.png)
 

packages/syncfusion_flutter_calendar/example/test/widget_test.dart

@@ -257,15 +257,13 @@ class AppointmentHelper {
 
   /// Return calendar appointment text style.
   static TextStyle getAppointmentTextStyle(
-      TextStyle appointmentTextStyle, CalendarView view) {
+      TextStyle appointmentTextStyle, CalendarView view, ThemeData themeData) {
     if (appointmentTextStyle.fontSize != -1) {
-      return appointmentTextStyle;
+      return themeData.textTheme.bodyMedium!.merge(appointmentTextStyle);
     }
-    return TextStyle(
-        color: appointmentTextStyle.color,
-        fontSize: 12,
-        fontWeight: appointmentTextStyle.fontWeight,
-        fontFamily: appointmentTextStyle.fontFamily);
+
+    return themeData.textTheme.bodyMedium!
+        .merge(appointmentTextStyle.copyWith(fontSize: 12));
   }
 
   static CalendarAppointment _copy(CalendarAppointment appointment) {

packages/syncfusion_flutter_calendar/lib/src/calendar/appointment_engine/appointment_helper.dart

@@ -249,9 +249,9 @@ class MonthAppointmentHelper {
     /// swap list index value.
     /// Eg., app1 start with Nov3 10AM and ends with Nov5 11AM and app2 starts
     /// with Nov3 9AM and ends with Nov4 11AM then swap the app1 before of app2.
-    return (AppointmentHelper.getDifference(endTime2, startTime2)
-            .inMinutes
-            .abs())
+    return AppointmentHelper.getDifference(endTime2, startTime2)
+        .inMinutes
+        .abs()
         .compareTo(AppointmentHelper.getDifference(endTime1, startTime1)
             .inMinutes
             .abs());