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

Merge pull request #45 from WDI-Ideas/jayeshjain25

Browse Source 
Jayeshjain25
This commit is contained in:
Jayesh jain
2024-05-03 18:45:11 +05:30
committed by GitHub
parent 9e8e189a91 f65afd9f6d
commit e55dd513ab
12 changed files with 240 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,5 @@
import 'dart:ui';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_svg/svg.dart';
import 'package:glassmorphism/glassmorphism.dart';
import 'package:traderscircuit/Utils/Common/MainController.dart';
@@ -19,13 +16,13 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
end: Alignment.bottomRight,
colors: [
Colors.white.withOpacity(0.1),
Color(0xFFFFFFFF).withOpacity(0.05),
const Color(0xFFFFFFFF).withOpacity(0.05),
],
stops: [
stops: const [
0.1,
1,
]),
borderGradient: LinearGradient(
borderGradient: const LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [
@@ -36,18 +33,18 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
child: BottomNavigationBar(
// backgroundColor: ,
type: BottomNavigationBarType.fixed,
backgroundColor: Color(0xFFFFFFFF).withOpacity(0),
backgroundColor: const Color(0xFFFFFFFF).withOpacity(0),
showUnselectedLabels: true,
selectedItemColor: Colors.white,
unselectedItemColor: Color(0xFF676767),
unselectedItemColor: const Color(0xFF676767),
unselectedLabelStyle: TextStyle(
fontSize: 10.sp,
color: Color(0xFF676767),
color: const Color(0xFF676767),
fontWeight: FontWeight.w400,
fontFamily: 'hiragino'),
selectedLabelStyle: TextStyle(
fontSize: 10.sp,
color: Color(0xFFFFFFFF),
color: const Color(0xFFFFFFFF),
fontWeight: FontWeight.w400,
fontFamily: 'hiragino'),
currentIndex: _mainController.selectedIndex.value,
@@ -78,7 +75,7 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
color: Colors.grey.withOpacity(0.4),
spreadRadius: 15,
blurRadius: 10,
offset: Offset(0, 10),
offset: const Offset(0, 10),
),
],
),
@@ -121,7 +118,7 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
color: Colors.grey.withOpacity(0.4),
spreadRadius: 15,
blurRadius: 10,
offset: Offset(0, 10),
offset: const Offset(0, 10),
),
],
),
@@ -163,7 +160,7 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
color: Colors.grey.withOpacity(0.4),
spreadRadius: 15,
blurRadius: 10,
offset: Offset(0, 10),
offset: const Offset(0, 10),
),
],
),
@@ -205,7 +202,7 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
color: Colors.grey.withOpacity(0.4),
spreadRadius: 15,
blurRadius: 10,
offset: Offset(0, 10),
offset: const Offset(0, 10),
),
],
),

1
lib/Utils/Common/MainController.dart
View File

@@ -1,7 +1,6 @@
import 'package:get/get.dart';
import 'package:traderscircuit/view/MainScreen/HomeScreen.dart';
import 'package:traderscircuit/view/MainScreen/PastPerformance.dart';
import 'package:traderscircuit/view/MainScreen/Portfolio/Holdings.dart';
import 'package:traderscircuit/view/MainScreen/Portfolio/PortfolioEmpty.dart';
import 'package:traderscircuit/view/MainScreen/ShortTrade.dart';

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

