diff --git a/assets/images/png/Group 1000004507.png b/assets/images/png/Group 1000004507.png
new file mode 100644
index 0000000..161b144
Binary files /dev/null and b/assets/images/png/Group 1000004507.png differ
diff --git a/assets/images/png/Group 1000004508.png b/assets/images/png/Group 1000004508.png
new file mode 100644
index 0000000..f300a59
Binary files /dev/null and b/assets/images/png/Group 1000004508.png differ
diff --git a/assets/images/png/Group 1000004518.png b/assets/images/png/Group 1000004518.png
new file mode 100644
index 0000000..7e0439e
Binary files /dev/null and b/assets/images/png/Group 1000004518.png differ
diff --git a/assets/images/png/Group.png b/assets/images/png/Group.png
new file mode 100644
index 0000000..c087ac8
Binary files /dev/null and b/assets/images/png/Group.png differ
diff --git a/assets/images/png/imgpsh_fullsize_anim.png b/assets/images/png/imgpsh_fullsize_anim.png
new file mode 100644
index 0000000..fc5b621
Binary files /dev/null and b/assets/images/png/imgpsh_fullsize_anim.png differ
diff --git a/assets/images/png/inactivepast.png b/assets/images/png/inactivepast.png
new file mode 100644
index 0000000..b7a7e96
Binary files /dev/null and b/assets/images/png/inactivepast.png differ
diff --git a/assets/images/png/layers (1) 2.png b/assets/images/png/layers (1) 2.png
new file mode 100644
index 0000000..964fc0c
Binary files /dev/null and b/assets/images/png/layers (1) 2.png differ
diff --git a/assets/images/png/pastPerformanceactive.png b/assets/images/png/pastPerformanceactive.png
new file mode 100644
index 0000000..fc5b621
Binary files /dev/null and b/assets/images/png/pastPerformanceactive.png differ
diff --git a/assets/images/png/return 1.png b/assets/images/png/return 1.png
new file mode 100644
index 0000000..27566fa
Binary files /dev/null and b/assets/images/png/return 1.png differ
diff --git a/assets/images/svg/Group (1).svg b/assets/images/svg/Group (1).svg
new file mode 100644
index 0000000..f281127
--- /dev/null
+++ b/assets/images/svg/Group (1).svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/images/svg/Group 1000004507.svg b/assets/images/svg/Group 1000004507.svg
new file mode 100644
index 0000000..2704b59
--- /dev/null
+++ b/assets/images/svg/Group 1000004507.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/images/svg/Group 1000004508.svg b/assets/images/svg/Group 1000004508.svg
new file mode 100644
index 0000000..db366c1
--- /dev/null
+++ b/assets/images/svg/Group 1000004508.svg
@@ -0,0 +1,4 @@
+
diff --git a/assets/images/svg/layers (1) 2.svg b/assets/images/svg/layers (1) 2.svg
new file mode 100644
index 0000000..6dc5693
--- /dev/null
+++ b/assets/images/svg/layers (1) 2.svg
@@ -0,0 +1,9 @@
+
diff --git a/assets/images/svg/past p.svg b/assets/images/svg/past p.svg
new file mode 100644
index 0000000..1028eb6
--- /dev/null
+++ b/assets/images/svg/past p.svg
@@ -0,0 +1,16 @@
+
diff --git a/assets/images/svg/past perfomance icon .svg b/assets/images/svg/past perfomance icon .svg
new file mode 100644
index 0000000..dafe4d5
--- /dev/null
+++ b/assets/images/svg/past perfomance icon .svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/images/svg/return 1.svg b/assets/images/svg/return 1.svg
new file mode 100644
index 0000000..40592af
--- /dev/null
+++ b/assets/images/svg/return 1.svg
@@ -0,0 +1,9 @@
+
diff --git a/lib/Utils/Common/CommonBottomNavigation.dart b/lib/Utils/Common/CommonBottomNavigation.dart
index 4d0dd1e..7e34e99 100644
--- a/lib/Utils/Common/CommonBottomNavigation.dart
+++ b/lib/Utils/Common/CommonBottomNavigation.dart
@@ -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,
),
))
],
diff --git a/lib/Utils/text.dart b/lib/Utils/text.dart
index 59b7897..668b291 100644
--- a/lib/Utils/text.dart
+++ b/lib/Utils/text.dart
@@ -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,
diff --git a/lib/view/MainScreen/ExploreUnseen.dart b/lib/view/MainScreen/ExploreUnseen.dart
index 4bb377a..9db2068 100644
--- a/lib/view/MainScreen/ExploreUnseen.dart
+++ b/lib/view/MainScreen/ExploreUnseen.dart
@@ -88,32 +88,31 @@ class _ExploreUnseenState extends State {
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 {
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 {
text15W600(amount)
],
),
- sizedBoxWidth(50.w),
+ Spacer(),
+ // sizedBoxWidth(50.w),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
diff --git a/lib/view/MainScreen/HomeScreen.dart b/lib/view/MainScreen/HomeScreen.dart
index 604e44a..af7d213 100644
--- a/lib/view/MainScreen/HomeScreen.dart
+++ b/lib/view/MainScreen/HomeScreen.dart
@@ -93,13 +93,13 @@ class _HomeScreenState extends State {
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: [
diff --git a/lib/view/MainScreen/PastPerformance.dart b/lib/view/MainScreen/PastPerformance.dart
index 444b4f4..2cb0de0 100644
--- a/lib/view/MainScreen/PastPerformance.dart
+++ b/lib/view/MainScreen/PastPerformance.dart
@@ -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 {
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 {
);
}
+ List