Renamed model to models

AppCheap · Dec 29, 2019 · 3bb1f56 · 3bb1f56
1 parent 2c8a6a8
commit 3bb1f56
Show file tree

Hide file tree

Showing 24 changed files with 43 additions and 42 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Install dependencies 
       run: flutter pub get
     - name: Analyze Dart code
-      run: flutter analyze
+      run: flutter analyze -v
     - name: Run tests
       run: flutter test --coverage
     - name: Coveralls

diff --git a/lib/flutter_paystack.dart b/lib/flutter_paystack.dart
@@ -1,7 +1,7 @@
 // Expose the following files
 export 'package:flutter_paystack/src/common/exceptions.dart';
 export 'package:flutter_paystack/src/common/paystack.dart' hide Paystack;
-export 'package:flutter_paystack/src/model/card.dart';
-export 'package:flutter_paystack/src/model/charge.dart';
-export 'package:flutter_paystack/src/model/checkout_response.dart';
-export 'package:flutter_paystack/src/model/transaction.dart';
+export 'package:flutter_paystack/src/models/card.dart';
+export 'package:flutter_paystack/src/models/charge.dart';
+export 'package:flutter_paystack/src/models/checkout_response.dart';
+export 'package:flutter_paystack/src/models/transaction.dart';
diff --git a/lib/src/api/request/bank_charge_request_body.dart b/lib/src/api/request/bank_charge_request_body.dart
@@ -1,5 +1,5 @@
 import 'package:flutter_paystack/src/api/request/base_request_body.dart';
