's removed

2024-04-04 11:45:15 +05:30
parent de9336227d
commit 9ec5daf8b5
31 changed files with 382 additions and 131 deletions
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.example.traderscircuit">
+    <uses-permission android:name="android.permission.INTERNET"/>
   <application
-        android:label="Trader's Circuit"
+        android:label="Traders Circuit"
        android:name="${applicationName}"
        android:icon="@mipmap/ic_launcher">
         <activity
--- a/assets/fonts/hiragino/Hiragino
+++ b/assets/fonts/hiragino/Hiragino
--- a/assets/fonts/hiragino/HiraginoInterface.ttc
+++ b/assets/fonts/hiragino/HiraginoInterface.ttc
--- a/lib/Utils/Common/CommonAppbar.dart
+++ b/lib/Utils/Common/CommonAppbar.dart
@@ -71,7 +71,7 @@ class CommonAppbar extends StatelessWidget implements PreferredSizeWidget {
                          color: Colors.white,
                          fontSize: 24.sp,
                          fontWeight: FontWeight.w500,
-                          fontFamily: 'manrope'),
+                          fontFamily: 'hiragino'),
                      maxLines: 2,
                      softWrap: true,
                    ),
--- a/lib/Utils/Common/CommonBottomNavigation.dart
+++ b/lib/Utils/Common/CommonBottomNavigation.dart
@@ -44,12 +44,12 @@ GlassmorphicContainer bottomnavigationbar(MainController _mainController) {
          fontSize: 10.sp,
          color: Color(0xFF676767),
          fontWeight: FontWeight.w400,
-          fontFamily: 'manrope'),
+          fontFamily: 'hiragino'),
      selectedLabelStyle: TextStyle(
          fontSize: 10.sp,
          color: Color(0xFFFFFFFF),
          fontWeight: FontWeight.w400,
-          fontFamily: 'manrope'),
+          fontFamily: 'hiragino'),
      currentIndex: _mainController.selectedIndex.value,
      onTap: (index) {
        _mainController.updateTab(index);
--- a/lib/Utils/Common/CommonDropdown.dart
+++ b/lib/Utils/Common/CommonDropdown.dart
@@ -78,6 +78,7 @@ class _CommonDropdownBtnState extends State<CommonDropdownBtn> {
                      widget.hint,
                      style: TextStyle(
                          fontSize: 12.sp,
+                          fontFamily: 'hiragino',
                          //fontWeight: FontWeight.bold,
                          color: Colors.white,
                          fontWeight: FontWeight.w500),
@@ -94,7 +95,7 @@ class _CommonDropdownBtnState extends State<CommonDropdownBtn> {
                          style: TextStyle(
                            color: Colors.white,
                            fontSize: 16.sp,
-                            fontFamily: 'manrope',
+                            fontFamily: 'hiragino',
                            fontWeight: FontWeight.w500,
                          ),
                          overflow: TextOverflow.ellipsis,
--- a/lib/Utils/Common/CommonTabBar.dart
+++ b/lib/Utils/Common/CommonTabBar.dart
@@ -22,7 +22,7 @@ class MyTabBar extends StatelessWidget {
              fontSize: 18.sp,
              color: Colors.white,
              fontWeight: FontWeight.w500,
-              fontFamily: 'manrope'),
+              fontFamily: 'hiragino'),
          indicatorSize: TabBarIndicatorSize.tab,
          indicatorColor: const Color(0xFFFFFFFF),
          labelColor: Colors.white,
--- a/lib/Utils/Common/CustomTextFormField.dart
+++ b/lib/Utils/Common/CustomTextFormField.dart
@@ -246,7 +246,7 @@ class _CustomTextFormField1State extends State<CustomTextFormField1> {
              fontSize: 16.sp,
              color: Colors.white,
              fontWeight: FontWeight.w400,
-              fontFamily: 'manrope'),
+              fontFamily: 'hiragino'),

          // ignore: prefer_null_aware_operators
          prefixIcon: widget.leadingIcon == null ? null : widget.leadingIcon!,
@@ -394,7 +394,7 @@ class _CustomTextFormField3State extends State<CustomTextFormField3> {
            fontSize: 16.sp,
            color: Colors.white,
            fontWeight: FontWeight.w400,
-            fontFamily: 'manrope'),
+            fontFamily: 'hiragino'),

        // ignore: prefer_null_aware_operators
        prefixIcon: widget.leadingIcon == null ? null : widget.leadingIcon!,
