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-20 17:26:47 +05:30
parent 1fa37a1c3e e9fb8806ea
commit bc0478c134
10 changed files with 95 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -154,7 +154,9 @@ class AppText {
static const String SWIFTcode = "SWIFT/BIC code"; static const String SWIFTcode = "SWIFT/BIC code";
static const String refid = "Reference ID"; static const String refid = "Reference ID";
static const String previewTitle = "Withdrawal confirmation"; static const String previewTitle = "Withdrawal confirmation";
static const String info1 = static const String info =
'Your withdrawal request has been received and is currently being processed.';
static const String info1 =
'Please confirm the withdrawal amount and verify the accuracy of your bank details.'; 'Please confirm the withdrawal amount and verify the accuracy of your bank details.';
static const String workingDays = static const String workingDays =
'Processing times vary from 3-7 working days'; 'Processing times vary from 3-7 working days';
@@ -262,7 +264,7 @@ class AppText {
static const String holdingPeriodText = "Holding period"; static const String holdingPeriodText = "Holding period";
static const String payoutDateText = "Payout Date"; static const String payoutDateText = "Payout Date";
static const String minimumInvestmentText = "Minimum investment"; static const String minimumInvestmentText = "Minimum investment";
static const String keyMeritsIOfnvestmentText = "Key Merits of Investment"; static const String keyMeritsOfInvestmentText = "Key Merits of Investment";
static const String investmentDetailsText = "Investment details"; static const String investmentDetailsText = "Investment details";
static const String enterInvestmentAmountText = "Enter investment amount"; static const String enterInvestmentAmountText = "Enter investment amount";
static const String thisIsUsdInvestmentOpportunityText = static const String thisIsUsdInvestmentOpportunityText =

1
lib/features/MainScreens/Invest/presentation/pages/invest_screen.dart
View File

@@ -21,6 +21,7 @@ class _InvestScreenState extends State<InvestScreen> {
return Scaffold( return Scaffold(
backgroundColor: AppColor.plainWhite, backgroundColor: AppColor.plainWhite,
appBar: AppBar( appBar: AppBar(
centerTitle: false,
backgroundColor: AppColor.plainWhite, backgroundColor: AppColor.plainWhite,
elevation: 0, elevation: 0,
scrolledUnderElevation: 0, scrolledUnderElevation: 0,

6
lib/features/MainScreens/Invest/presentation/widgets/invest_details_section.dart
View File

@@ -43,7 +43,7 @@ class InvestDetailsSection extends StatelessWidget {
borderRadius: BorderRadius.circular(4)), borderRadius: BorderRadius.circular(4)),
), ),
child: Center( child: Center(
child: TextWidget().text12W700( child: TextWidget().text11W700(
"Real estate", "Real estate",
clr: AppColor.selectedItemColor, clr: AppColor.selectedItemColor,
)), )),
@@ -53,7 +53,7 @@ class InvestDetailsSection extends StatelessWidget {
Gap(10.h), Gap(10.h),
Container( Container(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 15.0, vertical: 10.0), horizontal: 12.0, vertical: 5.0),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
border: Border.all(color: const Color(0xFFE4F5E9)), border: Border.all(color: const Color(0xFFE4F5E9)),
@@ -65,7 +65,7 @@ class InvestDetailsSection extends StatelessWidget {
children: [ children: [
Image.asset( Image.asset(
AppImages.portfolioClock, AppImages.portfolioClock,
height: 15.h, height: 20.h,
), ),
Gap( Gap(
5.w, 5.w,

4
lib/features/MainScreens/Invest/presentation/widgets/key_investment_section.dart
View File

@@ -34,7 +34,7 @@ class KeyInvestmentSection extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
TextWidget().text15W700( TextWidget().text15W700(
AppText.keyMeritsIOfnvestmentText, AppText.keyMeritsOfInvestmentText,
clr: AppColor.plainBlack, clr: AppColor.plainBlack,
), ),
Gap( Gap(
@@ -51,7 +51,7 @@ class KeyInvestmentSection extends StatelessWidget {
), ),
child: investmentSectionCardText( child: investmentSectionCardText(
imageList[index], imageList[index],
"Nunc vulputate libero et velit interdum", "Nunc vulputate libero et velit interdumb aenfoao",
"ac aliquet odio mattis.", "ac aliquet odio mattis.",
), ),
); );

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

@@ -69,40 +69,25 @@ class _DepositPreviewState extends State<DepositPreview> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( RichText(
width: 0.55.sw, text: TextSpan(
decoration: const BoxDecoration(
border: Border(
bottom: BorderSide(width: 1, color: Colors.grey))),
child: Row(
children: [ children: [
RichText( TextSpan(
text: TextSpan( text: '${AppText.balance}: ',
children: [ style: GoogleFonts.dmSans(
TextSpan( color: Colors.grey,
text: '${AppText.balance}: ', fontSize: 12.sp,
style: GoogleFonts.dmSans( fontWeight: FontWeight.bold,
color: Colors.grey, ),
fontSize: 12.0, ),
fontWeight: FontWeight.bold, TextSpan(
), text: 'SAR 178,000 ',
), style: GoogleFonts.dmSans(
TextSpan( color: Colors.black,
text: 'SAR 178,000 ', fontSize: 14.sp,
style: GoogleFonts.dmSans( fontWeight: FontWeight.bold,
color: Colors.black,
fontSize: 14.0,
fontWeight: FontWeight.bold,
),
),
],
), ),
), ),
const Icon(
Icons.arrow_forward,
color: Colors.grey,
size: 15,
)
], ],
), ),
), ),
@@ -377,54 +362,50 @@ class _DepositPreviewState extends State<DepositPreview> {
) )
], ],
), ),
], GestureDetector(
), onTap: () {
), goRouter.pop();
), goRouter.pop();
bottomNavigationBar: Column( },
mainAxisSize: MainAxisSize.min, child: Container(
children: [ margin: const EdgeInsets.all(10.0),
GestureDetector( height: 65.h,
onTap: () { width: double.infinity,
goRouter.pop(); decoration: BoxDecoration(
goRouter.pop(); borderRadius: BorderRadius.circular(22.r),
}, color: const Color(0xFF004717),
child: Container( ),
margin: const EdgeInsets.all(10.0), child: Padding(
height: 65.h, padding: const EdgeInsets.symmetric(vertical: 20.0),
width: double.infinity, child: Center(
decoration: BoxDecoration( child: Text(
borderRadius: BorderRadius.circular(22.r), AppText.submitDeposit,
color: const Color(0xFF004717), style: GoogleFonts.dmSans(
), color: Colors.white,
child: Padding( fontSize: 14.sp,
padding: const EdgeInsets.symmetric(vertical: 20.0), fontWeight: FontWeight.w700,
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(10), ),
GestureDetector(
onTap: () {
goRouter.pop();
},
child: TextWidget().text14W700(
AppText.back,
clr: const Color(0xFF363636),
textDecoration: TextDecoration.underline,
),
),
const Gap(30),
],
), ),
); );
} }

2
lib/features/MainScreens/Wallet/presentation/pages/withdrawal/confirmation.dart
View File

@@ -90,7 +90,7 @@ class _WithdrawalConfirmationState extends State<WithdrawalConfirmation> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
AppText.info1, AppText.info,
style: GoogleFonts.dmSans( style: GoogleFonts.dmSans(
color: const Color(0xFF015698), color: const Color(0xFF015698),
fontSize: 14.sp, fontSize: 14.sp,

47
lib/features/MainScreens/Wallet/presentation/pages/withdrawal/preview.dart
View File

@@ -80,40 +80,25 @@ class _WithdrawalPreviewState extends State<WithdrawalPreview> {
SizedBox( SizedBox(
height: 20.h, height: 20.h,
), ),
Container( RichText(
width: 0.55.sw, text: TextSpan(
decoration: const BoxDecoration(
border: Border(
bottom: BorderSide(width: 1, color: Colors.grey))),
child: Row(
children: [ children: [
RichText( TextSpan(
text: TextSpan( text: '${AppText.balance}: ',
children: [ style: GoogleFonts.dmSans(
TextSpan( color: Colors.grey,
text: '${AppText.balance}: ', fontSize: 12.sp,
style: GoogleFonts.dmSans( fontWeight: FontWeight.bold,
color: Colors.grey, ),
fontSize: 12.0, ),
fontWeight: FontWeight.bold, TextSpan(
), text: 'SAR 178,000',
), style: GoogleFonts.dmSans(
TextSpan( color: Colors.black,
text: 'SAR 178,000', fontSize: 14.sp,
style: GoogleFonts.dmSans( fontWeight: FontWeight.bold,
color: Colors.black,
fontSize: 14.0,
fontWeight: FontWeight.bold,
),
),
],
), ),
), ),
const Icon(
Icons.arrow_forward,
color: Colors.grey,
size: 15,
)
], ],
), ),
), ),

14
lib/features/deleteAccount/presentation/pages/delete_account_screen.dart
View File

@@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:tanami_app/features/deleteAccount/presentation/bloc/text_bloc.dart'; import 'package:tanami_app/features/deleteAccount/presentation/bloc/text_bloc.dart';
import 'package:tanami_app/features/deleteAccount/presentation/pages/delete_account_layout.dart'; import 'package:tanami_app/features/deleteAccount/presentation/pages/delete_account_layout.dart';
import 'package:tanami_app/shared/components/text_widget.dart';
import '../../../../core/styles/app_color.dart'; import '../../../../core/styles/app_color.dart';
import '../../../../core/styles/app_text.dart'; import '../../../../core/styles/app_text.dart';
import '../../../../shared/components/appbar_widget.dart';
import '../../../../shared/components/bloc/checkbox/checkbox_bloc.dart'; import '../../../../shared/components/bloc/checkbox/checkbox_bloc.dart';
import '../bloc/delete_account_bloc.dart'; import '../bloc/delete_account_bloc.dart';
@@ -16,9 +16,15 @@ class DeleteAccountScreen extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: AppColor.plainWhite, backgroundColor: AppColor.plainWhite,
appBar: const AppBarWidget( appBar: AppBar(
height: 75, backgroundColor: AppColor.plainWhite,
titleTxt: AppText.deleteAccountText, elevation: 0,
scrolledUnderElevation: 0,
title: TextWidget().text20W700(
AppText.deleteAccountText,
clr: AppColor.plainBlack,
),
centerTitle: true,
), ),
body: MultiBlocProvider( body: MultiBlocProvider(
providers: [ providers: [

21
lib/features/deleteAccount/presentation/widgets/bottom_section.dart
View File

@@ -62,31 +62,12 @@ Widget bottomSection(BuildContext context) {
} }
}, },
builder: (context, state) { builder: (context, state) {
// return ButtonWidget().textBtn(
// function: () {
// if (deleteAccountBloc.formKey.currentState!.validate()) {
// context.read<CheckboxBloc>().add(ValidateCheckbox());
// if (context.read<CheckboxBloc>().state is CheckboxChecked) {
// context.read<DeleteAccountBloc>().add(
// DeleteAccountSubmitted(
// context
// .read<DeleteAccountBloc>()
// .descriptionTextField
// .text,
// ),
// );
// }
// }
// },
// text: TextWidget().text14W700(AppText.deleteAccountText,
// clr: AppColor.hintTextColor,
// textDecoration: TextDecoration.underline));
return Container( return Container(
width: 1.sw, width: 1.sw,
height: 56.h, height: 56.h,
child: ButtonWidget().textBorderBtn( child: ButtonWidget().textBorderBtn(
borderClr: AppColor.txtBorderColor, borderClr: AppColor.txtBorderColor,
txtClr: AppColor.hintTextColor, txtClr: AppColor.plainBlack,
function: () { function: () {
if (deleteAccountBloc.formKey.currentState!.validate()) { if (deleteAccountBloc.formKey.currentState!.validate()) {
context.read<CheckboxBloc>().add(ValidateCheckbox()); context.read<CheckboxBloc>().add(ValidateCheckbox());

4
lib/features/deleteAccount/presentation/widgets/form_section.dart
View File

@@ -35,7 +35,7 @@ class FormSection extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
const Gap(40), const Gap(70),
BlocBuilder<TextBloc, TextState>( BlocBuilder<TextBloc, TextState>(
builder: (context, state) { builder: (context, state) {
return FormLabelTextField( return FormLabelTextField(
@@ -80,7 +80,7 @@ class FormSection extends StatelessWidget {
left: 45, left: 45,
top: 14, top: 14,
child: SizedBox( child: SizedBox(
width: 0.75.sw, width: 0.85.sw,
child: TextWidget().text14W500( child: TextWidget().text14W500(
AppText.iUnderstandAndAgreeThatmyDataWillBeDeleted, AppText.iUnderstandAndAgreeThatmyDataWillBeDeleted,
clr: AppColor.charcoalColor, clr: AppColor.charcoalColor,