-import 'package:flutter_paystack/src/model/charge.dart';
+import 'package:flutter_paystack/src/models/charge.dart';
 import 'package:flutter_paystack/src/widgets/checkout/bank_checkout.dart';
 
 class BankChargeRequestBody extends BaseRequestBody {

diff --git a/lib/src/api/request/card_request_body.dart b/lib/src/api/request/card_request_body.dart
@@ -1,10 +1,10 @@
 import 'dart:async';
 
-import 'package:flutter_paystack/src/api/request/base_request_body.dart';
-import 'package:flutter_paystack/src/model/charge.dart';
 import 'package:flutter_paystack/flutter_paystack.dart';
+import 'package:flutter_paystack/src/api/request/base_request_body.dart';
 import 'package:flutter_paystack/src/common/card_utils.dart';
 import 'package:flutter_paystack/src/common/crypto.dart';
+import 'package:flutter_paystack/src/models/charge.dart';
 
 class CardRequestBody extends BaseRequestBody {
   static const String fieldClientData = "clientdata";

diff --git a/lib/src/common/card_utils.dart b/lib/src/common/card_utils.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_paystack/src/common/exceptions.dart';
 import 'package:flutter_paystack/src/common/string_utils.dart';
-import 'package:flutter_paystack/src/model/card.dart';
+import 'package:flutter_paystack/src/models/card.dart';
 
 class CardUtils {
   static bool isWholeNumberPositive(String value) {

diff --git a/lib/src/common/paystack.dart b/lib/src/common/paystack.dart
@@ -7,10 +7,10 @@ import 'package:flutter_paystack/src/common/exceptions.dart';
 import 'package:flutter_paystack/src/common/my_strings.dart';
 import 'package:flutter_paystack/src/common/platform_info.dart';
 import 'package:flutter_paystack/src/common/utils.dart';
-import 'package:flutter_paystack/src/model/card.dart';
-import 'package:flutter_paystack/src/model/charge.dart';
-import 'package:flutter_paystack/src/model/checkout_response.dart';
-import 'package:flutter_paystack/src/model/transaction.dart';
+import 'package:flutter_paystack/src/models/card.dart';
+import 'package:flutter_paystack/src/models/charge.dart';
+import 'package:flutter_paystack/src/models/checkout_response.dart';
+import 'package:flutter_paystack/src/models/transaction.dart';
 import 'package:flutter_paystack/src/transaction/card_transaction_manager.dart';
 import 'package:flutter_paystack/src/widgets/checkout/checkout_widget.dart';
 

diff --git a/lib/src/common/utils.dart b/lib/src/common/utils.dart
@@ -3,9 +3,10 @@ import 'dart:convert';
 
 import 'package:async/async.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_paystack/flutter_paystack.dart';
 import 'package:flutter_paystack/src/common/exceptions.dart';
+import 'package:flutter_paystack/src/common/paystack.dart';
 import 'package:flutter_paystack/src/common/string_utils.dart';
+import 'package:flutter_paystack/src/models/charge.dart';
 import 'package:flutter_paystack/src/widgets/checkout/bank_checkout.dart';
 import 'package:http/http.dart' as http;
 import 'package:intl/intl.dart';

diff --git a/lib/src/model/card.dart → lib/src/models/card.dart b/lib/src/model/card.dart → lib/src/models/card.dart
diff --git a/lib/src/model/charge.dart → lib/src/models/charge.dart b/lib/src/model/charge.dart → lib/src/models/charge.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_paystack/src/common/exceptions.dart';
 import 'package:flutter_paystack/src/common/my_strings.dart';
-import 'package:flutter_paystack/src/model/card.dart';
+import 'package:flutter_paystack/src/models/card.dart';
 import 'package:flutter_paystack/src/widgets/checkout/bank_checkout.dart';
 
 class Charge {

diff --git a/lib/src/model/checkout_response.dart → lib/src/models/checkout_response.dart b/lib/src/model/checkout_response.dart → lib/src/models/checkout_response.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_paystack/src/common/my_strings.dart';
-import 'package:flutter_paystack/src/model/card.dart';
 import 'package:flutter_paystack/src/common/paystack.dart';
+import 'package:flutter_paystack/src/models/card.dart';
 import 'package:flutter_paystack/src/widgets/checkout/bank_checkout.dart';
 import 'package:meta/meta.dart';
 

diff --git a/lib/src/model/transaction.dart → lib/src/models/transaction.dart b/lib/src/model/transaction.dart → lib/src/models/transaction.dart
diff --git a/lib/src/transaction/bank_transaction_manager.dart b/lib/src/transaction/bank_transaction_manager.dart
@@ -7,8 +7,8 @@ import 'package:flutter_paystack/src/api/service/bank_service.dart';
 import 'package:flutter_paystack/src/common/exceptions.dart';
 import 'package:flutter_paystack/src/common/my_strings.dart';
 import 'package:flutter_paystack/src/common/paystack.dart';
-import 'package:flutter_paystack/src/model/charge.dart';
-import 'package:flutter_paystack/src/model/transaction.dart';
+import 'package:flutter_paystack/src/models/charge.dart';
+import 'package:flutter_paystack/src/models/transaction.dart';
 import 'package:flutter_paystack/src/transaction/base_transaction_manager.dart';
 
 class BankTransactionManager extends BaseTransactionManager {

diff --git a/lib/src/transaction/base_transaction_manager.dart b/lib/src/transaction/base_transaction_manager.dart
@@ -7,9 +7,9 @@ import 'package:flutter_paystack/src/api/model/transaction_api_response.dart';
 import 'package:flutter_paystack/src/common/exceptions.dart';
 import 'package:flutter_paystack/src/common/paystack.dart';
 import 'package:flutter_paystack/src/common/utils.dart';
-import 'package:flutter_paystack/src/model/card.dart';
-import 'package:flutter_paystack/src/model/charge.dart';
-import 'package:flutter_paystack/src/model/transaction.dart';
+import 'package:flutter_paystack/src/models/card.dart';
+import 'package:flutter_paystack/src/models/charge.dart';
+import 'package:flutter_paystack/src/models/transaction.dart';
 import 'package:flutter_paystack/src/widgets/birthday_widget.dart';
 import 'package:flutter_paystack/src/widgets/card_widget.dart';
 import 'package:flutter_paystack/src/widgets/otp_widget.dart';

diff --git a/lib/src/transaction/card_transaction_manager.dart b/lib/src/transaction/card_transaction_manager.dart
@@ -8,8 +8,8 @@ import 'package:flutter_paystack/src/api/service/card_service.dart';
 import 'package:flutter_paystack/src/common/exceptions.dart';
 import 'package:flutter_paystack/src/common/my_strings.dart';
 import 'package:flutter_paystack/src/common/paystack.dart';
-import 'package:flutter_paystack/src/model/charge.dart';
-import 'package:flutter_paystack/src/model/transaction.dart';
+import 'package:flutter_paystack/src/models/charge.dart';
+import 'package:flutter_paystack/src/models/transaction.dart';
 import 'package:flutter_paystack/src/transaction/base_transaction_manager.dart';
 
 class CardTransactionManager extends BaseTransactionManager {

diff --git a/lib/src/widgets/base_widget.dart b/lib/src/widgets/base_widget.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_paystack/src/model/checkout_response.dart';
+import 'package:flutter_paystack/src/models/checkout_response.dart';
 
 abstract class BaseState<T extends StatefulWidget> extends State<T> {
   bool isProcessing = false;

diff --git a/lib/src/widgets/card_widget.dart b/lib/src/widgets/card_widget.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_paystack/src/model/card.dart';
+import 'package:flutter_paystack/src/models/card.dart';
 import 'package:flutter_paystack/src/widgets/base_widget.dart';
 import 'package:flutter_paystack/src/widgets/buttons.dart';
-import 'package:flutter_paystack/src/widgets/input/card_input.dart';
 import 'package:flutter_paystack/src/widgets/custom_dialog.dart';
+import 'package:flutter_paystack/src/widgets/input/card_input.dart';
 
 class CardInputWidget extends StatefulWidget {
   final PaymentCard card;

diff --git a/lib/src/widgets/checkout/bank_checkout.dart b/lib/src/widgets/checkout/bank_checkout.dart
@@ -4,9 +4,9 @@ import 'package:async/async.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_paystack/src/common/paystack.dart';
 import 'package:flutter_paystack/src/common/utils.dart';
-import 'package:flutter_paystack/src/model/charge.dart';
-import 'package:flutter_paystack/src/model/checkout_response.dart';
-import 'package:flutter_paystack/src/model/transaction.dart';
+import 'package:flutter_paystack/src/models/charge.dart';
+import 'package:flutter_paystack/src/models/checkout_response.dart';
+import 'package:flutter_paystack/src/models/transaction.dart';
 import 'package:flutter_paystack/src/transaction/bank_transaction_manager.dart';
 import 'package:flutter_paystack/src/widgets/buttons.dart';
 import 'package:flutter_paystack/src/widgets/checkout/base_checkout.dart';

diff --git a/lib/src/widgets/checkout/base_checkout.dart b/lib/src/widgets/checkout/base_checkout.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_paystack/src/common/my_strings.dart';
-import 'package:flutter_paystack/src/model/checkout_response.dart';
-import 'package:flutter_paystack/src/model/card.dart';
 import 'package:flutter_paystack/src/common/paystack.dart';
+import 'package:flutter_paystack/src/models/card.dart';
+import 'package:flutter_paystack/src/models/checkout_response.dart';
 import 'package:flutter_paystack/src/widgets/animated_widget.dart';
 import 'package:flutter_paystack/src/widgets/checkout/bank_checkout.dart';
 import 'package:flutter_paystack/src/widgets/checkout/checkout_widget.dart';

diff --git a/lib/src/widgets/checkout/card_checkout.dart b/lib/src/widgets/checkout/card_checkout.dart
@@ -3,10 +3,10 @@ import 'package:flutter_paystack/src/common/exceptions.dart';
 import 'package:flutter_paystack/src/common/my_strings.dart';
 import 'package:flutter_paystack/src/common/paystack.dart';
 import 'package:flutter_paystack/src/common/utils.dart';
-import 'package:flutter_paystack/src/model/card.dart';
-import 'package:flutter_paystack/src/model/charge.dart';
-import 'package:flutter_paystack/src/model/checkout_response.dart';
-import 'package:flutter_paystack/src/model/transaction.dart';
+import 'package:flutter_paystack/src/models/card.dart';
+import 'package:flutter_paystack/src/models/charge.dart';
+import 'package:flutter_paystack/src/models/checkout_response.dart';
+import 'package:flutter_paystack/src/models/transaction.dart';
 import 'package:flutter_paystack/src/transaction/card_transaction_manager.dart';
 import 'package:flutter_paystack/src/widgets/checkout/base_checkout.dart';
 import 'package:flutter_paystack/src/widgets/checkout/checkout_widget.dart';

diff --git a/lib/src/widgets/checkout/checkout_widget.dart b/lib/src/widgets/checkout/checkout_widget.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart' hide ErrorWidget;
 import 'package:flutter_paystack/src/common/paystack.dart';
 import 'package:flutter_paystack/src/common/utils.dart';
-import 'package:flutter_paystack/src/model/card.dart';
-import 'package:flutter_paystack/src/model/charge.dart';
-import 'package:flutter_paystack/src/model/checkout_response.dart';
+import 'package:flutter_paystack/src/models/card.dart';
+import 'package:flutter_paystack/src/models/charge.dart';
+import 'package:flutter_paystack/src/models/checkout_response.dart';
 import 'package:flutter_paystack/src/widgets/base_widget.dart';
 import 'package:flutter_paystack/src/widgets/checkout/bank_checkout.dart';
 import 'package:flutter_paystack/src/widgets/checkout/card_checkout.dart';

diff --git a/lib/src/widgets/input/card_input.dart b/lib/src/widgets/input/card_input.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_paystack/src/common/card_utils.dart';
-import 'package:flutter_paystack/src/model/card.dart';
+import 'package:flutter_paystack/src/models/card.dart';
 import 'package:flutter_paystack/src/widgets/buttons.dart';
 import 'package:flutter_paystack/src/widgets/input/cvc_field.dart';
 import 'package:flutter_paystack/src/widgets/input/date_field.dart';

diff --git a/lib/src/widgets/input/cvc_field.dart b/lib/src/widgets/input/cvc_field.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_paystack/src/common/my_strings.dart';
-import 'package:flutter_paystack/src/model/card.dart';
+import 'package:flutter_paystack/src/models/card.dart';
 import 'package:flutter_paystack/src/widgets/input/base_field.dart';
 
 class CVCField extends BaseTextField {

diff --git a/lib/src/widgets/input/date_field.dart b/lib/src/widgets/input/date_field.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_paystack/src/common/card_utils.dart';
 import 'package:flutter_paystack/src/common/my_strings.dart';
-import 'package:flutter_paystack/src/model/card.dart';
+import 'package:flutter_paystack/src/models/card.dart';
 import 'package:flutter_paystack/src/widgets/common/input_formatters.dart';
 import 'package:flutter_paystack/src/widgets/input/base_field.dart';
 

diff --git a/lib/src/widgets/input/number_field.dart b/lib/src/widgets/input/number_field.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_paystack/src/common/card_utils.dart';
 import 'package:flutter_paystack/src/common/my_strings.dart';
-import 'package:flutter_paystack/src/model/card.dart';
+import 'package:flutter_paystack/src/models/card.dart';
 import 'package:flutter_paystack/src/widgets/common/input_formatters.dart';
 import 'package:flutter_paystack/src/widgets/input/base_field.dart';