diff --git a/openclosenew/lib/07_addbusiness.dart b/openclosenew/lib/07_addbusiness.dart index b5f1b03..8812eaa 100644 --- a/openclosenew/lib/07_addbusiness.dart +++ b/openclosenew/lib/07_addbusiness.dart @@ -1,7 +1,9 @@ import 'package:flutter/material.dart'; import 'package:openclosenew/businessaddedsuccess.dart'; +import 'FontFamily.dart'; import 'colors.dart'; +import 'fontsize.dart'; class addbusiness extends StatefulWidget { addbusiness({Key? key}) : super(key: key); @@ -74,9 +76,9 @@ class _addbusinessState extends State { Text( 'Add Business', style: TextStyle( - fontSize: 15, + fontSize: HeadText, color: DarkGray, - fontFamily: 'assets/fonts/Manrope-Medium.ttf', + fontFamily: Font, ), ), ], @@ -95,10 +97,11 @@ class _addbusinessState extends State { Text( 'Uploading Logo', style: TextStyle( - color: Gray, - fontSize: 14, - fontWeight: FontWeight.w400, - fontFamily: 'Manrope'), + color: Gray, + fontSize: HeadText, + fontWeight: FontWeight.w400, + fontFamily: Font, + ), ), ], ), @@ -121,8 +124,8 @@ class _addbusinessState extends State { child: Text( 'Business Name', style: TextStyle( - fontFamily: "Manrope", - fontSize: 14, + fontFamily: Font, + fontSize: HeadText, color: DarkGray, ), ), @@ -152,8 +155,8 @@ class _addbusinessState extends State { child: Text( 'Contact Number', style: TextStyle( - fontFamily: "Manrope", - fontSize: 14, + fontFamily: Font, + fontSize: HeadText, color: DarkGray, ), ), @@ -181,8 +184,8 @@ class _addbusinessState extends State { child: Text( 'Tell about your business...', style: TextStyle( - fontFamily: "Manrope", - fontSize: 14, + fontFamily: Font, + fontSize: HeadText, color: DarkGray, ), ), @@ -214,14 +217,21 @@ class _addbusinessState extends State { ), Text( 'Industry', - style: TextStyle(color: DarkGray), + style: TextStyle( + color: DarkGray, + fontSize: HeadText, + fontFamily: Font, + ), ), SizedBox( width: 120, ), Text( 'Category', - style: TextStyle(color: DarkGray), + style: TextStyle( + color: DarkGray, + fontFamily: Font, + fontSize: HeadText), ), ], ), @@ -304,8 +314,8 @@ class _addbusinessState extends State { child: Text( 'Address', style: TextStyle( - fontFamily: "Manrope", - fontSize: 14, + fontFamily: Font, + fontSize: HeadText, color: DarkGray, ), ), @@ -352,7 +362,11 @@ class _addbusinessState extends State { }, child: Text( 'Save', - style: TextStyle(color: White, fontSize: 15), + style: TextStyle( + color: White, + fontSize: HeadText, + fontFamily: Font, + ), ), ), ], diff --git a/openclosenew/lib/11_busiesshome.dart b/openclosenew/lib/11_busiesshome.dart index 5fe3718..c616a7f 100644 --- a/openclosenew/lib/11_busiesshome.dart +++ b/openclosenew/lib/11_busiesshome.dart @@ -1,8 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_switch/flutter_switch.dart'; import '07_addbusiness.dart'; +import 'FontFamily.dart'; import 'businessdetail.dart'; import 'colors.dart'; +import 'fontsize.dart'; class businesshome extends StatefulWidget { const businesshome({Key? key}) : super(key: key); @@ -52,8 +54,8 @@ class _businesshomeState extends State { 'Hi, Sudharsan', style: TextStyle( color: DarkGray, - fontSize: 16, - fontFamily: 'Manrope', + fontSize: HeadText, + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, ), @@ -61,10 +63,10 @@ class _businesshomeState extends State { Text( 'Mon, 02 May 2022', style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, - fontSize: 11, + fontSize: SubText, color: Gray, ), ), @@ -119,30 +121,30 @@ class _businesshomeState extends State { Text( "Today", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 14, + fontSize: HeadText, color: Colors.white, ), ), Text( "42", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 26, + fontSize: TitleText, color: Colors.white, ), ), Text( "Visitors viewed Barbeque Nation", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 12, + fontSize: SubText, color: Colors.white, ), ), @@ -182,30 +184,30 @@ class _businesshomeState extends State { Text( "Today", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 14, + fontSize: HeadText, color: Colors.white, ), ), Text( "42", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 26, + fontSize: TitleText, color: Colors.white, ), ), Text( "Visitors viewed Barbeque Nation", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 12, + fontSize: SubText, color: Colors.white, ), ), @@ -245,30 +247,30 @@ class _businesshomeState extends State { Text( "Today", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 14, + fontSize: HeadText, color: Colors.white, ), ), Text( "42", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 26, + fontSize: TitleText, color: Colors.white, ), ), Text( "Visitors viewed Barbeque Nation", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 12, + fontSize: SubText, color: Colors.white, ), ), @@ -288,8 +290,8 @@ class _businesshomeState extends State { child: Text( 'My Businesses', style: TextStyle( - fontSize: 16, - fontFamily: 'Manrope', + fontSize: HeadText, + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, color: DarkGray, @@ -308,10 +310,10 @@ class _businesshomeState extends State { label: Text( "Add Business", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, - fontSize: 15, + fontSize: HeadText, color: primaryColor, ), ), @@ -373,20 +375,20 @@ class _businesshomeState extends State { text: TextSpan( text: "Barbeque Nation ", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, - fontSize: 18, + fontSize: TitleText, color: Colors.white, ), children: [ TextSpan( text: "4.2 ", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 15, + fontSize: HeadText, color: Color(0xFFFFBE3F), ), ), @@ -407,7 +409,7 @@ class _businesshomeState extends State { FlutterSwitch( width: 105, height: 40, - valueFontSize: 15, + valueFontSize: HeadText, toggleSize: 25, value: status, borderRadius: 30.0, @@ -447,10 +449,10 @@ class _businesshomeState extends State { TextSpan( text: "Town Hall, Coimbatore", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 14, + fontSize: HeadText, color: Colors.white, ), ), @@ -509,20 +511,20 @@ class _businesshomeState extends State { text: TextSpan( text: "Barbeque Nation ", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, - fontSize: 18, + fontSize: TitleText, color: Colors.white, ), children: [ TextSpan( text: "4.2 ", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 15, + fontSize: HeadText, color: Color(0xFFFFBE3F), ), ), @@ -543,7 +545,7 @@ class _businesshomeState extends State { FlutterSwitch( width: 105, height: 40, - valueFontSize: 15, + valueFontSize: HeadText, toggleSize: 25, value: status1, borderRadius: 30.0, @@ -583,10 +585,10 @@ class _businesshomeState extends State { TextSpan( text: "Town Hall, Coimbatore", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 14, + fontSize: HeadText, color: Colors.white, ), ), @@ -645,20 +647,20 @@ class _businesshomeState extends State { text: TextSpan( text: "Barbeque Nation ", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, - fontSize: 18, + fontSize: TitleText, color: Colors.white, ), children: [ TextSpan( text: "4.2 ", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 15, + fontSize: HeadText, color: Color(0xFFFFBE3F), ), ), @@ -679,7 +681,7 @@ class _businesshomeState extends State { FlutterSwitch( width: 105, height: 40, - valueFontSize: 15, + valueFontSize: HeadText, toggleSize: 25, value: status2, borderRadius: 30.0, @@ -719,10 +721,10 @@ class _businesshomeState extends State { TextSpan( text: "Town Hall, Coimbatore", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 14, + fontSize: HeadText, color: Colors.white, ), ), @@ -742,8 +744,8 @@ class _businesshomeState extends State { ), BottomNavigationBar( iconSize: 20, - unselectedFontSize: 12, - selectedFontSize: 12, + unselectedFontSize: SubText, + selectedFontSize: SubText, type: BottomNavigationBarType.fixed, items: const [ BottomNavigationBarItem( diff --git a/openclosenew/lib/14_businessdetailsempty.dart b/openclosenew/lib/14_businessdetailsempty.dart index 4d6d6c4..8540aaf 100644 --- a/openclosenew/lib/14_businessdetailsempty.dart +++ b/openclosenew/lib/14_businessdetailsempty.dart @@ -4,6 +4,9 @@ import 'package:flutter_switch/flutter_switch.dart'; import 'package:openclosenew/15_addbusinessdetails.dart'; import 'package:openclosenew/colors.dart'; +import 'FontFamily.dart'; +import 'fontsize.dart'; + class businessdetailsempty extends StatefulWidget { const businessdetailsempty({Key? key}) : super(key: key); @@ -70,7 +73,7 @@ class _businessdetailsemptyState extends State { FlutterSwitch( width: 107, height: 50, - valueFontSize: 12, + valueFontSize: SubText, toggleSize: 20, value: status, borderRadius: 30.0, @@ -146,7 +149,7 @@ class _businessdetailsemptyState extends State { Text( "LOGO", style: TextStyle( - fontFamily: "Manrope", + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, letterSpacing: 0.25, @@ -168,10 +171,10 @@ class _businessdetailsemptyState extends State { text: TextSpan( text: "Barbeque Nation ", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, - fontSize: 20, + fontSize: TitleText, color: DarkGray, ), ), @@ -182,10 +185,10 @@ class _businessdetailsemptyState extends State { TextSpan( text: "0.0 ", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 15, + fontSize: HeadText, color: Color(0xFFFFBE3F), ), ), @@ -245,10 +248,10 @@ class _businessdetailsemptyState extends State { text: " +91 98651 76796, +91 76786 85869", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, - fontSize: 12, + fontSize: SubText, color: Gray, ), ), @@ -274,10 +277,10 @@ class _businessdetailsemptyState extends State { text: " 112, Avinashi Road, Peelamedu, Coimbatore...", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, - fontSize: 12, + fontSize: SubText, color: Gray, ), ), @@ -307,10 +310,10 @@ class _businessdetailsemptyState extends State { Text( 'This Business Profile looks incomplete', style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, - fontSize: 13, + fontSize: SubText, color: primaryColor, ), ), @@ -360,10 +363,10 @@ class _businessdetailsemptyState extends State { Text( 'Add your food items', style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, - fontSize: 15, + fontSize: HeadText, color: primaryColor, ), ), @@ -398,10 +401,10 @@ class _businessdetailsemptyState extends State { Text( 'Add your shop photos', style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, - fontSize: 15, + fontSize: HeadText, color: primaryColor, ), ), @@ -436,10 +439,10 @@ class _businessdetailsemptyState extends State { Text( 'Add your business services', style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, - fontSize: 15, + fontSize: HeadText, color: primaryColor, ), ), @@ -474,10 +477,10 @@ class _businessdetailsemptyState extends State { Text( 'Add your business offers', style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, - fontSize: 15, + fontSize: HeadText, color: primaryColor, ), ), @@ -512,10 +515,10 @@ class _businessdetailsemptyState extends State { Text( 'Add your business coupons', style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, - fontSize: 15, + fontSize: HeadText, color: primaryColor, ), ), diff --git a/openclosenew/lib/15_addbusinessdetails.dart b/openclosenew/lib/15_addbusinessdetails.dart index 25bc66a..724c9f5 100644 --- a/openclosenew/lib/15_addbusinessdetails.dart +++ b/openclosenew/lib/15_addbusinessdetails.dart @@ -3,6 +3,8 @@ import 'package:openclosenew/businessdetail.dart'; import 'package:openclosenew/colors.dart'; import '17-BusinessProfileFormSuccess.dart'; +import 'FontFamily.dart'; +import 'fontsize.dart'; class addbusinessdetails extends StatefulWidget { const addbusinessdetails({Key? key}) : super(key: key); @@ -61,9 +63,9 @@ class _addbusinessdetailsState extends State { Text( 'Add Business Detail', style: TextStyle( - fontSize: 15, + fontSize: HeadText, color: DarkGray, - fontFamily: 'assets/fonts/Manrope-Medium.ttf', + fontFamily: Font, ), ), ], @@ -77,10 +79,10 @@ class _addbusinessdetailsState extends State { Text( "Website", style: TextStyle( - fontFamily: "Manrope", + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w300, - fontSize: 15, + fontSize: HeadText, color: DarkGray, ), ), @@ -99,10 +101,10 @@ class _addbusinessdetailsState extends State { Text( "Your working days & hours", style: TextStyle( - fontFamily: "Manrope", + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w300, - fontSize: 15, + fontSize: HeadText, color: DarkGray, ), ), @@ -136,10 +138,10 @@ class _addbusinessdetailsState extends State { Text( "From", style: TextStyle( - fontFamily: "Manrope", + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w300, - fontSize: 15, + fontSize: HeadText, color: DarkGray, ), ), @@ -149,10 +151,10 @@ class _addbusinessdetailsState extends State { Text( "To", style: TextStyle( - fontFamily: "Manrope", + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w300, - fontSize: 15, + fontSize: HeadText, color: DarkGray, ), ), @@ -187,10 +189,10 @@ class _addbusinessdetailsState extends State { Text( _TimeofDay.format(context).toString(), style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 15, + fontSize: HeadText, color: DarkGray, ), ), @@ -223,10 +225,10 @@ class _addbusinessdetailsState extends State { Text( _TimeofDay1.format(context).toString(), style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 15, + fontSize: HeadText, color: DarkGray, ), ), @@ -257,7 +259,10 @@ class _addbusinessdetailsState extends State { }, child: Text( "Cancel", - style: TextStyle(color: Gray), + style: TextStyle( + color: Gray, + fontFamily: Font, + ), ), ), ), @@ -279,7 +284,11 @@ class _addbusinessdetailsState extends State { }, child: Text( 'Save', - style: TextStyle(color: White, fontSize: 15), + style: TextStyle( + color: White, + fontSize: HeadText, + fontFamily: Font, + ), ), ), ), diff --git a/openclosenew/lib/17-BusinessProfileFormSuccess.dart b/openclosenew/lib/17-BusinessProfileFormSuccess.dart index 3092d51..56657c9 100644 --- a/openclosenew/lib/17-BusinessProfileFormSuccess.dart +++ b/openclosenew/lib/17-BusinessProfileFormSuccess.dart @@ -1,6 +1,8 @@ import 'package:flutter/material.dart'; import 'package:openclosenew/colors.dart'; import '19-AddProductFrom.dart'; +import 'FontFamily.dart'; +import 'fontsize.dart'; class profileformsuccess extends StatelessWidget { const profileformsuccess({Key? key}) : super(key: key); @@ -25,10 +27,10 @@ class profileformsuccess extends StatelessWidget { child: Text( 'Awesome!', style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 25, + fontSize: TitleText, color: primaryColor, ), ), @@ -36,10 +38,10 @@ class profileformsuccess extends StatelessWidget { Text( 'Your business profile completed successfully!', style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 15, + fontSize: HeadText, color: DarkGray, ), ), @@ -57,10 +59,10 @@ class profileformsuccess extends StatelessWidget { child: Text( 'Go to Business', style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, - fontSize: 15, + fontSize: HeadText, color: White), ), shape: RoundedRectangleBorder( diff --git a/openclosenew/lib/19-AddProductFrom.dart b/openclosenew/lib/19-AddProductFrom.dart index f07c0e2..cb7d632 100644 --- a/openclosenew/lib/19-AddProductFrom.dart +++ b/openclosenew/lib/19-AddProductFrom.dart @@ -3,6 +3,9 @@ import 'package:flutter/material.dart'; import 'package:openclosenew/businessdetail.dart'; import 'package:openclosenew/colors.dart'; +import 'FontFamily.dart'; +import 'fontsize.dart'; + class addproductfrom extends StatefulWidget { const addproductfrom({Key? key}) : super(key: key); @@ -49,9 +52,9 @@ class _addproductfromState extends State { Text( 'Add Business Detail', style: TextStyle( - fontSize: 15, + fontSize: HeadText, color: DarkGray, - fontFamily: 'assets/fonts/Manrope-Medium.ttf', + fontFamily: Font, ), ), ], @@ -65,10 +68,10 @@ class _addproductfromState extends State { Text( 'Item Name', style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w300, - fontSize: 15, + fontSize: HeadText, color: DarkGray, ), ), @@ -90,10 +93,10 @@ class _addproductfromState extends State { Text( 'Category', style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w300, - fontSize: 15, + fontSize: HeadText, color: DarkGray, ), ), @@ -138,10 +141,10 @@ class _addproductfromState extends State { child: Text( 'Price', style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w300, - fontSize: 15, + fontSize: HeadText, color: DarkGray, ), ), @@ -176,10 +179,10 @@ class _addproductfromState extends State { child: Text( 'Upload photo', style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w300, - fontSize: 15, + fontSize: HeadText, color: DarkGray, ), ), @@ -203,7 +206,7 @@ class _addproductfromState extends State { "Choose You Image", style: TextStyle( fontSize: 20, - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.bold), ), @@ -220,7 +223,7 @@ class _addproductfromState extends State { 'Camera', style: TextStyle( fontSize: 15, - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w300, color: Color(0xFF333333), @@ -238,7 +241,7 @@ class _addproductfromState extends State { 'Gallery', style: TextStyle( fontSize: 15, - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w300, color: Color(0xFF333333), @@ -285,7 +288,10 @@ class _addproductfromState extends State { }, child: Text( "Cancel", - style: TextStyle(color: Gray), + style: TextStyle( + color: Gray, + fontFamily: Font, + ), ), ), ), @@ -307,7 +313,11 @@ class _addproductfromState extends State { }, child: Text( 'Save', - style: TextStyle(color: White, fontSize: 15), + style: TextStyle( + color: White, + fontSize: HeadText, + fontFamily: Font, + ), ), ), ), diff --git a/openclosenew/lib/FontFamily.dart b/openclosenew/lib/FontFamily.dart new file mode 100644 index 0000000..a2eac2b --- /dev/null +++ b/openclosenew/lib/FontFamily.dart @@ -0,0 +1 @@ +String Font = 'Manrope'; diff --git a/openclosenew/lib/businessaddedsuccess.dart b/openclosenew/lib/businessaddedsuccess.dart index 7509eda..c1ea5e6 100644 --- a/openclosenew/lib/businessaddedsuccess.dart +++ b/openclosenew/lib/businessaddedsuccess.dart @@ -2,6 +2,9 @@ import 'package:flutter/material.dart'; import 'package:openclosenew/businessempty.dart'; import 'package:openclosenew/colors.dart'; +import 'FontFamily.dart'; +import 'fontsize.dart'; + class businessaddedsuccess extends StatelessWidget { const businessaddedsuccess({Key? key}) : super(key: key); @@ -25,7 +28,7 @@ class businessaddedsuccess extends StatelessWidget { Text( "Yay!", style: TextStyle( - fontSize: 24, + fontSize: TitleText, color: primaryColor, ), ), @@ -35,7 +38,8 @@ class businessaddedsuccess extends StatelessWidget { Text( "Your business added successfully", style: TextStyle( - fontSize: 15, + fontFamily: Font, + fontSize: HeadText, color: DarkGray, ), ), @@ -52,7 +56,11 @@ class businessaddedsuccess extends StatelessWidget { }, child: Text( 'Let’s Explore', - style: TextStyle(color: White, fontSize: 15), + style: TextStyle( + color: White, + fontSize: HeadText, + fontFamily: Font, + ), ), ), ], diff --git a/openclosenew/lib/businessdetail.dart b/openclosenew/lib/businessdetail.dart index 96aa4f0..531adb2 100644 --- a/openclosenew/lib/businessdetail.dart +++ b/openclosenew/lib/businessdetail.dart @@ -3,7 +3,9 @@ import 'package:flutter_switch/flutter_switch.dart'; import 'package:openclosenew/14_businessdetailsempty.dart'; import 'package:smooth_page_indicator/smooth_page_indicator.dart'; +import 'FontFamily.dart'; import 'colors.dart'; +import 'fontsize.dart'; class businessdetail extends StatefulWidget { const businessdetail({Key? key}) : super(key: key); @@ -74,7 +76,7 @@ class _businessdetailState extends State { FlutterSwitch( width: 107, height: 50, - valueFontSize: 12, + valueFontSize: SubText, toggleSize: 20, value: status, borderRadius: 30.0, @@ -148,10 +150,10 @@ class _businessdetailState extends State { text: TextSpan( text: "Barbeque Nation ", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, - fontSize: 20, + fontSize: TitleText, color: DarkGray, ), ), @@ -162,10 +164,10 @@ class _businessdetailState extends State { TextSpan( text: "4.2 ", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 15, + fontSize: HeadText, color: Color(0xFFFFBE3F), ), ), @@ -173,7 +175,7 @@ class _businessdetailState extends State { child: Icon( Icons.star, color: Color(0xFFFFBE3F), - size: 15, + size: HeadText, ), ), ], @@ -219,10 +221,10 @@ class _businessdetailState extends State { Text( 'Veg', style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 13, + fontSize: SubText, color: Gray), ), SizedBox( @@ -239,10 +241,10 @@ class _businessdetailState extends State { Text( 'Non-Veg', style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 13, + fontSize: SubText, color: Gray), ), ], @@ -266,10 +268,10 @@ class _businessdetailState extends State { text: " +91 98651 76796, +91 76786 85869", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, - fontSize: 12, + fontSize: SubText, color: Gray, ), ), @@ -295,10 +297,10 @@ class _businessdetailState extends State { text: " 112, Avinashi Road, Peelamedu, Coimbatore...", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, - fontSize: 12, + fontSize: SubText, color: Gray, ), ), @@ -321,10 +323,10 @@ class _businessdetailState extends State { TextSpan( text: " www.bbqnation.com", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, - fontSize: 12, + fontSize: SubText, color: Gray, ), ), @@ -348,10 +350,10 @@ class _businessdetailState extends State { text: " Working Hours: Mon - Fri 9:00am to 9:00pm", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, - fontSize: 12, + fontSize: SubText, color: Gray, ), ), @@ -409,20 +411,20 @@ class _businessdetailState extends State { Text( "WELCOME OFFER !", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w700, - fontSize: 20, + fontSize: TitleText, color: primaryColor, ), ), Text( "Get 50% discount on your first order", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 15, + fontSize: HeadText, color: Gray, ), ), @@ -466,20 +468,20 @@ class _businessdetailState extends State { Text( "WELCOME OFFER !", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w700, - fontSize: 20, + fontSize: TitleText, color: primaryColor, ), ), Text( "Get 50% discount on your first order", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 15, + fontSize: HeadText, color: Gray, ), ), @@ -512,10 +514,10 @@ class _businessdetailState extends State { Text( "Food Items", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, - fontSize: 20, + fontSize: TitleText, color: DarkGray, ), ), @@ -565,20 +567,20 @@ class _businessdetailState extends State { Text( "Chicken Briyani", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, - fontSize: 15, + fontSize: HeadText, color: DarkGray, ), ), Text( "₹ 180.00", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, - fontSize: 15, + fontSize: HeadText, color: DarkGray, ), ), @@ -612,20 +614,20 @@ class _businessdetailState extends State { Text( "Chicken Pepper...", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, - fontSize: 15, + fontSize: HeadText, color: DarkGray, ), ), Text( "₹ 360.00", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, - fontSize: 15, + fontSize: HeadText, color: DarkGray, ), ), @@ -661,20 +663,20 @@ class _businessdetailState extends State { Text( "Malai Kofta", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, - fontSize: 15, + fontSize: HeadText, color: DarkGray, ), ), Text( "₹ 280.00", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, - fontSize: 15, + fontSize: HeadText, color: DarkGray, ), ), @@ -695,10 +697,10 @@ class _businessdetailState extends State { Text( "Photos", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, - fontSize: 20, + fontSize: TitleText, color: DarkGray, ), ), @@ -796,10 +798,10 @@ class _businessdetailState extends State { Text( "Services", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, - fontSize: 20, + fontSize: TitleText, color: DarkGray, ), ), @@ -849,20 +851,20 @@ class _businessdetailState extends State { Text( "Buffet", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, - fontSize: 15, + fontSize: HeadText, color: DarkGray, ), ), Text( "₹ 480.00 - 890.00", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, - fontSize: 12, + fontSize: SubText, color: DarkGray, ), ), @@ -896,20 +898,20 @@ class _businessdetailState extends State { Text( "Bar", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, - fontSize: 15, + fontSize: HeadText, color: DarkGray, ), ), Text( "₹ 200.00 (Starts from)", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, - fontSize: 12, + fontSize: SubText, color: DarkGray, ), ), @@ -945,20 +947,20 @@ class _businessdetailState extends State { Text( "Cafe Club", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, - fontSize: 15, + fontSize: HeadText, color: DarkGray, ), ), Text( "₹ 280.00", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, - fontSize: 12, + fontSize: SubText, color: DarkGray, ), ), @@ -979,10 +981,10 @@ class _businessdetailState extends State { Text( "Offers", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, - fontSize: 20, + fontSize: TitleText, color: DarkGray, ), ), @@ -1033,20 +1035,20 @@ class _businessdetailState extends State { Text( "WELCOME OFFER !", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w700, - fontSize: 20, + fontSize: TitleText, color: primaryColor, ), ), Text( "Get 50% discount on your first order", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 15, + fontSize: HeadText, color: Gray, ), ), @@ -1084,20 +1086,20 @@ class _businessdetailState extends State { Text( "WELCOME OFFER !", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w700, - fontSize: 20, + fontSize: TitleText, color: primaryColor, ), ), Text( "Get 50% discount on your first order", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 15, + fontSize: HeadText, color: Gray, ), ), @@ -1119,10 +1121,10 @@ class _businessdetailState extends State { Text( "Coupons", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, - fontSize: 20, + fontSize: TitleText, color: DarkGray, ), ), @@ -1175,10 +1177,10 @@ class _businessdetailState extends State { Text( "FEST500", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w700, - fontSize: 20, + fontSize: TitleText, color: primaryColor, ), ), @@ -1195,10 +1197,10 @@ class _businessdetailState extends State { Text( "Get 50% discount on festival offer", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 15, + fontSize: HeadText, color: Gray, ), ), @@ -1238,10 +1240,10 @@ class _businessdetailState extends State { Text( "FEST500", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w700, - fontSize: 20, + fontSize: TitleText, color: primaryColor, ), ), @@ -1258,10 +1260,10 @@ class _businessdetailState extends State { Text( "Get 50% discount on festival offer", style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 15, + fontSize: HeadText, color: Gray, ), ), diff --git a/openclosenew/lib/businessempty.dart b/openclosenew/lib/businessempty.dart index 65d14ad..6e70c0d 100644 --- a/openclosenew/lib/businessempty.dart +++ b/openclosenew/lib/businessempty.dart @@ -1,7 +1,9 @@ import 'package:flutter/material.dart'; import 'package:dotted_border/dotted_border.dart'; import 'package:openclosenew/11_busiesshome.dart'; +import 'package:openclosenew/fontsize.dart'; +import 'FontFamily.dart'; import 'colors.dart'; class businessempty extends StatefulWidget { @@ -13,26 +15,6 @@ class businessempty extends StatefulWidget { class _businessemptyState extends State { int _selectedIndex = 0; - static const TextStyle optionStyle = TextStyle( - fontFamily: 'Manrope', - fontSize: 10, - fontWeight: FontWeight.w400, - fontStyle: FontStyle.normal, - ); - static const List _widgetOptions = [ - Text( - 'Index 0: Home', - style: optionStyle, - ), - Text( - 'Index 1: Business', - style: optionStyle, - ), - Text( - 'Index 2: School', - style: optionStyle, - ), - ]; void _onItemTapped(int index) { setState(() { @@ -70,8 +52,8 @@ class _businessemptyState extends State { 'Hi, Sudharsan', style: TextStyle( color: DarkGray, - fontSize: 16, - fontFamily: 'Manrope', + fontSize: HeadText, + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, ), @@ -79,10 +61,10 @@ class _businessemptyState extends State { Text( 'Mon, 02 May 2022', style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, - fontSize: 11, + fontSize: SubText, color: Gray, ), ), @@ -132,10 +114,10 @@ class _businessemptyState extends State { Text( 'Add your Business', style: TextStyle( - fontFamily: 'Manrope', + fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, - fontSize: 14, + fontSize: HeadText, color: primaryColor, ), ) @@ -148,8 +130,8 @@ class _businessemptyState extends State { Spacer(), BottomNavigationBar( iconSize: 20, - unselectedFontSize: 12, - selectedFontSize: 12, + unselectedFontSize: SubText, + selectedFontSize: SubText, type: BottomNavigationBarType.fixed, items: const [ BottomNavigationBarItem( diff --git a/openclosenew/lib/businessstart_page.dart b/openclosenew/lib/businessstart_page.dart index 6071f32..8129f3f 100644 --- a/openclosenew/lib/businessstart_page.dart +++ b/openclosenew/lib/businessstart_page.dart @@ -2,7 +2,9 @@ import 'package:flutter/material.dart'; import 'package:openclosenew/07_addbusiness.dart'; import 'package:openclosenew/colors.dart'; +import 'FontFamily.dart'; import 'businessempty.dart'; +import 'fontsize.dart'; class business extends StatefulWidget { const business({Key? key}) : super(key: key); @@ -24,7 +26,8 @@ class _businessState extends State { Text( 'Let’s add your business...', style: TextStyle( - fontSize: 15, + fontFamily: Font, + fontSize: HeadText, color: DarkGray, ), ), @@ -45,7 +48,11 @@ class _businessState extends State { }, child: Text( 'Skip', - style: TextStyle(color: Gray, fontSize: 15), + style: TextStyle( + color: Gray, + fontSize: HeadText, + fontFamily: Font, + ), ), ), ), @@ -65,7 +72,11 @@ class _businessState extends State { }, child: Text( 'Add Now', - style: TextStyle(color: White, fontSize: 15), + style: TextStyle( + color: White, + fontSize: HeadText, + fontFamily: Font, + ), ), ), ), diff --git a/openclosenew/lib/home_screen.dart b/openclosenew/lib/home_screen.dart index c1dd546..398aa33 100644 --- a/openclosenew/lib/home_screen.dart +++ b/openclosenew/lib/home_screen.dart @@ -2,6 +2,9 @@ import 'package:flutter/material.dart'; import 'package:openclosenew/colors.dart'; import 'package:openclosenew/verification.dart'; +import 'FontFamily.dart'; +import 'fontsize.dart'; + class Register extends StatelessWidget { @override Widget build(BuildContext context) { @@ -24,7 +27,8 @@ class Register extends StatelessWidget { Text( "Welcome!", style: TextStyle( - fontSize: 24, + fontFamily: Font, + fontSize: TitleText, color: primaryColor, ), ), @@ -34,7 +38,8 @@ class Register extends StatelessWidget { Text( "Enter your mobile number to verification ", style: TextStyle( - fontSize: 12, + fontFamily: Font, + fontSize: HeadText, color: DarkGray, ), ), @@ -75,7 +80,11 @@ class Register extends StatelessWidget { }, child: Text( 'Get OTP', - style: TextStyle(color: White, fontSize: 15), + style: TextStyle( + color: White, + fontSize: HeadText, + fontFamily: Font, + ), ), ), ], diff --git a/openclosenew/lib/iintroduction_screen.dart b/openclosenew/lib/iintroduction_screen.dart index ada551f..39156c8 100644 --- a/openclosenew/lib/iintroduction_screen.dart +++ b/openclosenew/lib/iintroduction_screen.dart @@ -2,6 +2,8 @@ import 'package:flutter/material.dart'; import 'package:openclosenew/colors.dart'; import 'package:openclosenew/home_screen.dart'; +import 'FontFamily.dart'; + class PageViewModel { String title; String body; @@ -109,12 +111,16 @@ class _IntroScreenState extends State { }, child: Text( "Skip", - style: TextStyle(color: Gray), + style: TextStyle( + color: Gray, + fontSize: 18, + fontFamily: Font, + ), ), ), ], ), - ) + ), ], ), ); diff --git a/openclosenew/lib/thankyou.dart b/openclosenew/lib/thankyou.dart index f815a66..7a59ba8 100644 --- a/openclosenew/lib/thankyou.dart +++ b/openclosenew/lib/thankyou.dart @@ -1,6 +1,8 @@ import 'package:flutter/material.dart'; import 'package:openclosenew/businessstart_page.dart'; +import 'FontFamily.dart'; import 'colors.dart'; +import 'fontsize.dart'; class thankyou extends StatelessWidget { const thankyou({Key? key}) : super(key: key); @@ -25,7 +27,8 @@ class thankyou extends StatelessWidget { Text( "Thank You!", style: TextStyle( - fontSize: 24, + fontFamily: Font, + fontSize: TitleText, color: primaryColor, ), ), @@ -35,7 +38,8 @@ class thankyou extends StatelessWidget { Text( "Your mobile number verified successfully", style: TextStyle( - fontSize: 15, + fontFamily: Font, + fontSize: HeadText, color: DarkGray, ), ), @@ -52,7 +56,11 @@ class thankyou extends StatelessWidget { }, child: Text( 'Let’s Explore', - style: TextStyle(color: White, fontSize: 15), + style: TextStyle( + color: White, + fontSize: HeadText, + fontFamily: Font, + ), ), ), ], diff --git a/openclosenew/lib/verification.dart b/openclosenew/lib/verification.dart index a5dbde5..d227e6b 100644 --- a/openclosenew/lib/verification.dart +++ b/openclosenew/lib/verification.dart @@ -4,6 +4,8 @@ import 'package:openclosenew/colors.dart'; import 'package:openclosenew/fontsize.dart'; import 'package:openclosenew/thankyou.dart'; +import 'FontFamily.dart'; + class verification extends StatelessWidget { @override Widget build(BuildContext context) { @@ -30,6 +32,7 @@ class verification extends StatelessWidget { Text( 'Verification', style: TextStyle( + fontFamily: Font, fontSize: TitleText, color: primaryColor, ), @@ -38,6 +41,7 @@ class verification extends StatelessWidget { Text( 'Enter Verification code', style: TextStyle( + fontFamily: Font, fontSize: SubText, ), ), @@ -61,6 +65,7 @@ class verification extends StatelessWidget { TextSpan( text: 'Didn’t receive code? ', style: TextStyle( + fontFamily: Font, fontSize: SubText, color: DarkGray, ), @@ -79,7 +84,10 @@ class verification extends StatelessWidget { Spacer(), Text( 'By clicking “Verify” you are accepting our Terms & Conditions', - style: TextStyle(fontSize: SubText), + style: TextStyle( + fontSize: SubText, + fontFamily: Font, + ), ), SizedBox(height: 20), MaterialButton( @@ -94,7 +102,11 @@ class verification extends StatelessWidget { }, child: Text( 'Verify', - style: TextStyle(color: White, fontSize: HeadText), + style: TextStyle( + color: White, + fontSize: HeadText, + fontFamily: Font, + ), ), ), ],