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

Merge branch 'main' into splash

Browse Source
This commit is contained in:
Raj
2024-04-04 11:49:11 +05:30
committed by GitHub
parent 9ec5daf8b5 67ab224593
commit c9bdd76c70
27 changed files with 1328 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:traderscircuit/Utils/Common/CommonAppbar.dart';
import 'package:traderscircuit/Utils/text.dart';
import 'package:traderscircuit/model/AboutUsModel/about_us_model.dart';
import 'package:traderscircuit/view/onBoarding/splashScreen1.dart';
import 'package:traderscircuit/view_model/AboutApi/about_api.dart';
class AboutUs extends StatefulWidget {
const AboutUs({super.key});
@@ -12,44 +15,65 @@ class AboutUs extends StatefulWidget {
}
class _AboutUsState extends State<AboutUs> {
RxBool isLoading = true.obs;
AboutUsModel aboutUsModel = AboutUsModel();
@override
void initState() {
AboutUsApi().getAboutUsData().then((value) {
aboutUsModel = AboutUsModel.fromJson(value.data);
isLoading.value = false;
});
super.initState();
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "About Us",
),
backgroundColor: Colors.black,
extendBody: true,
body: Stack(
children: [
CommonBlurLeft(),
CommonBlurRight(),
Stack(
children: [
Padding(
padding: EdgeInsets.symmetric(horizontal: 16, vertical: 16),
child: ListView(
physics: BouncingScrollPhysics(),
// mainAxisAlignment: MainAxisAlignment.start,
// crossAxisAlignment: CrossAxisAlignment.start,
children: [
// CommonDropdownBtn(hint: "hint", items: ["hi", "hii"]),
SizedBox(
height: 10.h,
body: Obx(
() => Stack(
children: [
const CommonBlurLeft(),
const CommonBlurRight(),
isLoading.value
? const Center(
child: CircularProgressIndicator(
color: Color(0xFF9A0000),
),
text16W400(
"""Lorem ipsum dolor sit amet, conse consectetur adipiscing elit, sed do euio eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ulla ullamco laboris nisi ut aliquip ex ea It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. \n\ncommodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla velit pariatur. Excepteur sint occaecat velit cupidatat non proident, sunt in culpa qui \n\nofficia deserunt mollit anim id est laborum. cupidatat non proident, sunt in culpa qui commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla velit pariatur. Excepteur sint occaecat velit cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."""),
)
: Stack(
children: [
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 16, vertical: 16),
child: ListView(
physics: const BouncingScrollPhysics(),
// mainAxisAlignment: MainAxisAlignment.start,
// crossAxisAlignment: CrossAxisAlignment.start,
SizedBox(
height: 10.h,
),
],
),
),
],
),
],
children: [
// CommonDropdownBtn(hint: "hint", items: ["hi", "hii"]),
SizedBox(
height: 10.h,
),
text16W400(
aboutUsModel.data!.content!,
),
SizedBox(
height: 10.h,
),
],
),
),
],
),
],
),
),
);
}

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

