diff --git a/assets/images/png/slider1.png b/assets/images/png/slider1.png index 5edbd0d..fff5bce 100644 Binary files a/assets/images/png/slider1.png and b/assets/images/png/slider1.png differ diff --git a/assets/images/png/slider2.png b/assets/images/png/slider2.png index 67b441f..4c72e3f 100644 Binary files a/assets/images/png/slider2.png and b/assets/images/png/slider2.png differ diff --git a/assets/images/png/slider3.png b/assets/images/png/slider3.png index ce05d97..cfed10f 100644 Binary files a/assets/images/png/slider3.png and b/assets/images/png/slider3.png differ diff --git a/lib/Utils/Common/CustomTextFormField.dart b/lib/Utils/Common/CustomTextFormField.dart index 5092de4..34765e1 100644 --- a/lib/Utils/Common/CustomTextFormField.dart +++ b/lib/Utils/Common/CustomTextFormField.dart @@ -79,13 +79,13 @@ class _CustomTextFormFieldState extends State { 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, diff --git a/lib/view/Sidemenu/myProfile/my_profile_screen.dart b/lib/view/Sidemenu/myProfile/my_profile_screen.dart index 6435e7f..97dd691 100644 --- a/lib/view/Sidemenu/myProfile/my_profile_screen.dart +++ b/lib/view/Sidemenu/myProfile/my_profile_screen.dart @@ -191,7 +191,9 @@ class _MyProfileScreenState extends State { children: [ Padding( padding: const EdgeInsets.symmetric( - horizontal: 16, vertical: 16), + horizontal: 16, + vertical: 16, + ), child: ListView( physics: const BouncingScrollPhysics(), children: [ diff --git a/lib/view/login/AddDetails.dart b/lib/view/login/AddDetails.dart index 00364e2..7c779c1 100644 --- a/lib/view/login/AddDetails.dart +++ b/lib/view/login/AddDetails.dart @@ -55,7 +55,7 @@ class _AddDetailsState extends State { colorScheme: ColorScheme.light( surface: Colors.black, onSurface: Colors.white, - primary: Color(0xff9A0000), + primary: Color(0xff4A73FB), onPrimary: Colors.white, ), textButtonTheme: TextButtonThemeData( diff --git a/lib/view/login/Kyc.dart b/lib/view/login/Kyc.dart index 37d847b..6d593c5 100644 --- a/lib/view/login/Kyc.dart +++ b/lib/view/login/Kyc.dart @@ -240,8 +240,8 @@ class _KycState extends State { 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 { 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 { 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 { 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 diff --git a/lib/view/login/LoginScreen.dart b/lib/view/login/LoginScreen.dart index e705dd6..5f7e158 100644 --- a/lib/view/login/LoginScreen.dart +++ b/lib/view/login/LoginScreen.dart @@ -156,8 +156,8 @@ class _LoginScreenState extends State { 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 { 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 { 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, diff --git a/lib/view/login/uploadKycImage.dart b/lib/view/login/uploadKycImage.dart index e47d5d4..412677b 100644 --- a/lib/view/login/uploadKycImage.dart +++ b/lib/view/login/uploadKycImage.dart @@ -71,7 +71,7 @@ class _UploadKYCImageState extends State { } }, bgClr: const Color(0xFF111313), - borderClr: const Color(0xFF990000), + borderClr: const Color(0xff4A73FB), ), ), ), @@ -84,8 +84,8 @@ class _UploadKYCImageState extends State { onTap: () { Get.back(); }, - bgClr: const Color(0xFF6C0000), - borderClr: const Color(0xFF990000), + bgClr: const Color(0xff4A73FB), + borderClr: const Color(0xff4A73FB), ), ), ), diff --git a/lib/view/onBoarding/splashScreen.dart b/lib/view/onBoarding/splashScreen.dart index 4260a28..d03de81 100644 --- a/lib/view/onBoarding/splashScreen.dart +++ b/lib/view/onBoarding/splashScreen.dart @@ -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 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 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); + } } - // } }); } }); diff --git a/lib/view/onBoarding/splashScreen3.dart b/lib/view/onBoarding/splashScreen3.dart index 339c26d..ad3ac67 100644 --- a/lib/view/onBoarding/splashScreen3.dart +++ b/lib/view/onBoarding/splashScreen3.dart @@ -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 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 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 boxShadow: [ BoxShadow( color: Color(0xffAFAFAF), - offset: const Offset( + offset: Offset( 5.0, 5.0, ), @@ -74,7 +75,7 @@ class _Sliderscreen3State extends State 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 ), 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); }, ) ],