Raj.Shinde/Traders_Circuit
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #58 from WDI-Ideas/product

Browse Source 
text form field
This commit is contained in:
Raj
2024-05-14 15:54:50 +05:30
committed by GitHub
parent 0df7b147a4 9202308c2a
commit b2c24bf92e
11 changed files with 62 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/images/png/slider1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 121 KiB

After

Width:  |  Height:  |  Size: 1.7 MiB

BIN
assets/images/png/slider2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 174 KiB

After

Width:  |  Height:  |  Size: 1.9 MiB

BIN
assets/images/png/slider3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 117 KiB

After

Width:  |  Height:  |  Size: 1.7 MiB

6
lib/Utils/Common/CustomTextFormField.dart
View File

@@ -79,13 +79,13 @@ class _CustomTextFormFieldState extends State<CustomTextFormField> {
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
const Color(0xff9A0000).withOpacity(0.5),
const Color(0xFFffffff).withOpacity(0.5),
const Color(0xff4A73FB).withOpacity(0.5),
const Color(0xff4A73FB).withOpacity(0.5),
],
),
child: TextFormField(
textAlignVertical: TextAlignVertical.center,
cursorColor: Colors.red,
cursorColor: Color(0xff4A73FB),
initialValue: widget.value,
readOnly: widget.readonly,
onTap: widget.onTap,

4
lib/view/Sidemenu/myProfile/my_profile_screen.dart
View File

@@ -191,7 +191,9 @@ class _MyProfileScreenState extends State<MyProfileScreen> {
children: [
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 16, vertical: 16),
horizontal: 16,
vertical: 16,
),
child: ListView(
physics: const BouncingScrollPhysics(),
children: [

2
lib/view/login/AddDetails.dart
View File

@@ -55,7 +55,7 @@ class _AddDetailsState extends State<AddDetails> {
colorScheme: ColorScheme.light(
surface: Colors.black,
onSurface: Colors.white,
primary: Color(0xff9A0000),
primary: Color(0xff4A73FB),
onPrimary: Colors.white,
),
textButtonTheme: TextButtonThemeData(

16
lib/view/login/Kyc.dart
View File

@@ -240,8 +240,8 @@ class _KycState extends State<Kyc> {
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
const Color(0xff9A0000).withOpacity(0.5),
const Color(0xFFffffff).withOpacity(0.5),
const Color(0xff4A73FB).withOpacity(0.5),
const Color(0xff4A73FB).withOpacity(0.5),
],
),
child: (kycController
@@ -345,8 +345,8 @@ class _KycState extends State<Kyc> {
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
const Color(0xff9A0000).withOpacity(0.5),
const Color(0xFFffffff).withOpacity(0.5),
const Color(0xff4A73FB).withOpacity(0.5),
const Color(0xff4A73FB).withOpacity(0.5),
],
),
child: (kycController.panBackImage.isNotEmpty)
@@ -511,8 +511,8 @@ class _KycState extends State<Kyc> {
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
const Color(0xff9A0000).withOpacity(0.5),
const Color(0xFFffffff).withOpacity(0.5),
const Color(0xff4A73FB).withOpacity(0.5),
const Color(0xff4A73FB).withOpacity(0.5),
],
),
child: (kycController
@@ -617,8 +617,8 @@ class _KycState extends State<Kyc> {
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
const Color(0xff9A0000).withOpacity(0.5),
const Color(0xFFffffff).withOpacity(0.5),
const Color(0xff4A73FB).withOpacity(0.5),
const Color(0xff4A73FB).withOpacity(0.5),
],
),
child: (kycController

16
lib/view/login/LoginScreen.dart
View File

@@ -156,8 +156,8 @@ class _LoginScreenState extends State<LoginScreen> {
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
const Color(0xff9A0000).withOpacity(0.5),
const Color(0xFFffffff).withOpacity(0.5),
const Color(0xff4A73FB).withOpacity(0.5),
const Color(0xff4A73FB).withOpacity(0.5),
],
),
child: Row(
@@ -330,9 +330,9 @@ class _LoginScreenState extends State<LoginScreen> {
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
const Color(0xFFAF2E89).withOpacity(0.2),
const Color(0xFFA23E31).withOpacity(0.2),
const Color(0xFF0000).withOpacity(0.2),
const Color(0xff4A73FB).withOpacity(0.2),
const Color(0xff4A73FB).withOpacity(0.2),
const Color(0xff4A73FB).withOpacity(0.2),
],
stops: const [
0.3,
@@ -380,9 +380,9 @@ class _LoginScreenState extends State<LoginScreen> {
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
const Color(0xFFAF2E89).withOpacity(0.2),
const Color(0xFFA23E31).withOpacity(0.2),
const Color(0xFF0000).withOpacity(0.2),
const Color(0xff4A73FB).withOpacity(0.2),
const Color(0xff4A73FB).withOpacity(0.2),
const Color(0xff4A73FB).withOpacity(0.2),
],
stops: const [
0.3,

6
lib/view/login/uploadKycImage.dart
View File

@@ -71,7 +71,7 @@ class _UploadKYCImageState extends State<UploadKYCImage> {
}
},
bgClr: const Color(0xFF111313),
borderClr: const Color(0xFF990000),
borderClr: const Color(0xff4A73FB),
),
),
),
@@ -84,8 +84,8 @@ class _UploadKYCImageState extends State<UploadKYCImage> {
onTap: () {
Get.back();
},
bgClr: const Color(0xFF6C0000),
borderClr: const Color(0xFF990000),
bgClr: const Color(0xff4A73FB),
borderClr: const Color(0xff4A73FB),
),
),
),

