refactor: unified themes

wilburx9 · Sep 18, 2022 · 351ef80 · 351ef80
1 parent b063cde
commit 351ef80
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 15 deletions.
diff --git a/lib/src/api/service/bank_service.dart b/lib/src/api/service/bank_service.dart
@@ -25,9 +25,7 @@ class BankService with BaseApiService implements BankServiceContract {
       if (response.statusCode == HttpStatus.ok && status!) {
         return responseBody['data']['id'].toString();
       }
-    } catch (e, s) {
-      print("$e :: $s");
-    }
+    } catch (e) {}
     return null;
   }
 
@@ -87,9 +85,7 @@ class BankService with BaseApiService implements BankServiceContract {
         banks.add(new Bank(bank['name'], bank['id']));
       }
       return banks;
-    } catch (e, s) {
-      print("$e :: $s");
-    }
+    } catch (e) {}
     return null;
   }
 }

diff --git a/lib/src/widgets/buttons.dart b/lib/src/widgets/buttons.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_paystack/src/widgets/common/extensions.dart';
 
 class WhiteButton extends _BaseButton {
   final bool flat;
@@ -46,7 +47,7 @@ class AccentButton extends StatelessWidget {
     return _BaseButton(
       onPressed: onPressed,
       showProgress: showProgress,
-      color: Theme.of(context).colorScheme.secondary,
+      color: context.colorScheme().secondary,
       borderSide: BorderSide.none,
       textStyle: const TextStyle(
           fontSize: 14.0, color: Colors.white, fontWeight: FontWeight.bold),

diff --git a/lib/src/widgets/checkout/bank_checkout.dart b/lib/src/widgets/checkout/bank_checkout.dart
@@ -12,6 +12,7 @@ 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';
 import 'package:flutter_paystack/src/widgets/checkout/checkout_widget.dart';
+import 'package:flutter_paystack/src/widgets/common/extensions.dart';
 import 'package:flutter_paystack/src/widgets/input/account_field.dart';
 
 class BankCheckout extends StatefulWidget {
@@ -147,7 +148,7 @@ class _BankCheckoutState extends BaseCheckoutMethodState<BankCheckout> {
                         const BorderSide(color: Colors.grey, width: 0.5)),
                 focusedBorder: OutlineInputBorder(
                     borderSide: BorderSide(
-                        color: Theme.of(context).colorScheme.secondary, width: 1.0)),
+                        color: context.colorScheme().secondary, width: 1.0)),
                 hintText: 'Tap here to choose',
               ),
               isEmpty: _currentBank == null,

diff --git a/lib/src/widgets/checkout/checkout_widget.dart b/lib/src/widgets/checkout/checkout_widget.dart
@@ -166,7 +166,7 @@ class _CheckoutWidgetState extends BaseState<CheckoutWidget>
   }
 
   Widget _buildTitle() {
-    final accentColor = Theme.of(context).colorScheme.secondary;
+    final accentColor = context.colorScheme().secondary;
     var emailAndAmount = Column(
       crossAxisAlignment: CrossAxisAlignment.end,
       children: <Widget>[

diff --git a/lib/src/widgets/custom_dialog.dart b/lib/src/widgets/custom_dialog.dart
@@ -1,6 +1,7 @@
 import 'dart:math' as math;
 
 import 'package:flutter/material.dart';
+import 'package:flutter_paystack/src/widgets/common/extensions.dart';
 
 /// This is a modification of [AlertDialog]. A lot of modifications was made. The goal is
 /// to retain the dialog feel and look while adding the close IconButton
@@ -32,7 +33,7 @@ class CustomAlertDialog extends StatelessWidget {
       children.add(new Padding(
         padding: titlePadding!,
         child: new DefaultTextStyle(
-          style: Theme.of(context).textTheme.headline6!,
+          style: context.textTheme().headline6!,
           child: new Semantics(child: title, namesRoute: true),
         ),
       ));
@@ -42,7 +43,7 @@ class CustomAlertDialog extends StatelessWidget {
       child: new Padding(
         padding: contentPadding,
         child: new DefaultTextStyle(
-          style: Theme.of(context).textTheme.subtitle1!,
+          style: context.textTheme().subtitle1!,
           child: content,
         ),
       ),

diff --git a/lib/src/widgets/input/base_field.dart b/lib/src/widgets/input/base_field.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_paystack/src/widgets/common/extensions.dart';
 
 class BaseTextField extends StatelessWidget {
   final Widget? suffix;
@@ -50,7 +51,7 @@ class BaseTextField extends StatelessWidget {
             borderSide: const BorderSide(color: Colors.grey, width: 0.5)),
         focusedBorder: OutlineInputBorder(
             borderSide:
-                BorderSide(color: Theme.of(context).colorScheme.secondary, width: 1.0)),
+                BorderSide(color: context.colorScheme().secondary, width: 1.0)),
         hintText: hintText,
       ),
     );

diff --git a/lib/src/widgets/input/pin_field.dart b/lib/src/widgets/input/pin_field.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_paystack/src/widgets/common/extensions.dart';
 
 class PinField extends StatefulWidget {
   final ValueChanged<String>? onSaved;
@@ -44,7 +45,7 @@ class _PinFieldState extends State<PinField> {
               borderSide: const BorderSide(color: Colors.grey, width: 0.5)),
           focusedBorder: OutlineInputBorder(
               borderSide:
-                  BorderSide(color: Theme.of(context).colorScheme.secondary, width: 1.0)),
+                  BorderSide(color: context.colorScheme().secondary, width: 1.0)),
         ),
         onChanged: (String value) {
           if (value.length == widget.pinLength) {

diff --git a/lib/src/widgets/otp_widget.dart b/lib/src/widgets/otp_widget.dart
@@ -51,7 +51,7 @@ class _OtpWidgetState extends BaseState<OtpWidget> {
                   padding: EdgeInsets.symmetric(horizontal: 10),
                   child: new OtpField(
                     onSaved: (String? value) => _otp = value,
-                    borderColor: Theme.of(context).colorScheme.secondary,
+                    borderColor: context.colorScheme().secondary,
                   ),
                 ),
                 heightBox,

diff --git a/lib/src/widgets/pin_widget.dart b/lib/src/widgets/pin_widget.dart
@@ -77,7 +77,7 @@ class _PinWidgetState extends BaseState<PinWidget> {
         children: List.generate(
             _startCount,
             (i) => star(i == (_startCount - 1)
-                ? Theme.of(context).colorScheme.secondary
+                ? context.colorScheme().secondary
                 : Theme.of(context).primaryColorLight)),
       ),
     );