's removed
This commit is contained in:
@@ -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,
|
||||
),
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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!,
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -140,7 +140,7 @@ class ImageUploadBottomSheet {
|
||||
style: TextStyle(
|
||||
fontSize: 13.sp,
|
||||
color: const Color(0xff444444),
|
||||
fontFamily: 'Poppins'),
|
||||
fontFamily: 'hiragino'),
|
||||
)
|
||||
],
|
||||
),
|
||||
|
||||
@@ -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,
|
||||
),
|
||||
),
|
||||
|
||||
@@ -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,
|
||||
),
|
||||
|
||||
@@ -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'),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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),
|
||||
@@ -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() {
|
||||
75
lib/view/Sidemenu/ContentByte/Reels.dart
Normal file
75
lib/view/Sidemenu/ContentByte/Reels.dart
Normal file
@@ -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));
|
||||
}
|
||||
}
|
||||
@@ -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,
|
||||
|
||||
@@ -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)),
|
||||
|
||||
@@ -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)"),
|
||||
|
||||
@@ -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,
|
||||
),
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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),
|
||||
|
||||
Reference in New Issue
Block a user