Jayesh.Jain/Tanami_App
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/WDI-Ideas/Tanami_App into jayeshjain25

Browse Source
This commit is contained in:
jayesh
2024-06-21 10:40:18 +05:30
parent ded04e7b64 074d780086
commit c44b8b2f5e
5 changed files with 57 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/core/styles/app_text.dart
View File

@@ -25,7 +25,7 @@ class AppText {
static const String chooseCountry = "Choose country";
static const String phoneNumber = "Phone number";
static const String password = "Password";
static const String enterPassword = "Enter password";
static const String enterPassword = "Enter Password";
static const String invalidPhoneNo = "Invalid phone number";
static const String enterPhoneNo = "Enter phone number";
static const String invalidPassword = "Invalid password";
@@ -156,7 +156,7 @@ class AppText {
static const String previewTitle = "Withdrawal confirmation";
static const String info =
'Your withdrawal request has been received and is currently being processed.';
static const String info1 =
static const String info1 =
'Please confirm the withdrawal amount and verify the accuracy of your bank details.';
static const String workingDays =
'Processing times vary from 3-7 working days';

1
lib/features/MainScreens/Academy/presentation/pages/academy_screen.dart
View File

@@ -18,6 +18,7 @@ class _AcademyScreenState extends State<AcademyScreen> {
return Scaffold(
backgroundColor: AppColor.plainWhite,
appBar: AppBar(
centerTitle: false,
backgroundColor: Colors.white,
elevation: 0,
scrolledUnderElevation: 0,

2
lib/features/MainScreens/Wallet/presentation/pages/deposit/depositScreen.dart
View File

@@ -22,7 +22,7 @@ class _DepositScreenState extends State<DepositScreen> {
int selectedIndex = 0;
@override
Widget build(BuildContext context) {
final radioBloc = context.read<RadioBloc>();
context.read<RadioBloc>();
return Scaffold(
backgroundColor: Colors.white,
appBar: AppBar(

89
lib/features/MainScreens/Wallet/presentation/pages/deposit/preview.dart
View File

@@ -362,51 +362,58 @@ class _DepositPreviewState extends State<DepositPreview> {
)
],
),
GestureDetector(
onTap: () {
goRouter.pop();
goRouter.pop();
},
child: Container(
margin: const EdgeInsets.all(10.0),
height: 65.h,
width: double.infinity,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(22.r),
color: const Color(0xFF004717),
),
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 20.0),
child: Center(
child: Text(
AppText.submitDeposit,
style: GoogleFonts.dmSans(
color: Colors.white,
fontSize: 14.sp,
fontWeight: FontWeight.w700,
),
),
),
),
),
),
const Gap(10),
GestureDetector(
onTap: () {
goRouter.pop();
},
child: Center(
child: TextWidget().text14W700(
AppText.back,
clr: const Color(0xFF363636),
textDecoration: TextDecoration.underline,
),
),
),
],
),
),
),
bottomNavigationBar: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
GestureDetector(
onTap: () {
goRouter.pop();
goRouter.pop();
},
child: Container(
margin: const EdgeInsets.all(10.0),
height: 65.h,
width: double.infinity,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(22.r),
color: const Color(0xFF004717),
),
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 20.0),
child: Center(
child: Text(
AppText.submitDeposit,
style: GoogleFonts.dmSans(
color: Colors.white,
fontSize: 14.sp,
fontWeight: FontWeight.w700,
),
),
),
),
),
),
const Gap(10),
GestureDetector(
onTap: () {
goRouter.pop();
},
child: Center(
child: TextWidget().text14W700(
AppText.back,
clr: const Color(0xFF363636),
textDecoration: TextDecoration.underline,
),
),
),
const Gap(20),
],
),
);
}
}

12
lib/features/MainScreens/Wallet/presentation/widgets/deposit_pay_method_section.dart
View File

@@ -112,11 +112,6 @@ class DepositPayMethodSection extends StatelessWidget {
],
),
),
// const Icon(
// Icons.arrow_forward,
// color: Colors.grey,
// size: 15,
// )
],
),
],
@@ -165,6 +160,7 @@ class DepositPayMethodSection extends StatelessWidget {
],
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
padding: const EdgeInsets.all(12),
@@ -201,8 +197,10 @@ class DepositPayMethodSection extends StatelessWidget {
Padding(
padding: const EdgeInsets.all(12.0),
child: TextWidget().text14W500(
AppText.instantTransferFundsApplePayText,
clr: AppColor.textLabelColor),
AppText.instantTransferFundsApplePayText,
clr: AppColor.textLabelColor,
txtAlign: TextAlign.start,
),
),
const Gap(12),
],