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-18 11:20:24 +05:30
parent 2fcda67bee
commit 54efe06dea
11 changed files with 143 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,7 +133,7 @@ class AppText {
static const String walletText = "Wallet"; static const String walletText = "Wallet";
static const String day = "Today"; static const String day = "Today";
static const String filterTitle = "Filters"; static const String filterTitle = "Filters";
static const String onHold = "On hold"; static const String onHold = "On Hold";
static const String deposit = "Deposit"; static const String deposit = "Deposit";
static const String withdrawal = "Withdrawal"; static const String withdrawal = "Withdrawal";
static const String yield = "Yield"; static const String yield = "Yield";

2
lib/features/MainScreens/Invest/presentation/widgets/payment/invest_pay_top_section.dart
View File

@@ -189,7 +189,7 @@ class InvestPayTopSection extends StatelessWidget {
SizedBox( SizedBox(
width: 0.8.sw, width: 0.8.sw,
child: TextWidget().text12W500( child: TextWidget().text12W500(
AppText.upgradeYourInvestorStatusToIncreaseText, AppText.thisIsUsdInvestmentOpportunityText,
clr: AppColor.languageTextColor, clr: AppColor.languageTextColor,
), ),
), ),

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

@@ -48,25 +48,40 @@ class _DepositScreenState extends State<DepositScreen> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
RichText( Container(
text: TextSpan( width: 0.55.sw,
decoration: const BoxDecoration(
border: Border(
bottom: BorderSide(width: 1, color: Colors.grey))),
child: Row(
children: [ children: [
TextSpan( RichText(
text: AppText.balance, text: TextSpan(
style: GoogleFonts.dmSans( children: [
color: const Color(0xFF888888), TextSpan(
fontSize: 12.sp, text: '${AppText.balance}: ',
fontWeight: FontWeight.w700, style: GoogleFonts.dmSans(
), color: Colors.grey,
), fontSize: 12.0,
TextSpan( fontWeight: FontWeight.bold,
text: 'SAR 178,000 ', ),
style: GoogleFonts.dmSans( ),
color: const Color(0xFF191B1E), TextSpan(
fontSize: 14.sp, text: 'SAR 178,000',
fontWeight: FontWeight.w700, style: GoogleFonts.dmSans(
color: Colors.black,
fontSize: 14.0,
fontWeight: FontWeight.bold,
),
),
],
), ),
), ),
const Icon(
Icons.arrow_forward,
color: Colors.grey,
size: 15,
)
], ],
), ),
), ),

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

@@ -1,9 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:gap/gap.dart'; import 'package:gap/gap.dart';
import 'package:google_fonts/google_fonts.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/routes/routes.dart';
import 'package:tanami_app/core/styles/app_text.dart'; import 'package:tanami_app/core/styles/app_text.dart';
import 'package:tanami_app/shared/components/text_widget.dart'; import 'package:tanami_app/shared/components/text_widget.dart';
@@ -71,25 +69,40 @@ class _DepositPreviewState extends State<DepositPreview> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
RichText( Container(
text: TextSpan( width: 0.55.sw,
decoration: const BoxDecoration(
border: Border(
bottom: BorderSide(width: 1, color: Colors.grey))),
child: Row(
children: [ children: [
TextSpan( RichText(
text: AppText.balance, text: TextSpan(
style: GoogleFonts.dmSans( children: [
color: const Color(0xFF888888), TextSpan(
fontSize: 12.sp, text: '${AppText.balance}: ',
fontWeight: FontWeight.w700, style: GoogleFonts.dmSans(
), color: Colors.grey,
), fontSize: 12.0,
TextSpan( fontWeight: FontWeight.bold,
text: 'SAR 178,000 ', ),
style: GoogleFonts.dmSans( ),
color: const Color(0xFF191B1E), TextSpan(
fontSize: 14.sp, text: 'SAR 178,000 ',
fontWeight: FontWeight.w700, style: GoogleFonts.dmSans(
color: Colors.black,
fontSize: 14.0,
fontWeight: FontWeight.bold,
),
),
],
), ),
), ),
const Icon(
Icons.arrow_forward,
color: Colors.grey,
size: 15,
)
], ],
), ),
), ),
@@ -219,7 +232,6 @@ class _DepositPreviewState extends State<DepositPreview> {
height: 20.h, height: 20.h,
), ),
Container( Container(
width: double.infinity,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(22.r), borderRadius: BorderRadius.circular(22.r),
color: const Color(0xFFEEF6FB), color: const Color(0xFFEEF6FB),
@@ -246,30 +258,32 @@ class _DepositPreviewState extends State<DepositPreview> {
SizedBox( SizedBox(
width: 10.w, width: 10.w,
), ),
Column( Expanded(
crossAxisAlignment: CrossAxisAlignment.start, child: Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
Text( children: [
AppText.depositScreenTitle, Text(
style: GoogleFonts.dmSans( AppText.depositScreenTitle,
color: const Color(0xFF015698),
fontSize: 14.sp,
fontWeight: FontWeight.w700,
),
),
const Gap(4),
SizedBox(
width: 280.w,
child: Text(
AppText.info3,
style: GoogleFonts.dmSans( style: GoogleFonts.dmSans(
color: const Color(0xFF015698), color: const Color(0xFF015698),
fontSize: 12.sp, fontSize: 14.sp,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w700,
), ),
), ),
), const Gap(4),
], SizedBox(
width: 280.w,
child: Text(
AppText.info3,
style: GoogleFonts.dmSans(
color: const Color(0xFF015698),
fontSize: 12.sp,
fontWeight: FontWeight.w500,
),
),
),
],
),
), ),
], ],
), ),
@@ -347,7 +361,8 @@ class _DepositPreviewState extends State<DepositPreview> {
height: 12.h, height: 12.h,
), ),
Divider( Divider(
color: Color(0xFFE3E3E3), height: 2.h), color: const Color(0xFFE3E3E3),
height: 2.h),
SizedBox( SizedBox(
height: 12.h, height: 12.h,
), ),
@@ -371,13 +386,12 @@ class _DepositPreviewState extends State<DepositPreview> {
children: [ children: [
GestureDetector( GestureDetector(
onTap: () { onTap: () {
goRouter.pushNamed( goRouter.pop();
RouteName.mainScreen, goRouter.pop();
);
}, },
child: Container( child: Container(
margin: const EdgeInsets.all(10.0), margin: const EdgeInsets.all(10.0),
height: 65.h, height: 65.h,
width: double.infinity, width: double.infinity,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(22.r), borderRadius: BorderRadius.circular(22.r),
@@ -401,7 +415,7 @@ class _DepositPreviewState extends State<DepositPreview> {
const Gap(10), const Gap(10),
GestureDetector( GestureDetector(
onTap: () { onTap: () {
Navigator.pop(context); goRouter.pop();
}, },
child: TextWidget().text14W700( child: TextWidget().text14W700(
AppText.back, AppText.back,

3
lib/features/MainScreens/Wallet/presentation/pages/wallet_details_screen.dart
View File

@@ -112,7 +112,7 @@ class WalletDetailsScreen extends StatelessWidget {
], ],
), ),
child: TicketWidget( child: TicketWidget(
height: 1.sh, height: 360.sh,
isCornerRounded: true, isCornerRounded: true,
width: double.infinity, width: double.infinity,
color: AppColor.plainWhite, color: AppColor.plainWhite,
@@ -169,6 +169,7 @@ class WalletDetailsScreen extends StatelessWidget {
body: Padding( body: Padding(
padding: const EdgeInsets.all(18.0), padding: const EdgeInsets.all(18.0),
child: Container( child: Container(
width: 1.sw,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(22.r), borderRadius: BorderRadius.circular(22.r),
color: (type == 'Yield' || type == 'Refund') color: (type == 'Yield' || type == 'Refund')

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

@@ -1,8 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:google_fonts/google_fonts.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/routes/routes.dart';
import 'package:tanami_app/core/styles/app_text.dart'; import 'package:tanami_app/core/styles/app_text.dart';
import 'package:ticket_widget/ticket_widget.dart'; import 'package:ticket_widget/ticket_widget.dart';
@@ -59,7 +57,10 @@ class _WithdrawalConfirmationState extends State<WithdrawalConfirmation> {
actions: [ actions: [
IconButton( IconButton(
onPressed: () { onPressed: () {
goRouter.goNamed(RouteName.mainScreen); goRouter.pop();
goRouter.pop();
goRouter.pop();
goRouter.pop();
}, },
icon: const Icon( icon: const Icon(
Icons.close_sharp, Icons.close_sharp,
@@ -255,7 +256,10 @@ class _WithdrawalConfirmationState extends State<WithdrawalConfirmation> {
), ),
bottomNavigationBar: GestureDetector( bottomNavigationBar: GestureDetector(
onTap: () { onTap: () {
goRouter.goNamed(RouteName.mainScreen); goRouter.pop();
goRouter.pop();
goRouter.pop();
goRouter.pop();
}, },
child: Container( child: Container(
margin: const EdgeInsets.all(10.0), margin: const EdgeInsets.all(10.0),

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

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

5
lib/features/MainScreens/Wallet/presentation/pages/withdrawal/withdrawalScreen.dart
View File

@@ -5,11 +5,8 @@ import 'package:gap/gap.dart';
import 'package:google_fonts/google_fonts.dart'; import 'package:google_fonts/google_fonts.dart';
import 'package:tanami_app/core/routes/route_name.dart'; import 'package:tanami_app/core/routes/route_name.dart';
import 'package:tanami_app/core/routes/routes.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_text.dart'; import 'package:tanami_app/core/styles/app_text.dart';
import '../../../../../../shared/components/button_widget.dart';
class WithdrawalScreen extends StatefulWidget { class WithdrawalScreen extends StatefulWidget {
const WithdrawalScreen({super.key}); const WithdrawalScreen({super.key});
@@ -51,7 +48,7 @@ class _WithdrawalScreenState extends State<WithdrawalScreen> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( Container(
width: 0.5.sw, width: 0.55.sw,
decoration: const BoxDecoration( decoration: const BoxDecoration(
border: Border( border: Border(
bottom: BorderSide(width: 1, color: Colors.grey))), bottom: BorderSide(width: 1, color: Colors.grey))),

5
lib/features/MainScreens/Wallet/presentation/widgets/wallet_list_section.dart
View File

@@ -1,3 +1,5 @@
import 'dart:developer';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:gap/gap.dart'; import 'package:gap/gap.dart';
@@ -101,6 +103,7 @@ class WalletListSection extends StatelessWidget {
} }
Widget getIcon(String title) { Widget getIcon(String title) {
log(title);
if (title == 'Deposit') { if (title == 'Deposit') {
return Container( return Container(
decoration: const BoxDecoration( decoration: const BoxDecoration(
@@ -122,7 +125,7 @@ Widget getIcon(String title) {
child: Image.asset(AppImages.withdrawalListIcon, height: 25.h), child: Image.asset(AppImages.withdrawalListIcon, height: 25.h),
), ),
); );
} else if (title == 'Investment') { } else if (title == 'Investment' || title == 'confirm-investment') {
return Container( return Container(
decoration: const BoxDecoration( decoration: const BoxDecoration(
shape: BoxShape.circle, color: AppColor.investmentListIconColor), shape: BoxShape.circle, color: AppColor.investmentListIconColor),

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

@@ -41,6 +41,7 @@ class FormLabelTextField extends StatelessWidget {
type == "password" type == "password"
? PasswordField( ? PasswordField(
controller: textEditingController, controller: textEditingController,
hintText: hintText,
) )
: textFormField( : textFormField(
onInput: onChangeFun, onInput: onChangeFun,

7
lib/shared/components/password_text_form_field.dart
View File

@@ -13,8 +13,9 @@ import 'bloc/password_field/password_visibility_state.dart';
class PasswordField extends StatelessWidget { class PasswordField extends StatelessWidget {
final TextEditingController controller; final TextEditingController controller;
final String hintText;
const PasswordField({super.key, required this.controller}); const PasswordField(
{super.key, required this.controller, required this.hintText});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@@ -121,7 +122,7 @@ class PasswordField extends StatelessWidget {
) )
], ],
), ),
hintText: 'Password', hintText: hintText,
suffixIcon: IconButton( suffixIcon: IconButton(
icon: SvgPicture.asset( icon: SvgPicture.asset(
state.isPasswordVisible state.isPasswordVisible