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

Merge pull request #34 from WDI-Ideas/priyanka

Browse Source 
Priyanka
This commit is contained in:
priyankahadpad
2024-04-26 16:40:53 +05:30
committed by GitHub
parent c2657556c7 624c95eac3
commit b25e561039
24 changed files with 430 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/images/png/Group 1000004507.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 543 B

BIN
assets/images/png/Group 1000004508.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 822 B

BIN
assets/images/png/Group 1000004518.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 377 B

BIN
assets/images/png/Group.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
assets/images/png/imgpsh_fullsize_anim.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 385 B

BIN
assets/images/png/inactivepast.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 402 B

BIN
assets/images/png/layers (1) 2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
assets/images/png/pastPerformanceactive.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 385 B

BIN
assets/images/png/return 1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

3
assets/images/svg/Group (1).svg Normal file
View File

@@ -0,0 +1,3 @@
<svg width="29" height="29" viewBox="0 0 29 29" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M14.4998 2.41669C21.1735 2.41669 26.5832 7.8264 26.5832 14.5C26.5832 21.1736 21.1735 26.5834 14.4998 26.5834C7.82621 26.5834 2.4165 21.1736 2.4165 14.5C2.4165 7.8264 7.82621 2.41669 14.4998 2.41669ZM14.4998 4.83335C11.9361 4.83335 9.47732 5.8518 7.66447 7.66465C5.85162 9.47751 4.83317 11.9363 4.83317 14.5C4.83317 17.0638 5.85162 19.5225 7.66447 21.3354C9.47732 23.1482 11.9361 24.1667 14.4998 24.1667C17.0636 24.1667 19.5224 23.1482 21.3352 21.3354C23.1481 19.5225 24.1665 17.0638 24.1665 14.5C24.1665 11.9363 23.1481 9.47751 21.3352 7.66465C19.5224 5.8518 17.0636 4.83335 14.4998 4.83335ZM14.4998 7.25002C14.7958 7.25006 15.0815 7.35872 15.3026 7.55538C15.5238 7.75205 15.6651 8.02305 15.6997 8.31698L15.7082 8.45835V13.9998L18.9791 17.2707C19.1958 17.4882 19.3217 17.78 19.331 18.0868C19.3404 18.3937 19.2326 18.6926 19.0296 18.9229C18.8265 19.1531 18.5435 19.2975 18.2378 19.3266C17.9322 19.3557 17.627 19.2674 17.3841 19.0796L17.2705 18.9793L13.6455 15.3543C13.4577 15.1664 13.3371 14.9217 13.3024 14.6583L13.2915 14.5V8.45835C13.2915 8.13788 13.4188 7.83054 13.6454 7.60393C13.872 7.37733 14.1794 7.25002 14.4998 7.25002Z" fill="white"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

8
assets/images/svg/Group 1000004507.svg Normal file
View File

@@ -0,0 +1,8 @@
<svg width="26" height="26" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg">
<line x1="1.1129" y1="13.3548" x2="1.1129" y2="25.2258" stroke="white" stroke-width="2.22581"/>
<line x1="10.7579" y1="-4.86465e-08" x2="10.7579" y2="25.2258" stroke="white" stroke-width="2.22581"/>
<line x1="15.2096" y1="2.22577" x2="15.2096" y2="25.2258" stroke="white" stroke-width="2.22581"/>
<line x1="20.4029" y1="8.16132" x2="20.4029" y2="25.2258" stroke="white" stroke-width="2.22581"/>
<line x1="24.1124" y1="10.3871" x2="24.1124" y2="25.2258" stroke="white" stroke-width="2.22581"/>
<line x1="5.56456" y1="15.5807" x2="5.56456" y2="25.2258" stroke="white" stroke-width="2.22581"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 694 B

4
assets/images/svg/Group 1000004508.svg Normal file
View File

@@ -0,0 +1,4 @@
<svg width="24" height="23" viewBox="0 0 24 23" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M2 0V21H22.65" stroke="white" stroke-width="2.1"/>
<path d="M6.90039 13.65L13.2004 7.35005L16.7004 10.85L23.0004 4.55005" stroke="white" stroke-width="2.1"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 270 B

9
assets/images/svg/layers (1) 2.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

16
assets/images/svg/past p.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

5
assets/images/svg/past perfomance icon .svg Normal file
View File

