Fixed warnings in the code & Fixes #82 Added support to add network i…

…mage as card background (#85)

* Fixed warnings in the code.

* Fixes #82 Added support to add network image as card background

CHANGELOG.md

@@ -1,6 +1,8 @@
 ## 3.0.2 - Jul 25, 2022
 
 - Fixed [#73](https://github.com/SimformSolutionsPvtLtd/flutter_credit_card/issues/73) - Pass AutovalidateMode to CreditCardForm
+- Fixed [#82](https://github.com/SimformSolutionsPvtLtd/flutter_credit_card/issues/82) - Added support to add network image as card background
+- Fixed [#46](https://github.com/SimformSolutionsPvtLtd/flutter_credit_card/issues/46) - Card number Regex issue for safari and web
 
 ## 3.0.1 - Oct 12, 2021
 

README.md

@@ -50,6 +50,7 @@ import 'package:flutter_credit_card/flutter_credit_card.dart';
         cardBgColor: Colors.black,
         glassmorphismConfig: Glassmorphism.defaultConfig(),
         backgroundImage: 'assets/card_bg.png',
+        backgroundNetworkImage: 'image-url'
         obscureCardNumber: true,
         obscureCardCvv: true,
         isHolderNameVisible: false,

analysis_options.yaml

@@ -50,8 +50,6 @@ linter:
     - always_require_non_null_named_parameters
     - always_specify_types
     - annotate_overrides
-    # - avoid_annotating_with_dynamic # conflicts with always_specify_types
-    - avoid_as
     # - avoid_bool_literals_in_conditional_expressions # not yet tested
     # - avoid_catches_without_on_clauses # we do this commonly
     # - avoid_catching_errors # we do this commonly
@@ -149,7 +147,6 @@ linter:
     - recursive_getters
     - slash_for_doc_comments
     - sort_constructors_first
-    - sort_pub_dependencies
     - sort_unnamed_constructors_first
     # - super_goes_last # no longer needed w/ Dart 2
     - test_types_in_equals

example/lib/main.dart

@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_credit_card/credit_card_brand.dart';
-import 'package:flutter_credit_card/credit_card_form.dart';
-import 'package:flutter_credit_card/credit_card_model.dart';
 import 'package:flutter_credit_card/flutter_credit_card.dart';
 
 void main() => runApp(MySample());

lib/credit_card_background.dart

@@ -9,14 +9,21 @@ class CardBackground extends StatelessWidget {
   const CardBackground({
     Key? key,
     required this.backgroundGradientColor,
-    required this.backgroundImage,
+    this.backgroundImage,
+    this.backgroundNetworkImage,
     required this.child,
     this.width,
     this.height,
     this.glassmorphismConfig,
-  }) : super(key: key);
+  })  : assert(
+            (backgroundImage == null && backgroundNetworkImage == null) ||
+                (backgroundImage == null && backgroundNetworkImage != null) ||
+                (backgroundImage != null && backgroundNetworkImage == null),
+            "You can't use network image & asset image at same time for card background"),
+        super(key: key);
 
   final String? backgroundImage;
+  final String? backgroundNetworkImage;
   final Widget child;
   final Gradient backgroundGradientColor;
   final Glassmorphism? glassmorphismConfig;
@@ -42,14 +49,22 @@ class CardBackground extends StatelessWidget {
               gradient: glassmorphismConfig != null
                   ? glassmorphismConfig!.gradient
                   : backgroundGradientColor,
-              image: backgroundImage != null
+              image: backgroundImage != null && backgroundImage!.isNotEmpty
                   ? DecorationImage(
                       image: ExactAssetImage(
                         backgroundImage!,
                       ),
                       fit: BoxFit.fill,
                     )
-                  : null,
+                  : backgroundNetworkImage != null &&
+                          backgroundNetworkImage!.isNotEmpty
+                      ? DecorationImage(
+                          image: NetworkImage(
+                            backgroundNetworkImage!,
+                          ),
+                          fit: BoxFit.fill,
+                        )
+                      : null,
             ),
             width: width ?? screenWidth,
             height: height ??

lib/credit_card_brand.dart

@@ -1,7 +1,7 @@
 import 'package:flutter_credit_card/flutter_credit_card.dart';
 
 class CreditCardBrand {
-  CardType? brandName;
 
   CreditCardBrand(this.brandName);
+  CardType? brandName;
 }

lib/credit_card_widget.dart

@@ -539,8 +539,9 @@ class _CreditCardWidgetState extends State<CreditCardWidget>
   }
 
   Widget getCardTypeImage(CardType? cardType) {
-    final List<CustomCardTypeIcon> customCardTypeIcon = getCustomCardTypeIcon(cardType!);
-    if(customCardTypeIcon.isNotEmpty){
+    final List<CustomCardTypeIcon> customCardTypeIcon =
+        getCustomCardTypeIcon(cardType!);
+    if (customCardTypeIcon.isNotEmpty) {
       return customCardTypeIcon.first.cardImage;
     } else {
       return Image.asset(
@@ -552,12 +553,13 @@ class _CreditCardWidgetState extends State<CreditCardWidget>
     }
   }
 
-    // This method returns the icon for the visa card type if found
-    // else will return the empty container
+  // This method returns the icon for the visa card type if found
+  // else will return the empty container
   Widget getCardTypeIcon(String cardNumber) {
     Widget icon;
     final CardType ccType = detectCCType(cardNumber);
-    final List<CustomCardTypeIcon> customCardTypeIcon = getCustomCardTypeIcon(ccType);
+    final List<CustomCardTypeIcon> customCardTypeIcon =
+        getCustomCardTypeIcon(ccType);
     if (customCardTypeIcon.isNotEmpty) {
       icon = customCardTypeIcon.first.cardImage;
       isAmex = ccType == CardType.americanExpress;

lib/flutter_credit_card.dart

@@ -3,5 +3,5 @@ library flutter_credit_card;
 export 'credit_card_form.dart';
 export 'credit_card_model.dart';
 export 'credit_card_widget.dart';
-export 'glassmorphism_config.dart';
 export 'custom_card_type_icon.dart';
+export 'glassmorphism_config.dart';

lib/glassmorphism_config.dart

@@ -1,5 +1,3 @@
-import 'dart:ui';
-
 import 'package:flutter/material.dart';
 
 class Glassmorphism {

pubspec.yaml

@@ -14,6 +14,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
+  flutter_lints: ^2.0.1
 
 flutter:
   assets:

test/localized_text_model_test.dart

@@ -1,5 +1,5 @@
-import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_credit_card/localized_text_model.dart';
+import 'package:flutter_test/flutter_test.dart';
 
 void main() {
   test('Object correctly instantiated with properties', () {