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

Merge pull request #65 from WDI-Ideas/meet

Browse Source 
bugs fixed
This commit is contained in:
meet2711
2024-06-19 16:24:17 +05:30
committed by GitHub
parent 312ed28e82 8ad120714f
commit 60cb950990
6 changed files with 101 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,8 +52,8 @@ class AppText {
"Select your country of residence and enter your mobile number";
static const String nextText = "Next";
static const String backText = "Back";
static const String firstNameText = "First name";
static const String lastNameText = "Last name";
static const String firstNameText = "First Name";
static const String lastNameText = "Last Name";
static const String emailText = "Email";
static const String repeatPasswordText = "Repeat Password";
static const String min8CharactersSpecialCharctersText =

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

@@ -109,7 +109,7 @@ class WalletDetails extends StatelessWidget {
],
),
child: TicketWidget(
height: 320.h,
height: 325.h,
isCornerRounded: true,
width: double.infinity,
color: Colors.white,
@@ -177,7 +177,7 @@ class WalletDetails extends StatelessWidget {
],
),
SizedBox(
height: 35.h,
height: 33.h,
),
_buildBody(),
],
@@ -205,7 +205,7 @@ class WalletDetails extends StatelessWidget {
),
),
body: Padding(
padding: const EdgeInsets.all(18.0),
padding: const EdgeInsets.fromLTRB(18.0, 18.0, 18.0, 0.0),
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(22.r),
@@ -294,91 +294,104 @@ class WalletDetails extends StatelessWidget {
],
),
)
: TicketWidget(
height: (type == 'Investment' ||
type == "confirm-investment")
? 325.h
: double.infinity,
isCornerRounded: true,
width: double.infinity,
color: Colors.white,
child: Padding(
padding: const EdgeInsets.fromLTRB(20.0, 30, 20, 10),
child: Column(
// mainAxisSize: MainAxisSize.min,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
getIcon(type),
SizedBox(
height: 16.h,
),
Text(
type == "confirm-investment"
? "Investment"
: type,
style: GoogleFonts.dmSans(
color: const Color(0xFF191B1E),
fontSize: 14.sp,
fontWeight: FontWeight.w600,
),
),
SizedBox(
height: 4.h,
),
(type == "confirm-investment" ||
type == 'Investment')
? Text(
"Name of investment",
: SingleChildScrollView(
child: Column(
children: [
TicketWidget(
height: (type == 'Investment' ||
type == "confirm-investment")
? 325.h
: MediaQuery.of(context).size.height - 70,
isCornerRounded: true,
width: double.infinity,
color: Colors.white,
child: Padding(
padding:
const EdgeInsets.fromLTRB(20.0, 30, 20, 10),
child: Column(
// mainAxisSize: MainAxisSize.min,
children: [
Column(
crossAxisAlignment:
CrossAxisAlignment.center,
children: [
getIcon(type),
SizedBox(
height: 16.h,
),
Text(
type == "confirm-investment"
? "Investment"
: type,
style: GoogleFonts.dmSans(
color: const Color(0xFF191B1E),
fontSize: 17.sp,
fontWeight: FontWeight.w700,
fontSize: 14.sp,
fontWeight: FontWeight.w600,
),
)
: const SizedBox(),
SizedBox(
height: 4.h,
),
Text(
'10/04/2024 22:04',
style: GoogleFonts.dmSans(
color: const Color(0xFF8D8D8D),
fontSize: 11.sp,
fontWeight: FontWeight.w500,
),
),
SizedBox(
height: 16.h,
),
Text(
'+ SAR 100,000',
style: GoogleFonts.dmSans(
color: const Color(0xFF191B1E),
fontSize: 20.sp,
fontWeight: FontWeight.w900,
),
),
(type == "confirm-investment" ||
type == 'Investment')
? Text(
"+ \$100.00",
),
SizedBox(
height: 4.h,
),
(type == "confirm-investment" ||
type == '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(
color: const Color(0xFF363636),
fontSize: 12.sp,
color: const Color(0xFF8D8D8D),
fontSize: 11.sp,
fontWeight: FontWeight.w500,
),
)
: const SizedBox(),
],
),
SizedBox(
height: 16.h,
),
Text(
'+ SAR 100,000',
style: GoogleFonts.dmSans(
color: const Color(0xFF191B1E),
fontSize: 20.sp,
fontWeight: FontWeight.w900,
),
),
(type == "confirm-investment" ||
type == 'Investment')
? Text(
"+ \$100.00",
style: GoogleFonts.dmSans(
color:
const Color(0xFF363636),
fontSize: 12.sp,
fontWeight: FontWeight.w500,
),
)
: const SizedBox(),
],
),
SizedBox(
height: 33.h,
),
_buildBody(),
],
),
),
SizedBox(
height: 35.h,
),
Expanded(child: _buildBody()),
],
),
),
SizedBox(
height: 10.h,
),
],
),
),
),
@@ -491,7 +504,7 @@ class WalletDetails extends StatelessWidget {
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 8.0),
child: ListView.builder(
physics: const AlwaysScrollableScrollPhysics(),
physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemCount: titles.length,
itemBuilder: (context, index) {

1
lib/features/login/presentation/pages/login_layout.dart
View File

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import 'package:tanami_app/core/styles/app_color.dart';
import 'package:tanami_app/features/login/presentation/widgets/login_form.dart';
import '../../../../core/styles/app_color.dart';
import '../widgets/bottom_section.dart';
import '../widgets/top_section.dart';

1
lib/features/register/presentation/widgets/register_step_count.dart
View File

@@ -10,6 +10,7 @@ class RegisterStepCount extends StatelessWidget {
@override
Widget build(BuildContext context) {
return ListView.builder(
physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemCount: 3,
itemBuilder: (context, index) {

2
lib/features/securePin/presentation/widgets/confirm_pin_keypad_section.dart
View File

@@ -60,7 +60,7 @@ class ConfirmPinKey extends StatelessWidget {
return const SizedBox.shrink();
},
),
const Gap(50),
const Gap(20),
GridView.builder(
shrinkWrap: true,
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(

4
lib/features/securePin/presentation/widgets/confirm_pin_top_section.dart
View File

@@ -14,13 +14,13 @@ class ConfirmPinTopSection extends StatelessWidget {
Widget build(BuildContext context) {
return Column(
children: [
const Gap(85),
const Gap(70),
Center(
child: SvgPicture.asset(
AppImages.welcomeLogo,
),
),
const Gap(60),
const Gap(40),
TextWidget().text14W500(
AppText.confirmPinCode,
clr: AppColor.textLabelColor,