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

ui fixing

Browse Source
This commit is contained in:
jayesh
2024-06-20 16:03:44 +05:30
parent 60cb950990
commit c7aedc3383
5 changed files with 242 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,7 @@ class KeyInvestmentSection extends StatelessWidget {
Widget build(BuildContext context) {
return Container(
width: double.infinity,
padding: const EdgeInsets.symmetric(horizontal: 5),
decoration: BoxDecoration(
color: AppColor.documentCardBgColor,
borderRadius: const BorderRadius.all(Radius.circular(20.0)),
@@ -79,20 +80,22 @@ Widget investmentSectionCardText(
children: [
SvgPicture.asset(icon),
const Gap(8),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
TextWidget().text14W700(
title,
clr: AppColor.textLabelColor,
txtAlign: TextAlign.start,
),
TextWidget().text14W400(
subtitle,
clr: AppColor.textLabelColor,
txtAlign: TextAlign.start,
),
],
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
TextWidget().text14W700(
title,
clr: AppColor.textLabelColor,
txtAlign: TextAlign.start,
),
TextWidget().text14W400(
subtitle,
clr: AppColor.textLabelColor,
txtAlign: TextAlign.start,
),
],
),
)
],
);

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

@@ -2,17 +2,14 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_svg/svg.dart';
import 'package:gap/gap.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:tanami_app/core/routes/route_name.dart';
import 'package:tanami_app/core/routes/routes.dart';
import 'package:tanami_app/core/styles/app_color.dart';
import 'package:tanami_app/core/styles/app_images.dart';
import 'package:tanami_app/core/styles/app_text.dart';
import 'package:tanami_app/features/countrySelection/presentation/bloc/choose_country_bloc.dart';
import 'package:tanami_app/features/countrySelection/presentation/bloc/choose_country_event.dart';
import 'package:tanami_app/shared/components/text_widget.dart';
import '../../widgets/deposit_pay_method_section.dart';
class DepositScreen extends StatefulWidget {
const DepositScreen({super.key});
@@ -288,131 +285,7 @@ class _DepositScreenState extends State<DepositScreen> {
),
),
const Gap(30),
TextWidget().text15W700(AppText.choosePaymentMethodText,
clr: AppColor.plainBlack),
const Gap(16),
GestureDetector(
onTap: () {
radioBloc.add(const RadioSelected(0));
},
child: Container(
padding: const EdgeInsets.all(12),
decoration: ShapeDecoration(
color: Colors.white,
shape: RoundedRectangleBorder(
side: const BorderSide(color: Color(0xFFD8D8D8)),
borderRadius: BorderRadius.circular(22),
),
shadows: const [
BoxShadow(
color: Color(0x14000000),
blurRadius: 8,
offset: Offset(-2, -2),
spreadRadius: 0.50,
),
BoxShadow(
color: Color(0x3391978E),
blurRadius: 8,
offset: Offset(2, 2),
spreadRadius: 1,
)
],
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Radio<int>(
activeColor: AppColor.radioActiveColor,
value: 0,
groupValue: selectedIndex,
onChanged: (int? value) {
if (value != null) {
radioBloc.add(RadioSelected(value));
}
},
),
SvgPicture.asset(AppImages.walletIcon),
const Gap(5),
TextWidget().text14W700(AppText.bankTransfer,
clr: AppColor.textLabelColor),
],
),
TextWidget().text14W500(
"Directly transfer funds from your bank account into your Tanami wallet.",
clr: AppColor.textLabelColor,
txtAlign: TextAlign.left,
),
const Gap(12),
],
),
),
),
const Gap(12),
GestureDetector(
onTap: () {
radioBloc.add(const RadioSelected(1));
},
child: Container(
padding: const EdgeInsets.all(12),
decoration: ShapeDecoration(
color: Colors.white,
shape: RoundedRectangleBorder(
side: const BorderSide(color: Color(0xFFD8D8D8)),
borderRadius: BorderRadius.circular(22),
),
shadows: const [
BoxShadow(
color: Color(0x14000000),
blurRadius: 8,
offset: Offset(-2, -2),
spreadRadius: 0.2,
),
BoxShadow(
color: Color(0x3391978E),
blurRadius: 8,
offset: Offset(2, 2),
spreadRadius: 1,
)
],
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
Radio<int>(
activeColor: AppColor.radioActiveColor,
value: 1,
groupValue: selectedIndex,
onChanged: (int? value) {
if (value != null) {
radioBloc.add(RadioSelected(value));
}
},
),
SvgPicture.asset(AppImages.applePayIcon),
const Gap(5),
TextWidget().text14W700(AppText.applePayText,
clr: AppColor.textLabelColor),
],
),
],
),
TextWidget().text14W500(
AppText.instantTransferFundsApplePayText,
clr: AppColor.textLabelColor,
txtAlign: TextAlign.left,
),
const Gap(12),
],
),
),
),
const DepositPayMethodSection(),
const Gap(16),
],
),

217
lib/features/MainScreens/Wallet/presentation/widgets/deposit_pay_method_section.dart Normal file
View File