@@ -0,0 +1,5 @@
<svg width="18" height="17" viewBox="0 0 18 17" fill="none" xmlns="http://www.w3.org/2000/svg">
<line x1="2" y1="9" x2="2" y2="17" stroke="white" stroke-width="4"/>
<line x1="9" y1="-8.74228e-08" x2="9" y2="17" stroke="white" stroke-width="4"/>
<line x1="16" y1="5" x2="16" y2="17" stroke="white" stroke-width="4"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 323 B

9
assets/images/svg/return 1.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

16
lib/Utils/Common/CommonBottomNavigation.dart
View File

@@ -75,9 +75,9 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.2),
color: Colors.grey.withOpacity(0.4),
spreadRadius: 15,
blurRadius: 5,
blurRadius: 10,
offset: Offset(0, 10),
),
],
@@ -146,9 +146,9 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
),
BottomNavigationBarItem(
icon: Image.asset(
'assets/images/png/sidemenu/past perfomance icon.png',
height: 26.h,
width: 26.w,
'assets/images/png/inactivepast.png',
height: 24.h,
width: 24.w,
),
activeIcon: Stack(
children: [
@@ -175,9 +175,9 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
bottom: 0,
child: Center(
child: Image.asset(
'assets/images/png/sidemenu/activetrade.png',
height: 30.h,
width: 30.w,
'assets/images/png/pastPerformanceactive.png',
height: 28.h,
width: 28.w,
),
))
],

22
lib/Utils/text.dart
View File

@@ -58,6 +58,17 @@ Widget text18W500(String text) {
);
}
Widget text18W500manrope(String text) {
return Text(
text,
style: TextStyle(
fontSize: 18.sp,
color: Colors.white,
fontWeight: FontWeight.w500,
fontFamily: 'Manrope'),
);
}
Widget text18W400(String text,
{TextAlign texAl = TextAlign.start, double heightV = 1.5}) {
return Text(
@@ -219,6 +230,17 @@ Widget text22W600(String text) {
);
}
Widget text22W600manrope(String text) {
return Text(
text,
style: TextStyle(
fontSize: 22.sp,
color: Colors.white,
fontWeight: FontWeight.w600,
fontFamily: 'Manrope'),
);
}
Widget text25W600(String text) {
return Text(
text,

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

@@ -88,32 +88,31 @@ class _ExploreUnseenState extends State<ExploreUnseen> {
children: [
text22W600('Content Bytes'),
sizedBoxHeight(8.w),
SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
text16W400_DADADA('The Beauty and Power of Video'),
sizedBoxWidth(10.w),
Container(
height: 35.h,
width: 105.w,
decoration: BoxDecoration(
color: Color(0xFF3A3A3A).withOpacity(0.6),
borderRadius: BorderRadius.circular(5.r),
border: Border.all(
color: Color(0xFF3A3A3A),
)),
child: Center(child: text16W500('View More')),
),
],
),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
width: 240.w,
child: text16W400_DADADA('The Beauty and Power of Video')),
Spacer(),
Container(
height: 35.h,
width: 105.w,
decoration: BoxDecoration(
color: Color(0xFF3A3A3A).withOpacity(0.6),
borderRadius: BorderRadius.circular(5.r),
border: Border.all(
color: Color(0xFF3A3A3A),
)),
child: Center(child: text16W500('View More')),
),
],
),
sizedBoxHeight(20.h),
commonGlassContainer(
borderradius: 8,
width: double.infinity,
height: 300.h,
height: 330.h,
customWidget: Padding(
padding:
EdgeInsets.symmetric(vertical: 10.h, horizontal: 10.w),
@@ -147,7 +146,10 @@ class _ExploreUnseenState extends State<ExploreUnseen> {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
text18W500('Week of 21st February 2024'),
SizedBox(
width: 250.w,
child:
text18W500('Week of 21st February 2024')),
// sizedBoxHeight(10.h),
text12W400_979797('20k views . 2 days ago'),
],
@@ -235,7 +237,8 @@ class _ExploreUnseenState extends State<ExploreUnseen> {
text15W600(amount)
],
),
sizedBoxWidth(50.w),
Spacer(),
// sizedBoxWidth(50.w),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [

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

@@ -93,13 +93,13 @@ class _HomeScreenState extends State<HomeScreen> {
child: Row(
children: [
commoncontainer(
width: 180.w,
width: 195.w,
text: 'NIFTY',
amount: '22,286.95',
rate: '+304.15 (+1.38%)'),
sizedBoxWidth(10.w),
commoncontainer(
width: 220.w,
width: 240.w,
text: 'BANKNIFTY',
amount: '22,286.95',
rate: '+896.10 (+1.94%)'),
@@ -255,9 +255,13 @@ Widget ActiveCallsTab() {
sizedBoxHeight(8.w),
Row(
mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
text16W400_DADADA('The Beauty and Power of Video'),
sizedBoxWidth(10.w),
SizedBox(
width: 240.w,
child: text16W400_DADADA('The Beauty and Power of Video')),
// sizedBoxWidth(10.w),
Spacer(),
Container(
height: 35.h,
width: 105.w,
@@ -283,7 +287,7 @@ Widget ActiveCallsTab() {
commonGlassContainer(
borderradius: 8,
width: double.infinity,
height: 300.h,
height: 330.h,
customWidget: Padding(
padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 10.w),
child: Column(
@@ -313,6 +317,7 @@ Widget ActiveCallsTab() {
),
sizedBoxHeight(20.h),
Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
CircleAvatar(
radius: 23.r,
@@ -320,13 +325,15 @@ Widget ActiveCallsTab() {
AssetImage('assets/images/png/Ellipse 1494.png'),
),
sizedBoxWidth(10.w),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
text18W500('Week of 21st February 2024'),
// sizedBoxHeight(10.h),
text12W400_979797('20k views . 2 days ago'),
],
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
text18W500('Week of 21st February 2024'),
// sizedBoxHeight(10.h),
text12W400_979797('20k views . 2 days ago'),
],
),
)
],
)
@@ -452,7 +459,8 @@ Widget cardcallWidget(
text15W600(amount)
],
),
sizedBoxWidth(50.w),
// sizedBoxWidth(50.w),
Spacer(),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [

129
lib/view/MainScreen/PastPerformance.dart
View File

@@ -5,6 +5,7 @@ import 'package:async/async.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart';
import 'package:glassmorphism/glassmorphism.dart';
import 'package:lottie/lottie.dart';
@@ -119,13 +120,55 @@ class _PastPerformanceState extends State<PastPerformance> {
height: 440.h,
borderradius: 8,
customWidget: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
text18W400("Traders Circuit Metrics"),
text12W400("(Mar 2023 - Jan 2024)"),
],
Padding(
padding: EdgeInsets.symmetric(
horizontal: 12.w, vertical: 16.h),
child: RichText(
text: TextSpan(
children: [
TextSpan(
text: "Traders Circuit Metrics",
style: TextStyle(
fontSize: 20.sp,
color: Colors.white,
fontWeight: FontWeight.w600,
fontFamily: 'hiragino'),
),
TextSpan(
text: " (Mar 2023 - Jan 2024)",
style: TextStyle(
fontSize: 14.sp,
color: Colors.white,
fontWeight: FontWeight.w300,
fontFamily: 'hiragino'),
),
],
),
),
),
// Padding(
// padding:
// const EdgeInsets.symmetric(horizontal: 12),
// child: Row(
// mainAxisAlignment: MainAxisAlignment.start,
// children: [
// text18W400("Traders Circuit Metrics"),
// text12W400("(Mar 2023 - Jan 2024)")
// ],
// ),
// ),
Column(
children:
List.generate(metricsRowtile.length, (index) {
return matricsWidget(
iconimg: metricsRowtile[index]['iconImg']!,
textName: metricsRowtile[index]
['textName']!,
rate: metricsRowtile[index]['rate']!);
}),
)
],
),
),
@@ -170,6 +213,80 @@ class _PastPerformanceState extends State<PastPerformance> {
);
}
List<Map<String, String>> metricsRowtile = [
{
'iconImg': 'assets/images/png/layers (1) 2.png',
'textName': 'Total Calls',
'rate': '132',
},
{
'iconImg': 'assets/images/png/return 1.png',
'textName': 'Exited Calls',
'rate': '109',
},
{
'iconImg': 'assets/images/png/Group 1000004507.png',
'textName': 'Success Rate',
'rate': '70%',
},
{
'iconImg': 'assets/images/png/Group.png',
'textName': 'Avg. duration/call',
'rate': '20d',
},
{
'iconImg': 'assets/images/png/Group 1000004508.png',
'textName': 'Annual Returns',
'rate': '90%',
},
];
Widget matricsWidget(
{required String iconimg,
required String textName,
required String rate}) {
return Column(
children: [
Divider(
color: Color(0xFF2D2D2D),
thickness: 1.h,
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w, vertical: 5.h),
child: Row(
children: [
Container(
width: 46.w,
height: 45.h,
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(4.r)),
gradient: LinearGradient(
begin: Alignment.centerLeft,
end: Alignment.centerRight,
colors: [
Color.fromRGBO(154, 0, 0, 0.38),
Color.fromRGBO(108, 0, 0, 0.31),
],
),
),
child: Center(
child: Image.asset(
iconimg,
height: 26.h,
width: 26.w,
)),
),
sizedBoxWidth(16.w),
text18W500manrope(textName),
Spacer(),
text22W600manrope(rate),
],
),
)
],
);
}
List<Map<String, String>> cardMultibagger = [
{
'text': 'TATA MOTORS',
@@ -210,7 +327,7 @@ class _PastPerformanceState extends State<PastPerformance> {
}) {
return commonGlassContainer(
width: double.infinity,
height: 330.h,
height: 360.h,
borderradius: 8,
customWidget: Column(
children: [

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

@@ -90,51 +90,54 @@ class _ShortTradeState extends State<ShortTrade> {
Stack(children: [
Padding(
padding: EdgeInsets.symmetric(horizontal: 16, vertical: 16),
child: ListView(physics: BouncingScrollPhysics(), children: [
sizedBoxHeight(15.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)
],
child: ListView(
physics: NeverScrollableScrollPhysics(),
children: [
sizedBoxHeight(15.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),
DefaultTabController(
length: 2,
// initialIndex: selectedIndex.value,
child: Column(
children: [
MyTabBar(),
SizedBox(
height: 700.h,
child: TabBarView(
children: [
ActiveCallsTab(),
ExitedCallsTab(),
],
),
),
);
}),
),
sizedBoxHeight(20.h),
DefaultTabController(
length: 2,
// initialIndex: selectedIndex.value,
child: Column(
children: [
MyTabBar(),
SizedBox(
height: 700.h,
child: TabBarView(
children: [
ActiveCallsTab(),
ExitedCallsTab(),
],
),
],
),
],
),
),
sizedBoxHeight(20.h),
]))
),
sizedBoxHeight(20.h),
]))
])
],
),
@@ -187,103 +190,112 @@ class _ShortTradeState extends State<ShortTrade> {
if (selectedIndex == 1 || selectedIndex == 2) _unlockbottomsheet();
});
return selectedIndex == 0
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
sizedBoxHeight(20.h),
cardSwingWidget(
text: 'Indiabulls Housing Finance Ltd',
amount: '₹ 196.50 - ₹ 197',
targetamount: '₹ 204',
stoploss: '₹ 190',
time: '4-5 Days'),
sizedBoxHeight(25.h),
text22W600('Content Bytes'),
SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
text16W400_DADADA('The Beauty and Power of Video'),
sizedBoxWidth(10.w),
Container(
height: 35.h,
width: 105.w,
decoration: BoxDecoration(
color: Color(0xFF3A3A3A).withOpacity(0.6),
borderRadius: BorderRadius.circular(5.r),
border: Border.all(
color: Color(0xFF3A3A3A),
)),
child: Center(
child: InkWell(
onTap: () {
Get.toNamed(RouteName.contentbytes);
},
child: text16W500('View More'),
? SingleChildScrollView(
physics: AlwaysScrollableScrollPhysics(),
child: Padding(
padding: EdgeInsets.only(top: 20.h, bottom: 210.h),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
cardSwingWidget(
text: 'Indiabulls Housing Finance Ltd',
amount: '₹ 196.50 - ₹ 197',
targetamount: '₹ 204',
stoploss: '₹ 190',
time: '4-5 Days'),
sizedBoxHeight(25.h),
text22W600('Content Bytes'),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(
width: 240.w,
child: text16W400_DADADA(
'The Beauty and Power of Video')),
Spacer(),
Container(
height: 35.h,
width: 105.w,
decoration: BoxDecoration(
color: Color(0xFF3A3A3A).withOpacity(0.6),
borderRadius: BorderRadius.circular(5.r),
border: Border.all(
color: Color(0xFF3A3A3A),
)),
child: Center(
child: InkWell(
onTap: () {
Get.toNamed(RouteName.contentbytes);
},
child: text16W500('View More'),
),
),
),
),
],
),
),
sizedBoxHeight(20.h),
commonGlassContainer(
borderradius: 8,
width: double.infinity,
height: 300.h,
customWidget: Padding(
padding:
EdgeInsets.symmetric(vertical: 10.h, horizontal: 10.w),
child: Column(
children: [
InkWell(
onTap: () {
Get.to(() => PlayerWidget(), arguments: {
"video_url": "",
});
},
child: Container(
height: 200.h,
width: double.infinity,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.r),
image: DecorationImage(
image: AssetImage(
'assets/images/png/Rectangle 17934.png'))),
child: Center(
child: SvgPicture.asset(
'assets/images/svg/gridicons_play.svg',
height: 56.h,
width: 56.w,
],
),
sizedBoxHeight(20.h),
commonGlassContainer(
borderradius: 8,
width: double.infinity,
height: 330.h,
customWidget: Padding(
padding: EdgeInsets.symmetric(
vertical: 10.h, horizontal: 10.w),
child: Column(
children: [
InkWell(
onTap: () {
Get.to(() => PlayerWidget(), arguments: {
"video_url": "",
});
},
child: Container(
height: 200.h,
width: double.infinity,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.r),
image: DecorationImage(
image: AssetImage(
'assets/images/png/Rectangle 17934.png'))),
child: Center(
child: SvgPicture.asset(
'assets/images/svg/gridicons_play.svg',
height: 56.h,
width: 56.w,
),
),
),
),
),
),
sizedBoxHeight(20.h),
Row(
children: [
CircleAvatar(
radius: 23.r,
backgroundImage: AssetImage(
'assets/images/png/Ellipse 1494.png'),
),
sizedBoxWidth(10.w),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
sizedBoxHeight(20.h),
Row(
children: [
text18W500('Week of 21st February 2024'),
// sizedBoxHeight(10.h),
text12W400_979797('20k views . 2 days ago'),
CircleAvatar(
radius: 23.r,
backgroundImage: AssetImage(
'assets/images/png/Ellipse 1494.png'),
),
sizedBoxWidth(10.w),
Expanded(
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
text18W500('Week of 21st February 2024'),
// sizedBoxHeight(10.h),
text12W400_979797(
'20k views . 2 days ago'),
],
),
)
],
)
],
)
],
),
),
),
),
],
),
],
),
)
: selectedIndex == 1
? Column(
@@ -499,7 +511,7 @@ class _ShortTradeState extends State<ShortTrade> {
}) {
return commonGlassContainer(
width: double.infinity,
height: 380.h,
height: 400.h,
borderradius: 8,
customWidget: Column(
children: [
@@ -657,7 +669,7 @@ class _ShortTradeState extends State<ShortTrade> {
}) {
return commonGlassContainer(
width: double.infinity,
height: 330.h,
height: 360.h,
borderradius: 8,
customWidget: Column(
children: [
@@ -815,7 +827,7 @@ class _ShortTradeState extends State<ShortTrade> {
}) {
return commonGlassContainer(
width: double.infinity,
height: 255.h,
height: 260.h,
borderradius: 8,
customWidget: Column(
children: [

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

@@ -164,38 +164,39 @@ class _VideosMoreState extends State<VideosMore> {
return [
PopupMenuItem(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
height: (Get.height *
contentBytesController
.contentBytesCategoriesModel.data!.length) /
17,
width: 150,
child: ListView.builder(
padding: EdgeInsets.zero,
shrinkWrap: true,
itemCount: contentBytesController
.contentBytesCategoriesModel.data!.length,
itemBuilder: (ctx, index) {
return InkWell(
onTap: () {
// contentBytesController.isApiCalling.value = true;
Get.back();
contentBytesController.filterId =
contentBytesController
.contentBytesCategoriesModel
.data![index]
.id!;
log(
contentBytesController.filterId.toString(),
);
handleSearch(searchController.text,
contentBytesController.filterId.toString());
},
child: itemFilter(index));
}),
Center(
child: SizedBox(
height: (Get.height *
contentBytesController
.contentBytesCategoriesModel.data!.length) /
17,
width: 160,
child: ListView.builder(
padding: EdgeInsets.zero,
shrinkWrap: true,
itemCount: contentBytesController
.contentBytesCategoriesModel.data!.length,
itemBuilder: (ctx, index) {
return InkWell(
onTap: () {
// contentBytesController.isApiCalling.value = true;
Get.back();
contentBytesController.filterId =
contentBytesController
.contentBytesCategoriesModel
.data![index]
.id!;
log(
contentBytesController.filterId.toString(),
);
handleSearch(searchController.text,
contentBytesController.filterId.toString());
},
child: itemFilter(index));
}),
),
),
],
))

1
pubspec.yaml
View File

@@ -49,7 +49,6 @@ dependencies:
syncfusion_flutter_pdfviewer:
flutter_html: ^3.0.0-beta.2
dev_dependencies:
flutter_test:
sdk: flutter