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

Conflict resolve

Browse Source
This commit is contained in:
priyanka
2024-03-19 23:09:10 -07:00
parent 811ca97678 9e2147a199
commit 55db1a038f
23 changed files with 920 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@ import 'package:traderscircuit/Utils/Common/CommonBottomNavigation.dart';
import 'package:traderscircuit/Utils/Common/MainController.dart';
import 'package:traderscircuit/Utils/Common/comonGlassmorphicContainer.dart';
import 'package:traderscircuit/Utils/Common/sized_box.dart';
import 'package:traderscircuit/Utils/Common/text.dart';
import 'package:traderscircuit/Utils/text.dart';
import 'package:traderscircuit/resources/routes/route_name.dart';
import 'package:traderscircuit/view/MainScreen/MainScreen.dart';
import 'package:traderscircuit/view/Sidemenu/Sidemenu.dart';

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

@@ -6,7 +6,7 @@ import 'package:glassmorphism/glassmorphism.dart';
import 'package:traderscircuit/Utils/Common/CommonAppBar.dart';
import 'package:traderscircuit/Utils/Common/comonGlassmorphicContainer.dart';
import 'package:traderscircuit/Utils/Common/sized_box.dart';
import 'package:traderscircuit/Utils/Common/text.dart';
import 'package:traderscircuit/Utils/text.dart';
import 'package:traderscircuit/view/Sidemenu/Sidemenu.dart';
import 'package:traderscircuit/view/onBoarding/splashScreen1.dart';
@@ -28,11 +28,13 @@ class _ShortTradeState extends State<ShortTrade> {
backgroundColor: Colors.black,
drawer: Container(width: 320.w, child: SideMenu()),
extendBody: true,
appBar: CommonAppbar(
titleTxt: '',
preferredSize: Size.fromHeight(60.h),
showLeading: false,
customleading: InkWell(
appBar: AppBar(
scrolledUnderElevation: 0.0,
backgroundColor: Colors.black,
elevation: 0,
automaticallyImplyLeading: false,
titleSpacing: 0,
leading: InkWell(
onTap: () {
_scaffoldKey1.currentState?.openDrawer();
},
@@ -43,13 +45,31 @@ class _ShortTradeState extends State<ShortTrade> {
width: 20.w,
),
),
// Icon(
// Icons.menu,
// color: Colors.white,
// size: 27.sp,
// ),
),
),
// CommonAppbar(
// titleTxt: '',
// // preferredSize: Size.fromHeight(60.h),
// showLeading: false,
// customleading: InkWell(
// onTap: () {
// _scaffoldKey1.currentState?.openDrawer();
// },
// child: Center(
// child: Image.asset(
// 'assets/images/png/menu.png',
// height: 15.h,
// width: 20.w,
// ),
// ),
// // Icon(
// // Icons.menu,
// // color: Colors.white,
// // size: 27.sp,
// // ),
// ),
// ),
body: Stack(children: [
CommonBlurLeft(),
CommonBlurRight(),