@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:glassmorphism/glassmorphism.dart';
Widget commonGlassContainer(
@@ -19,14 +18,14 @@ Widget commonGlassContainer(
end: Alignment.bottomRight,
colors: [
Colors.white.withOpacity(0.1),
Color(0xFFFFFFFF).withOpacity(0.05),
const Color(0xFFFFFFFF).withOpacity(0.05),
],
stops: [
stops: const [
0.1,
1,
],
),
borderGradient: LinearGradient(
borderGradient: const LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [

2
lib/Utils/Common/noInternet.dart
View File

@@ -2,8 +2,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:traderscircuit/Utils/Common/sized_box.dart';
import 'package:traderscircuit/Utils/text.dart';
class NoInternet extends StatefulWidget {
const NoInternet({super.key});

10
lib/controller/contact_us_controller.dart
View File

@@ -3,9 +3,9 @@ import 'dart:io';
import 'package:get/get.dart';
import 'package:traderscircuit/model/ContactUsModel/contact_us_cat_model.dart';
import 'package:traderscircuit/model/ContactUsModel/contact_us_model.dart';
import 'package:intl/intl.dart';
import '../model/ContactUsModel/ticket_details_model.dart';
import 'package:intl/intl.dart';
class ContactUsController extends GetxController {
RxBool isLoading = true.obs;
@@ -19,7 +19,7 @@ class ContactUsController extends GetxController {
//contact us page controller
RxList<File?> attachmentFileList = [File("")].obs;
RxList<String> attachmentPathNameList = [""].obs;
RxList<dynamic> contactUsDetailsChatContent = [].obs;
RxList<dynamic> contactUsDetailsChatContent = [].obs;
//contact us details page controller
RxList<File?> attachmentFileDetailsList = [File("")].obs;
RxList<String> attachmentPathNameDetailsList = [""].obs;
@@ -29,14 +29,10 @@ class ContactUsController extends GetxController {
RxString selectedValue = "".obs;
//formated date
String formatedDateTimeMethod(String originalDateTimeString) {
DateTime dateTime = DateTime.parse(originalDateTimeString);
return DateFormat("dd MMM yyyy, hh:mm a").format(dateTime.toLocal());
}
RxList<dynamic> contactUsDetailsChatContent = [].obs;
}

2
lib/controller/content_bytes_controller.dart
View File

@@ -1,10 +1,8 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:just_audio/just_audio.dart';
import 'package:traderscircuit/Utils/base_manager.dart';
import 'package:traderscircuit/model/ContentBytesModel/content_bytes_categories_model.dart';
import 'package:traderscircuit/model/ContentBytesModel/content_bytes_model.dart';
import 'package:traderscircuit/view_model/ContentBytesApi/content_bytes_api.dart';
import '../view/Sidemenu/ContentByte/ContentBytes.dart';

8
lib/controller/products_controller.dart
View File

@@ -1,9 +1,17 @@
import 'package:get/get.dart';
import 'package:traderscircuit/model/ProductsModel/call_recommendations_model.dart';
import 'package:intl/intl.dart';
class ProductsController extends GetxController {
RxBool isLoaded = true.obs;
CallRecommendationsModel swingTradeModel = CallRecommendationsModel();
CallRecommendationsModel multibaggerModel = CallRecommendationsModel();
CallRecommendationsModel optionModel = CallRecommendationsModel();
final selectedIndex = 0.obs;
String dateConverterMethod(String dateV) {
DateTime dateTime = DateTime.parse(dateV);
DateTime newDateTime = DateTime(dateTime.year, 3, 25);
return DateFormat("dd MMMM yyyy").format(newDateTime);
}
}

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

@@ -5,7 +5,6 @@ import 'package:shared_preferences/shared_preferences.dart';
import 'package:dio/dio.dart';
import 'package:traderscircuit/Utils/utils.dart';
import '../../Utils/base_manager.dart';
import 'base_api_services.dart';
class NetworkApiServices {
Dio dio = Dio();

2
lib/model/FAQModel/faq_model.dart
View File

@@ -1,5 +1,3 @@
import 'package:get/get.dart';
class FAQModel {
String? status;
int? statusCode;

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

@@ -10,6 +10,7 @@ import 'package:traderscircuit/Utils/Common/CommonTabBar.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/controller/products_controller.dart';
import 'package:traderscircuit/resources/routes/route_name.dart';
import 'package:traderscircuit/view/MainScreen/MainScreen.dart';
import 'package:traderscircuit/view/Sidemenu/ContentByte/PlayerWidget.dart';
@@ -28,6 +29,7 @@ class HomeScreen extends StatefulWidget {
class _HomeScreenState extends State<HomeScreen> {
GlobalKey<ScaffoldState> _scaffoldKey1 = GlobalKey<ScaffoldState>();
RxString userName = "User".obs;
ProductsController productsController = Get.put(ProductsController());
@override
void initState() {
@@ -132,20 +134,44 @@ class _HomeScreenState extends State<HomeScreen> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
ProductWidget(
text: 'Options', subtext: 'Recommendation'),
ProductWidget(
text: 'Multibagger', subtext: 'Recommendation')
InkWell(
onTap: () {
mainController.selectedIndex.value = 1;
productsController.selectedIndex.value = 2;
},
child: ProductWidget(
text: 'Options', subtext: 'Recommendation'),
),
InkWell(
onTap: () {
mainController.selectedIndex.value = 1;
productsController.selectedIndex.value = 1;
},
child: ProductWidget(
text: 'Multibagger', subtext: 'Recommendation'),
)
],
),
sizedBoxHeight(15.h),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
ProductWidget(
text: 'Swing Trade', subtext: 'Recommendation'),
ProductWidget(
text: 'OP + MB + ST', subtext: 'Recommendation'),
InkWell(
onTap: () {
mainController.selectedIndex.value = 1;
productsController.selectedIndex.value = 0;
},
child: ProductWidget(
text: 'Swing Trade', subtext: 'Recommendation'),
),
InkWell(
onTap: () {
mainController.selectedIndex.value = 1;
productsController.selectedIndex.value = 0;
},
child: ProductWidget(
text: 'OP + MB + ST', subtext: 'Recommendation'),
),
],
),
sizedBoxHeight(25.h),

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

@@ -28,7 +28,6 @@ class ShortTrade extends StatefulWidget {
class _ShortTradeState extends State<ShortTrade> {
GlobalKey<ScaffoldState> _scaffoldKey1 = GlobalKey<ScaffoldState>();
List<String> containerTexts = ["Swing Trade", "Multibagger", "Options"];
final selectedIndex = 0.obs;
ProductsController productsController = Get.put(ProductsController());
@override
@@ -129,7 +128,8 @@ class _ShortTradeState extends State<ShortTrade> {
itemBuilder: (context, index) {
return GestureDetector(
onTap: () {
selectedIndex.value = index;
productsController.selectedIndex.value =
index;
},
child: Row(
children: [
@@ -158,24 +158,32 @@ class _ShortTradeState extends State<ShortTrade> {
height: 700.h,
child: TabBarView(
children: [
ActiveCallsTab(
selectedIndex.value == 0
ActiveCallsTab(productsController
.selectedIndex.value ==
0
? productsController
.swingTradeModel
: productsController
.selectedIndex
.value ==
1
? productsController
.swingTradeModel
: selectedIndex.value == 1
? productsController
.multibaggerModel
: productsController
.optionModel),
ExitedCallsTab(
selectedIndex.value == 0
.multibaggerModel
: productsController
.optionModel),
ExitedCallsTab(productsController
.selectedIndex.value ==
0
? productsController
.swingTradeModel
: productsController
.selectedIndex
.value ==
1
? productsController
.swingTradeModel
: selectedIndex.value == 1
? productsController
.multibaggerModel
: productsController
.optionModel),
.multibaggerModel
: productsController
.optionModel),
],
),
),
@@ -245,7 +253,7 @@ class _ShortTradeState extends State<ShortTrade> {
itemBuilder: (ctx, index) {
return Padding(
padding: EdgeInsets.only(top: 20.h, bottom: 5.h),
child: selectedIndex.value == 0
child: productsController.selectedIndex.value == 0
? cardSwingWidget(
image: callRecommendationsModel
.data!.activeCalls![index].stockImage!,
@@ -261,8 +269,12 @@ class _ShortTradeState extends State<ShortTrade> {
action: callRecommendationsModel
.data!.activeCalls![index].actionData!.name!,
)
: selectedIndex.value == 1
: productsController.selectedIndex.value == 1
? cardMultibaggerWidget(
image: callRecommendationsModel
.data!.activeCalls![index].stockImage!,
action: callRecommendationsModel
.data!.activeCalls![index].actionData!.name!,
text: callRecommendationsModel
.data!.activeCalls![index].stockName!,
price:
@@ -270,14 +282,34 @@ class _ShortTradeState extends State<ShortTrade> {
date: callRecommendationsModel
.data!.activeCalls![index].createdAt!,
returns:
"₹ ${callRecommendationsModel.data!.activeCalls![index].stopLoss}",
"₹ ${callRecommendationsModel.data!.activeCalls![index].targetPrice}",
stoploss:
"₹ ${callRecommendationsModel.data!.activeCalls![index].stopLoss}",
duration: callRecommendationsModel
.data!.activeCalls![index].duration!,
pdfname: "Download Pdf",
)
: SizedBox(),
: cardOptionWidget(
image: callRecommendationsModel
.data!.activeCalls![index].stockImage!,
action: callRecommendationsModel
.data!.activeCalls![index].actionData!.name!,
text: callRecommendationsModel
.data!.activeCalls![index].stockName!,
optiontype: "test",
price:
"₹ ${callRecommendationsModel.data!.activeCalls![index].buyPrice}",
date: callRecommendationsModel
.data!.activeCalls![index].createdAt!,
premium:
"₹ ${callRecommendationsModel.data!.activeCalls![index].stopLoss}",
price1:
"₹ ${callRecommendationsModel.data!.activeCalls![index].stopLoss}",
price2:
"₹ ${callRecommendationsModel.data!.activeCalls![index].stopLoss}",
stoploss:
"₹ ${callRecommendationsModel.data!.activeCalls![index].stopLoss}",
),
);
});
}
@@ -319,175 +351,78 @@ class _ShortTradeState extends State<ShortTrade> {
}
Widget ExitedCallsTab(CallRecommendationsModel callRecommendationsModel) {
List<Map<String, String>> cardSwing = [
{
'text': 'Indiabulls Housing Finance Ltd',
'amount': '₹ 196.50 - ₹ 197',
'targetamount': '₹ 204',
'stoploss': '₹ 190',
'time': '4-5 Days',
},
{
'text': 'Indiabulls Housing Finance Ltd',
'amount': '₹ 196.50 - ₹ 197',
'targetamount': '₹ 204',
'stoploss': '₹ 190',
'time': '4-5 Days',
},
{
'text': 'Indiabulls Housing Finance Ltd',
'amount': '₹ 196.50 - ₹ 197',
'targetamount': '₹ 204',
'stoploss': '₹ 190',
'time': '4-5 Days',
},
];
List<Map<String, String>> cardMultibagger = [
{
'text': 'TATA MOTORS',
'price': '₹ 453 - ₹234',
'date': '25 March 2024',
'returns': '103%',
'stoploss': '₹ 198',
'duration': '271 Days',
'pdfname': 'Download Pdf'
},
{
'text': 'TATA MOTORS',
'price': '₹ 453 - ₹234',
'date': '25 March 2024',
'returns': '103%',
'stoploss': '₹ 198',
'duration': '271 Days',
'pdfname': 'Download Pdf'
},
{
'text': 'TATA MOTORS',
'price': '₹ 453 - ₹234',
'date': '25 March 2024',
'returns': '103%',
'stoploss': '₹ 198',
'duration': '271 Days',
'pdfname': 'Download Pdf'
},
];
List<Map<String, String>> cardOptionsbagger = [
{
'text': 'NIFTY/ BANK NIFTY',
'optiontype': 'Call',
'price': '₹ 46500',
'date': '6th Mar',
'premium': 'Buy above₹ 690',
'price1': '₹ 740',
'price2': '₹ 780',
'stoploss': '₹ 645',
},
{
'text': 'NIFTY/ BANK NIFTY',
'optiontype': 'Call',
'price': '₹ 46500',
'date': '6th Mar',
'premium': 'Buy above₹ 690',
'price1': '₹ 740',
'price2': '₹ 780',
'stoploss': '₹ 645',
},
{
'text': 'NIFTY/ BANK NIFTY',
'optiontype': 'Call',
'price': '₹ 46500',
'date': '6th Mar',
'premium': 'Buy above₹ 690',
'price1': '₹ 740',
'price2': '₹ 780',
'stoploss': '₹ 645',
},
];
return SingleChildScrollView(
child: Column(
children: [
sizedBoxHeight(20.h),
Obx(() {
return selectedIndex.value == 0
? callRecommendationsModel.data!.exitedCalls!.isEmpty
? Center(
child: Column(
children: [
const Gap(200),
text22W600("No Data Available !"),
],
))
: ListView.builder(
itemCount:
callRecommendationsModel.data!.exitedCalls!.length,
itemBuilder: (ctx, index) {
return Padding(
padding: EdgeInsets.only(top: 20.h, bottom: 5.h),
child: cardSwingWidget(
image: callRecommendationsModel
.data!.exitedCalls![index].stockImage!,
text: callRecommendationsModel
.data!.exitedCalls![index].stockName!,
amount: '₹ 196.50 - ₹ 197',
targetamount:
'₹ ${callRecommendationsModel.data!.exitedCalls![index].targetPrice}',
stoploss:
'₹ ${callRecommendationsModel.data!.exitedCalls![index].stopLoss}',
time:
'${callRecommendationsModel.data!.exitedCalls![index].duration}',
action: callRecommendationsModel
.data!.exitedCalls![index].actionData!.name!,
),
);
})
: selectedIndex == 1
? Column(
children:
List.generate(cardMultibagger.length, (index) {
return Column(
children: [
cardMultibaggerWidget(
text: cardMultibagger[index]['text']!,
price: cardMultibagger[index]['price']!,
date: cardMultibagger[index]['date']!,
returns: cardMultibagger[index]['returns']!,
stoploss: cardMultibagger[index]['stoploss']!,
duration: cardMultibagger[index]['duration']!,
pdfname: cardMultibagger[index]['pdfname']!),
sizedBoxHeight(20.h)
],
);
}),
return callRecommendationsModel.data!.exitedCalls!.isEmpty
? Center(
child: Column(
children: [
const Gap(200),
text22W600("No Data Available !"),
],
))
: ListView.builder(
itemCount: callRecommendationsModel.data!.exitedCalls!.length,
itemBuilder: (ctx, index) {
return Padding(
padding: EdgeInsets.only(top: 20.h, bottom: 5.h),
child: productsController.selectedIndex.value == 0
? cardSwingWidget(
image: callRecommendationsModel
.data!.exitedCalls![index].stockImage!,
text: callRecommendationsModel
.data!.exitedCalls![index].stockName!,
amount: '₹ 196.50 - ₹ 197',
targetamount:
'₹ ${callRecommendationsModel.data!.exitedCalls![index].targetPrice}',
stoploss:
'₹ ${callRecommendationsModel.data!.exitedCalls![index].stopLoss}',
time:
'${callRecommendationsModel.data!.exitedCalls![index].duration}',
action: callRecommendationsModel
.data!.exitedCalls![index].actionData!.name!,
)
: Column(
children:
List.generate(cardMultibagger.length, (index) {
return Column(
children: [
cardOptionWidget(
text: cardOptionsbagger[index]['text']!,
optiontype: cardOptionsbagger[index]
['optiontype']!,
price: cardOptionsbagger[index]['price']!,
date: cardOptionsbagger[index]['date']!,
premium: cardOptionsbagger[index]['premium']!,
price1: cardOptionsbagger[index]['price1']!,
price2: cardOptionsbagger[index]['price2']!,
stoploss: cardOptionsbagger[index]
['stoploss']!),
sizedBoxHeight(20.h)
],
);
}),
);
}),
sizedBoxHeight(200.h)
],
),
);
: productsController.selectedIndex.value == 1
? cardMultibaggerWidget(
image: callRecommendationsModel
.data!.exitedCalls![index].stockImage!,
action: callRecommendationsModel
.data!.exitedCalls![index].actionData!.name!,
text: callRecommendationsModel
.data!.exitedCalls![index].stockName!,
price:
"₹ ${callRecommendationsModel.data!.exitedCalls![index].buyPrice}",
date: callRecommendationsModel
.data!.exitedCalls![index].createdAt!,
returns:
"₹ ${callRecommendationsModel.data!.exitedCalls![index].targetPrice}",
stoploss:
"₹ ${callRecommendationsModel.data!.exitedCalls![index].stopLoss}",
duration: callRecommendationsModel
.data!.exitedCalls![index].duration!,
pdfname: "Download Pdf",
)
: cardOptionWidget(
image: callRecommendationsModel
.data!.exitedCalls![index].stockImage!,
action: callRecommendationsModel
.data!.exitedCalls![index].actionData!.name!,
text: callRecommendationsModel
.data!.exitedCalls![index].stockName!,
optiontype: "test",
price:
"₹ ${callRecommendationsModel.data!.exitedCalls![index].buyPrice}",
date: callRecommendationsModel
.data!.exitedCalls![index].createdAt!,
premium:
"₹ ${callRecommendationsModel.data!.exitedCalls![index].stopLoss}",
price1:
"₹ ${callRecommendationsModel.data!.exitedCalls![index].stopLoss}",
price2:
"₹ ${callRecommendationsModel.data!.exitedCalls![index].stopLoss}",
stoploss:
"₹ ${callRecommendationsModel.data!.exitedCalls![index].stopLoss}",
),
);
});
}
Widget cardOptionWidget({
@@ -499,6 +434,8 @@ class _ShortTradeState extends State<ShortTrade> {
required String price1,
required String price2,
required String stoploss,
required String action,
required String image,
}) {
return commonGlassContainer(
width: double.infinity,
@@ -534,8 +471,8 @@ class _ShortTradeState extends State<ShortTrade> {
],
),
child: Center(
child: Image.asset(
'assets/images/png/Group 1000004495.png',
child: CachedNetworkImage(
imageUrl: image,
width: 26.w,
height: 23.h,
),
@@ -551,7 +488,7 @@ class _ShortTradeState extends State<ShortTrade> {
borderRadius: BorderRadius.circular(4.r),
color: const Color(0xFFFFAD31),
),
child: Center(child: text14W600_1B1B1B('Hold')),
child: Center(child: text14W600_1B1B1B(action)),
)
],
),
@@ -657,6 +594,8 @@ class _ShortTradeState extends State<ShortTrade> {
required String stoploss,
required String duration,
required String pdfname,
required String action,
required String image,
}) {
return commonGlassContainer(
width: double.infinity,
@@ -692,8 +631,8 @@ class _ShortTradeState extends State<ShortTrade> {
],
),
child: Center(
child: Image.asset(
'assets/images/png/TATAMOTORS.NS_BIG 1.png',
child: CachedNetworkImage(
imageUrl: image,
width: 26.w,
height: 23.h,
),
@@ -707,9 +646,11 @@ class _ShortTradeState extends State<ShortTrade> {
height: 25.h,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(4.r),
color: const Color(0xFFFFAD31),
color: action == "Buy"
? const Color(0xFF00FF19)
: const Color(0xFFFFAD31),
),
child: Center(child: text14W600_1B1B1B('Hold')),
child: Center(child: text14W600_1B1B1B(action)),
)
],
),
@@ -742,7 +683,7 @@ class _ShortTradeState extends State<ShortTrade> {
width: 130.w,
child: text14W400_979797('Date of recommendation')),
sizedBoxHeight(5.h),
text15W600(date)
text15W600(productsController.dateConverterMethod(date))
],
)
],
@@ -753,10 +694,9 @@ class _ShortTradeState extends State<ShortTrade> {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
text14W400_979797('% Return'),
text14W400_979797('Target Price'),
sizedBoxHeight(5.h),
SizedBox(
width: 150.w, child: text15W600_00FF19(returns))
SizedBox(width: 150.w, child: text15W600(returns))
],
),
sizedBoxWidth(30.w),
@@ -782,23 +722,23 @@ class _ShortTradeState extends State<ShortTrade> {
],
),
sizedBoxWidth(30.w),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
text14W400_979797('Report'),
sizedBoxHeight(5.h),
Row(
children: [
Image.asset(
'assets/images/png/pdf.png',
height: 20.h,
width: 20.w,
),
text15W600(pdfname),
],
)
],
)
// Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// text14W400_979797('Report'),
// sizedBoxHeight(5.h),
// Row(
// children: [
// Image.asset(
// 'assets/images/png/pdf.png',
// height: 20.h,
// width: 20.w,
// ),
// text15W600(pdfname),
// ],
// )
// ],
// )
],
),
],
@@ -934,7 +874,7 @@ class _ShortTradeState extends State<ShortTrade> {
Widget topContainer(String text, int index) {
return Obx(() {
return selectedIndex.value == index
return productsController.selectedIndex.value == index
? Container(
height: 40.h,
width: 126.w,

44
pubspec.lock
View File

@@ -117,10 +117,10 @@ packages:
dependency: transitive
description:
name: collection
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
url: "https://pub.dev"
source: hosted
version: "1.18.0"
version: "1.17.2"
connectivity_plus:
dependency: "direct main"
description:
@@ -580,10 +580,10 @@ packages:
dependency: transitive
description:
name: intl
sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
url: "https://pub.dev"
source: hosted
version: "0.19.0"
version: "0.18.1"
js:
dependency: transitive
description:
@@ -636,10 +636,10 @@ packages:
dependency: "direct main"
description:
name: local_auth
sha256: "280421b416b32de31405b0a25c3bd42dfcef2538dfbb20c03019e02a5ed55ed0"
sha256: "27679ed8e0d7daab2357db6bb7076359e083a56b295c0c59723845301da6aed9"
url: "https://pub.dev"
source: hosted
version: "2.2.0"
version: "2.1.8"
local_auth_android:
dependency: transitive
description:
@@ -648,14 +648,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.0.37"
local_auth_darwin:
local_auth_ios:
dependency: transitive
description:
name: local_auth_darwin
sha256: "33381a15b0de2279523eca694089393bb146baebdce72a404555d03174ebc1e9"
name: local_auth_ios
sha256: eb283b530029b334698918f1e282d4483737cbca972ff21b9193be3d6de8e2b8
url: "https://pub.dev"
source: hosted
version: "1.2.2"
version: "1.1.6"
local_auth_platform_interface:
dependency: transitive
description:
@@ -700,10 +700,10 @@ packages:
dependency: transitive
description:
name: meta
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.9.1"
mime:
dependency: transitive
description:
@@ -985,18 +985,18 @@ packages:
dependency: transitive
description:
name: stack_trace
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
url: "https://pub.dev"
source: hosted
version: "1.11.1"
version: "1.11.0"
stream_channel:
dependency: transitive
description:
name: stream_channel
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
url: "https://pub.dev"
source: hosted
version: "2.1.2"
version: "2.1.1"
string_scanner:
dependency: transitive
description:
@@ -1081,10 +1081,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
url: "https://pub.dev"
source: hosted
version: "0.6.1"
version: "0.6.0"
typed_data:
dependency: transitive
description:
@@ -1290,10 +1290,10 @@ packages:
dependency: transitive
description:
name: web
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
url: "https://pub.dev"
source: hosted
version: "0.3.0"
version: "0.1.4-beta"
win32:
dependency: transitive
description:
@@ -1319,5 +1319,5 @@ packages:
source: hosted
version: "6.3.0"
sdks:
dart: ">=3.2.3 <4.0.0"
flutter: ">=3.16.6"
dart: ">=3.1.0 <4.0.0"
flutter: ">=3.13.0"