diff --git a/android/app/build.gradle b/android/app/build.gradle index ae4a4ac..7b3ce58 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion flutter.compileSdkVersion + compileSdkVersion 34 ndkVersion flutter.ndkVersion compileOptions { diff --git a/lib/main.dart b/lib/main.dart index 406c806..4cca09e 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -97,7 +97,7 @@ class _MyAppState extends State with WidgetsBindingObserver { fontFamily: 'manrope', ), debugShowCheckedModeBanner: false, - initialRoute: RouteName.mainscreen, + initialRoute: RouteName.contentbytes, getPages: AppRoutes.appRoutes(), ), designSize: const Size(390, 844), diff --git a/lib/view/MainScreen/HomeScreen.dart b/lib/view/MainScreen/HomeScreen.dart index 87241a0..0b532ce 100644 --- a/lib/view/MainScreen/HomeScreen.dart +++ b/lib/view/MainScreen/HomeScreen.dart @@ -12,6 +12,7 @@ import 'package:traderscircuit/Utils/Common/sized_box.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/PlayerWidget.dart'; import 'package:traderscircuit/view/Sidemenu/Sidemenu.dart'; import 'package:traderscircuit/view/onBoarding/splashScreen1.dart'; @@ -241,19 +242,26 @@ Widget ActiveCallsTab() { padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 10.w), child: Column( children: [ - Container( - height: 200.h, - width: double.infinity, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(8.r), - image: DecorationImage( - image: AssetImage( - 'assets/images/png/Rectangle 17934.png'))), - child: Center( - child: SvgPicture.asset( - 'assets/images/svg/gridicons_play.svg', - height: 56.h, - width: 56.w, + InkWell( + onTap: () { + Get.to( + () => PlayerWidget(), + ); + }, + child: Container( + height: 200.h, + width: double.infinity, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(8.r), + image: DecorationImage( + image: AssetImage( + 'assets/images/png/Rectangle 17934.png'))), + child: Center( + child: SvgPicture.asset( + 'assets/images/svg/gridicons_play.svg', + height: 56.h, + width: 56.w, + ), ), ), ), diff --git a/lib/view/MainScreen/Notification.dart b/lib/view/MainScreen/Notification.dart index 42a3422..d4d348b 100644 --- a/lib/view/MainScreen/Notification.dart +++ b/lib/view/MainScreen/Notification.dart @@ -87,6 +87,7 @@ class _NotificationScreenState extends State { ), sizedBoxHeight(30.h), ListView.builder( + physics: NeverScrollableScrollPhysics(), shrinkWrap: true, itemCount: CardList.length, itemBuilder: (context, index) { diff --git a/lib/view/MainScreen/Portfolio/Holdings.dart b/lib/view/MainScreen/Portfolio/Holdings.dart index 4834aba..46c463c 100644 --- a/lib/view/MainScreen/Portfolio/Holdings.dart +++ b/lib/view/MainScreen/Portfolio/Holdings.dart @@ -35,7 +35,7 @@ class _HoldingsState extends State { key: _scaffoldKey1, backgroundColor: Colors.black, drawerEnableOpenDragGesture: false, - drawer: Container(width: 320.w, child: SideMenu()), + drawer: Container( child: SideMenu()), extendBody: true, appBar: AppBar( scrolledUnderElevation: 0.0, diff --git a/lib/view/MainScreen/Portfolio/PortfolioEmpty.dart b/lib/view/MainScreen/Portfolio/PortfolioEmpty.dart index 3826e81..cfa7930 100644 --- a/lib/view/MainScreen/Portfolio/PortfolioEmpty.dart +++ b/lib/view/MainScreen/Portfolio/PortfolioEmpty.dart @@ -26,7 +26,7 @@ class _PortfolioState extends State { key: _scaffoldKey1, backgroundColor: Colors.black, drawerEnableOpenDragGesture: false, - drawer: Container(width: 320.w, child: SideMenu()), + drawer: Container(child: SideMenu()), extendBody: true, appBar: AppBar( scrolledUnderElevation: 0.0, diff --git a/lib/view/MainScreen/ShortTrade.dart b/lib/view/MainScreen/ShortTrade.dart index b0113bb..0ea7964 100644 --- a/lib/view/MainScreen/ShortTrade.dart +++ b/lib/view/MainScreen/ShortTrade.dart @@ -10,7 +10,9 @@ import 'package:traderscircuit/Utils/Common/commonBotton.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/resources/routes/route_name.dart'; import 'package:traderscircuit/view/MainScreen/MainScreen.dart'; +import 'package:traderscircuit/view/Sidemenu/PlayerWidget.dart'; import 'package:traderscircuit/view/Sidemenu/Sidemenu.dart'; import 'package:traderscircuit/view/onBoarding/splashScreen1.dart'; @@ -168,7 +170,14 @@ class _ShortTradeState extends State { border: Border.all( color: Color(0xFF3A3A3A), )), - child: Center(child: text16W500('View More')), + child: Center( + child: InkWell( + onTap: () { + Get.toNamed(RouteName.contentbytes); + }, + child: text16W500('View More'), + ), + ), ), ], ), @@ -183,19 +192,24 @@ class _ShortTradeState extends State { EdgeInsets.symmetric(vertical: 10.h, horizontal: 10.w), child: Column( children: [ - Container( - height: 200.h, - width: double.infinity, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(8.r), - image: DecorationImage( - image: AssetImage( - 'assets/images/png/Rectangle 17934.png'))), - child: Center( - child: SvgPicture.asset( - 'assets/images/svg/gridicons_play.svg', - height: 56.h, - width: 56.w, + InkWell( + onTap: () { + Get.to(PlayerWidget()); + }, + child: Container( + height: 200.h, + width: double.infinity, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(8.r), + image: DecorationImage( + image: AssetImage( + 'assets/images/png/Rectangle 17934.png'))), + child: Center( + child: SvgPicture.asset( + 'assets/images/svg/gridicons_play.svg', + height: 56.h, + width: 56.w, + ), ), ), ), diff --git a/lib/view/Sidemenu/ContentBytes.dart b/lib/view/Sidemenu/ContentBytes.dart index ff064ed..3a1bd8a 100644 --- a/lib/view/Sidemenu/ContentBytes.dart +++ b/lib/view/Sidemenu/ContentBytes.dart @@ -589,7 +589,7 @@ class Videos extends StatelessWidget { sizedBoxHeight(20.h), InkWell( onTap: () { - Get.to(PlayerWidget()); + Get.to(() => PlayerWidget()); }, child: commonGlassContainer( borderradius: 8, @@ -642,7 +642,9 @@ class Videos extends StatelessWidget { sizedBoxHeight(20.h), InkWell( onTap: () { - Get.to(PlayerWidget()); + Get.to(() { + PlayerWidget(); + }); }, child: commonGlassContainer( borderradius: 8, @@ -732,7 +734,9 @@ class Videos extends StatelessWidget { sizedBoxHeight(20.h), InkWell( onTap: () { - Get.to(PlayerWidget()); + Get.to(() { + PlayerWidget(); + }); }, child: commonGlassContainer( borderradius: 8, diff --git a/lib/view/Sidemenu/PlayerWidget.dart b/lib/view/Sidemenu/PlayerWidget.dart index c8c2b8a..5e64e2b 100644 --- a/lib/view/Sidemenu/PlayerWidget.dart +++ b/lib/view/Sidemenu/PlayerWidget.dart @@ -14,54 +14,55 @@ class PlayerWidget extends StatefulWidget { class _PlayerWidgetState extends State { late VideoPlayerController videoPlayerController; late ChewieController chewieController; - bool isVideoIntialized = false; @override void initState() { // TODO: implement initState super.initState(); - videoPlayerController = VideoPlayerController.networkUrl(Uri.parse( - "https://flutter.github.io/assets-for-api-docs/assets/videos/bee.mp4")); + _initializePlayer(); + } + _initializePlayer() async { + videoPlayerController = VideoPlayerController.networkUrl(Uri.tryParse( + "https://flutter.github.io/assets-for-api-docs/assets/videos/bee.mp4")!); + + await videoPlayerController.initialize(); + initChewie(); + } + + initChewie() { chewieController = ChewieController( videoPlayerController: videoPlayerController, autoPlay: true, looping: false); - - videoPlayerController.initialize().then((value) { - setState(() { - isVideoIntialized = true; - }); - }); } @override Widget build(BuildContext context) { - if (isVideoIntialized) { - return Scaffold( - backgroundColor: Colors.black, - appBar: AppBar( - backgroundColor: Colors.black, - leading: InkWell( - onTap: () => Get.back(), - child: Icon( - Icons.arrow_back_ios, - color: Colors.white, + return videoPlayerController != null && + videoPlayerController.value.isInitialized + ? Scaffold( + backgroundColor: Colors.black, + appBar: AppBar( + backgroundColor: Colors.black, + leading: InkWell( + onTap: () => Get.back(), + child: Icon( + Icons.arrow_back_ios, + color: Colors.white, + ), + ), ), - ), - ), - // CommonAppbar(titleTxt: ""), - body: Center( - child: AspectRatio( - aspectRatio: videoPlayerController.value.aspectRatio, - child: Chewie( - controller: chewieController, + // CommonAppbar(titleTxt: ""), + body: Center( + child: AspectRatio( + aspectRatio: videoPlayerController.value.aspectRatio, + child: Chewie( + controller: chewieController, + ), + ), ), - ), - ), - ); - } else { - return Center(child: CircularProgressIndicator()); - } + ) + : Center(child: CircularProgressIndicator()); } } diff --git a/lib/view/Sidemenu/Sidemenu.dart b/lib/view/Sidemenu/Sidemenu.dart index 82941b9..5ed9587 100644 --- a/lib/view/Sidemenu/Sidemenu.dart +++ b/lib/view/Sidemenu/Sidemenu.dart @@ -183,7 +183,7 @@ class _SideMenuState extends State { selected: true, onTap: () { setState(() { - // Get.toNamed(RouteName.privacypolicy); + Get.toNamed(RouteName.contentbytes); }); }, ), @@ -254,7 +254,7 @@ class _SideMenuState extends State { ListTile( leading: SvgPicture.asset( 'assets/images/svg/sidemenu/Group 51347.svg'), - title: text18W400('My Subscription'), + title: text18W400('My Risk Profile'), trailing: Container( height: 35.h, width: 122.w, @@ -267,7 +267,7 @@ class _SideMenuState extends State { selected: true, onTap: () { setState(() { - // Get.toNamed(RouteName.privacypolicy); + Get.toNamed(RouteName.updateriskprofile); }); }, ), @@ -458,7 +458,14 @@ void navigateTo(int index, BuildContext context) { text20W400_center( 'Are you sure you want to logout your account?'), sizedBoxHeight(50.h), - CommonYesNoBtn(), + CommonYesNoBtn( + yesonTap: () { + Get.toNamed(RouteName.loginscreen); + }, + noonTap: () { + Get.back(); + }, + ), ], ), ), diff --git a/lib/view/login/AddDetails.dart b/lib/view/login/AddDetails.dart index 0de3d32..225ee81 100644 --- a/lib/view/login/AddDetails.dart +++ b/lib/view/login/AddDetails.dart @@ -109,7 +109,9 @@ class _AddDetailsState extends State { SizedBox( height: 15.h, ), - CustomTextFormField(), + CustomTextFormField( + texttype: TextInputType.emailAddress, + ), SizedBox( height: 30.h, ), @@ -121,7 +123,9 @@ class _AddDetailsState extends State { SizedBox( height: 15.h, ), - CustomTextFormField(), + CustomTextFormField( + texttype: TextInputType.phone, + ), SizedBox( height: 30.h, ), diff --git a/lib/view/login/Kyc.dart b/lib/view/login/Kyc.dart index 00759e0..f318221 100644 --- a/lib/view/login/Kyc.dart +++ b/lib/view/login/Kyc.dart @@ -366,7 +366,9 @@ class _KycState extends State { SizedBox( height: 15.h, ), - const CustomTextFormField(), + const CustomTextFormField( + texttype: TextInputType.phone, + ), SizedBox( height: 30.h, ), diff --git a/lib/view/login/LoginScreen.dart b/lib/view/login/LoginScreen.dart index 6f8e5d4..dbb2766 100644 --- a/lib/view/login/LoginScreen.dart +++ b/lib/view/login/LoginScreen.dart @@ -309,8 +309,13 @@ class _LoginScreenState extends State { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - text16W700( - "Continue as guest", + InkWell( + onTap: () { + Get.toNamed(RouteName.mainscreen); + }, + child: text16W700( + "Continue as guest", + ), ), ], ) diff --git a/lib/view/login/VerifyOtp.dart b/lib/view/login/VerifyOtp.dart index 3aea9ba..da0d00a 100644 --- a/lib/view/login/VerifyOtp.dart +++ b/lib/view/login/VerifyOtp.dart @@ -8,7 +8,6 @@ import 'package:traderscircuit/Utils/Common/commonBotton.dart'; import 'package:traderscircuit/Utils/text.dart'; import 'package:traderscircuit/resources/routes/route_name.dart'; import 'package:traderscircuit/view/onBoarding/splashScreen1.dart'; -import 'package:traderscircuit/Utils/Dialogs.dart'; class VerifyOTP extends StatefulWidget { const VerifyOTP({super.key}); @@ -51,6 +50,8 @@ class _VerifyOTPState extends State { child: PinCodeTextField( showCursor: true, cursorColor: Colors.white, + hintStyle: + TextStyle(fontSize: 18.sp, color: Colors.white), textStyle: TextStyle(fontSize: 18.sp, color: Colors.white), errorTextSpace: 22, diff --git a/pubspec.yaml b/pubspec.yaml index 23d87f4..b355921 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -29,7 +29,7 @@ dependencies: file_picker: ^8.0.0+1 lottie: ^2.7.0 chewie: ^1.7.5 - video_player: ^2.8.3 + video_player: ^2.5.2