@@ -7,7 +7,9 @@ import 'package:traderscircuit/Utils/Common/CustomTextFormField.dart';
import 'package:traderscircuit/Utils/Common/comonGlassmorphicContainer.dart';
import 'package:traderscircuit/Utils/Common/sized_box.dart';
import 'package:traderscircuit/Utils/text.dart';
import 'package:traderscircuit/model/FAQModel/faq_model.dart';
import 'package:traderscircuit/view/onBoarding/splashScreen1.dart';
import 'package:traderscircuit/view_model/FaqApi/faq_api.dart';
class FaqScreen extends StatefulWidget {
const FaqScreen({super.key});
@@ -17,157 +19,119 @@ class FaqScreen extends StatefulWidget {
}
class _FaqScreenState extends State<FaqScreen> {
List<String> containerTexts = [
"Subscriptions",
"Investments",
"App features"
];
List<String> categoryList = [];
RxBool isLoading = true.obs;
FAQModel faqModel = FAQModel();
final selectedIndex = 0.obs;
late RxList<bool> isExpandedList;
@override
void initState() {
isExpandedList = RxList.generate(Faqcard.length, (index) => index == 0);
FAQApi().getFAQData().then((value) {
faqModel = FAQModel.fromJson(value.data);
for (var a in faqModel.data!) {
categoryList.add(a.categoryName!);
}
isExpandedList = RxList.generate(
faqModel.data![selectedIndex.value].faqQueAns!.length,
(index) => index == 0);
isLoading.value = false;
});
super.initState();
}
List<Map<String, String>> Faqcard = [
{
'title': 'How to create new account?',
'content':
"Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since. Lorem Ipsum has been the industry's standard dummy text ever since.",
},
{
'title': 'What is Traders Circuits ?',
'content':
"Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since. Lorem Ipsum has been the industry's standard dummy text ever since.",
},
{
'title': 'What is Traders Circuits ?',
'content':
"Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since. Lorem Ipsum has been the industry's standard dummy text ever since.",
},
{
'title': 'What is Traders Circuits ?',
'content':
"Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since. Lorem Ipsum has been the industry's standard dummy text ever since.",
},
{
'title': 'What is Traders Circuits ?',
'content':
"Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since. Lorem Ipsum has been the industry's standard dummy text ever since.",
},
];
List<Map<String, String>> Faqcard2 = [
{
'title': 'How to create new account?',
'content':
"Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since. Lorem Ipsum has been the industry's standard dummy text ever since.",
},
{
'title': 'What is Traders Circuits ?',
'content':
"Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since. Lorem Ipsum has been the industry's standard dummy text ever since.",
},
];
final selectedIndex = 0.obs;
late RxList<bool> isExpandedList;
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "",
),
backgroundColor: Colors.black,
extendBody: true,
body: Stack(children: [
CommonBlurLeft(),
CommonBlurRight(),
Stack(children: [
Padding(
padding: EdgeInsets.symmetric(horizontal: 16),
child: ListView(physics: BouncingScrollPhysics(), children: [
text25W600('FAQ'),
sizedBoxHeight(20),
CustomTextFormField1(
hintText: 'Search Chats',
leadingIcon: Container(
height: 20,
width: 20,
child: Center(
child: SvgPicture.asset(
'assets/images/svg/search-svgrepo-com.svg',
),
),
body: Obx(
() => Stack(children: [
const CommonBlurLeft(),
const CommonBlurRight(),
isLoading.value
? const Center(
child: CircularProgressIndicator(
color: Color(0xFF9A0000),
),
),
sizedBoxHeight(20.h),
SizedBox(
height: 60,
width: double.infinity,
// color: Colors.amber,
child: ListView.builder(
shrinkWrap: true,
scrollDirection: Axis.horizontal,
itemCount: containerTexts.length,
itemBuilder: (context, index) {
return GestureDetector(
onTap: () {
selectedIndex.value = index;
},
child: Row(
children: [
topContainer(containerTexts[index], index),
sizedBoxWidth(10.w)
],
),
);
}),
),
sizedBoxHeight(20.h),
Obx(() {
return selectedIndex == 0
? Column(
children: List.generate(Faqcard.length, (index) {
return customExpandableItem(
isExpanded: isExpandedList[index],
title: Faqcard[index]['title']!,
content: Faqcard[index]['content']!,
toggleExpansion: () => toggleExpansion(index),
);
}))
: Column(
children: List.generate(Faqcard2.length, (index) {
return customExpandableItem(
isExpanded: isExpandedList[index],
title: Faqcard2[index]['title']!,
content: Faqcard2[index]['content']!,
toggleExpansion: () => toggleExpansion(index),
);
}));
}),
// ListView.builder(
// shrinkWrap: true,
// itemCount: Faqcard.length,
// itemBuilder: (BuildContext context, int index) {
// return Obx(
// () {
// return customExpandableItem(
// isExpanded: isExpandedList[index],
// title: Faqcard[index]['title']!,
// content: Faqcard[index]['content']!,
// toggleExpansion: () => toggleExpansion(index),
// );
// },
// );
// },
// ),
sizedBoxHeight(30.h),
]))
])
]));
)
: Stack(children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: ListView(
physics: const BouncingScrollPhysics(),
children: [
text25W600('FAQ'),
sizedBoxHeight(20),
CustomTextFormField1(
hintText: 'Search Chats',
leadingIcon: SizedBox(
height: 20,
width: 20,
child: Center(
child: SvgPicture.asset(
'assets/images/svg/search-svgrepo-com.svg',
),
),
),
),
sizedBoxHeight(20.h),
SizedBox(
height: 60,
width: double.infinity,
// color: Colors.amber,
child: ListView.builder(
shrinkWrap: true,
scrollDirection: Axis.horizontal,
itemCount: categoryList.length,
itemBuilder: (context, index) {
return GestureDetector(
onTap: () {
selectedIndex.value = index;
isExpandedList = RxList.generate(
faqModel
.data![selectedIndex.value]
.faqQueAns!
.length,
(index) => index == 0);
},
child: Row(
children: [
topContainer(
categoryList[index], index),
sizedBoxWidth(10.w)
],
),
);
}),
),
sizedBoxHeight(20.h),
Obx(() {
return Column(
children: List.generate(
faqModel.data![selectedIndex.value]
.faqQueAns!.length, (index) {
return customExpandableItem(
isExpanded: isExpandedList[index],
title: faqModel.data![selectedIndex.value]
.faqQueAns![index].faqQuestion!,
content: faqModel.data![selectedIndex.value]
.faqQueAns![index].faqAnswer!,
toggleExpansion: () =>
toggleExpansion(index),
);
}));
}),
sizedBoxHeight(30.h),
]))
])
]),
));
}
Widget topContainer(String text, int index) {
@@ -178,8 +142,8 @@ class _FaqScreenState extends State<FaqScreen> {
width: 136.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(5),
color: Color(0XFF3F0502),
border: Border.all(color: Color(0xFF9A0000), width: 1)),
color: const Color(0XFF3F0502),
border: Border.all(color: const Color(0xFF9A0000), width: 1)),
child: Center(child: text16W500(text)),
)
: commonGlassContainer(
@@ -231,7 +195,7 @@ class _FaqScreenState extends State<FaqScreen> {
color: Colors.white,
),
),
Spacer(),
const Spacer(),
Icon(
isExpanded
? Icons.keyboard_arrow_up_outlined
@@ -258,15 +222,19 @@ class _FaqScreenState extends State<FaqScreen> {
bottomRight: Radius.circular(8.r),
),
color: Colors.black,
border: Border.all(color: Color(0xFF3A3A3A), width: 0.5)),
border:
Border.all(color: const Color(0xFF3A3A3A), width: 0.5)),
child: Padding(
padding: EdgeInsets.only(
top: 11.h, left: 14.w, bottom: 25.h, right: 28.w),
child: Text(
content,
style: TextStyle(
color: Color(0xFFFFFFFF),
fontFamily: 'hiragino',
fontSize: 14.sp,
fontWeight: FontWeight.w400,
),
@@ -291,7 +259,7 @@ class _FaqScreenState extends State<FaqScreen> {
color: Colors.white,
),
),
Spacer(),
const Spacer(),
Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [

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

@@ -1,8 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:traderscircuit/Utils/Common/CommonAppbar.dart';
import 'package:traderscircuit/Utils/text.dart';
import 'package:traderscircuit/model/PrivacyPolicyModel/privacy_policy_model.dart';
import 'package:traderscircuit/view/onBoarding/splashScreen1.dart';
import 'package:traderscircuit/view_model/PrivacyPolicyApi/privacy_poilcy_api.dart';
class PrivacyPolicy extends StatefulWidget {
const PrivacyPolicy({super.key});
@@ -12,44 +15,61 @@ class PrivacyPolicy extends StatefulWidget {
}
class _PrivacyPolicyState extends State<PrivacyPolicy> {
RxBool isLoading = true.obs;
PrivacyPolicyModel privacyPolicyModel = PrivacyPolicyModel();
@override
void initState() {
PrivacyPolicyApi().getPrivacyPolicyData().then((value) {
privacyPolicyModel = PrivacyPolicyModel.fromJson(value.data);
isLoading.value = false;
});
super.initState();
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "Privacy Policy",
),
backgroundColor: Colors.black,
extendBody: true,
body: Stack(
children: [
CommonBlurLeft(),
CommonBlurRight(),
Stack(
children: [
Padding(
padding: EdgeInsets.symmetric(horizontal: 16, vertical: 16),
child: ListView(
physics: BouncingScrollPhysics(),
// mainAxisAlignment: MainAxisAlignment.start,
// crossAxisAlignment: CrossAxisAlignment.start,
children: [
// CommonDropdownBtn(hint: "hint", items: ["hi", "hii"]),
SizedBox(
height: 10.h,
body: Obx(
() => Stack(
children: [
const CommonBlurLeft(),
const CommonBlurRight(),
isLoading.value
? const Center(
child: CircularProgressIndicator(
color: Color(0xFF9A0000),
),
text16W400(
"""Lorem ipsum dolor sit amet, conse consectetur adipiscing elit, sed do euio eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ulla ullamco laboris nisi ut aliquip ex ea It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. \n\ncommodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla velit pariatur. Excepteur sint occaecat velit cupidatat non proident, sunt in culpa qui \n\nofficia deserunt mollit anim id est laborum. cupidatat non proident, sunt in culpa qui commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla velit pariatur. Excepteur sint occaecat velit cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."""),
SizedBox(
height: 10.h,
),
],
),
),
],
),
],
)
: Stack(
children: [
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 16, vertical: 16),
child: ListView(
physics: const BouncingScrollPhysics(),
children: [
SizedBox(
height: 10.h,
),
text16W400(
privacyPolicyModel.data!.content!,
),
SizedBox(
height: 10.h,
),
],
),
),
],
),
],
),
),
);
}

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

@@ -1,9 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart';
import 'package:traderscircuit/Utils/Common/CommonAppbar.dart';
import 'package:traderscircuit/Utils/text.dart';
import 'package:traderscircuit/model/TermsConditionModel/terms_condition_model.dart';
import 'package:traderscircuit/view/onBoarding/splashScreen1.dart';
import 'package:traderscircuit/view_model/TermsAndConditionApi/terms_condition_api.dart';
class TermsAndConditions extends StatefulWidget {
const TermsAndConditions({super.key});
@@ -13,44 +15,65 @@ class TermsAndConditions extends StatefulWidget {
}
class _TermsAndConditionsState extends State<TermsAndConditions> {
RxBool isLoading = true.obs;
TermsAndConditionModel termsAndConditionModel = TermsAndConditionModel();
@override
void initState() {
TermsAndConditionApi().getTermsAndConditionData().then((value) {
termsAndConditionModel = TermsAndConditionModel.fromJson(value.data);
isLoading.value = false;
});
super.initState();
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: CommonAppbar(
appBar: const CommonAppbar(
titleTxt: "Terms & Conditions",
),
backgroundColor: Colors.black,
extendBody: true,
body: Stack(
children: [
CommonBlurLeft(),
CommonBlurRight(),
Stack(
children: [
Padding(
padding: EdgeInsets.symmetric(horizontal: 16, vertical: 16),
child: ListView(
physics: BouncingScrollPhysics(),
// mainAxisAlignment: MainAxisAlignment.start,
// crossAxisAlignment: CrossAxisAlignment.start,
children: [
// CommonDropdownBtn(hint: "hint", items: ["hi", "hii"]),
SizedBox(
height: 10.h,
body: Obx(
() => Stack(
children: [
const CommonBlurLeft(),
const CommonBlurRight(),
isLoading.value
? const Center(
child: CircularProgressIndicator(
color: Color(0xFF9A0000),
),
text16W400(
"""Lorem ipsum dolor sit amet, conse consectetur adipiscing elit, sed do euio eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ulla ullamco laboris nisi ut aliquip ex ea It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. \n\ncommodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla velit pariatur. Excepteur sint occaecat velit cupidatat non proident, sunt in culpa qui \n\nofficia deserunt mollit anim id est laborum. cupidatat non proident, sunt in culpa qui commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla velit pariatur. Excepteur sint occaecat velit cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."""),
)
: Stack(
children: [
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 16, vertical: 16),
child: ListView(
physics: const BouncingScrollPhysics(),
// mainAxisAlignment: MainAxisAlignment.start,
// crossAxisAlignment: CrossAxisAlignment.start,
SizedBox(
height: 10.h,
),
],
),
),
],
),
],
children: [
// CommonDropdownBtn(hint: "hint", items: ["hi", "hii"]),
SizedBox(
height: 10.h,
),
text16W400(
termsAndConditionModel.data!.content!,
),
SizedBox(
height: 10.h,
),
],
),
),
],
),
],
),
),
);
}

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

@@ -29,6 +29,8 @@ class _KycState extends State<Kyc> {
Color secondaryColor = Colors.grey.shade800;
KYCController kycController = Get.put(KYCController());
TextEditingController panController = TextEditingController();
TextEditingController addharController = TextEditingController();
// DateTime timebackPressed = DateTime.now();
@@ -358,6 +360,18 @@ class _KycState extends State<Kyc> {
SizedBox(
height: 30.h,
),
Row(
children: [
text18W400("Pan Card"),
],
),
SizedBox(
height: 15.h,
),
const CustomTextFormField(),
SizedBox(
height: 15.h,
),
Row(
children: [
text18W400("Aadhar Number"),