changed primary color usage to fix the color bug in dark mode

Changed Theme.of(context).primaryColor to Theme.of(contex).colorScheme.primary to make dark mode work properly.
2025-09-03 23:49:30 +05:30
parent 85f58c1e25
commit 64e80148a3
17 changed files with 234 additions and 202 deletions
--- a/lib/features/quick_pay/screens/quick_pay_outside_bank_screen.dart
+++ b/lib/features/quick_pay/screens/quick_pay_outside_bank_screen.dart
@@ -375,8 +375,6 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
      appBar: AppBar(
        title: Text(
          AppLocalizations.of(context).quickPayOutsideBank,
-          style:
-              const TextStyle(color: Colors.black, fontWeight: FontWeight.w500),
        ),
        centerTitle: false,
      ),
@@ -413,10 +411,12 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                  filled: true,
                  fillColor: Theme.of(context).scaffoldBackgroundColor,
                  enabledBorder: OutlineInputBorder(
-                    borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
+                    borderSide: BorderSide(
+                        color: Theme.of(context).colorScheme.outline),
                  ),
                  focusedBorder: OutlineInputBorder(
-                    borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
+                    borderSide: BorderSide(
+                        color: Theme.of(context).colorScheme.primary, width: 2),
                  ),
                ),
                controller: accountNumberController,
@@ -449,10 +449,12 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                  filled: true,
                  fillColor: Theme.of(context).scaffoldBackgroundColor,
                  enabledBorder: OutlineInputBorder(
-                    borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
+                    borderSide: BorderSide(
+                        color: Theme.of(context).colorScheme.outline),
                  ),
                  focusedBorder: OutlineInputBorder(
-                    borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
+                    borderSide: BorderSide(
+                        color: Theme.of(context).colorScheme.primary, width: 2),
                  ),
                ),
                keyboardType: TextInputType.number,
@@ -484,10 +486,13 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                        filled: true,
                        fillColor: Theme.of(context).scaffoldBackgroundColor,
                        enabledBorder: OutlineInputBorder(
-                          borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
+                          borderSide: BorderSide(
+                              color: Theme.of(context).colorScheme.outline),
                        ),
                        focusedBorder: OutlineInputBorder(
-                          borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
+                          borderSide: BorderSide(
+                              color: Theme.of(context).colorScheme.primary,
+                              width: 2),
                        ),
                      ),
                      controller: ifscController,
@@ -531,10 +536,13 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                        filled: true,
                        fillColor: Theme.of(context).scaffoldBackgroundColor,
                        enabledBorder: OutlineInputBorder(
-                          borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
+                          borderSide: BorderSide(
+                              color: Theme.of(context).colorScheme.outline),
                        ),
                        focusedBorder: OutlineInputBorder(
-                          borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
+                          borderSide: BorderSide(
+                              color: Theme.of(context).colorScheme.primary,
+                              width: 2),
                        ),
                      ),
                      items: [
@@ -563,13 +571,12 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                  filled: true,
                  fillColor: Theme.of(context).dialogBackgroundColor,
                  enabledBorder: OutlineInputBorder(
-                    borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
-                  ),
-                  focusedBorder: const OutlineInputBorder(
                    borderSide: BorderSide(
-                      color: Colors.black,
-                      width: 2,
-                    ),
+                        color: Theme.of(context).colorScheme.outline),
+                  ),
+                  focusedBorder: OutlineInputBorder(
+                    borderSide: BorderSide(
+                        color: Theme.of(context).colorScheme.primary, width: 2),
                  ),
                ),
              ),
@@ -584,11 +591,12 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                  filled: true,
                  fillColor: Theme.of(context).dialogBackgroundColor,
                  enabledBorder: OutlineInputBorder(
-                    borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
-                  ),
-                  focusedBorder: const OutlineInputBorder(
                    borderSide: BorderSide(
-                      color: Colors.black,
+                        color: Theme.of(context).colorScheme.outline),
+                  ),
+                  focusedBorder: OutlineInputBorder(
+                    borderSide: BorderSide(
+                      color: Theme.of(context).colorScheme.primary,
                      width: 2,
                    ),
                  ),
