diff --git a/lib/core/styles/app_text.dart b/lib/core/styles/app_text.dart index 1594a79..75e4dc4 100644 --- a/lib/core/styles/app_text.dart +++ b/lib/core/styles/app_text.dart @@ -96,6 +96,9 @@ class AppText { static const String areYouSureYouWantToExitText = "Are you sure you want to Exit?"; +//FAQ + static const String faqTitle = "Frequently Asked Questions:"; + //OTP static const String checkYourMessages = "Check your messages"; static const String referToSameOtpMessage = @@ -121,6 +124,10 @@ class AppText { static const String allowText = "Allow"; static const String declineText = "Decline"; + //Forgot Password + static const String almostHere = 'Almost here...'; + static const String completeAcc = 'Complete account profile in 3 minutes to start investing'; + //Forgot Password static const String restorePasswordText = "Restore password"; static const String toRestorePasswordPleaseEnterPhoneNumber = @@ -135,6 +142,7 @@ class AppText { static const String filterTitle = "Filters"; static const String onHold = "On Hold"; static const String deposit = "Deposit"; + static const String withdraw = "Withdraw"; static const String withdrawal = "Withdrawal"; static const String yield = "Yield"; static const String refund = "Refund"; @@ -273,7 +281,8 @@ class AppText { static const String balanceText = "Balance"; static const String applePayText = "Apple Pay"; static const String gPayText = "Gpay Pay"; - static const String bankTransferText = "Directly transfer funds from your bank account into your Tanami wallet."; + static const String bankTransferText = + "Directly transfer funds from your bank account into your Tanami wallet."; static const String instantTransferFundsApplePayText = "Instant transfer of funds using Apple Pay!"; static const String instantTransferFundsGpayPayText = @@ -301,6 +310,4 @@ class AppText { static const String enterAmountText = "Enter Amount"; static const String pleaseEnterAmountText = "Please Enter Amount"; - //Wallet - static const String withdrawText = 'Withdraw'; } diff --git a/lib/features/MainScreens/Settings/presentation/widgets/settings_list_tile_item.dart b/lib/features/MainScreens/Settings/presentation/widgets/settings_list_tile_item.dart index 1da3cc7..64d4cc3 100644 --- a/lib/features/MainScreens/Settings/presentation/widgets/settings_list_tile_item.dart +++ b/lib/features/MainScreens/Settings/presentation/widgets/settings_list_tile_item.dart @@ -41,11 +41,14 @@ class SettingsListItem extends StatelessWidget { trailing: Row( mainAxisSize: MainAxisSize.min, children: [ - Text(trailing, - style: GoogleFonts.dmSans( - fontSize: 15, - fontWeight: FontWeight.w500, - color: AppColor.plainBlack)), + Text( + trailing, + style: GoogleFonts.dmSans( + fontSize: 15, + fontWeight: FontWeight.w500, + color: AppColor.plainBlack, + ), + ), const Gap(10), const Icon(Icons.arrow_forward_ios, size: 16.0), ], diff --git a/lib/features/MainScreens/Wallet/presentation/pages/deposit/depositScreen.dart b/lib/features/MainScreens/Wallet/presentation/pages/deposit/depositScreen.dart index fed324e..2073fba 100644 --- a/lib/features/MainScreens/Wallet/presentation/pages/deposit/depositScreen.dart +++ b/lib/features/MainScreens/Wallet/presentation/pages/deposit/depositScreen.dart @@ -224,7 +224,7 @@ class _DepositScreenState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - 'Fee', + AppText.feeText, style: GoogleFonts.dmSans( color: const Color(0xFF535353), fontSize: 14.sp, @@ -245,7 +245,7 @@ class _DepositScreenState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( - 'Total Deposit amount:', + AppText.depositAmt, style: GoogleFonts.dmSans( color: const Color(0xFF535353), fontSize: 14.sp, diff --git a/lib/features/MainScreens/Wallet/presentation/pages/kyc.dart b/lib/features/MainScreens/Wallet/presentation/pages/kyc.dart index e41fd43..9f4011d 100644 --- a/lib/features/MainScreens/Wallet/presentation/pages/kyc.dart +++ b/lib/features/MainScreens/Wallet/presentation/pages/kyc.dart @@ -47,7 +47,7 @@ class _KYCScreenState extends State { height: 24.h, ), Text( - 'Almost here...', + AppText.almostHere, style: GoogleFonts.dmSans( color: const Color(0xFF363636), fontSize: 17.sp, @@ -60,7 +60,7 @@ class _KYCScreenState extends State { SizedBox( width: 280.w, child: Text( - 'Complete account profile in 3 minutes to start investing', + AppText.completeAcc, textAlign: TextAlign.center, style: GoogleFonts.dmSans( color: const Color(0xFF8D8D8D), diff --git a/lib/features/MainScreens/Wallet/presentation/pages/walletScreen.dart b/lib/features/MainScreens/Wallet/presentation/pages/walletScreen.dart index 2a4e827..666033d 100644 --- a/lib/features/MainScreens/Wallet/presentation/pages/walletScreen.dart +++ b/lib/features/MainScreens/Wallet/presentation/pages/walletScreen.dart @@ -148,7 +148,7 @@ class _WalletScreenState extends State { ), ), Text( - 'Deposit', + AppText.deposit, style: GoogleFonts.dmSans( color: const Color(0xFF363636), fontSize: 12.sp, @@ -183,7 +183,7 @@ class _WalletScreenState extends State { ), ), Text( - 'Withdraw', + AppText.withdraw, style: GoogleFonts.dmSans( color: const Color(0xFF363636), fontSize: 12.sp, diff --git a/lib/features/MainScreens/Wallet/presentation/pages/withdrawal/confirmation.dart b/lib/features/MainScreens/Wallet/presentation/pages/withdrawal/confirmation.dart index 2fc8066..24a39b6 100644 --- a/lib/features/MainScreens/Wallet/presentation/pages/withdrawal/confirmation.dart +++ b/lib/features/MainScreens/Wallet/presentation/pages/withdrawal/confirmation.dart @@ -273,7 +273,7 @@ class _WithdrawalConfirmationState extends State { padding: const EdgeInsets.symmetric(vertical: 20.0), child: Center( child: Text( - 'Close', + AppText.closeText, style: GoogleFonts.dmSans( color: Colors.white, fontSize: 14.sp, diff --git a/lib/features/faq/presentation/pages/faq_screen.dart b/lib/features/faq/presentation/pages/faq_screen.dart index 01265b1..1f763ef 100644 --- a/lib/features/faq/presentation/pages/faq_screen.dart +++ b/lib/features/faq/presentation/pages/faq_screen.dart @@ -35,7 +35,7 @@ class _AccountappState extends State { Padding( padding: EdgeInsets.only(left: 16.w, top: 23.h), child: Text( - "Frequently Asked Questions:", + AppText.faqTitle, style: GoogleFonts.dmSans( fontSize: 18.sp, color: AppColor.charcoalColor, @@ -52,78 +52,75 @@ class _AccountappState extends State { child: Padding( padding: EdgeInsets.symmetric(horizontal: 16.w), child: ExpansionTileGroup( - spaceBetweenItem: 23, - toggleType: ToggleType.expandOnlyCurrent, - children: List.generate( - faList.length, - (index) => ExpansionTileItem( - isHasBottomBorder: true, - isHasLeftBorder: true, - isHasRightBorder: true, - boxShadow: [ - BoxShadow( - color: AppColor.plainBlack.withOpacity(0.15), - spreadRadius: 2, - blurRadius: 10, - offset: const Offset( - 0, 3), // changes position of shadow - ), - ], - isHasTopBorder: true, - collapsedBackgroundColor: - AppColor.portfolioCardBgColor, - borderRadius: BorderRadius.circular(10), - onExpansionChanged: (bool expanding) { - if (expanding) { - setState(() { - selectedTile = index; - }); - } else { - setState(() { - selectedTile = -1; - }); - } - }, - backgroundColor: AppColor.portfolioCardBgColor, - childrenPadding: EdgeInsets.only( - left: 0.w, - right: 0.w, - bottom: 8.h, - top: 10.h), - initiallyExpanded: index == selectedTile, - isHasTrailing: false, - title: Text( - faList[index]['title']!, - maxLines: 3, - style: GoogleFonts.dmSans( - fontSize: 16.sp, - color: AppColor.otpTextColor, - fontWeight: FontWeight.w600), + spaceBetweenItem: 23, + toggleType: ToggleType.expandOnlyCurrent, + children: List.generate( + faList.length, + (index) => ExpansionTileItem( + isHasBottomBorder: true, + isHasLeftBorder: true, + isHasRightBorder: true, + boxShadow: [ + BoxShadow( + color: AppColor.plainBlack.withOpacity(0.15), + spreadRadius: 2, + blurRadius: 10, + offset: + const Offset(0, 3), // changes position of shadow + ), + ], + isHasTopBorder: true, + collapsedBackgroundColor: AppColor.portfolioCardBgColor, + borderRadius: BorderRadius.circular(10), + onExpansionChanged: (bool expanding) { + if (expanding) { + setState(() { + selectedTile = index; + }); + } else { + setState(() { + selectedTile = -1; + }); + } + }, + backgroundColor: AppColor.portfolioCardBgColor, + childrenPadding: EdgeInsets.only( + left: 0.w, right: 0.w, bottom: 8.h, top: 10.h), + initiallyExpanded: index == selectedTile, + isHasTrailing: false, + title: Text( + faList[index]['title']!, + maxLines: 3, + style: GoogleFonts.dmSans( + fontSize: 16.sp, + color: AppColor.otpTextColor, + fontWeight: FontWeight.w600), + ), + children: [ + Container( + margin: const EdgeInsets.symmetric(horizontal: 5), + width: 1.sw, + // height: 109.h, + decoration: BoxDecoration( + color: AppColor.plainWhite, + borderRadius: BorderRadius.circular(10.r), + ), + child: Padding( + padding: EdgeInsets.symmetric( + horizontal: 12.w, vertical: 10.h), + child: Text( + faList[index]['answer']!, + style: GoogleFonts.dmSans( + fontSize: 16.sp, + color: AppColor.investPaymentTextColor, ), - children: [ - Container( - margin: - const EdgeInsets.symmetric(horizontal: 5), - width: 1.sw, - // height: 109.h, - decoration: BoxDecoration( - color: AppColor.plainWhite, - borderRadius: BorderRadius.circular(10.r), - ), - child: Padding( - padding: EdgeInsets.symmetric( - horizontal: 12.w, vertical: 10.h), - child: Text( - faList[index]['answer']!, - style: GoogleFonts.dmSans( - fontSize: 16.sp, - color: AppColor.investPaymentTextColor, - ), - ), - ), - ) - ], - ))), + ), + ), + ) + ], + ), + ), + ), ), ), ], diff --git a/lib/shared/components/no_internet.dart b/lib/shared/components/no_internet.dart index 0922e39..b91c80a 100644 --- a/lib/shared/components/no_internet.dart +++ b/lib/shared/components/no_internet.dart @@ -7,8 +7,7 @@ import 'package:google_fonts/google_fonts.dart'; import 'package:tanami_app/core/routes/routes.dart'; import 'package:tanami_app/core/styles/app_color.dart'; import 'package:tanami_app/shared/components/toast_message.dart'; - -import '../../core/styles/app_images.dart'; +import 'package:tanami_app/core/styles/app_images.dart'; class NoInternet extends StatelessWidget { const NoInternet({super.key}); @@ -18,8 +17,9 @@ class NoInternet extends StatelessWidget { return WillPopScope( onWillPop: () => Future.value(false), child: Scaffold( - backgroundColor: AppColor.plainWhite, - body: Column(children: [ + backgroundColor: AppColor.plainWhite, + body: Column( + children: [ Center( child: Container( margin: const EdgeInsets.only(top: 100), @@ -40,12 +40,13 @@ class NoInternet extends StatelessWidget { Container( margin: const EdgeInsets.symmetric(horizontal: 20), child: Text( - "Internet Connection is Down!\n\nEnsure your internet's up and running.", - textAlign: TextAlign.center, - style: GoogleFonts.dmSans( - fontSize: 18.0, - fontWeight: FontWeight.w500, - )), + "Internet Connection is Down!\n\nEnsure your internet's up and running.", + textAlign: TextAlign.center, + style: GoogleFonts.dmSans( + fontSize: 18.0, + fontWeight: FontWeight.w500, + ), + ), ), const SizedBox( height: 30.0, @@ -74,7 +75,9 @@ class NoInternet extends StatelessWidget { child: Text( "Try Again", style: GoogleFonts.dmSans( - color: AppColor.plainWhite, fontSize: 20.sp), + color: AppColor.plainWhite, + fontSize: 20.sp, + ), ), ), ), @@ -84,7 +87,9 @@ class NoInternet extends StatelessWidget { ), ), ), - ])), + ], + ), + ), ); } }