--- a/lib/Utils/Common/FilePicker.dart
+++ b/lib/Utils/Common/FilePicker.dart
@@ -16,7 +16,8 @@ class FilePickerMethod {
  Future<List<File?>?> pickFile() async {
    FilePickerResult? result = await FilePicker.platform.pickFiles(
      allowMultiple: true,
-      allowCompression: true, compressionQuality: 50,
+      allowCompression: true,
+      //compressionQuality: 50,
      type: FileType.custom,
      allowedExtensions: [
        'jpg',
--- a/lib/Utils/Common/ImageUpload.dart
+++ b/lib/Utils/Common/ImageUpload.dart
@@ -140,7 +140,7 @@ class ImageUploadBottomSheet {
                              style: TextStyle(
                                  fontSize: 13.sp,
                                  color: const Color(0xff444444),
-                                  fontFamily: 'Poppins'),
+                                  fontFamily: 'hiragino'),
                            )
                          ],
                        ),
--- a/lib/Utils/Common/commonBotton.dart
+++ b/lib/Utils/Common/commonBotton.dart
@@ -19,7 +19,7 @@ Widget CommonBtn({void Function()? onTap, required String text}) {
            style: TextStyle(
              color: Colors.white,
              fontSize: 20.sp,
-              fontFamily: 'Cambria',
+              fontFamily: 'hiragino',
              fontWeight: FontWeight.w400,
            ),
          ),
@@ -132,7 +132,7 @@ Widget kycBtn({
          style: TextStyle(
            color: Colors.white,
            fontSize: 20.sp,
-            fontFamily: 'Cambria',
+            fontFamily: 'hiragino',
            fontWeight: FontWeight.w400,
          ),
        ),
--- a/lib/Utils/Common/custom_drop_down.dart
+++ b/lib/Utils/Common/custom_drop_down.dart
@@ -91,7 +91,7 @@ class _CustomDropDownWidgetState extends State<CustomDropDownWidget> {
                        style: const TextStyle(
                          color: Color(0xFFADADAD),
                          fontSize: 16,
-                          fontFamily: 'Manrope',
+                          fontFamily: 'hiragino',
                          fontWeight: FontWeight.w400,
                          height: 0,
                        ),
--- a/lib/Utils/text.dart
+++ b/lib/Utils/text.dart
@@ -8,7 +8,7 @@ Widget text20W400(String text) {
        fontSize: 20.sp,
        color: Colors.white,
        fontWeight: FontWeight.w400,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -20,7 +20,7 @@ Widget text20W400_center(String text) {
        fontSize: 20.sp,
        color: Colors.white,
        fontWeight: FontWeight.w400,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -31,7 +31,7 @@ Widget text18W800(String text) {
        fontSize: 18.sp,
        color: Colors.white,
        fontWeight: FontWeight.w800,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -43,7 +43,7 @@ Widget text18W600(String text, {TextAlign textAl = TextAlign.start}) {
        fontSize: 18.sp,
        color: Colors.white,
        fontWeight: FontWeight.w600,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -54,7 +54,7 @@ Widget text18W500(String text) {
        fontSize: 18.sp,
        color: Colors.white,
        fontWeight: FontWeight.w500,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -68,7 +68,7 @@ Widget text18W400(String text,
        color: Colors.white,
        fontWeight: FontWeight.w400,
        height: heightV,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -79,7 +79,7 @@ Widget text24W500(String text) {
        color: Colors.white,
        fontSize: 24.sp,
        fontWeight: FontWeight.w500,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
    maxLines: 2,
    softWrap: true,
  );
@@ -94,7 +94,7 @@ Widget text16W400(String text,
        fontSize: 16.sp,
        color: clr,
        fontWeight: FontWeight.w400,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -105,7 +105,7 @@ Widget text16W400_1B1B1B(String text) {
        fontSize: 16.sp,
        color: Color(0Xff1B1B1B),
        fontWeight: FontWeight.w400,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -116,7 +116,7 @@ Widget text12W500_B4B4B4(String text) {
        fontSize: 12.sp,
        color: Color(0XffB4B4B4),
        fontWeight: FontWeight.w500,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -127,7 +127,7 @@ Widget text14W600_1B1B1B(String text) {
        fontSize: 14.sp,
        color: Color(0Xff1B1B1B),
        fontWeight: FontWeight.w600,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -138,7 +138,7 @@ Widget text16W600(String text, {Color clr = Colors.white}) {
        fontSize: 16.sp,
        color: clr,
        fontWeight: FontWeight.w600,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -149,7 +149,7 @@ Widget text16W500(String text, {Color clr = Colors.white}) {
        fontSize: 16.sp,
        color: clr,
        fontWeight: FontWeight.w500,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -160,7 +160,7 @@ Widget text15W600(String text) {
        fontSize: 15.sp,
        color: Colors.white,
        fontWeight: FontWeight.w600,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -171,7 +171,7 @@ Widget text15W600_00FF19(String text) {
        fontSize: 15.sp,
        color: Color(0xFF00FF19),
        fontWeight: FontWeight.w600,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -182,7 +182,7 @@ Widget text12W400(String text) {
        fontSize: 12.sp,
        color: Colors.white,
        fontWeight: FontWeight.w400,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -193,7 +193,7 @@ Widget text12W500(String text) {
        fontSize: 12.sp,
        color: Colors.white,
        fontWeight: FontWeight.w500,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -204,7 +204,7 @@ Widget text8W400(String text) {
        fontSize: 8.sp,
        color: Colors.white,
        fontWeight: FontWeight.w400,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -215,7 +215,7 @@ Widget text22W600(String text) {
        fontSize: 22.sp,
        color: Colors.white,
        fontWeight: FontWeight.w600,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -226,7 +226,7 @@ Widget text25W600(String text) {
        fontSize: 25.sp,
        color: Colors.white,
        fontWeight: FontWeight.w600,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -237,7 +237,7 @@ Widget text22W500(String text) {
        fontSize: 22.sp,
        color: Colors.white,
        fontWeight: FontWeight.w500,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -248,7 +248,7 @@ Widget text16W700(String text) {
        fontSize: 16.sp,
        color: Colors.white,
        fontWeight: FontWeight.w700,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -259,7 +259,7 @@ Widget text14W300(String text) {
        fontSize: 14.sp,
        color: Colors.white,
        fontWeight: FontWeight.w300,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -270,7 +270,7 @@ Widget text14W400(String text) {
        fontSize: 14.sp,
        color: Colors.white,
        fontWeight: FontWeight.w400,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -281,7 +281,7 @@ Widget text14W500(String text) {
        fontSize: 14.sp,
        color: Colors.white,
        fontWeight: FontWeight.w500,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -293,7 +293,7 @@ Widget text14W500Overflow(String text) {
        color: Colors.white,
        fontWeight: FontWeight.w500,
        overflow: TextOverflow.ellipsis,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -304,7 +304,7 @@ Widget text16W400_DADADA(String text) {
        fontSize: 16.sp,
        color: Color(0xFFDADADA),
        fontWeight: FontWeight.w400,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -315,7 +315,7 @@ Widget text14W400_979797(String text) {
        fontSize: 14.sp,
        color: Color(0xFF979797),
        fontWeight: FontWeight.w400,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -326,7 +326,7 @@ Widget text12W400_979797(String text) {
        fontSize: 12.sp,
        color: Color(0xFF979797),
        fontWeight: FontWeight.w400,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -337,7 +337,7 @@ Widget text14W400_00FF19(String text) {
        fontSize: 14.sp,
        color: Color(0xFF00FF19),
        fontWeight: FontWeight.w400,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -348,7 +348,7 @@ Widget text14W500_black(String text) {
        fontSize: 14.sp,
        color: Colors.black,
        fontWeight: FontWeight.w500,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }

@@ -359,6 +359,6 @@ Widget text10W300(String text) {
        fontSize: 10.sp,
        color: Colors.white,
        fontWeight: FontWeight.w300,
-        fontFamily: 'manrope'),
+        fontFamily: 'hiragino'),
  );
 }
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -91,13 +91,13 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
  Widget build(BuildContext context) {
    return ScreenUtilInit(
      builder: (BuildContext context, Widget? child) => GetMaterialApp(
-        title: 'Trader\'s Circuit',
+        title: 'Traders Circuit',
        theme: ThemeData(
          primarySwatch: Colors.blue,
-          fontFamily: 'manrope',
+          fontFamily: 'hiragino',
        ),
        debugShowCheckedModeBanner: false,
-        initialRoute: RouteName.contentbytes,
+        initialRoute: RouteName.splashScreen,
        getPages: AppRoutes.appRoutes(),
      ),
      designSize: const Size(390, 844),
--- a/lib/resources/routes/routes.dart
+++ b/lib/resources/routes/routes.dart
@@ -3,7 +3,7 @@ import 'package:traderscircuit/Utils/Common/noInternet.dart';
 import 'package:traderscircuit/resources/routes/route_name.dart';
 import 'package:traderscircuit/view/MainScreen/ExploreUnseen.dart';
 import 'package:traderscircuit/view/Sidemenu/AboutUs.dart';
-import 'package:traderscircuit/view/Sidemenu/ContentBytes.dart';
+import 'package:traderscircuit/view/Sidemenu/ContentByte/ContentBytes.dart';
 import 'package:traderscircuit/view/Sidemenu/FaqScreen.dart';
 import 'package:traderscircuit/view/Sidemenu/PrivacyPolicy.dart';
 import 'package:traderscircuit/view/Sidemenu/Settings.dart';
--- a/lib/view/MainScreen/HomeScreen.dart
+++ b/lib/view/MainScreen/HomeScreen.dart
@@ -12,7 +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/ContentByte/PlayerWidget.dart';
 import 'package:traderscircuit/view/Sidemenu/Sidemenu.dart';
 import 'package:traderscircuit/view/onBoarding/splashScreen1.dart';

@@ -78,7 +78,7 @@ class _HomeScreenState extends State<HomeScreen> {
                    style: TextStyle(
                        color: Colors.white,
                        fontSize: 24.sp,
-                        fontFamily: 'Manrope',
+                        fontFamily: 'hiragino',
                        fontWeight: FontWeight.w500),
                  ),
                  sizedBoxHeight(25.h),
--- a/lib/view/MainScreen/Portfolio/Holdings.dart
+++ b/lib/view/MainScreen/Portfolio/Holdings.dart
@@ -35,7 +35,7 @@ class _HoldingsState extends State<Holdings> {
      key: _scaffoldKey1,
      backgroundColor: Colors.black,
      drawerEnableOpenDragGesture: false,
-      drawer: Container( child: SideMenu()),
+      drawer: Container(child: SideMenu()),
      extendBody: true,
      appBar: AppBar(
        scrolledUnderElevation: 0.0,
@@ -214,7 +214,7 @@ class _HoldingsState extends State<Holdings> {
                                fontSize: 16.sp,
                                color: Colors.white,
                                fontWeight: FontWeight.w500,
-                                fontFamily: 'manrope'),
+                                fontFamily: 'hiragino'),
                          ),
                        ),
                        TableCell(
@@ -225,7 +225,7 @@ class _HoldingsState extends State<Holdings> {
                                fontSize: 16.sp,
                                color: Colors.white,
                                fontWeight: FontWeight.w500,
-                                fontFamily: 'manrope'),
+                                fontFamily: 'hiragino'),
                          ),
                        ),
                        TableCell(
@@ -236,7 +236,7 @@ class _HoldingsState extends State<Holdings> {
                                fontSize: 16.sp,
                                color: Colors.white,
                                fontWeight: FontWeight.w500,
-                                fontFamily: 'manrope'),
+                                fontFamily: 'hiragino'),
                          ),
                        ),
                        TableCell(
@@ -247,7 +247,7 @@ class _HoldingsState extends State<Holdings> {
                                fontSize: 16.sp,
                                color: Colors.white,
                                fontWeight: FontWeight.w500,
-                                fontFamily: 'manrope'),
+                                fontFamily: 'hiragino'),
                          ),
                        ),
                      ],
@@ -275,7 +275,7 @@ class _HoldingsState extends State<Holdings> {
                                      fontSize: 16.sp,
                                      color: Colors.white,
                                      fontWeight: FontWeight.w500,
-                                      fontFamily: 'manrope'),
+                                      fontFamily: 'hiragino'),
                                ),
                              ),
                              TableCell(
@@ -286,7 +286,7 @@ class _HoldingsState extends State<Holdings> {
                                      fontSize: 16.sp,
                                      color: Colors.white,
                                      fontWeight: FontWeight.w500,
-                                      fontFamily: 'manrope'),
+                                      fontFamily: 'hiragino'),
                                ),
                              ),
                              TableCell(
@@ -297,7 +297,7 @@ class _HoldingsState extends State<Holdings> {
                                      fontSize: 16.sp,
                                      color: Colors.white,
                                      fontWeight: FontWeight.w500,
-                                      fontFamily: 'manrope'),
+                                      fontFamily: 'hiragino'),
                                ),
                              ),
                              TableCell(
@@ -308,7 +308,7 @@ class _HoldingsState extends State<Holdings> {
                                      fontSize: 16.sp,
                                      color: Colors.white,
                                      fontWeight: FontWeight.w500,
-                                      fontFamily: 'manrope'),
+                                      fontFamily: 'hiragino'),
                                ),
                              ),
                            ],
@@ -604,10 +604,10 @@ class HoldingsTabBar extends StatelessWidget {
          ),
          dividerColor: Colors.transparent,
          labelStyle: TextStyle(
-              fontSize: 18.sp,
+              fontSize: 16.sp,
              color: Colors.white,
              fontWeight: FontWeight.w500,
-              fontFamily: 'manrope'),
+              fontFamily: 'hiragino'),
          indicatorSize: TabBarIndicatorSize.tab,
          indicatorColor: const Color(0xFFFFFFFF),
          labelColor: Colors.white,
@@ -638,7 +638,7 @@ class PortfolioTabBar extends StatelessWidget {
            fontSize: 18.sp,
            color: Colors.white,
            fontWeight: FontWeight.w500,
-            fontFamily: 'manrope'),
+            fontFamily: 'hiragino'),
        indicatorSize: TabBarIndicatorSize.tab,
        indicatorWeight: 2,
        indicatorColor: const Color(0xff6C0000),
--- a/lib/view/MainScreen/Portfolio/PortfolioEmpty.dart
+++ b/lib/view/MainScreen/Portfolio/PortfolioEmpty.dart
@@ -69,6 +69,7 @@ class _PortfolioState extends State<Portfolio> {
                      'Please click the "Add" button below to add a portfolio.',
                      textAlign: TextAlign.center,
                      style: TextStyle(
+                        fontFamily: 'hiragino',
                        color: Colors.white,
                        fontSize: 16.sp,
                        fontWeight: FontWeight.w400,
--- a/lib/view/MainScreen/ShortTrade.dart
+++ b/lib/view/MainScreen/ShortTrade.dart
@@ -12,7 +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/ContentByte/PlayerWidget.dart';
 import 'package:traderscircuit/view/Sidemenu/Sidemenu.dart';
 import 'package:traderscircuit/view/onBoarding/splashScreen1.dart';

@@ -194,7 +194,9 @@ class _ShortTradeState extends State<ShortTrade> {
                      children: [
                        InkWell(
                          onTap: () {
-                            Get.to(PlayerWidget());
+                            Get.to(
+                              () => PlayerWidget(),
+                            );
                          },
                          child: Container(
                            height: 200.h,
--- a/lib/view/Sidemenu/ContentByte/ContentBytes.dart
+++ b/lib/view/Sidemenu/ContentByte/ContentBytes.dart
@@ -7,7 +7,8 @@ import 'package:traderscircuit/Utils/Common/CustomTextFormField.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/view/Sidemenu/PlayerWidget.dart';
+import 'package:traderscircuit/view/Sidemenu/ContentByte/PlayerWidget.dart';
+import 'package:traderscircuit/view/Sidemenu/ContentByte/Reels.dart';
 import 'package:traderscircuit/view/Sidemenu/Sidemenu.dart';
 import 'package:traderscircuit/view/onBoarding/splashScreen1.dart';

@@ -710,23 +711,30 @@ class Videos extends StatelessWidget {

              itemCount: 4, // total number of items
              itemBuilder: (context, index) {
-                return Container(
-                  decoration: BoxDecoration(
-                    gradient: LinearGradient(
-                      begin: Alignment.topLeft,
-                      end: Alignment.bottomRight,
-                      colors: [
-                        Colors.white.withOpacity(0.1),
-                        Color(0xFFFFFFFF).withOpacity(0.05),
-                      ],
-                      stops: [
-                        0.1,
-                        1,
-                      ],
+                return InkWell(
+                  onTap: () {
+                    Get.to(
+                      () => Reels(),
+                    );
+                  },
+                  child: Container(
+                    decoration: BoxDecoration(
+                      gradient: LinearGradient(
+                        begin: Alignment.topLeft,
+                        end: Alignment.bottomRight,
+                        colors: [
+                          Colors.white.withOpacity(0.1),
+                          Color(0xFFFFFFFF).withOpacity(0.05),
+                        ],
+                        stops: [
+                          0.1,
+                          1,
+                        ],
+                      ),
+                      borderRadius: BorderRadius.circular(8),
                    ),
-                    borderRadius: BorderRadius.circular(8),
+                    child: Image.asset(images[index]),
                  ),
-                  child: Image.asset(images[index]),
                );
              },
            ),
@@ -805,7 +813,7 @@ class ContentTabBar extends StatelessWidget {
            fontSize: 18.sp,
            color: Colors.white,
            fontWeight: FontWeight.w500,
-            fontFamily: 'manrope'),
+            fontFamily: 'hiragino'),
        indicatorSize: TabBarIndicatorSize.tab,
        indicatorWeight: 2,
        indicatorColor: const Color(0xff6C0000),
--- a/lib/view/Sidemenu/ContentByte/PlayerWidget.dart
+++ b/lib/view/Sidemenu/ContentByte/PlayerWidget.dart
@@ -1,7 +1,6 @@
 import 'package:chewie/chewie.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:traderscircuit/Utils/Common/CommonAppBar.dart';
 import 'package:video_player/video_player.dart';

 class PlayerWidget extends StatefulWidget {
@@ -22,12 +21,25 @@ class _PlayerWidgetState extends State<PlayerWidget> {
    _initializePlayer();
  }

-  _initializePlayer() async {
-    videoPlayerController = VideoPlayerController.networkUrl(Uri.tryParse(
-        "https://flutter.github.io/assets-for-api-docs/assets/videos/bee.mp4")!);
+  // _initializePlayer() async {
+  //   videoPlayerController = VideoPlayerController.networkUrl(Uri.parse(
+  //       "https://flutter.github.io/assets-for-api-docs/assets/videos/bee.mp4"));

-    await videoPlayerController.initialize();
-    initChewie();
+  //   await videoPlayerController.initialize();
+  //   initChewie();
+  // }
+
+  _initializePlayer() async {
+    try {
+      videoPlayerController = VideoPlayerController.network(
+        "https://assets.mixkit.co/videos/preview/mixkit-spinning-around-the-earth-29351-large.mp4",
+      );
+
+      await videoPlayerController.initialize();
+      initChewie();
+    } catch (e) {
+      print("Error initializing video player: $e");
+    }
  }

  initChewie() {
--- a/lib/view/Sidemenu/ContentByte/Reels.dart
+++ b/lib/view/Sidemenu/ContentByte/Reels.dart
@@ -0,0 +1,75 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/src/widgets/framework.dart';
+import 'package:flutter/src/widgets/placeholder.dart';
+import 'package:videoplayerkb/Model/short_clip_likes_model.dart';
+import 'package:videoplayerkb/Model/short_clip_model.dart';
+import 'package:videoplayerkb/VideoPageGetx.dart';
+import 'package:videoplayerkb/api_service.dart';
+
+class Reels extends StatefulWidget {
+  const Reels({super.key});
+
+  @override
+  State<Reels> createState() => _ReelsState();
+}
+
+class _ReelsState extends State<Reels> {
+  List<ShortClipModel> fetchedClips = [
+    ShortClipModel(
+        id: 36,
+        title: "Mindful Approach",
+        description: "Mindful Approach for your health",
+        videoUrl:
+            "https://player.vimeo.com/progressive_redirect/playback/861153289/rendition/540p/file.mp4?loc=external&signature=375b7a2ebe8586f6630f63872bf8f2c95cc78a7cd48dd3f71cd2a3021bd724d3",
+        thumbnailUrl:
+            "https://thegsf.co/public/uploads/short_clips/1693980602.png?d=1710692729",
+        likes: 6),
+    ShortClipModel(
+        id: 37,
+        title: "Does green tea really cause weight loss?",
+        description: "Does green tea really cause weight loss?",
+        videoUrl:
+            "https://player.vimeo.com/progressive_redirect/playback/861152968/rendition/720p/file.mp4?loc=external&signature=693dceacbc17c8893917d74c5288acd9083fdf3c062c8c322319b8c99a402585",
+        thumbnailUrl:
+            "https://thegsf.co/public/uploads/short_clips/1693980701.png?d=1710692729",
+        likes: 5),
+    ShortClipModel(
+        id: 38,
+        title: "No need to have fancy food for having a good health",
+        description: "No need to have fancy food for having a good health",
+        videoUrl:
+            "https://player.vimeo.com/progressive_redirect/playback/861152607/rendition/720p/file.mp4?loc=external&signature=efd819cdf12671287b15e80134017c3ca2b158b46cb4aa0b51cf43bf2a1429c4",
+        thumbnailUrl:
+            "https://thegsf.co/public/uploads/short_clips/1693980902.png?d=1710692729",
+        likes: 4),
+  ];
+  List<ShortClipLikesModel> fetchedLikes = [
+    ShortClipLikesModel(shortClipId: 36, isLiked: true),
+    ShortClipLikesModel(shortClipId: 37, isLiked: false),
+    ShortClipLikesModel(shortClipId: 38, isLiked: true),
+  ];
+
+  @override
+  Widget build(BuildContext context) {
+    ApiService.videos = fetchedClips.map((e) => e.videoUrl).toList();
+    return Scaffold(
+        appBar: AppBar(
+          leading: const SizedBox(
+            width: 50,
+            height: 50,
+            child: Padding(
+              padding: EdgeInsets.only(left: 8.0),
+              child: Icon(
+                Icons.arrow_back_ios,
+                color: Colors.black,
+                size: 20,
+              ),
+            ),
+          ),
+          backgroundColor: const Color(0xFFCC9900),
+          title: const Text('Reels'),
+        ),
+        body: VideoPlayerKB(
+            fetchedClips: fetchedClips, fetchedLikes: fetchedLikes));
+  }
+}
--- a/lib/view/Sidemenu/FaqScreen.dart
+++ b/lib/view/Sidemenu/FaqScreen.dart
@@ -225,7 +225,7 @@ class _FaqScreenState extends State<FaqScreen> {
                    Text(
                      title,
                      style: TextStyle(
-                        fontFamily: 'manrope',
+                        fontFamily: 'hiragino',
                        fontSize: 16.sp,
                        fontWeight: FontWeight.w500,
                        color: Colors.white,
@@ -266,7 +266,7 @@ class _FaqScreenState extends State<FaqScreen> {
                    content,
                    style: TextStyle(
                      color: Color(0xFFFFFFFF),
-                      fontFamily: 'manrope',
+                      fontFamily: 'hiragino',
                      fontSize: 14.sp,
                      fontWeight: FontWeight.w400,
                    ),
@@ -285,7 +285,7 @@ class _FaqScreenState extends State<FaqScreen> {
                          Text(
                            'Was this answer helpful?',
                            style: TextStyle(
-                              fontFamily: 'manrope',
+                              fontFamily: 'hiragino',
                              fontSize: 16.sp,
                              fontWeight: FontWeight.w500,
                              color: Colors.white,
--- a/lib/view/Sidemenu/Sidemenu.dart
+++ b/lib/view/Sidemenu/Sidemenu.dart
@@ -355,7 +355,7 @@ LogOutdialog(context) {
                "Are you sure you want to logout ?",
                textAlign: TextAlign.center,
                style: TextStyle(
-                    fontFamily: "manrope",
+                    fontFamily: "hiragino",
                    fontWeight: FontWeight.w400,
                    fontSize: 20.sp,
                    color: const Color(0xFFFFFFFF)),
--- a/lib/view/Sidemenu/contactUs/contact_us_main.dart
+++ b/lib/view/Sidemenu/contactUs/contact_us_main.dart
@@ -68,7 +68,7 @@ class _ContactUsMainScreenState extends State<ContactUsMainScreen> {
                        labelStyle: TextStyle(
                          fontSize: 18.sp,
                          fontWeight: FontWeight.w400,
-                          fontFamily: "manrope",
+                          fontFamily: "hiragino",
                        ),
                        isScrollable: true,
                        labelColor: Colors.white,
@@ -78,7 +78,7 @@ class _ContactUsMainScreenState extends State<ContactUsMainScreen> {
                        unselectedLabelStyle: TextStyle(
                          fontSize: 18.sp,
                          fontWeight: FontWeight.w500,
-                          fontFamily: "manrope",
+                          fontFamily: "hiragino",
                        ),
                        tabs: const [
                          Tab(text: "All Tickets (2)"),
--- a/lib/view/login/LoginScreen.dart
+++ b/lib/view/login/LoginScreen.dart
@@ -54,6 +54,7 @@ class _LoginScreenState extends State<LoginScreen> {
                        Text(
                          "Traders Circuit",
                          style: TextStyle(
+                              fontFamily: 'hiragino',
                              color: Colors.white,
                              fontSize: 25,
                              fontWeight: FontWeight.w600),
@@ -66,6 +67,7 @@ class _LoginScreenState extends State<LoginScreen> {
                    const Text(
                      "Lets get started ",
                      style: TextStyle(
+                          fontFamily: 'hiragino',
                          color: Colors.white,
                          fontSize: 24,
                          fontWeight: FontWeight.w700),
@@ -122,6 +124,7 @@ class _LoginScreenState extends State<LoginScreen> {
                                const Text(
                                  "+91",
                                  style: TextStyle(
+                                    fontFamily: 'hiragino',
                                    fontSize: 15,
                                    color: Colors.white,
                                  ),
--- a/lib/view/onBoarding/splashScreen.dart
+++ b/lib/view/onBoarding/splashScreen.dart
@@ -130,8 +130,8 @@ class _SplashScreenState extends State<SplashScreen>
                ScaleTransition(
                  scale: _scaleAnimation,
                  child: Text(
-                    "Trader\'s Circuit",
-                    style: TextStyle(
+                    "Traders Circuit",
+                    style: TextStyle(fontFamily: 'hiragino',
                        fontSize: 50,
                        fontWeight: FontWeight.w600,
                        color: Colors.white),
--- a/lib/view/onBoarding/splashScreen1.dart
+++ b/lib/view/onBoarding/splashScreen1.dart
@@ -46,6 +46,7 @@ class _Sliderscreen1State extends State<Sliderscreen1>
                          child: Text(
                            'Skip',
                            style: TextStyle(
+                              fontFamily: 'hiragino',
                              color: Colors.white,
                              fontSize: 18,
                              fontWeight: FontWeight.w500,
@@ -94,6 +95,7 @@ class _Sliderscreen1State extends State<Sliderscreen1>
                        Text(
                          'Unlock a world of diversified investment opportunities with our app',
                          style: TextStyle(
+                              fontFamily: 'hiragino',
                              fontSize: 20,
                              fontWeight: FontWeight.w400,
                              color: Colors.white),
--- a/lib/view/onBoarding/splashScreen2.dart
+++ b/lib/view/onBoarding/splashScreen2.dart
@@ -43,6 +43,7 @@ class _Sliderscreen2State extends State<Sliderscreen2>
                          child: Text(
                            'Skip',
                            style: TextStyle(
+                              fontFamily: 'hiragino',
                              color: Colors.white,
                              fontSize: 18,
                              fontWeight: FontWeight.w500,
@@ -93,7 +94,7 @@ class _Sliderscreen2State extends State<Sliderscreen2>
                            text:
                                'Your one-stop solution for effortless and diversified fund investments  ',
                            style: TextStyle(
-                                fontFamily: 'manrope',
+                                fontFamily: 'hiragino',
                                fontSize: 20,
                                fontWeight: FontWeight.w400,
                                color: Colors.white),
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1,6 +1,14 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  another_flushbar:
+    dependency: transitive
+    description:
+      name: another_flushbar
+      sha256: "19bf9520230ec40b300aaf9dd2a8fefcb277b25ecd1c4838f530566965befc2a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.12.30"
  archive:
    dependency: transitive
    description:
@@ -45,10 +53,10 @@ packages:
    dependency: "direct main"
    description:
      name: chewie
-      sha256: "8bc4ac4cf3f316e50a25958c0f5eb9bb12cf7e8308bb1d74a43b230da2cfc144"
+      sha256: "745e81e84c6d7f3835f89f85bb49771c0a66099e4caf8f8e9e9a372bc66fb2c1"
      url: "https://pub.dev"
    source: hosted
-    version: "1.7.5"
+    version: "1.5.0"
  clock:
    dependency: transitive
    description:
@@ -165,18 +173,18 @@ packages:
    dependency: transitive
    description:
      name: file
-      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+      sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
      url: "https://pub.dev"
    source: hosted
-    version: "7.0.0"
+    version: "6.1.4"
  file_picker:
    dependency: "direct main"
    description:
      name: file_picker
-      sha256: d1d0ac3966b36dc3e66eeefb40280c17feb87fa2099c6e22e6a1fc959327bd03
+      sha256: b85eb92b175767fdaa0c543bf3b0d1f610fe966412ea72845fe5ba7801e763ff
      url: "https://pub.dev"
    source: hosted
-    version: "8.0.0+1"
+    version: "5.2.10"
  file_selector_linux:
    dependency: transitive
    description:
@@ -214,6 +222,22 @@ packages:
    description: flutter
    source: sdk
    version: "0.0.0"
+  flutter_branch_sdk:
+    dependency: transitive
+    description:
+      name: flutter_branch_sdk
+      sha256: "3850097e5c70d89db235fb160e92eac5928f4206ab167b0d83c7e4e50b1357f8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.1.0"
+  flutter_isolate:
+    dependency: transitive
+    description:
+      name: flutter_isolate
+      sha256: "994ddec596da4ca12ca52154fd59404077584643eb7e3f1008a55fda9fe0b76b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.4"
  flutter_lints:
    dependency: "direct dev"
    description:
@@ -280,6 +304,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "4.6.6"
+  get_it:
+    dependency: transitive
+    description:
+      name: get_it
+      sha256: e6017ce7fdeaf218dc51a100344d8cb70134b80e28b760f8bb23c242437bafd7
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.6.7"
  glassmorphism:
    dependency: "direct main"
    description:
@@ -400,6 +432,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.2.1+1"
+  injectable:
+    dependency: transitive
+    description:
+      name: injectable
+      sha256: f71eb879124ed286cbd2210337b91ff5f345f146187c1f1891c172e0ac06443a
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.5.4"
  js:
    dependency: transitive
    description:
@@ -472,22 +512,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.5.0"
-  package_info_plus:
-    dependency: transitive
-    description:
-      name: package_info_plus
-      sha256: "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.1"
-  package_info_plus_platform_interface:
-    dependency: transitive
-    description:
-      name: package_info_plus_platform_interface
-      sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.1"
  path:
    dependency: transitive
    description:
@@ -512,6 +536,30 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.0.1"
+  path_provider:
+    dependency: transitive
+    description:
+      name: path_provider
+      sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  path_provider_android:
+    dependency: transitive
+    description:
+      name: path_provider_android
+      sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.2"
+  path_provider_foundation:
+    dependency: transitive
+    description:
+      name: path_provider_foundation
+      sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.2"
  path_provider_linux:
    dependency: transitive
    description:
@@ -584,6 +632,22 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "6.1.2"
+  share_plus:
+    dependency: transitive
+    description:
+      name: share_plus
+      sha256: b1f15232d41e9701ab2f04181f21610c36c83a12ae426b79b4bd011c567934b1
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.3.4"
+  share_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: share_plus_platform_interface
+      sha256: "251eb156a8b5fa9ce033747d73535bf53911071f8d3b6f4f0b578505ce0d4496"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.4.0"
  shared_preferences:
    dependency: "direct main"
    description:
@@ -701,6 +765,46 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.3.2"
+  url_launcher_linux:
+    dependency: transitive
+    description:
+      name: url_launcher_linux
+      sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.1"
+  url_launcher_platform_interface:
+    dependency: transitive
+    description:
+      name: url_launcher_platform_interface
+      sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.2"
+  url_launcher_web:
+    dependency: transitive
+    description:
+      name: url_launcher_web
+      sha256: fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.3"
+  url_launcher_windows:
+    dependency: transitive
+    description:
+      name: url_launcher_windows
+      sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.1"
+  uuid:
+    dependency: transitive
+    description:
+      name: uuid
+      sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.7"
  vector_graphics:
    dependency: transitive
    description:
@@ -773,22 +877,55 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.1.3"
-  wakelock_plus:
+  videoplayerkb:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: HEAD
+      resolved-ref: f62d2d0a68b045649056ba588b69d0114855b109
+      url: "https://github.com/kishan06/videoPlayerKB.git"
+    source: git
+    version: "0.0.2"
+  wakelock:
    dependency: transitive
    description:
-      name: wakelock_plus
-      sha256: f268ca2116db22e57577fb99d52515a24bdc1d570f12ac18bb762361d43b043d
+      name: wakelock
+      sha256: "769ecf42eb2d07128407b50cb93d7c10bd2ee48f0276ef0119db1d25cc2f87db"
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.4"
-  wakelock_plus_platform_interface:
+    version: "0.6.2"
+  wakelock_macos:
    dependency: transitive
    description:
-      name: wakelock_plus_platform_interface
-      sha256: "40fabed5da06caff0796dc638e1f07ee395fb18801fbff3255a2372db2d80385"
+      name: wakelock_macos
+      sha256: "047c6be2f88cb6b76d02553bca5a3a3b95323b15d30867eca53a19a0a319d4cd"
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.0"
+    version: "0.4.0"
+  wakelock_platform_interface:
+    dependency: transitive
+    description:
+      name: wakelock_platform_interface
+      sha256: "1f4aeb81fb592b863da83d2d0f7b8196067451e4df91046c26b54a403f9de621"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.0"
+  wakelock_web:
+    dependency: transitive
+    description:
+      name: wakelock_web
+      sha256: "1b256b811ee3f0834888efddfe03da8d18d0819317f20f6193e2922b41a501b5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.0"
+  wakelock_windows:
+    dependency: transitive
+    description:
+      name: wakelock_windows
+      sha256: "857f77b3fe6ae82dd045455baa626bc4b93cb9bb6c86bf3f27c182167c3a5567"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.1"
  web:
    dependency: transitive
    description:
@@ -801,10 +938,10 @@ packages:
    dependency: transitive
    description:
      name: win32
-      sha256: b0f37db61ba2f2e9b7a78a1caece0052564d1bc70668156cf3a29d676fe4e574
+      sha256: a6f0236dbda0f63aa9a25ad1ff9a9d8a4eaaa5012da0dc59d21afdb1dc361ca4
      url: "https://pub.dev"
    source: hosted
-    version: "5.1.1"
+    version: "3.1.4"
  xdg_directories:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -12,6 +12,9 @@ dependencies:
  flutter:
    sdk: flutter

+  videoplayerkb:
+    git:
+      url: https://github.com/kishan06/videoPlayerKB.git
  cupertino_icons: ^1.0.2
  get: ^4.6.5
  flutter_screenutil: ^5.9.0
@@ -26,9 +29,9 @@ dependencies:
  image_picker: ^1.0.7
  dotted_border: ^2.1.0
  image_cropper: ^5.0.1
-  file_picker: ^8.0.0+1
+  file_picker: any
  lottie: ^2.7.0
-  chewie: ^1.7.5
+  chewie: ^1.5.0
  video_player: ^2.5.2
  

@@ -53,3 +56,7 @@ flutter:
    - family: manrope
      fonts:
        - asset: assets/fonts/manrope/Manrope-VariableFont_wght.ttf
+
+    - family: hiragino
+      fonts:
+        - asset: assets/fonts/hiragino/Hiragino Sans GB W6.TTF