@@ -631,7 +639,8 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                  padding: const EdgeInsets.only(bottom: 24.0),
                  child: Text(
                    _validationError!,
-                    style: const TextStyle(color: Colors.red),
+                    style:
+                        TextStyle(color: Theme.of(context).colorScheme.error),
                  ),
                ),
              TextFormField(
@@ -644,10 +653,12 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                  filled: true,
                  fillColor: Theme.of(context).dialogBackgroundColor,
                  enabledBorder: OutlineInputBorder(
-                    borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
+                    borderSide: BorderSide(
+                        color: Theme.of(context).colorScheme.outline),
                  ),
                  focusedBorder: OutlineInputBorder(
-                    borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
+                    borderSide: BorderSide(
+                        color: Theme.of(context).colorScheme.primary, width: 2),
                  ),
                ),
                validator: (value) {
@@ -672,10 +683,13 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                        filled: true,
                        fillColor: Theme.of(context).scaffoldBackgroundColor,
                        enabledBorder: OutlineInputBorder(
-                          borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
+                          borderSide: BorderSide(
+                              color: Theme.of(context).colorScheme.outline),
                        ),
                        focusedBorder: OutlineInputBorder(
-                          borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
+                          borderSide: BorderSide(
+                              color: Theme.of(context).colorScheme.primary,
+                              width: 2),
                        ),
                      ),
                      textInputAction: TextInputAction.next,
@@ -694,10 +708,13 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                        filled: true,
                        fillColor: Theme.of(context).scaffoldBackgroundColor,
                        enabledBorder: OutlineInputBorder(
-                          borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
+                          borderSide: BorderSide(
+                              color: Theme.of(context).colorScheme.outline),
                        ),
                        focusedBorder: OutlineInputBorder(
-                          borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
+                          borderSide: BorderSide(
+                              color: Theme.of(context).colorScheme.primary,
+                              width: 2),
                        ),
                      ),
                      controller: amountController,
