ui changes

This commit is contained in:
jayesh
2024-05-15 18:49:17 +05:30
16 changed files with 95 additions and 38 deletions

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 543 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 822 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

File diff suppressed because one or more lines are too long

Binary file not shown.

After

Width:  |  Height:  |  Size: 892 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 576 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@@ -1,8 +1,58 @@
// import 'package:flutter/material.dart';
// import 'package:flutter_screenutil/flutter_screenutil.dart';
// class MyTabBar extends StatelessWidget {
// // Set the desired height
// @override
// Widget build(BuildContext context) {
// return Container(
// decoration: BoxDecoration(
// border: Border.all(
// color: Color(0Xff4A73FB).withOpacity(0.6),
// ),
// borderRadius: BorderRadius.circular(8.r),
// ),
// padding: const EdgeInsets.all(10.0), // Set the desired padding
// child: TabBar(
// indicator: BoxDecoration(
// color: const Color(0xff00C236),
// borderRadius: BorderRadius.circular(5),
// ),
// isScrollable: false,
// dividerColor: Colors.transparent,
// labelStyle: TextStyle(
// fontSize: 18.sp,
// color: Colors.white,
// fontWeight: FontWeight.w500,
// fontFamily: 'hiragino'),
// indicatorSize: TabBarIndicatorSize.tab,
// indicatorColor: const Color(0xFFFFFFFF),
// labelColor: Colors.white,
// unselectedLabelColor: const Color(0xffFFFFFF),
// overlayColor: MaterialStateProperty.all(const Color(0xFFFFFFFF)),
// onTap: ,
// tabs: const [
// Tab(
// text: 'Active Calls',
// ),
// Tab(
// text: 'Exited Calls',
// ),
// ]),
// );
// }
// }
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
class MyTabBar extends StatelessWidget { class MyTabBar extends StatefulWidget {
// Set the desired height @override
_MyTabBarState createState() => _MyTabBarState();
}
class _MyTabBarState extends State<MyTabBar> {
Color _indicatorColor = Colors.green; // Initial indicator color
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@@ -15,30 +65,37 @@ class MyTabBar extends StatelessWidget {
), ),
padding: const EdgeInsets.all(10.0), // Set the desired padding padding: const EdgeInsets.all(10.0), // Set the desired padding
child: TabBar( child: TabBar(
indicator: BoxDecoration( indicator: BoxDecoration(
color: const Color(0xff00C236), // Color(0xFFB60000), borderRadius: BorderRadius.circular(5.r),
borderRadius: BorderRadius.circular(5), color: _indicatorColor, // Set indicator color dynamically
),
isScrollable: false,
dividerColor: Colors.transparent,
labelStyle: TextStyle(
fontSize: 18,
color: Colors.white,
fontWeight: FontWeight.w500,
fontFamily: 'hiragino',
),
indicatorSize: TabBarIndicatorSize.tab,
labelColor: Colors.white,
unselectedLabelColor: const Color(0xffFFFFFF),
overlayColor: MaterialStateProperty.all(const Color(0xFFFFFFFF)),
tabs: const [
Tab(
text: 'Active Calls',
), ),
isScrollable: false, Tab(
dividerColor: Colors.transparent, text: 'Exited Calls',
labelStyle: TextStyle( ),
fontSize: 18.sp, ],
color: Colors.white, onTap: (index) {
fontWeight: FontWeight.w500, // Update indicator color based on selected tab
fontFamily: 'hiragino'), setState(() {
indicatorSize: TabBarIndicatorSize.tab, _indicatorColor = index == 0 ? Colors.green : Colors.red;
indicatorColor: const Color(0xFFFFFFFF), });
labelColor: Colors.white, },
unselectedLabelColor: const Color(0xffFFFFFF), ),
overlayColor: MaterialStateProperty.all(const Color(0xFFFFFFFF)),
tabs: const [
Tab(
text: 'Active Calls',
),
Tab(
text: 'Exited Calls',
),
]),
); );
} }
} }

View File

@@ -215,27 +215,27 @@ class _PastPerformanceState extends State<PastPerformance> {
List<Map<String, String>> metricsRowtile = [ List<Map<String, String>> metricsRowtile = [
{ {
'iconImg': 'assets/images/png/layers (1) 2.png', 'iconImg': 'assets/images/png/totalcalls.png',
'textName': 'Total Calls', 'textName': 'Total Calls',
'rate': '132', 'rate': '132',
}, },
{ {
'iconImg': 'assets/images/png/return 1.png', 'iconImg': 'assets/images/png/exitedcalls.png',
'textName': 'Exited Calls', 'textName': 'Exited Calls',
'rate': '109', 'rate': '109',
}, },
{ {
'iconImg': 'assets/images/png/Group 1000004507.png', 'iconImg': 'assets/images/png/successrate.png',
'textName': 'Success Rate', 'textName': 'Success Rate',
'rate': '70%', 'rate': '70%',
}, },
{ {
'iconImg': 'assets/images/png/Group.png', 'iconImg': 'assets/images/png/avgduration.png',
'textName': 'Avg. duration/call', 'textName': 'Avg. duration/call',
'rate': '20d', 'rate': '20d',
}, },
{ {
'iconImg': 'assets/images/png/Group 1000004508.png', 'iconImg': 'assets/images/png/annualreturn.png',
'textName': 'Annual Returns', 'textName': 'Annual Returns',
'rate': '90%', 'rate': '90%',
}, },
@@ -261,11 +261,11 @@ class _PastPerformanceState extends State<PastPerformance> {
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(4.r)), borderRadius: BorderRadius.all(Radius.circular(4.r)),
gradient: LinearGradient( gradient: LinearGradient(
begin: Alignment.centerLeft, begin: Alignment.topCenter,
end: Alignment.centerRight, end: Alignment.bottomCenter,
colors: [ colors: [
Color.fromRGBO(154, 0, 0, 0.38), Color(0xFF3365F6),
Color.fromRGBO(108, 0, 0, 0.31), Color(0xff1538F6),
], ],
), ),
), ),

View File

@@ -318,7 +318,7 @@ class _PortfolioState extends State<Portfolio> {
), ),
const Spacer(), const Spacer(),
LottieBuilder.asset( LottieBuilder.asset(
"assets/images/empty.json", "assets/images/png/TAdlX7YnR7 (1).json",
width: 200.w, width: 200.w,
height: 200.h, height: 200.h,
), ),

View File

@@ -171,8 +171,8 @@ class _FaqScreenState extends State<FaqScreen> {
width: 136.w, width: 136.w,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(5), borderRadius: BorderRadius.circular(5),
color: const Color(0XFF3F0502), color: const Color(0XFF0093FF),
border: Border.all(color: const Color(0xFF9A0000), width: 1)), border: Border.all(color: const Color(0xFF0093FF), width: 1)),
child: Center( child: Center(
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(vertical: 8), padding: const EdgeInsets.symmetric(vertical: 8),