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

Merge pull request #37 from WDI-Ideas/jayeshjain25

Browse Source 
wallet details screen changes
This commit is contained in:
Jayesh jain
2024-06-12 11:29:09 +05:30
committed by GitHub
parent 0d2d6b7f8d 84ac88da10
commit 6f75d913b7
5 changed files with 83 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
build - Shortcut.lnk Normal file
View File

Binary file not shown.

2
lib/core/routes/route_name.dart
View File

@@ -43,7 +43,7 @@ class RouteName {
//Biometric
static const String biometricScreen = 'biometricScreen';
//Biometric
//Otp Screen
static const String otpScreen = 'otpScreen';
//Pin Screen

7
lib/features/MainScreens/Invest/presentation/widgets/payment/confirm_invest_bottom_section.dart
View File

@@ -1,6 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import '../../../../../../core/routes/route_name.dart';
import '../../../../../../core/routes/routes.dart';
import '../../../../../../core/styles/app_color.dart';
import '../../../../../../core/styles/app_text.dart';
import '../../../../../../shared/components/button_widget.dart';
@@ -21,7 +23,10 @@ class ConfirmInvestBottomSection extends StatelessWidget {
height: 60.h,
child: ButtonWidget().elevatedBtn(
txtClr: AppColor.plainWhite,
function: () {},
function: () {
goRouter.pushNamed(RouteName.otpScreen,
pathParameters: {"fromScreen": "confirm-investment"});
},
text: AppText.investText,
clr: AppColor.primaryColor2,
),

76
lib/features/MainScreens/Wallet/presentation/pages/walletDetails.dart
View File

@@ -1,8 +1,12 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:tanami_app/core/routes/routes.dart';
import 'package:tanami_app/core/styles/app_text.dart';
import '../../../../../core/styles/app_color.dart';
import '../../../../../shared/components/button_widget.dart';
class WalletDetails extends StatelessWidget {
final String type;
WalletDetails({super.key, required this.type});
@@ -57,13 +61,54 @@ class WalletDetails extends StatelessWidget {
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Colors.white,
bottomNavigationBar: type == "confirm-investment"
? Container(
margin: const EdgeInsets.symmetric(
horizontal: 16,
vertical: 15,
),
width: 1.sw,
height: 60.h,
child: ButtonWidget().elevatedBtn(
txtClr: AppColor.plainWhite,
function: () {
goRouter.pop();
goRouter.pop();
goRouter.pop();
goRouter.pop();
goRouter.pop();
},
text: AppText.closeText,
clr: AppColor.primaryColor2,
),
)
: const SizedBox(),
appBar: AppBar(
backgroundColor: Colors.white,
elevation: 0,
automaticallyImplyLeading: type == "confirm-investment" ? false : true,
actions: [
type == "confirm-investment"
? IconButton(
onPressed: () {
goRouter.pop();
goRouter.pop();
goRouter.pop();
goRouter.pop();
goRouter.pop();
},
icon: const Icon(
Icons.cancel_outlined,
color: Color(0xFF363636),
))
: const SizedBox()
],
scrolledUnderElevation: 0.0,
centerTitle: true,
title: Text(
AppText.walletDetailsTitle,
type == "confirm-investment"
? AppText.investmentConfirmationText
: AppText.walletDetailsTitle,
style: GoogleFonts.dmSans(
color: const Color(0xFF272727),
fontSize: 20.sp,
@@ -102,7 +147,7 @@ class WalletDetails extends StatelessWidget {
height: 16.h,
),
Text(
type,
type == "confirm-investment" ? "Investment" : type,
style: GoogleFonts.dmSans(
color: const Color(0xFF191B1E),
fontSize: 14.sp,
@@ -112,6 +157,19 @@ class WalletDetails extends StatelessWidget {
SizedBox(
height: 4.h,
),
type == "confirm-investment"
? Text(
"Name of investment",
style: GoogleFonts.dmSans(
color: const Color(0xFF191B1E),
fontSize: 17.sp,
fontWeight: FontWeight.w700,
),
)
: const SizedBox(),
SizedBox(
height: 4.h,
),
Text(
'10/04/2024 22:04',
style: GoogleFonts.dmSans(
@@ -131,6 +189,16 @@ class WalletDetails extends StatelessWidget {
fontWeight: FontWeight.w900,
),
),
type == "confirm-investment"
? Text(
"+ \$100.00",
style: GoogleFonts.dmSans(
color: const Color(0xFF363636),
fontSize: 12.sp,
fontWeight: FontWeight.w500,
),
)
: const SizedBox(),
],
),
SizedBox(
@@ -192,7 +260,7 @@ class WalletDetails extends StatelessWidget {
height: 25.h),
),
);
} else if (title == 'Investment') {
} else if (title == 'Investment' || title == 'confirm-investment') {
return Container(
decoration: const BoxDecoration(
shape: BoxShape.circle, color: Color(0xFF0172CB)),
@@ -231,7 +299,7 @@ class WalletDetails extends StatelessWidget {
return Container();
} else if (type == 'Refund') {
return Container();
} else if (type == 'Investment') {
} else if (type == 'Investment' || type == "confirm-investment") {
return Container(
width: double.infinity,
decoration: const BoxDecoration(

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

@@ -37,6 +37,10 @@ class OtpFillSection extends StatelessWidget {
goRouter.pushNamed(RouteName.forgotPasswordScreen);
} else if (fromScreen == "withdrawal") {
goRouter.pushNamed(RouteName.withdrawalConfirmation);
} else if (fromScreen == "confirm-investment") {
goRouter.pushNamed(RouteName.walletDetails, pathParameters: {
"type": 'confirm-investment',
});
} else {
goRouter.pushNamed(RouteName.registerUserDetailsScreen);
}