diff --git a/lib/features/card/screens/card_details_screen.dart b/lib/features/card/screens/card_details_screen.dart index d3583b2..2275154 100644 --- a/lib/features/card/screens/card_details_screen.dart +++ b/lib/features/card/screens/card_details_screen.dart @@ -90,12 +90,12 @@ class CardTile extends StatelessWidget { const Text( "Kangra Central Co-operative Bank", style: TextStyle( - color: Colors.white, - fontSize: 15.5, + color: Color.fromARGB(255, 238, 237, 237), + fontSize: 15, fontWeight: FontWeight.bold, ), - overflow: TextOverflow.ellipsis, - maxLines: 1, + overflow: TextOverflow.visible, + maxLines: 2, ), ], ), diff --git a/lib/features/card/screens/card_management_screen.dart b/lib/features/card/screens/card_management_screen.dart index 1243f84..6a9962a 100644 --- a/lib/features/card/screens/card_management_screen.dart +++ b/lib/features/card/screens/card_management_screen.dart @@ -19,7 +19,6 @@ class _CardManagementScreen extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - automaticallyImplyLeading: false, title: Text( AppLocalizations.of(context).cardManagement, ), @@ -61,7 +60,7 @@ class _CardManagementScreen extends State { ), ); }, - disabled: true, + disabled: false, ), Divider(height: 1, color: Theme.of(context).dividerColor), CardManagementTile( diff --git a/lib/features/card/screens/card_pin_change_details_screen.dart b/lib/features/card/screens/card_pin_change_details_screen.dart index d5a196a..5145fcc 100644 --- a/lib/features/card/screens/card_pin_change_details_screen.dart +++ b/lib/features/card/screens/card_pin_change_details_screen.dart @@ -45,7 +45,7 @@ class _CardPinChangeDetailsScreen extends State { return Scaffold( appBar: AppBar( title: Text( - AppLocalizations.of(context).cardDetails, + AppLocalizations.of(context).changeCardPin, ), centerTitle: false, ), @@ -66,12 +66,8 @@ class _CardPinChangeDetailsScreen extends State { isDense: true, filled: true, fillColor: Theme.of(context).scaffoldBackgroundColor, - enabledBorder: const OutlineInputBorder( - borderSide: BorderSide(color: Colors.black), - ), - focusedBorder: const OutlineInputBorder( - borderSide: BorderSide(color: Colors.black, width: 2), - ), + enabledBorder: const OutlineInputBorder(), + focusedBorder: const OutlineInputBorder(), ), keyboardType: TextInputType.number, textInputAction: TextInputAction.next, @@ -92,13 +88,8 @@ class _CardPinChangeDetailsScreen extends State { filled: true, fillColor: Theme.of(context).scaffoldBackgroundColor, - enabledBorder: const OutlineInputBorder( - borderSide: BorderSide(color: Colors.black), - ), - focusedBorder: const OutlineInputBorder( - borderSide: - BorderSide(color: Colors.black, width: 2), - ), + enabledBorder: const OutlineInputBorder(), + focusedBorder: const OutlineInputBorder(), ), keyboardType: TextInputType.number, textInputAction: TextInputAction.next, @@ -123,13 +114,8 @@ class _CardPinChangeDetailsScreen extends State { filled: true, fillColor: Theme.of(context).scaffoldBackgroundColor, - enabledBorder: const OutlineInputBorder( - borderSide: BorderSide(color: Colors.black), - ), - focusedBorder: const OutlineInputBorder( - borderSide: - BorderSide(color: Colors.black, width: 2), - ), + enabledBorder: const OutlineInputBorder(), + focusedBorder: const OutlineInputBorder(), ), validator: (value) => value != null && value.isNotEmpty @@ -149,12 +135,8 @@ class _CardPinChangeDetailsScreen extends State { isDense: true, filled: true, fillColor: Theme.of(context).scaffoldBackgroundColor, - enabledBorder: const OutlineInputBorder( - borderSide: BorderSide(color: Colors.black), - ), - focusedBorder: const OutlineInputBorder( - borderSide: BorderSide(color: Colors.black, width: 2), - ), + enabledBorder: const OutlineInputBorder(), + focusedBorder: const OutlineInputBorder(), ), textInputAction: TextInputAction.done, keyboardType: TextInputType.phone, diff --git a/lib/features/service/screens/service_screen.dart b/lib/features/service/screens/service_screen.dart index 2989028..e72379b 100644 --- a/lib/features/service/screens/service_screen.dart +++ b/lib/features/service/screens/service_screen.dart @@ -1,4 +1,5 @@ import 'package:kmobile/features/account_opening/screens/account_opening_screen.dart'; +import 'package:kmobile/features/card/screens/card_management_screen.dart'; import 'package:kmobile/features/service/screens/atm_locator_screen.dart'; import '../../../l10n/app_localizations.dart'; import 'package:flutter/material.dart'; @@ -83,6 +84,19 @@ class _ServiceScreen extends State { disabled: false, ), ), + Expanded( + child: ServiceManagementTile( + icon: Symbols.credit_card, + label: AppLocalizations.of(context).cardManagement, + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => const CardManagementScreen())); + }, + disabled: false, + ), + ), // No Spacer() needed here as Expanded children will fill space ], ),