@@ -734,7 +751,7 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                child: SwipeButton.expand(
                  thumb: Icon(Icons.arrow_forward,
                      color: Theme.of(context).dialogBackgroundColor),
-                  activeThumbColor: Theme.of(context).primaryColor,
+                  activeThumbColor: Theme.of(context).colorScheme.primary,
                  activeTrackColor:
                      Theme.of(context).colorScheme.secondary.withAlpha(100),
                  borderRadius: BorderRadius.circular(30),
@@ -770,12 +787,12 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                padding: const EdgeInsets.symmetric(vertical: 5),
                decoration: BoxDecoration(
                  color: isSelected
-                      ? Theme.of(context).primaryColor
+                      ? Theme.of(context).colorScheme.primary
                      : Theme.of(context).scaffoldBackgroundColor,
                  borderRadius: BorderRadius.circular(5),
                  border: Border.all(
                    color: isSelected
-                        ? Theme.of(context).primaryColor
+                        ? Theme.of(context).colorScheme.primary
                        : Theme.of(context).scaffoldBackgroundColor,
                    width: isSelected ? 0 : 1.2,
                  ),
@@ -783,7 +800,8 @@ class _QuickPayOutsideBankScreen extends State<QuickPayOutsideBankScreen> {
                alignment: Alignment.center,
                child: Text(
                  transactionModes(context)[index],
-                  style: const TextStyle(color: Colors.black),
+                  style:
+                      TextStyle(color: Theme.of(context).colorScheme.onSurface),
                ),
              ),
            ),
--- a/lib/features/quick_pay/screens/quick_pay_within_bank_screen.dart
+++ b/lib/features/quick_pay/screens/quick_pay_within_bank_screen.dart
@@ -90,8 +90,9 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
      appBar: AppBar(
        title: Text(
          AppLocalizations.of(context).quickPayOwnBank,
-          style:
-              TextStyle(color: Theme.of(context).colorScheme.onSurface, fontWeight: FontWeight.w500),
+          style: TextStyle(
+              color: Theme.of(context).colorScheme.onSurface,
+              fontWeight: FontWeight.w500),
        ),
        centerTitle: false,
      ),
@@ -125,10 +126,12 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
                  filled: true,
                  fillColor: Theme.of(context).scaffoldBackgroundColor,
                  enabledBorder: OutlineInputBorder(
-                    borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
+                    borderSide: BorderSide(
+                        color: Theme.of(context).colorScheme.outline),
                  ),
-                  focusedBorder:  OutlineInputBorder(
-                    borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
+                  focusedBorder: OutlineInputBorder(
+                    borderSide: BorderSide(
+                        color: Theme.of(context).colorScheme.primary, width: 2),
                  ),
                ),
                controller: accountNumberController,
@@ -154,11 +157,13 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
                  isDense: true,
                  filled: true,
                  fillColor: Theme.of(context).scaffoldBackgroundColor,
-                  enabledBorder:  OutlineInputBorder(
-                    borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
+                  enabledBorder: OutlineInputBorder(
+                    borderSide: BorderSide(
+                        color: Theme.of(context).colorScheme.outline),
                  ),
                  focusedBorder: OutlineInputBorder(
-                    borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
+                    borderSide: BorderSide(
+                        color: Theme.of(context).colorScheme.primary, width: 2),
                  ),
                ),
                keyboardType: TextInputType.number,
@@ -239,10 +244,12 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
                  filled: true,
                  fillColor: Theme.of(context).scaffoldBackgroundColor,
                  enabledBorder: OutlineInputBorder(
-                    borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
+                    borderSide: BorderSide(
+                        color: Theme.of(context).colorScheme.outline),
                  ),
-                  focusedBorder:  OutlineInputBorder(
-                    borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
+                  focusedBorder: OutlineInputBorder(
+                    borderSide: BorderSide(
+                        color: Theme.of(context).colorScheme.primary, width: 2),
                  ),
                ),
                value: _selectedAccountType,
@@ -276,11 +283,13 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
                  isDense: true,
                  filled: true,
                  fillColor: Theme.of(context).scaffoldBackgroundColor,
-                  enabledBorder:  OutlineInputBorder(
-                    borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
+                  enabledBorder: OutlineInputBorder(
+                    borderSide: BorderSide(
+                        color: Theme.of(context).colorScheme.outline),
                  ),
-                  focusedBorder:  OutlineInputBorder(
-                    borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
+                  focusedBorder: OutlineInputBorder(
+                    borderSide: BorderSide(
+                        color: Theme.of(context).colorScheme.primary, width: 2),
                  ),
                ),
                controller: amountController,
@@ -303,7 +312,7 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
                child: SwipeButton.expand(
                  thumb: Icon(Icons.arrow_forward,
                      color: Theme.of(context).dialogBackgroundColor),
-                  activeThumbColor: Theme.of(context).primaryColor,
+                  activeThumbColor: Theme.of(context).colorScheme.primary,
                  activeTrackColor: Theme.of(
                    context,
                  ).colorScheme.secondary.withAlpha(100),
@@ -377,11 +386,12 @@ class _QuickPayWithinBankScreen extends State<QuickPayWithinBankScreen> {
        isDense: true,
        filled: true,
        fillColor: Theme.of(context).dialogBackgroundColor,
-        enabledBorder:  OutlineInputBorder(
+        enabledBorder: OutlineInputBorder(
          borderSide: BorderSide(color: Theme.of(context).colorScheme.outline),
        ),
-        focusedBorder:  OutlineInputBorder(
-          borderSide: BorderSide(color: Theme.of(context).colorScheme.primary, width: 2),
+        focusedBorder: OutlineInputBorder(
+          borderSide: BorderSide(
+              color: Theme.of(context).colorScheme.primary, width: 2),
        ),
      ),
    );