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

kyc and update risk profile api integration and issues fixed

Browse Source
This commit is contained in:
jayesh
2024-05-10 15:49:53 +05:30
parent 112ece34cf 516788d628
commit b6813ce76c
27 changed files with 90 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,13 +8,15 @@ class MyTabBar extends StatelessWidget {
Widget build(BuildContext context) {
return Container(
decoration: BoxDecoration(
border: Border.all(color: Color(0Xff3A3A3A)),
border: Border.all(
color: Color(0Xff4A73FB).withOpacity(0.6),
),
borderRadius: BorderRadius.circular(8.r),
),
padding: const EdgeInsets.all(10.0), // Set the desired padding
child: TabBar(
indicator: BoxDecoration(
color: const Color(0xff6C0000),
color: const Color(0xff00C236),
borderRadius: BorderRadius.circular(5),
),
isScrollable: false,

42
lib/Utils/Common/commonBotton.dart
View File

@@ -11,7 +11,7 @@ Widget CommonBtn({void Function()? onTap, required String text}) {
width: double.infinity,
height: 50.h,
decoration: BoxDecoration(
color: Color(0xff9A0000), borderRadius: BorderRadius.circular(5)),
color: Color(0xFF0093FF), borderRadius: BorderRadius.circular(5)),
child: Center(
child: Text(
text,
@@ -84,26 +84,26 @@ Widget CommonYesNoBtn({
);
}
// InkWell(
// onTap: onTap,
// child: Container(
// width: double.infinity,
// height: 50.h,
// decoration: BoxDecoration(
// color: Color(0xff9A0000), borderRadius: BorderRadius.circular(5)),
// child: Center(
// child: Text(
// text,
// textAlign: TextAlign.center,
// style: TextStyle(
// color: Colors.white,
// fontSize: 20.sp,
// fontFamily: 'Cambria',
// fontWeight: FontWeight.w400,
// ),
// ),
// ),
// ));
// InkWell(
// onTap: onTap,
// child: Container(
// width: double.infinity,
// height: 50.h,
// decoration: BoxDecoration(
// color: Color(0xff9A0000), borderRadius: BorderRadius.circular(5)),
// child: Center(
// child: Text(
// text,
// textAlign: TextAlign.center,
// style: TextStyle(
// color: Colors.white,
// fontSize: 20.sp,
// fontFamily: 'Cambria',
// fontWeight: FontWeight.w400,
// ),
// ),
// ),
// ));
Widget kycBtn({
void Function()? onTap,
required String text,

10
lib/Utils/Common/comonGlassmorphicContainer.dart
View File

@@ -17,20 +17,20 @@ Widget commonGlassContainer(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
Colors.white.withOpacity(0.1),
const Color(0xFFFFFFFF).withOpacity(0.05),
Color(0xFF2D7AEE).withOpacity(0.14),
const Color(0xFF2D7AEE).withOpacity(0.14),
],
stops: const [
0.1,
1,
],
),
borderGradient: const LinearGradient(
borderGradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
Color(0xff3A3A3A),
Color(0xFF3A3A3A),
Color(0xff4A73FB).withOpacity(0.6),
Color(0xFF4A73FB).withOpacity(0.6),
],
),
child: customWidget);

2
lib/Utils/dialogs.dart
View File

@@ -19,7 +19,7 @@ class utils {
mainAxisAlignment: MainAxisAlignment.center,
children: [
CircularProgressIndicator(
color: Colors.red,
color: Color(0xFF0093FF),
),
],
),

2
lib/Utils/image_preview_screen.dart
View File

@@ -44,7 +44,7 @@ class _ImagePreviewScreenState extends State<ImagePreviewScreen> {
placeholder: (context, url) {
return const Center(
child: CircularProgressIndicator(
color: Colors.redAccent,
color: Color(0xff0093FF),
),
);
},

2
lib/Utils/utils.dart
View File

@@ -57,7 +57,7 @@ class Utils {
mainAxisAlignment: MainAxisAlignment.center,
children: [
CircularProgressIndicator(
color: Color(0xFF9A0000),
color: Color(0xFF0093FF),
),
],
),

2
lib/data/network/network_api_services.dart
View File

@@ -72,7 +72,7 @@ class NetworkApiServices {
SharedPreferences prefs = await SharedPreferences.getInstance();
String? token = prefs.getString('accessToken');
try {
response = await dio.post(url,
response = await dio.post(url,
data: data,
options: (token == null || token == "")
? Options(

7
lib/view/MainScreen/ExploreUnseen.dart
View File

@@ -47,7 +47,9 @@ class _ExploreUnseenState extends State<ExploreUnseen> {
CommonBlurRight(),
Obx(
() => isApiCalling.value
? CircularProgressIndicator()
? Center(
child: CircularProgressIndicator( color: Color(0xFF0093FF),),
)
: Stack(
children: [
Padding(
@@ -56,7 +58,7 @@ class _ExploreUnseenState extends State<ExploreUnseen> {
),
child: isApiCalling.value
? Center(
child: CircularProgressIndicator(),
child: CircularProgressIndicator( color: Color(0xFF0093FF),),
)
: ListView(
physics: BouncingScrollPhysics(),
@@ -64,6 +66,7 @@ class _ExploreUnseenState extends State<ExploreUnseen> {
text22W600('Explore The Unseen'),
sizedBoxHeight(35.h),
ListView.builder(
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemCount: exploreModel.data!
.exploreTheUnseenActiveCalls!.length,

22
lib/view/MainScreen/HomeScreen.dart
View File

@@ -106,7 +106,7 @@ class _HomeScreenState extends State<HomeScreen> {
const EdgeInsets.symmetric(horizontal: 16, vertical: 16),
child: isApiCalling.value
? Center(
child: CircularProgressIndicator(),
child: CircularProgressIndicator( color: Color(0xFF0093FF),),
)
: ListView(
physics: const BouncingScrollPhysics(),
@@ -201,8 +201,8 @@ class _HomeScreenState extends State<HomeScreen> {
height: 35.h,
width: 105.w,
decoration: BoxDecoration(
color: const Color(0xFF3A3A3A)
.withOpacity(0.6),
color: const Color(0xFF0093FF),
// .withOpacity(0.6),
borderRadius:
BorderRadius.circular(5.r),
border: Border.all(
@@ -588,8 +588,8 @@ Widget ProductWidget({required String text, required String subtext}) {
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
Colors.white.withOpacity(0.1),
const Color(0xFFFFFFFF).withOpacity(0.05),
Color(0xFF2D7AEE).withOpacity(0.14),
const Color(0xFF2D7AEE).withOpacity(0.14),
],
stops: [
0.1,
@@ -599,8 +599,8 @@ Widget ProductWidget({required String text, required String subtext}) {
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
Color(0xff3A3A3A),
Color(0xFF3A3A3A),
Color(0xff0F2C53),
Color(0xFF0F2C53),
],
),
child: Padding(
@@ -633,8 +633,8 @@ Widget commoncontainer(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
Colors.white.withOpacity(0.1),
const Color(0xFFFFFFFF).withOpacity(0.05),
Color(0xFF2D7AEE).withOpacity(0.14),
const Color(0xFF2D7AEE).withOpacity(0.14),
],
stops: [
0.1,
@@ -644,8 +644,8 @@ Widget commoncontainer(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
Color(0xff3A3A3A),
Color(0xFF3A3A3A),
Color(0xff0F2C53),
Color(0xFF0F2C53),
],
),
child: Padding(

4
lib/view/MainScreen/ShortTrade.dart
View File

@@ -148,7 +148,7 @@ class _ShortTradeState extends State<ShortTrade> {
productsController.isLoaded.value
? const Center(
child: CircularProgressIndicator(
color: Colors.redAccent,
color: Color(0xFF0093FF),
),
)
: DefaultTabController(
@@ -970,7 +970,7 @@ class _ShortTradeState extends State<ShortTrade> {
width: 126.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(5),
color: const Color(0Xff6C0000),
color: const Color(0Xff0093FF),
),
child: Center(child: text16W500(text)),
)

2
lib/view/Sidemenu/AboutUs.dart
View File

@@ -43,7 +43,7 @@ class _AboutUsState extends State<AboutUs> {
isLoading.value
? const Center(
child: CircularProgressIndicator(
color: Color(0xFF9A0000),
color: Color(0xFF0093FF),
),
)
: Stack(

2
lib/view/Sidemenu/ContentByte/AudioMore.dart
View File

@@ -204,7 +204,7 @@ class _VideosMoreState extends State<AudioMore> {
isLoading.value
? const Center(
child: CircularProgressIndicator(
color: Color(0xFF9A0000),
color: Color(0xFF0093FF),
),
)
: Stack(

2
lib/view/Sidemenu/ContentByte/ContentBytes.dart
View File

@@ -1124,7 +1124,7 @@ class _VideosState extends State<Videos> {
Gap(50),
Center(
child: CircularProgressIndicator(
color: Color(0xFF9A0000),
color: Color(0xFF0093FF),
),
),
],

2
lib/view/Sidemenu/ContentByte/PlayerWidget.dart
View File

@@ -76,6 +76,6 @@ class _PlayerWidgetState extends State<PlayerWidget> {
),
),
)
: Center(child: CircularProgressIndicator());
: Center(child: CircularProgressIndicator( color: Color(0xFF0093FF),));
}
}

2
lib/view/Sidemenu/ContentByte/ReadMore.dart
View File

@@ -71,7 +71,7 @@ class _VideosMoreState extends State<ReadMore> {
isLoading.value
? const Center(
child: CircularProgressIndicator(
color: Color(0xFF9A0000),
color: Color(0xFF0093FF),
),
)
: Stack(

2
lib/view/Sidemenu/ContentByte/VideosMore.dart
View File

@@ -69,7 +69,7 @@ class _VideosMoreState extends State<VideosMore> {
isLoading.value
? const Center(
child: CircularProgressIndicator(
color: Color(0xFF9A0000),
color: Color(0xFF0093FF),
),
)
: SingleChildScrollView(

2
lib/view/Sidemenu/FaqScreen.dart
View File

@@ -68,7 +68,7 @@ class _FaqScreenState extends State<FaqScreen> {
isLoading.value
? const Center(
child: CircularProgressIndicator(
color: Color(0xFF9A0000),
color: Color(0xFF0093FF),
),
)
: Stack(children: [

2
lib/view/Sidemenu/PrivacyPolicy.dart
View File

@@ -43,7 +43,7 @@ class _PrivacyPolicyState extends State<PrivacyPolicy> {
isLoading.value
? const Center(
child: CircularProgressIndicator(
color: Color(0xFF9A0000),
color: Color(0xFF0093FF),
),
)
: Stack(

2
lib/view/Sidemenu/TermsAndCondition.dart
View File

@@ -44,7 +44,7 @@ class _TermsAndConditionsState extends State<TermsAndConditions> {
isLoading.value
? const Center(
child: CircularProgressIndicator(
color: Color(0xFF9A0000),
color: Color(0xFF0093FF),
),
)
: Stack(

2
lib/view/Sidemenu/contactUs/contact_us_details.dart
View File

@@ -98,7 +98,7 @@ class _ContactUsDetailsScreenState extends State<ContactUsDetailsScreen> {
contactUsController.isDetailsLoading.value
? const Center(
child:
CircularProgressIndicator(color: Color(0xFF9A0000)),
CircularProgressIndicator( color: Color(0xFF0093FF),),
)
: Stack(children: [
SingleChildScrollView(

2
lib/view/Sidemenu/contactUs/contact_us_main.dart
View File

@@ -104,7 +104,7 @@ class _ContactUsMainScreenState extends State<ContactUsMainScreen> {
child: contactUsController.isLoading.value
? const Center(
child: CircularProgressIndicator(
color: Colors.redAccent,
color: Color(0xFF0093FF),
))
: isEmpty.value
? Center(child: text18W800("No Data Available"))

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

@@ -184,7 +184,7 @@ class _MyProfileScreenState extends State<MyProfileScreen> {
isLoading.value
? const Center(
child: CircularProgressIndicator(
color: Color(0xFF9A0000),
color: Color(0xFF0093FF),
),
)
: Stack(

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

@@ -161,7 +161,12 @@ class _KycState extends State<Kyc> {
child: Scaffold(
appBar: CommonAppbar(
titleTxt: "KYC",
customActionWidget: text16W400(""),
customActionWidget: InkWell(
onTap: () {
Get.toNamed(RouteName.updateriskprofile);
},
child: text16W400("skip"),
),
),
backgroundColor: Colors.black,
extendBody: true,

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

@@ -239,10 +239,14 @@ class _LoginScreenState extends State<LoginScreen> {
print(state);
if (state == SendOtpState.loading) {
return Center(
child: Container(
height: 40,
width: 40,
child: CircularProgressIndicator()));
child: Container(
height: 40,
width: 40,
child: CircularProgressIndicator(
color: Color(0xFF0093FF),
),
),
);
}
return CommonBtn(
text: "Login/Signup",

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

@@ -85,7 +85,7 @@ class _UpdateRiskProfileState extends State<UpdateRiskProfile> {
() => isLoading.value
? const Center(
child: CircularProgressIndicator(
color: Color(0xFF9A0000),
color: Color(0xFF0093FF),
),
)
: Stack(

30
lib/view/login/VerifyOtp.dart
View File

@@ -70,34 +70,18 @@ class _VerifyOTPState extends State<VerifyOTP> {
SharedPreferences prefs = await SharedPreferences.getInstance();
await prefs.setString(
'accessToken', resp.data["data"]["access-token"]);
// await prefs.setString('productType',
// resp.data["data"]["nature_of_business_id"].toString());
// naturebusiness =
// resp.data["data"]["nature_of_business_id"].toString();
// ProfileApi().GetProfileApi().then(
// (value) {
// isSecuredAccess == 0
// ? Get.toNamed(RouteName.secureaccess)
// :
isProfileUpdated == 0
? Get.toNamed(RouteName.adddetails)
: isKycUpdated == 0
? Get.toNamed(RouteName.kyc, arguments: {
:
// isKycUpdated == 0
// ? Get.toNamed(RouteName.kyc)
// :
isriskProfileUpdated == 0
? Get.toNamed(RouteName.updateriskprofile, arguments: {
"fromScreen": "login-flow",
})
: isriskProfileUpdated == 0
? Get.toNamed(RouteName.updateriskprofile, arguments: {
"fromScreen": "login-flow",
})
: Get.toNamed(RouteName.mainscreen);
// Get.toNamed(RouteName.mainscreen);
// },
// );
// Get.to(() => CustomBottomBar(pageIndex: 0));
: Get.toNamed(RouteName.mainscreen);
} else {
Get.toNamed(RouteName.loginscreen);
}

8
lib/view/onBoarding/splashScreen1.dart
View File

@@ -174,10 +174,10 @@ class CommonBlurLeft extends StatelessWidget {
width: 200,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: Color(0xFF9A0000).withOpacity(0.5),
color: Color(0xFF001D54).withOpacity(0.5),
),
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 60, sigmaY: 60),
filter: ImageFilter.blur(sigmaX: 30, sigmaY: 30),
child: Container(
height: 200,
width: 200,
@@ -204,10 +204,10 @@ class CommonBlurRight extends StatelessWidget {
width: 200,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: Color(0xFF9A0000).withOpacity(0.5),
color: Color(0xFF001D54).withOpacity(0.5),
),
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 60, sigmaY: 60),
filter: ImageFilter.blur(sigmaX: 30, sigmaY: 30),
child: Container(
height: 200,
width: 200,