diff --git a/lib/Utils/Common/CommonTabBar.dart b/lib/Utils/Common/CommonTabBar.dart index 84be562..cd9bd25 100644 --- a/lib/Utils/Common/CommonTabBar.dart +++ b/lib/Utils/Common/CommonTabBar.dart @@ -16,7 +16,7 @@ class MyTabBar extends StatelessWidget { padding: const EdgeInsets.all(10.0), // Set the desired padding child: TabBar( indicator: BoxDecoration( - color: const Color(0xff00C236), + color: const Color(0xff00C236), // Color(0xFFB60000), borderRadius: BorderRadius.circular(5), ), isScrollable: false, diff --git a/lib/controller/contact_us_controller.dart b/lib/controller/contact_us_controller.dart index 72b16df..05baff4 100644 --- a/lib/controller/contact_us_controller.dart +++ b/lib/controller/contact_us_controller.dart @@ -37,6 +37,11 @@ class ContactUsController extends GetxController { return DateFormat("dd MMM yyyy, hh:mm a").format(dateTime.toLocal()); } + String formatedDateMethod(String originalDateTimeString) { + DateTime dateTime = DateTime.parse(originalDateTimeString); + + return DateFormat("dd MMM yyyy").format(dateTime.toLocal()); + } String timeAgoConverter(String originalDateTimeString) { DateTime dateTime = DateTime.parse(originalDateTimeString); @@ -48,5 +53,4 @@ class ContactUsController extends GetxController { // Convert to "2 days ago" format return timeago.format(now.subtract(Duration(days: differenceInDays))); } - } diff --git a/lib/view/MainScreen/HomeScreen.dart b/lib/view/MainScreen/HomeScreen.dart index bfeae22..bd79c22 100644 --- a/lib/view/MainScreen/HomeScreen.dart +++ b/lib/view/MainScreen/HomeScreen.dart @@ -1,4 +1,7 @@ // import 'package:flutter/material.dart'; +import 'dart:developer'; + +import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; @@ -12,12 +15,14 @@ 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/contact_us_controller.dart'; import 'package:traderscircuit/model/HomeModel/home_model.dart'; import 'package:traderscircuit/controller/products_controller.dart'; import 'package:traderscircuit/resources/routes/route_name.dart'; +import 'package:traderscircuit/view/MainScreen/ExploreUnseen.dart'; import 'package:traderscircuit/view/MainScreen/MainScreen.dart'; import 'package:traderscircuit/view/Sidemenu/ContentByte/PlayerWidget.dart'; import 'package:traderscircuit/view/Sidemenu/Sidemenu.dart'; @@ -44,6 +49,8 @@ class _HomeScreenState extends State { ProductsController productsController = Get.put(ProductsController()); + ContactUsController contactUsController = Get.put(ContactUsController()); + @override void initState() { GetProfile().GetProfileAPI().then((value) { @@ -307,30 +314,26 @@ class _HomeScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ SizedBox( - width: 240.w, + width: 220.w, child: text16W400_DADADA( 'The Beauty and Power of Video')), // sizedBoxWidth(10.w), const Spacer(), - Container( - height: 35.h, - width: 105.w, - decoration: BoxDecoration( - color: const Color(0xFF3A3A3A) - .withOpacity(0.6), - borderRadius: - BorderRadius.circular(5.r), - border: Border.all( - color: const Color(0xFF3A3A3A), - ), - ), - child: Center( - child: InkWell( - onTap: () { - Get.toNamed(RouteName.contentbytes); - }, - child: text16W500('View More'), + InkWell( + onTap: () { + Get.toNamed(RouteName.contentbytes); + }, + child: Container( + width: 105, + height: 35, + decoration: ShapeDecoration( + color: Color(0xFF0093FF), + shape: RoundedRectangleBorder( + borderRadius: + BorderRadius.circular(5)), ), + child: Center( + child: text14W500('View More')), ), ), ], @@ -384,15 +387,6 @@ class _HomeScreenState extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ - CircleAvatar( - radius: 23.r, - backgroundImage: NetworkImage( - homeModel - .data! - .contentByteVideo! - .title ?? - ""), - ), sizedBoxWidth(10.w), Expanded( child: Column( @@ -406,7 +400,12 @@ class _HomeScreenState extends State { ""), // sizedBoxHeight(10.h), text12W400_979797( - '20k views . 2 days ago'), + contactUsController + .timeAgoConverter( + homeModel + .data! + .contentByteVideo! + .createdAt!)), ], ), ) @@ -549,6 +548,9 @@ Widget cardcallWidget( ), child: Stack( children: [ + Positioned( + right: 0, + child: SvgPicture.asset("assets/images/svg/card_decoration.svg")), Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -615,15 +617,21 @@ Widget cardcallWidget( ], ), ), - Container( - height: 52, - width: 150, - decoration: ShapeDecoration( - color: const Color(0xFF0093FF), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(8)), + GestureDetector( + onTap: () { + log("RUNNING"); + Get.to(ExploreUnseen()); + }, + child: Container( + height: 52, + width: 150, + decoration: ShapeDecoration( + color: const Color(0xFF0093FF), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8)), + ), + child: Center(child: text15W600("View More")), ), - child: Center(child: text15W600("View More")), ) ], ), @@ -632,9 +640,6 @@ Widget cardcallWidget( ) ], ), - Positioned( - right: 0, - child: SvgPicture.asset("assets/images/svg/card_decoration.svg")) ], ), ); diff --git a/lib/view/MainScreen/ShortTrade.dart b/lib/view/MainScreen/ShortTrade.dart index dc19670..74a6c49 100644 --- a/lib/view/MainScreen/ShortTrade.dart +++ b/lib/view/MainScreen/ShortTrade.dart @@ -3,6 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:flutter_svg/svg.dart'; import 'package:gap/gap.dart'; import 'package:get/get.dart'; import 'package:glassmorphism/glassmorphism.dart'; @@ -292,7 +293,8 @@ class _ShortTradeState extends State { duration: callRecommendationsModel .data!.activeCalls![index].duration!, pdfname: "Download Pdf", - pdfLink: "", + pdfLink: callRecommendationsModel + .data!.activeCalls![index].docs!, ) : cardOptionWidget( pdfLink: "", @@ -448,178 +450,152 @@ class _ShortTradeState extends State { required String image, }) { ContactUsController contactUsController = Get.put(ContactUsController()); - return commonGlassContainer( - width: double.infinity, - height: action != "Exit" ? 330.h : 380.h, - borderradius: 8, - customWidget: Column( + return Container( + padding: const EdgeInsets.all(15), + width: 398, + height: 300, + decoration: ShapeDecoration( + color: const Color(0x232C79ED), + shape: RoundedRectangleBorder( + side: const BorderSide(width: 1, color: Color(0x994A73FB)), + borderRadius: BorderRadius.circular(8), + ), + ), + child: Stack( children: [ - Padding( - padding: EdgeInsets.symmetric(vertical: 16.h, horizontal: 16.w), - child: Row( - children: [ - GlassmorphicContainer( - width: 47.w, - height: 47.h, - borderRadius: 100, - blur: 10, - alignment: Alignment.center, - border: 0.9, - linearGradient: const LinearGradient( - begin: Alignment.topLeft, - end: Alignment.bottomRight, - colors: [ - Color(0xff3A3A3A), - Color(0xFF3A3A3A), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + CachedNetworkImage( + imageUrl: image, + width: 78.29, + height: 31, + ), + const Gap(10), + text16W700(text), + const Spacer(), + Container( + width: 62.w, + height: 25.h, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(15.r), + color: action == "Buy" + ? const Color(0xFF00FF19) + : action == "Exit" + ? const Color(0Xff6C0000) + : const Color(0xFFFFCE00), + ), + child: Center( + child: text14W600_1B1B1B( + action, + clr: action == "Exit" + ? Colors.white + : const Color(0Xff1B1B1B), + )), + ), + const Gap(15), + ], + ), + const Gap(30), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + text15W600(optiontype), + sizedBoxHeight(5.h), + text12W400_979797('Option Type'), ], ), - borderGradient: const LinearGradient( - begin: Alignment.topLeft, - end: Alignment.bottomRight, - colors: [ - Color.fromRGBO(70, 5, 1, 0.8), - Color.fromRGBO(102, 102, 102, 0.8), + const Gap(10), + Container( + width: 2, + height: 35, + color: Colors.white.withOpacity(0.30000001192092896), + ), + const Gap(10), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + text15W600(price), + sizedBoxHeight(5.h), + text12W400_979797('Strike Price'), ], ), - child: Center( - child: CachedNetworkImage( - imageUrl: image, - width: 26.w, - height: 23.h, - ), + const Gap(10), + Container( + width: 2, + height: 35, + color: Colors.white.withOpacity(0.30000001192092896), + ), + const Gap(10), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + text15W600(contactUsController.formatedDateMethod(date)), + sizedBoxHeight(5.h), + text12W400_979797('Expiry Date'), + ], + ), + ], + ), + const Gap(25), + Row( + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + text15W600(price1), + sizedBoxHeight(5.h), + text12W400_979797('Target Price'), + ], + ), + const Gap(10), + Container( + width: 2, + height: 35, + color: Colors.white.withOpacity(0.30000001192092896), + ), + const Gap(10), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + text15W600(stoploss), + sizedBoxHeight(5.h), + text12W400_979797('Stop Loss'), + ], + ), + ], + ), + const Gap(30), + Container( + width: 398, + height: 52, + decoration: const ShapeDecoration( + color: Color(0x332C79ED), + shape: RoundedRectangleBorder( + side: BorderSide(width: 1, color: Color(0x994A73FB)), ), ), - sizedBoxWidth(15.w), - SizedBox(width: 200.w, child: text18W600(text)), - const Spacer(), - Container( - width: 62.w, - height: 25.h, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(4.r), - color: action == "Buy" - ? const Color(0xFF00FF19) - : action == "Exit" - ? const Color(0Xff6C0000) - : const Color(0xFFFFAD31), - ), - child: Center( - child: text14W600_1B1B1B(action, - clr: action == "Exit" - ? Colors.white - : const Color(0Xff1B1B1B))), - ) - ], - ), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + text15W600(premium), + const Gap(5), + text14W400_979797('/ Premium'), + ], + ), + ) + ], ), - Container( - width: double.infinity, - height: 1.h, - color: const Color(0xFF3A3A3A), - ), - Padding( - padding: const EdgeInsets.all(18), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text14W400_979797('Option Type'), - sizedBoxHeight(5.h), - SizedBox(width: 150.w, child: text15W600(optiontype)) - ], - ), - sizedBoxWidth(30.w), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text14W400_979797('Strike Price'), - sizedBoxHeight(5.h), - text15W600(price) - ], - ) - ], - ), - sizedBoxHeight(15.h), - Row( - children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text14W400_979797('Expiry Date'), - sizedBoxHeight(5.h), - SizedBox( - width: 150.w, - child: text15W600( - productsController.dateConverterMethod(date))) - ], - ), - sizedBoxWidth(30.w), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text14W400_979797('Premium'), - sizedBoxHeight(5.h), - text15W600(premium) - ], - ) - ], - ), - sizedBoxHeight(15.h), - Row( - children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text14W400_979797('Target Price'), - sizedBoxHeight(5.h), - SizedBox(width: 150.w, child: text15W600(price1)) - ], - ), - sizedBoxWidth(30.w), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text14W400_979797('Stop Loss'), - sizedBoxHeight(5.h), - text15W600(stoploss) - ], - ) - ], - ), - sizedBoxHeight(15.h), - action != "Exit" - ? const SizedBox() - : Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text14W400_979797('Report'), - sizedBoxHeight(5.h), - GestureDetector( - onTap: () { - Utils.openFile( - url: pdfLink, fileName: "${text}_report.pdf"); - }, - child: Row( - children: [ - Image.asset( - 'assets/images/png/pdf.png', - height: 20.h, - width: 20.w, - ), - text15W600("Download Pdf"), - ], - ), - ) - ], - ) - ], - ), - ) + Positioned( + right: 0, + child: SvgPicture.asset("assets/images/svg/card_decoration.svg")) ], ), ); @@ -637,168 +613,162 @@ class _ShortTradeState extends State { required String pdfLink, required String image, }) { - return commonGlassContainer( - width: double.infinity, - height: 360.h, - borderradius: 8, - customWidget: Column( + ContactUsController contactUsController = Get.put(ContactUsController()); + return Container( + padding: const EdgeInsets.all(15), + width: 398, + height: 300, + decoration: ShapeDecoration( + color: const Color(0x232C79ED), + shape: RoundedRectangleBorder( + side: const BorderSide(width: 1, color: Color(0x994A73FB)), + borderRadius: BorderRadius.circular(8), + ), + ), + child: Stack( children: [ - Padding( - padding: EdgeInsets.symmetric(vertical: 16.h, horizontal: 16.w), - child: Row( - children: [ - GlassmorphicContainer( - width: 47.w, - height: 47.h, - borderRadius: 100, - blur: 10, - alignment: Alignment.center, - border: 0.9, - linearGradient: const LinearGradient( - begin: Alignment.topLeft, - end: Alignment.bottomRight, - colors: [ - Color(0xff3A3A3A), - Color(0xFF3A3A3A), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + CachedNetworkImage( + imageUrl: image, + width: 78.29, + height: 31, + ), + const Gap(10), + text16W700(text), + const Spacer(), + Container( + width: 62.w, + height: 25.h, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(15.r), + color: action == "Buy" + ? const Color(0xFF00FF19) + : action == "Exit" + ? const Color(0Xff6C0000) + : const Color(0xFFFFCE00), + ), + child: Center( + child: text14W600_1B1B1B( + action, + clr: action == "Exit" + ? Colors.white + : const Color(0Xff1B1B1B), + )), + ), + const Gap(15), + ], + ), + const Gap(30), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + text15W600(price), + sizedBoxHeight(5.h), + text12W400_979797('Entry Price'), ], ), - borderGradient: const LinearGradient( - begin: Alignment.topLeft, - end: Alignment.bottomRight, - colors: [ - Color.fromRGBO(70, 5, 1, 0.8), - Color.fromRGBO(102, 102, 102, 0.8), + const Gap(10), + Container( + width: 2, + height: 35, + color: Colors.white.withOpacity(0.30000001192092896), + ), + const Gap(10), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + text15W600(contactUsController.formatedDateMethod(date)), + sizedBoxHeight(5.h), + text12W400_979797('Date Of Recommendation'), ], ), - child: Center( - child: CachedNetworkImage( - imageUrl: image, - width: 26.w, - height: 23.h, + ], + ), + const Gap(25), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + text15W600(returns), + sizedBoxHeight(5.h), + text12W400_979797('Target Price'), + ], + ), + const Gap(10), + Container( + width: 2, + height: 35, + color: Colors.white.withOpacity(0.30000001192092896), + ), + const Gap(10), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + text15W600(stoploss), + sizedBoxHeight(5.h), + text12W400_979797('Stop Loss'), + ], + ), + const Gap(10), + Container( + width: 2, + height: 35, + color: Colors.white.withOpacity(0.30000001192092896), + ), + const Gap(10), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + text15W600(duration), + sizedBoxHeight(5.h), + text12W400_979797('Duration'), + ], + ), + ], + ), + const Gap(30), + GestureDetector( + onTap: () { + Utils.openFile(url: pdfLink, fileName: "${text}_report.pdf"); + }, + child: Container( + width: 398, + height: 52, + decoration: const ShapeDecoration( + color: Color(0x332C79ED), + shape: RoundedRectangleBorder( + side: BorderSide(width: 1, color: Color(0x994A73FB)), ), ), - ), - sizedBoxWidth(15.w), - SizedBox(width: 200.w, child: text18W600(text)), - const Spacer(), - Container( - width: 62.w, - height: 25.h, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(4.r), - color: action == "Buy" - ? const Color(0xFF00FF19) - : action == "Exit" - ? const Color(0Xff6C0000) - : const Color(0xFFFFAD31), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Image.asset( + 'assets/images/png/pdf.png', + height: 20.h, + width: 20.w, + ), + text15W600("Download Pdf"), + ], ), - child: Center( - child: text14W600_1B1B1B(action, - clr: action == "Exit" - ? Colors.white - : const Color(0Xff1B1B1B))), - ) - ], - ), + ), + ) + ], ), - Container( - width: double.infinity, - height: 1.h, - color: const Color(0xFF3A3A3A), - ), - Padding( - padding: const EdgeInsets.all(18), - child: Column( - children: [ - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text14W400_979797('Initial Entry Price'), - sizedBoxHeight(5.h), - SizedBox(width: 150.w, child: text15W600(price)) - ], - ), - sizedBoxWidth(30.w), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - SizedBox( - width: 130.w, - child: text14W400_979797('Date of recommendation')), - sizedBoxHeight(5.h), - text15W600(productsController.dateConverterMethod(date)) - ], - ) - ], - ), - sizedBoxHeight(15.h), - Row( - children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text14W400_979797('Target Price'), - sizedBoxHeight(5.h), - SizedBox(width: 150.w, child: text15W600(returns)) - ], - ), - sizedBoxWidth(30.w), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text14W400_979797('Stop Loss'), - sizedBoxHeight(5.h), - text15W600(stoploss) - ], - ) - ], - ), - sizedBoxHeight(15.h), - Row( - children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text14W400_979797('Duration'), - sizedBoxHeight(5.h), - SizedBox(width: 150.w, child: text15W600(duration)) - ], - ), - sizedBoxWidth(30.w), - action != "Exit" - ? const SizedBox() - : Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text14W400_979797('Report'), - sizedBoxHeight(5.h), - GestureDetector( - onTap: () { - Utils.openFile( - url: pdfLink, - fileName: "${text}_report.pdf"); - }, - child: Row( - children: [ - Image.asset( - 'assets/images/png/pdf.png', - height: 20.h, - width: 20.w, - ), - text15W600(pdfname), - ], - ), - ) - ], - ) - ], - ), - ], - ), - ) + Positioned( + right: 0, + child: SvgPicture.asset("assets/images/svg/card_decoration.svg")) ], ), ); @@ -814,57 +784,49 @@ class _ShortTradeState extends State { required String pdfLink, required String action, }) { - return InkWell( - child: commonGlassContainer( - width: double.infinity, - height: action != "Exit" ? 250.h : 300.h, - borderradius: 8, - customWidget: Column( - children: [ - Padding( - padding: EdgeInsets.symmetric(vertical: 16.h, horizontal: 16.w), - child: Row( + return Container( + padding: const EdgeInsets.all(15), + width: 398, + height: 285, + decoration: ShapeDecoration( + color: const Color(0x232C79ED), + shape: RoundedRectangleBorder( + side: const BorderSide(width: 1, color: Color(0x994A73FB)), + borderRadius: BorderRadius.circular(8), + ), + ), + child: Stack( + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - GlassmorphicContainer( - width: 47.w, - height: 47.h, - borderRadius: 100, - blur: 10, - alignment: Alignment.center, - border: 0.9, - linearGradient: const LinearGradient( - begin: Alignment.topLeft, - end: Alignment.bottomRight, - colors: [ - Color(0xff3A3A3A), - Color(0xFF3A3A3A), - ], - ), - borderGradient: const LinearGradient( - begin: Alignment.topLeft, - end: Alignment.bottomRight, - colors: [ - Color.fromRGBO(70, 5, 1, 0.8), - Color.fromRGBO(102, 102, 102, 0.8), - ], - ), - child: Center( - child: CachedNetworkImage(imageUrl: image), - ), + CachedNetworkImage( + imageUrl: image, + width: 78.29, + height: 31, ), - sizedBoxWidth(15.w), - SizedBox(width: 200.w, child: text18W600(text)), + const Gap(10), + Container( + width: 2, + height: 35, + color: Colors.white.withOpacity(0.30000001192092896), + ), + const Gap(10), + text16W700(text), const Spacer(), Container( width: 62.w, height: 25.h, decoration: BoxDecoration( - borderRadius: BorderRadius.circular(4.r), + borderRadius: BorderRadius.circular(15.r), color: action == "Buy" ? const Color(0xFF00FF19) : action == "Exit" ? const Color(0Xff6C0000) - : const Color(0xFFFFAD31), + : const Color(0xFFFFCE00), ), child: Center( child: text14W600_1B1B1B( @@ -873,94 +835,81 @@ class _ShortTradeState extends State { ? Colors.white : const Color(0Xff1B1B1B), )), - ) + ), + const Gap(15), ], ), - ), - Container( - width: double.infinity, - height: 1.h, - color: const Color(0xFF3A3A3A), - ), - Padding( - padding: const EdgeInsets.all(20), - child: Column( + const Gap(30), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Row( + Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text14W400_979797('Entry Price'), - sizedBoxHeight(5.h), - SizedBox(width: 150.w, child: text15W600(amount)) - ], - ), - sizedBoxWidth(50.w), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text14W400_979797('Target Price'), - sizedBoxHeight(5.h), - text15W600(targetamount) - ], - ) + text15W600(amount), + sizedBoxHeight(5.h), + text12W400_979797('Entry Price'), ], ), - sizedBoxHeight(15.h), - Row( + const Gap(10), + Container( + width: 2, + height: 35, + color: Colors.white.withOpacity(0.30000001192092896), + ), + const Gap(10), + Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text14W400_979797('Stop Loss'), - sizedBoxHeight(5.h), - SizedBox(width: 150.w, child: text15W600(stoploss)) - ], - ), - sizedBoxWidth(50.w), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text14W400_979797('Time Horizon'), - sizedBoxHeight(5.h), - text15W600(time) - ], - ) + text15W600(targetamount), + sizedBoxHeight(5.h), + text12W400_979797('Target Price'), ], ), - sizedBoxHeight(15.h), - action != "Exit" - ? const SizedBox() - : Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - text14W400_979797('Report'), - sizedBoxHeight(5.h), - GestureDetector( - onTap: () { - Utils.openFile( - url: pdfLink, - fileName: "${text}_report.pdf"); - }, - child: Row( - children: [ - Image.asset( - 'assets/images/png/pdf.png', - height: 20.h, - width: 20.w, - ), - text15W600("Download Pdf"), - ], - ), - ) - ], - ) + // const Gap(10), + // Container( + // width: 2, + // height: 35, + // color: Colors.white.withOpacity(0.30000001192092896), + // ), + // const Gap(10), ], ), - ) - ], - ), + const Gap(10), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + text15W600(stoploss), + sizedBoxHeight(5.h), + text12W400_979797('Stop Loss'), + ], + ), + const Gap(30), + Container( + width: 398, + height: 52, + decoration: const ShapeDecoration( + color: Color(0x332C79ED), + shape: RoundedRectangleBorder( + side: BorderSide(width: 1, color: Color(0x994A73FB)), + ), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + text15W600(time), + const Gap(5), + text14W400_979797('/ Time Horizon'), + ], + ), + ) + ], + ), + Positioned( + right: 0, + child: SvgPicture.asset("assets/images/svg/card_decoration.svg")) + ], ), ); }