48
lib/view/onBoarding/splashScreen.dart
View File

@@ -12,6 +12,8 @@ import 'package:traderscircuit/resources/routes/route_name.dart';
import '../../Utils/Common/noInternet.dart';
bool OnBoard = false;
class SplashScreen extends StatefulWidget {
const SplashScreen({super.key});
@@ -60,20 +62,19 @@ class _SplashScreenState extends State<SplashScreen>
var token = prefs.getString('accessToken');
// myusername = prefs.getString('name');
// phonenumber = prefs.getString('contact_number');
// OnBoard = prefs.getBool('OnBoard') ?? false;
// if (OnBoard == false) {
// Get.toNamed(RouteName.sliderscreen1);
// }
// else {
if (token == null || token!.isEmpty) {
Get.offAndToNamed(RouteName.loginscreen);
OnBoard = prefs.getBool('OnBoard') ?? false;
if (OnBoard == false) {
Get.toNamed(RouteName.sliderscreen1);
} else {
// GetProfile().GetProfileAPI().then((value) {
// Get.toNamed(RouteName.mainScreen, arguments: 0);
// });
Get.toNamed(RouteName.mainscreen);
if (token == null || token!.isEmpty) {
Get.offAndToNamed(RouteName.loginscreen);
} else {
// GetProfile().GetProfileAPI().then((value) {
// Get.toNamed(RouteName.mainScreen, arguments: 0);
// });
Get.toNamed(RouteName.mainscreen);
}
}
// }
});
}
} else {
@@ -83,20 +84,19 @@ class _SplashScreenState extends State<SplashScreen>
var token = prefs.getString('accessToken');
// myusername = prefs.getString('name');
// phonenumber = prefs.getString('contact_number');
// OnBoard = prefs.getBool('OnBoard') ?? false;
// if (OnBoard == false) {
// Get.toNamed(RouteName.sliderscreen1);
// }
// else {
if (token == null || token!.isEmpty) {
Get.offAndToNamed(RouteName.loginscreen);
OnBoard = prefs.getBool('OnBoard') ?? false;
if (OnBoard == false) {
Get.toNamed(RouteName.sliderscreen1);
} else {
// GetProfile().GetProfileAPI().then((value) {
// Get.toNamed(RouteName.mainScreen, arguments: 0);
// });
Get.toNamed(RouteName.mainscreen);
if (token == null || token!.isEmpty) {
Get.offAndToNamed(RouteName.loginscreen);
} else {
// GetProfile().GetProfileAPI().then((value) {
// Get.toNamed(RouteName.mainScreen, arguments: 0);
// });
Get.toNamed(RouteName.mainscreen);
}
}
// }
});
}
});

20
lib/view/onBoarding/splashScreen3.dart
View File

@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:traderscircuit/Utils/Common/commonBotton.dart';
import 'package:traderscircuit/resources/routes/route_name.dart';
import 'package:traderscircuit/view/onBoarding/splashScreen1.dart';
@@ -30,14 +31,14 @@ class _Sliderscreen3State extends State<Sliderscreen3>
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
children: [
SizedBox(
const SizedBox(
height: 20,
),
Row(
const Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [],
),
SizedBox(
const SizedBox(
height: 20,
),
Image.asset(
@@ -52,7 +53,7 @@ class _Sliderscreen3State extends State<Sliderscreen3>
child: Container(
width: 390.w,
height: 300.h,
decoration: BoxDecoration(
decoration: const BoxDecoration(
color: Colors.black,
borderRadius: BorderRadius.only(
topLeft: Radius.circular(30),
@@ -61,7 +62,7 @@ class _Sliderscreen3State extends State<Sliderscreen3>
boxShadow: [
BoxShadow(
color: Color(0xffAFAFAF),
offset: const Offset(
offset: Offset(
5.0,
5.0,
),
@@ -74,7 +75,7 @@ class _Sliderscreen3State extends State<Sliderscreen3>
padding: const EdgeInsets.all(20),
child: Column(
children: [
Text(
const Text(
'Unlock a world of diversified investment opportunities with our app',
style: TextStyle(
fontSize: 20,
@@ -123,8 +124,11 @@ class _Sliderscreen3State extends State<Sliderscreen3>
),
CommonBtn(
text: 'Next',
onTap: () {
Get.toNamed(RouteName.loginscreen);
onTap: () async {
Get.toNamed(RouteName.loginscreen);
final SharedPreferences prefs =
await SharedPreferences.getInstance();
await prefs.setBool('OnBoard', true);
},
)
],