diff --git a/lib/features/accounts/screens/account_statement_screen.dart b/lib/features/accounts/screens/account_statement_screen.dart index 4fe4327..de0f02c 100644 --- a/lib/features/accounts/screens/account_statement_screen.dart +++ b/lib/features/accounts/screens/account_statement_screen.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter_svg/svg.dart'; import 'package:material_symbols_icons/material_symbols_icons.dart'; import 'package:shimmer/shimmer.dart'; import 'package:kmobile/data/models/transaction.dart'; @@ -119,31 +118,12 @@ class _AccountStatementScreen extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - leading: IconButton( - icon: const Icon(Symbols.arrow_back_ios_new), - onPressed: () => Navigator.pop(context), - ), title: Text( AppLocalizations.of(context).accountStatement, style: const TextStyle(color: Colors.black, fontWeight: FontWeight.w500), ), centerTitle: false, - actions: [ - Padding( - padding: const EdgeInsets.only(right: 10.0), - child: CircleAvatar( - backgroundColor: Colors.grey[200], - radius: 20, - child: SvgPicture.asset( - 'assets/images/avatar_male.svg', - width: 40, - height: 40, - fit: BoxFit.cover, - ), - ), - ), - ], ), body: Padding( padding: const EdgeInsets.all(12.0), diff --git a/lib/features/beneficiaries/screens/add_beneficiary_screen.dart b/lib/features/beneficiaries/screens/add_beneficiary_screen.dart index 877987a..5288806 100644 --- a/lib/features/beneficiaries/screens/add_beneficiary_screen.dart +++ b/lib/features/beneficiaries/screens/add_beneficiary_screen.dart @@ -1,11 +1,9 @@ import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:flutter_svg/svg.dart'; import 'package:kmobile/api/services/beneficiary_service.dart'; import 'package:kmobile/data/models/beneficiary.dart'; import 'beneficiary_result_page.dart'; -import 'package:material_symbols_icons/material_symbols_icons.dart'; import '../../../di/injection.dart'; import '../../../l10n/app_localizations.dart'; import 'package:kmobile/features/fund_transfer/screens/transaction_pin_screen.dart'; @@ -220,34 +218,13 @@ class _AddBeneficiaryScreen extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - leading: IconButton( - icon: const Icon(Symbols.arrow_back_ios_new), - onPressed: () { - Navigator.pop(context); - }, - ), title: Text( AppLocalizations.of(context).addBeneficiary, style: const TextStyle(color: Colors.black, fontWeight: FontWeight.w500), ), centerTitle: false, - actions: [ - Padding( - padding: const EdgeInsets.only(right: 10.0), - child: CircleAvatar( - backgroundColor: Colors.grey[200], - radius: 20, - child: SvgPicture.asset( - 'assets/images/avatar_male.svg', - width: 40, - height: 40, - fit: BoxFit.cover, - ), - ), - ), - ], - ), + ), body: SafeArea( child: Form( key: _formKey, diff --git a/lib/features/card/screens/block_card_screen.dart b/lib/features/card/screens/block_card_screen.dart index 11cb9d7..b49ff2e 100644 --- a/lib/features/card/screens/block_card_screen.dart +++ b/lib/features/card/screens/block_card_screen.dart @@ -1,8 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:flutter_svg/svg.dart'; import 'package:intl/intl.dart'; import '../../../l10n/app_localizations.dart'; -import 'package:material_symbols_icons/material_symbols_icons.dart'; + class BlockCardScreen extends StatefulWidget { const BlockCardScreen({super.key}); @@ -56,34 +55,13 @@ class _BlockCardScreen extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - leading: IconButton( - icon: const Icon(Symbols.arrow_back_ios_new), - onPressed: () { - Navigator.pop(context); - }, - ), title: Text( AppLocalizations.of(context).blockCard, style: const TextStyle(color: Colors.black, fontWeight: FontWeight.w500), ), centerTitle: false, - actions: [ - Padding( - padding: const EdgeInsets.only(right: 10.0), - child: CircleAvatar( - backgroundColor: Colors.grey[200], - radius: 20, - child: SvgPicture.asset( - 'assets/images/avatar_male.svg', - width: 40, - height: 40, - fit: BoxFit.cover, - ), - ), - ), - ], - ), + ), body: Padding( padding: const EdgeInsets.all(10.0), child: Form( diff --git a/lib/features/card/screens/card_management_screen.dart b/lib/features/card/screens/card_management_screen.dart index b82f317..d7c223d 100644 --- a/lib/features/card/screens/card_management_screen.dart +++ b/lib/features/card/screens/card_management_screen.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter_svg/svg.dart'; import 'package:kmobile/features/card/screens/block_card_screen.dart'; import 'package:kmobile/features/card/screens/card_details_screen.dart'; import 'package:kmobile/features/card/screens/card_pin_change_details_screen.dart'; @@ -25,21 +24,6 @@ class _CardManagementScreen extends State { const TextStyle(color: Colors.black, fontWeight: FontWeight.w500), ), centerTitle: false, - actions: [ - Padding( - padding: const EdgeInsets.only(right: 10.0), - child: CircleAvatar( - backgroundColor: Colors.grey[200], - radius: 20, - child: SvgPicture.asset( - 'assets/images/avatar_male.svg', - width: 40, - height: 40, - fit: BoxFit.cover, - ), - ), - ), - ], ), body: ListView( children: [ 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 6d4a5ac..3be4e84 100644 --- a/lib/features/card/screens/card_pin_change_details_screen.dart +++ b/lib/features/card/screens/card_pin_change_details_screen.dart @@ -1,8 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:flutter_svg/svg.dart'; import 'package:intl/intl.dart'; import 'package:kmobile/features/card/screens/card_pin_set_screen.dart'; -import 'package:material_symbols_icons/material_symbols_icons.dart'; import '../../../l10n/app_localizations.dart'; class CardPinChangeDetailsScreen extends StatefulWidget { @@ -46,34 +44,13 @@ class _CardPinChangeDetailsScreen extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - leading: IconButton( - icon: const Icon(Symbols.arrow_back_ios_new), - onPressed: () { - Navigator.pop(context); - }, - ), title: Text( AppLocalizations.of(context).cardDetails, style: const TextStyle(color: Colors.black, fontWeight: FontWeight.w500), ), centerTitle: false, - actions: [ - Padding( - padding: const EdgeInsets.only(right: 10.0), - child: CircleAvatar( - backgroundColor: Colors.grey[200], - radius: 20, - child: SvgPicture.asset( - 'assets/images/avatar_male.svg', - width: 40, - height: 40, - fit: BoxFit.cover, - ), - ), - ), - ], - ), + ), body: Padding( padding: const EdgeInsets.all(10.0), child: Form( diff --git a/lib/features/card/screens/card_pin_set_screen.dart b/lib/features/card/screens/card_pin_set_screen.dart index 1a71715..f6ba521 100644 --- a/lib/features/card/screens/card_pin_set_screen.dart +++ b/lib/features/card/screens/card_pin_set_screen.dart @@ -1,6 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter_svg/svg.dart'; -import 'package:material_symbols_icons/material_symbols_icons.dart'; import '../../../l10n/app_localizations.dart'; class CardPinSetScreen extends StatefulWidget { @@ -46,34 +44,13 @@ class _CardPinSetScreen extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - leading: IconButton( - icon: const Icon(Symbols.arrow_back_ios_new), - onPressed: () { - Navigator.pop(context); - }, - ), title: Text( AppLocalizations.of(context).cardPin, style: const TextStyle(color: Colors.black, fontWeight: FontWeight.w500), ), centerTitle: false, - actions: [ - Padding( - padding: const EdgeInsets.only(right: 10.0), - child: CircleAvatar( - backgroundColor: Colors.grey[200], - radius: 20, - child: SvgPicture.asset( - 'assets/images/avatar_male.svg', - width: 40, - height: 40, - fit: BoxFit.cover, - ), - ), - ), - ], - ), + ), body: Padding( padding: const EdgeInsets.all(16.0), child: Form( diff --git a/lib/features/cheque/screens/cheque_management_screen.dart b/lib/features/cheque/screens/cheque_management_screen.dart index 420117d..93f9c95 100644 --- a/lib/features/cheque/screens/cheque_management_screen.dart +++ b/lib/features/cheque/screens/cheque_management_screen.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter_svg/svg.dart'; import 'package:kmobile/features/enquiry/screens/enquiry_screen.dart'; import 'package:material_symbols_icons/material_symbols_icons.dart'; import '../../../l10n/app_localizations.dart'; @@ -16,34 +15,13 @@ class _ChequeManagementScreen extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - leading: IconButton( - icon: const Icon(Symbols.arrow_back_ios_new), - onPressed: () { - Navigator.pop(context); - }, - ), title: Text( AppLocalizations.of(context).chequeManagement, style: const TextStyle(color: Colors.black, fontWeight: FontWeight.w500), ), centerTitle: false, - actions: [ - Padding( - padding: const EdgeInsets.only(right: 10.0), - child: CircleAvatar( - backgroundColor: Colors.grey[200], - radius: 20, - child: SvgPicture.asset( - 'assets/images/avatar_male.svg', - width: 40, - height: 40, - fit: BoxFit.cover, - ), - ), - ), - ], - ), + ), body: ListView( children: [ const SizedBox(height: 15), diff --git a/lib/features/enquiry/screens/enquiry_screen.dart b/lib/features/enquiry/screens/enquiry_screen.dart index 94a839b..ef38e7e 100644 --- a/lib/features/enquiry/screens/enquiry_screen.dart +++ b/lib/features/enquiry/screens/enquiry_screen.dart @@ -1,8 +1,6 @@ // ignore_for_file: use_build_context_synchronously import 'package:flutter/material.dart'; -import 'package:flutter_svg/svg.dart'; -import 'package:material_symbols_icons/material_symbols_icons.dart'; import 'package:url_launcher/url_launcher.dart'; import '../../../l10n/app_localizations.dart'; @@ -58,33 +56,12 @@ class _EnquiryScreen extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - leading: IconButton( - icon: const Icon(Symbols.arrow_back_ios_new), - onPressed: () { - Navigator.pop(context); - }, - ), title: Text( AppLocalizations.of(context).enquiry, style: const TextStyle(color: Colors.black, fontWeight: FontWeight.w500), ), centerTitle: false, - actions: [ - Padding( - padding: const EdgeInsets.only(right: 10.0), - child: CircleAvatar( - backgroundColor: Colors.grey[200], - radius: 20, - child: SvgPicture.asset( - 'assets/images/avatar_male.svg', - width: 40, - height: 40, - fit: BoxFit.cover, - ), - ), - ), - ], ), body: Padding( padding: const EdgeInsets.all(16.0), diff --git a/lib/features/fund_transfer/screens/transaction_pin_screen.dart b/lib/features/fund_transfer/screens/transaction_pin_screen.dart index 6585d9d..f8384a1 100644 --- a/lib/features/fund_transfer/screens/transaction_pin_screen.dart +++ b/lib/features/fund_transfer/screens/transaction_pin_screen.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:kmobile/api/services/auth_service.dart'; import 'package:kmobile/di/injection.dart'; import 'package:kmobile/features/fund_transfer/screens/tpin_prompt_screen.dart'; -import 'package:material_symbols_icons/material_symbols_icons.dart'; import '../../../l10n/app_localizations.dart'; @@ -143,12 +142,6 @@ class _TransactionPinScreenState extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - leading: IconButton( - icon: const Icon(Symbols.arrow_back_ios_new), - onPressed: () { - Navigator.pop(context); - }, - ), title: Text( AppLocalizations.of(context).tpin, style: diff --git a/lib/features/profile/preferences/preference_screen.dart b/lib/features/profile/preferences/preference_screen.dart index 71f60bc..28b93fb 100644 --- a/lib/features/profile/preferences/preference_screen.dart +++ b/lib/features/profile/preferences/preference_screen.dart @@ -37,7 +37,6 @@ class PreferenceScreen extends StatelessWidget { ListTile( leading: const Icon(Icons.brightness_6), title: Text(AppLocalizations.of(context).themeMode), - enabled: false, //trailing: Switch( // value: state.isDarkMode, // onChanged: (val) { @@ -49,7 +48,6 @@ class PreferenceScreen extends StatelessWidget { ListTile( leading: const Icon(Icons.color_lens), title: Text(AppLocalizations.of(context).themeColor), - //enabled: false, onTap: () { showDialog( context: context, diff --git a/lib/features/quick_pay/screens/quick_pay_outside_bank_screen.dart b/lib/features/quick_pay/screens/quick_pay_outside_bank_screen.dart index a5ea3fb..10ccb9f 100644 --- a/lib/features/quick_pay/screens/quick_pay_outside_bank_screen.dart +++ b/lib/features/quick_pay/screens/quick_pay_outside_bank_screen.dart @@ -13,9 +13,7 @@ import 'package:kmobile/features/fund_transfer/screens/payment_animation.dart'; import 'package:kmobile/features/fund_transfer/screens/transaction_pin_screen.dart'; import '../../../l10n/app_localizations.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_svg/svg.dart'; import 'package:flutter_swipe_button/flutter_swipe_button.dart'; -import 'package:material_symbols_icons/material_symbols_icons.dart'; import '../../../../di/injection.dart'; import '../../../../api/services/beneficiary_service.dart'; @@ -375,34 +373,13 @@ class _QuickPayOutsideBankScreen extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - leading: IconButton( - icon: const Icon(Symbols.arrow_back_ios_new), - onPressed: () { - Navigator.pop(context); - }, - ), title: Text( AppLocalizations.of(context).quickPayOutsideBank, style: const TextStyle(color: Colors.black, fontWeight: FontWeight.w500), ), centerTitle: false, - actions: [ - Padding( - padding: const EdgeInsets.only(right: 10.0), - child: CircleAvatar( - backgroundColor: Colors.grey[200], - radius: 20, - child: SvgPicture.asset( - 'assets/images/avatar_male.svg', - width: 40, - height: 40, - fit: BoxFit.cover, - ), - ), - ), - ], - ), + ), body: Padding( padding: const EdgeInsets.all(12), child: Form( diff --git a/lib/features/quick_pay/screens/quick_pay_within_bank_screen.dart b/lib/features/quick_pay/screens/quick_pay_within_bank_screen.dart index 341cd63..5809cd3 100644 --- a/lib/features/quick_pay/screens/quick_pay_within_bank_screen.dart +++ b/lib/features/quick_pay/screens/quick_pay_within_bank_screen.dart @@ -1,13 +1,11 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:flutter_svg/svg.dart'; import 'package:flutter_swipe_button/flutter_swipe_button.dart'; import 'package:kmobile/api/services/beneficiary_service.dart'; import 'package:kmobile/api/services/payment_service.dart'; import 'package:kmobile/data/models/transfer.dart'; import 'package:kmobile/di/injection.dart'; import 'package:kmobile/features/fund_transfer/screens/payment_animation.dart'; -import 'package:material_symbols_icons/material_symbols_icons.dart'; import '../../../l10n/app_localizations.dart'; import '../../fund_transfer/screens/transaction_pin_screen.dart'; @@ -90,33 +88,12 @@ class _QuickPayWithinBankScreen extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - leading: IconButton( - icon: const Icon(Symbols.arrow_back_ios_new), - onPressed: () { - Navigator.pop(context); - }, - ), title: Text( AppLocalizations.of(context).quickPayOwnBank, style: const TextStyle(color: Colors.black, fontWeight: FontWeight.w500), ), centerTitle: false, - actions: [ - Padding( - padding: const EdgeInsets.only(right: 10.0), - child: CircleAvatar( - backgroundColor: Colors.grey[200], - radius: 20, - child: SvgPicture.asset( - 'assets/images/avatar_male.svg', - width: 40, - height: 40, - fit: BoxFit.cover, - ), - ), - ), - ], ), body: Padding( padding: const EdgeInsets.all(16.0), diff --git a/lib/features/service/screens/service_screen.dart b/lib/features/service/screens/service_screen.dart index 9065152..8970167 100644 --- a/lib/features/service/screens/service_screen.dart +++ b/lib/features/service/screens/service_screen.dart @@ -24,30 +24,6 @@ class _ServiceScreen extends State { const TextStyle(color: Colors.black, fontWeight: FontWeight.w500), ), centerTitle: false, - actions: [ - // IconButton( - // icon: const Icon(Icons.notifications_outlined), - // onPressed: () { - // // Navigate to notifications - // }, - // ), - Padding( - padding: const EdgeInsets.only(right: 10.0), - child: InkWell( - borderRadius: BorderRadius.circular(20), - onTap: () { - // Navigator.push(context, MaterialPageRoute( - // builder: (context) => const CustomerInfoScreen())); - }, - child: const CircleAvatar( - backgroundImage: AssetImage( - 'assets/images/avatar.jpg', - ), // Replace with your image - radius: 20, - ), - ), - ), - ], ), body: ListView( children: [