@@ -0,0 +1,217 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:gap/gap.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:tanami_app/core/styles/app_images.dart';
import 'package:tanami_app/core/styles/app_text.dart';
import 'package:tanami_app/shared/components/text_widget.dart';
import '../../../../../../core/styles/app_color.dart';
import '../../../../countrySelection/presentation/bloc/choose_country_bloc.dart';
import '../../../../countrySelection/presentation/bloc/choose_country_event.dart';
import '../../../../countrySelection/presentation/bloc/choose_country_state.dart';
class DepositPayMethodSection extends StatelessWidget {
const DepositPayMethodSection({super.key});
@override
Widget build(BuildContext context) {
final radioBloc = context.read<RadioBloc>();
return BlocBuilder<RadioBloc, RadioState>(
builder: (context, state) {
int selectedIndex = 0;
if (state is RadioSelectionChanged) {
selectedIndex = state.selectedIndex;
}
return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
TextWidget().text15W700(AppText.choosePaymentMethodText,
clr: AppColor.plainBlack),
const Gap(16),
GestureDetector(
onTap: () {
radioBloc.add(const RadioSelected(0));
},
child: Container(
clipBehavior: Clip.antiAlias,
// padding: const EdgeInsets.all(12),
decoration: ShapeDecoration(
color: Colors.white,
shape: RoundedRectangleBorder(
side: const BorderSide(color: Color(0xFFD8D8D8)),
borderRadius: BorderRadius.circular(22),
),
shadows: const [
BoxShadow(
color: Color(0x14000000),
blurRadius: 8,
offset: Offset(-2, -2),
spreadRadius: 0.50,
),
BoxShadow(
color: Color(0x3391978E),
blurRadius: 8,
offset: Offset(2, 2),
spreadRadius: 1,
)
],
),
child: Column(
children: [
Container(
padding: const EdgeInsets.all(12),
decoration: BoxDecoration(
color: selectedIndex == 0
? const Color(0xFFE4F5E9)
: const Color(0xCCE2E2E2),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
Radio<int>(
activeColor: AppColor.radioActiveColor,
value: 0,
groupValue: selectedIndex,
onChanged: (int? value) {
if (value != null) {
radioBloc.add(RadioSelected(value));
}
},
),
const Gap(5),
SvgPicture.asset(AppImages.walletIcon),
const Gap(5),
TextWidget().text14W700(AppText.walletText,
clr: AppColor.textLabelColor),
],
),
Row(
children: [
RichText(
text: TextSpan(
children: [
TextSpan(
text: '${AppText.balanceText}: ',
style: GoogleFonts.dmSans(
color: Colors.grey,
fontSize: 12.0,
fontWeight: FontWeight.bold,
),
),
TextSpan(
text: 'SAR 178,000',
style: GoogleFonts.dmSans(
color: Colors.black,
fontSize: 14.0,
fontWeight: FontWeight.bold,
),
),
],
),
),
// const Icon(
// Icons.arrow_forward,
// color: Colors.grey,
// size: 15,
// )
],
),
],
),
),
Padding(
padding: const EdgeInsets.all(12),
child: TextWidget().text14W500(
"condimentum ac, vestibulum eu nisl.torquent per conubia nostra, per inceptos himenaeos.",
clr: AppColor.textLabelColor,
txtAlign: TextAlign.start,
),
),
const Gap(12),
],
),
),
),
const Gap(12),
GestureDetector(
onTap: () {
radioBloc.add(const RadioSelected(1));
},
child: Container(
clipBehavior: Clip.antiAlias,
// padding: const EdgeInsets.all(12),
decoration: ShapeDecoration(
color: Colors.white,
shape: RoundedRectangleBorder(
side: const BorderSide(color: Color(0xFFD8D8D8)),
borderRadius: BorderRadius.circular(22),
),
shadows: const [
BoxShadow(
color: Color(0x14000000),
blurRadius: 8,
offset: Offset(-2, -2),
spreadRadius: 0.2,
),
BoxShadow(
color: Color(0x3391978E),
blurRadius: 8,
offset: Offset(2, 2),
spreadRadius: 1,
)
],
),
child: Column(
children: [
Container(
padding: const EdgeInsets.all(12),
decoration: BoxDecoration(
color: selectedIndex == 1
? const Color(0xFFE4F5E9)
: const Color(0xCCE2E2E2),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
Radio<int>(
activeColor: AppColor.radioActiveColor,
value: 1,
groupValue: selectedIndex,
onChanged: (int? value) {
if (value != null) {
radioBloc.add(RadioSelected(value));
}
},
),
const Gap(5),
SvgPicture.asset(AppImages.applePayIcon),
const Gap(5),
TextWidget().text14W700(AppText.applePayText,
clr: AppColor.textLabelColor),
],
),
],
),
),
Padding(
padding: const EdgeInsets.all(12.0),
child: TextWidget().text14W500(
AppText.instantTransferFundsApplePayText,
clr: AppColor.textLabelColor),
),
const Gap(12),
],
),
),
),
// const Gap(16),
]);
},
);
}
}

2
lib/features/otpVerification/presentation/widgets/otp_fill_section.dart
View File

@@ -25,9 +25,11 @@ class OtpFillSection extends StatelessWidget {
return BlocConsumer<OtpBloc, OtpState>(
listener: (context, state) {
if (state is OtpSubmitting) {
FocusScope.of(context).unfocus();
Loader.loader(context);
} else if (state is OtpSubmissionSuccess) {
goRouter.pop();
successToastMessage(
context,
AppText.otpVerifiedSucessfully,

4
lib/shared/components/form_label_textfield.dart
View File

@@ -71,7 +71,9 @@ class FormLabelTextField extends StatelessWidget {
maxlines: type == "description" ? 6 : 1,
texttype: type == "phone number"
? TextInputType.phone
: TextInputType.name,
: type == "Email"
? TextInputType.emailAddress
: TextInputType.name,
textEditingController: textEditingController,
readonly: type == "country selection" ? true : false,
hintText: hintText,