diff --git a/openclosenew/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/openclosenew/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 0246c6f..4f84da2 100644 Binary files a/openclosenew/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/openclosenew/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/openclosenew/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/openclosenew/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 59d7d49..548f268 100644 Binary files a/openclosenew/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/openclosenew/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/openclosenew/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/openclosenew/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index f5f1c5e..ab700a4 100644 Binary files a/openclosenew/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/openclosenew/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/openclosenew/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/openclosenew/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 02a8bf8..723f173 100644 Binary files a/openclosenew/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/openclosenew/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/openclosenew/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/openclosenew/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index d74cf0f..643589d 100644 Binary files a/openclosenew/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/openclosenew/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/openclosenew/lib/07_addbusiness.dart b/openclosenew/lib/07_addbusiness.dart index da4ab97..b5f1b03 100644 --- a/openclosenew/lib/07_addbusiness.dart +++ b/openclosenew/lib/07_addbusiness.dart @@ -1,6 +1,8 @@ import 'package:flutter/material.dart'; import 'package:openclosenew/businessaddedsuccess.dart'; +import 'colors.dart'; + class addbusiness extends StatefulWidget { addbusiness({Key? key}) : super(key: key); @@ -53,6 +55,7 @@ class _addbusinessState extends State { backgroundColor: Colors.white, body: SafeArea( child: SingleChildScrollView( + reverse: true, child: Column( children: [ Padding( @@ -72,7 +75,7 @@ class _addbusinessState extends State { 'Add Business', style: TextStyle( fontSize: 15, - color: Color(0xff3D3D3D), + color: DarkGray, fontFamily: 'assets/fonts/Manrope-Medium.ttf', ), ), @@ -84,6 +87,7 @@ class _addbusinessState extends State { children: [ Image.asset( 'assets/images/gallery-icon.png', + color: primaryColor, ), SizedBox( height: 10, @@ -91,7 +95,7 @@ class _addbusinessState extends State { Text( 'Uploading Logo', style: TextStyle( - color: Colors.grey, + color: Gray, fontSize: 14, fontWeight: FontWeight.w400, fontFamily: 'Manrope'), @@ -119,7 +123,7 @@ class _addbusinessState extends State { style: TextStyle( fontFamily: "Manrope", fontSize: 14, - color: Color(0xff333333), + color: DarkGray, ), ), ), @@ -150,7 +154,7 @@ class _addbusinessState extends State { style: TextStyle( fontFamily: "Manrope", fontSize: 14, - color: Color(0xff333333), + color: DarkGray, ), ), ), @@ -179,7 +183,7 @@ class _addbusinessState extends State { style: TextStyle( fontFamily: "Manrope", fontSize: 14, - color: Color(0xff333333), + color: DarkGray, ), ), ), @@ -208,11 +212,17 @@ class _addbusinessState extends State { SizedBox( width: 28, ), - Text('Industry'), + Text( + 'Industry', + style: TextStyle(color: DarkGray), + ), SizedBox( width: 120, ), - Text('Category'), + Text( + 'Category', + style: TextStyle(color: DarkGray), + ), ], ), ), @@ -296,7 +306,7 @@ class _addbusinessState extends State { style: TextStyle( fontFamily: "Manrope", fontSize: 14, - color: Color(0xff333333), + color: DarkGray, ), ), ), @@ -317,34 +327,34 @@ class _addbusinessState extends State { hintText: 'Type here...', suffixIcon: Icon( Icons.location_on_outlined, - color: Color(0xff09CD99), + color: primaryColor, ), ), ), ), - SizedBox( - height: 33, - ), - MaterialButton( - height: 50, - minWidth: double.infinity, - color: Color(0xff12C193), - onPressed: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (_) => businessaddedsuccess())); - }, - child: Text( - 'Save', - style: TextStyle(color: Colors.white, fontSize: 15), - ), - ), ], ), ], ), ), + SizedBox( + height: 50, + ), + MaterialButton( + height: 50, + minWidth: double.infinity, + color: primaryColor, + onPressed: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (_) => businessaddedsuccess())); + }, + child: Text( + 'Save', + style: TextStyle(color: White, fontSize: 15), + ), + ), ], ), ), diff --git a/openclosenew/lib/11_busiesshome.dart b/openclosenew/lib/11_busiesshome.dart index 290ea6d..5fe3718 100644 --- a/openclosenew/lib/11_busiesshome.dart +++ b/openclosenew/lib/11_busiesshome.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_switch/flutter_switch.dart'; import '07_addbusiness.dart'; import 'businessdetail.dart'; +import 'colors.dart'; class businesshome extends StatefulWidget { const businesshome({Key? key}) : super(key: key); @@ -50,7 +51,7 @@ class _businesshomeState extends State { Text( 'Hi, Sudharsan', style: TextStyle( - color: Colors.black, + color: DarkGray, fontSize: 16, fontFamily: 'Manrope', fontStyle: FontStyle.normal, @@ -64,6 +65,7 @@ class _businesshomeState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, fontSize: 11, + color: Gray, ), ), ], @@ -290,6 +292,7 @@ class _businesshomeState extends State { fontFamily: 'Manrope', fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, + color: DarkGray, ), ), ), @@ -300,7 +303,7 @@ class _businesshomeState extends State { child: TextButton.icon( icon: Icon( Icons.add, - color: Color(0xFF09CD99), + color: primaryColor, ), label: Text( "Add Business", @@ -309,7 +312,7 @@ class _businesshomeState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, fontSize: 15, - color: Color(0xFF09CD99), + color: primaryColor, ), ), onPressed: () { @@ -775,7 +778,7 @@ class _businesshomeState extends State { ), ], currentIndex: _selectedIndex, - selectedItemColor: Color(0xff09CD99), + selectedItemColor: primaryColor, onTap: _onItemTapped, ), ], diff --git a/openclosenew/lib/14_businessdetailsempty.dart b/openclosenew/lib/14_businessdetailsempty.dart index 6853d20..4d6d6c4 100644 --- a/openclosenew/lib/14_businessdetailsempty.dart +++ b/openclosenew/lib/14_businessdetailsempty.dart @@ -2,6 +2,7 @@ import 'package:dotted_border/dotted_border.dart'; import 'package:flutter/material.dart'; import 'package:flutter_switch/flutter_switch.dart'; import 'package:openclosenew/15_addbusinessdetails.dart'; +import 'package:openclosenew/colors.dart'; class businessdetailsempty extends StatefulWidget { const businessdetailsempty({Key? key}) : super(key: key); @@ -140,6 +141,7 @@ class _businessdetailsemptyState extends State { 'assets/images/insert_logo.png', width: 30, height: 30, + color: primaryColor, ), Text( "LOGO", @@ -148,7 +150,7 @@ class _businessdetailsemptyState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, letterSpacing: 0.25, - color: Color(0xFF5C5C5C), + color: Gray, ), ), ], @@ -170,7 +172,7 @@ class _businessdetailsemptyState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, fontSize: 20, - color: Color(0xFF3D3D3D), + color: DarkGray, ), ), ), @@ -247,7 +249,7 @@ class _businessdetailsemptyState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, fontSize: 12, - color: Color(0xFF5C5C5C), + color: Gray, ), ), ], @@ -276,7 +278,7 @@ class _businessdetailsemptyState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, fontSize: 12, - color: Color(0xFF5C5C5C), + color: Gray, ), ), ], @@ -299,7 +301,7 @@ class _businessdetailsemptyState extends State { child: DottedBorder( dashPattern: [5, 5, 5, 5], padding: EdgeInsets.all(15), - color: Color(0xff09CD99), + color: primaryColor, child: Row( children: [ Text( @@ -309,13 +311,13 @@ class _businessdetailsemptyState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, fontSize: 13, - color: Color(0xff09CD99), + color: primaryColor, ), ), Spacer(), Icon( Icons.arrow_forward_ios_rounded, - color: Color(0xFF09CD99), + color: primaryColor, size: 20, ), ], @@ -362,13 +364,13 @@ class _businessdetailsemptyState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, fontSize: 15, - color: Color(0xff09CD99), + color: primaryColor, ), ), Spacer(), Icon( Icons.arrow_forward_ios_rounded, - color: Color(0xFF09CD99), + color: primaryColor, size: 20, ) ], @@ -400,13 +402,13 @@ class _businessdetailsemptyState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, fontSize: 15, - color: Color(0xff09CD99), + color: primaryColor, ), ), Spacer(), Icon( Icons.arrow_forward_ios_rounded, - color: Color(0xFF09CD99), + color: primaryColor, size: 20, ) ], @@ -438,13 +440,13 @@ class _businessdetailsemptyState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, fontSize: 15, - color: Color(0xff09CD99), + color: primaryColor, ), ), Spacer(), Icon( Icons.arrow_forward_ios_rounded, - color: Color(0xFF09CD99), + color: primaryColor, size: 20, ) ], @@ -476,13 +478,13 @@ class _businessdetailsemptyState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, fontSize: 15, - color: Color(0xff09CD99), + color: primaryColor, ), ), Spacer(), Icon( Icons.arrow_forward_ios_rounded, - color: Color(0xFF09CD99), + color: primaryColor, size: 20, ) ], @@ -514,13 +516,13 @@ class _businessdetailsemptyState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, fontSize: 15, - color: Color(0xff09CD99), + color: primaryColor, ), ), Spacer(), Icon( Icons.arrow_forward_ios_rounded, - color: Color(0xFF09CD99), + color: primaryColor, size: 20, ) ], diff --git a/openclosenew/lib/15_addbusinessdetails.dart b/openclosenew/lib/15_addbusinessdetails.dart index a3547e3..25bc66a 100644 --- a/openclosenew/lib/15_addbusinessdetails.dart +++ b/openclosenew/lib/15_addbusinessdetails.dart @@ -1,4 +1,6 @@ import 'package:flutter/material.dart'; +import 'package:openclosenew/businessdetail.dart'; +import 'package:openclosenew/colors.dart'; import '17-BusinessProfileFormSuccess.dart'; @@ -60,7 +62,7 @@ class _addbusinessdetailsState extends State { 'Add Business Detail', style: TextStyle( fontSize: 15, - color: Color(0xff3D3D3D), + color: DarkGray, fontFamily: 'assets/fonts/Manrope-Medium.ttf', ), ), @@ -75,11 +77,12 @@ class _addbusinessdetailsState extends State { Text( "Website", style: TextStyle( - fontFamily: "Manrope", - fontStyle: FontStyle.normal, - fontWeight: FontWeight.w300, - fontSize: 15, - color: Color(0xFF333333)), + fontFamily: "Manrope", + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w300, + fontSize: 15, + color: DarkGray, + ), ), SizedBox( height: 10, @@ -100,7 +103,7 @@ class _addbusinessdetailsState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w300, fontSize: 15, - color: Color(0xFF333333), + color: DarkGray, ), ), SizedBox( @@ -137,6 +140,7 @@ class _addbusinessdetailsState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w300, fontSize: 15, + color: DarkGray, ), ), SizedBox( @@ -149,6 +153,7 @@ class _addbusinessdetailsState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w300, fontSize: 15, + color: DarkGray, ), ), ], @@ -186,7 +191,7 @@ class _addbusinessdetailsState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, fontSize: 15, - color: Color(0xFF3D3D3D), + color: DarkGray, ), ), Spacer(), @@ -222,7 +227,7 @@ class _addbusinessdetailsState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, fontSize: 15, - color: Color(0xFF3D3D3D), + color: DarkGray, ), ), Spacer(), @@ -239,30 +244,31 @@ class _addbusinessdetailsState extends State { Spacer(), Row( children: [ - Padding( - padding: - const EdgeInsets.only(left: 55, right: 20, bottom: 24), - child: TextButton( - onPressed: () { - Navigator.pop(context); - }, - child: Text( - "Cancel", - style: TextStyle(color: Colors.grey.shade600), - ), - ), - ), - SizedBox( - width: 50, - ), Expanded( child: Padding( - padding: - const EdgeInsets.only(left: 0, right: 24, bottom: 24), + padding: const EdgeInsets.only(left: 24, bottom: 24), child: MaterialButton( height: 50, minWidth: double.infinity, - color: Color(0xff12C193), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(4)), + onPressed: () { + Navigator.pop(context); + }, + child: Text( + "Cancel", + style: TextStyle(color: Gray), + ), + ), + ), + ), + Expanded( + child: Padding( + padding: const EdgeInsets.only(right: 24, bottom: 24), + child: MaterialButton( + height: 50, + minWidth: double.infinity, + color: primaryColor, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(4)), onPressed: () { @@ -273,7 +279,7 @@ class _addbusinessdetailsState extends State { }, child: Text( 'Save', - style: TextStyle(color: Colors.white, fontSize: 15), + style: TextStyle(color: White, fontSize: 15), ), ), ), diff --git a/openclosenew/lib/17-BusinessProfileFormSuccess.dart b/openclosenew/lib/17-BusinessProfileFormSuccess.dart index 7d2987a..3092d51 100644 --- a/openclosenew/lib/17-BusinessProfileFormSuccess.dart +++ b/openclosenew/lib/17-BusinessProfileFormSuccess.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '15_addbusinessdetails.dart'; +import 'package:openclosenew/colors.dart'; import '19-AddProductFrom.dart'; class profileformsuccess extends StatelessWidget { @@ -14,8 +14,12 @@ class profileformsuccess extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ Spacer(), - Image.asset('assets/images/success_vector.png', - width: 100, height: 100), + Image.asset( + 'assets/images/success_vector.png', + color: primaryColor, + width: 100, + height: 100, + ), Align( alignment: Alignment.center, child: Text( @@ -25,7 +29,7 @@ class profileformsuccess extends StatelessWidget { fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, fontSize: 25, - color: Color(0xFF09CD99), + color: primaryColor, ), ), ), @@ -36,7 +40,7 @@ class profileformsuccess extends StatelessWidget { fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, fontSize: 15, - color: Color(0xFF333333), + color: DarkGray, ), ), Spacer(), @@ -45,7 +49,7 @@ class profileformsuccess extends StatelessWidget { child: MaterialButton( height: 50, minWidth: double.infinity, - color: Color(0xFF09CD99), + color: primaryColor, onPressed: () { Navigator.push(context, MaterialPageRoute(builder: (_) => addproductfrom())); @@ -57,7 +61,7 @@ class profileformsuccess extends StatelessWidget { fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, fontSize: 15, - color: Colors.white), + color: White), ), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(5), diff --git a/openclosenew/lib/19-AddProductFrom.dart b/openclosenew/lib/19-AddProductFrom.dart index c06b3fb..f07c0e2 100644 --- a/openclosenew/lib/19-AddProductFrom.dart +++ b/openclosenew/lib/19-AddProductFrom.dart @@ -1,5 +1,7 @@ import 'package:dotted_border/dotted_border.dart'; import 'package:flutter/material.dart'; +import 'package:openclosenew/businessdetail.dart'; +import 'package:openclosenew/colors.dart'; class addproductfrom extends StatefulWidget { const addproductfrom({Key? key}) : super(key: key); @@ -27,248 +29,292 @@ class _addproductfromState extends State { Widget build(BuildContext context) { loadData(); return Scaffold( - body: SingleChildScrollView( - child: SafeArea( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.only(left: 10), - child: Row( - children: [ - IconButton( - icon: Icon(Icons.arrow_back, size: 24), + body: SafeArea( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: const EdgeInsets.only(left: 10), + child: Row( + children: [ + IconButton( + icon: Icon(Icons.arrow_back, size: 24), + onPressed: () { + Navigator.pop(context); + }, + ), + SizedBox( + width: 20, + ), + Text( + 'Add Business Detail', + style: TextStyle( + fontSize: 15, + color: DarkGray, + fontFamily: 'assets/fonts/Manrope-Medium.ttf', + ), + ), + ], + ), + ), + Padding( + padding: const EdgeInsets.only(left: 25, top: 20, right: 20), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + 'Item Name', + style: TextStyle( + fontFamily: 'Manrope', + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w300, + fontSize: 15, + color: DarkGray, + ), + ), + SizedBox( + height: 20, + ), + TextField( + decoration: InputDecoration( + contentPadding: + EdgeInsets.only(left: 10, top: 10, bottom: 10), + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(5)), + hintText: 'Type here...', + ), + ), + SizedBox( + height: 20, + ), + Text( + 'Category', + style: TextStyle( + fontFamily: 'Manrope', + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w300, + fontSize: 15, + color: DarkGray, + ), + ), + ], + ), + ), + SizedBox( + height: 20, + ), + Padding( + padding: const EdgeInsets.only(left: 25, right: 20), + child: Expanded( + child: InputDecorator( + decoration: InputDecoration( + contentPadding: + EdgeInsets.only(left: 10, top: 1, bottom: 1, right: 5), + border: OutlineInputBorder( + borderRadius: BorderRadius.all(Radius.circular(5)), + ), + ), + child: DropdownButtonHideUnderline( + child: new DropdownButton( + borderRadius: BorderRadius.circular(5), + value: selected, + items: listDrop, + icon: Icon(Icons.keyboard_arrow_down, size: 24), + hint: new Text('Choose...'), + onChanged: (value) { + selected = value as String?; + setState(() {}); + }, + ), + ), + ), + ), + ), + SizedBox( + height: 20, + ), + Padding( + padding: const EdgeInsets.only(left: 25), + child: Text( + 'Price', + style: TextStyle( + fontFamily: 'Manrope', + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w300, + fontSize: 15, + color: DarkGray, + ), + ), + ), + SizedBox( + height: 20, + ), + Padding( + padding: const EdgeInsets.only(left: 25, right: 20), + child: TextField( + keyboardType: TextInputType.number, + decoration: InputDecoration( + prefixIcon: Image.asset( + 'assets/images/dollor.png', + width: 10, + height: 10, + ), + contentPadding: + EdgeInsets.only(left: 10, top: 10, bottom: 10), + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(5), + ), + hintText: '00.00', + ), + ), + ), + SizedBox( + height: 20, + ), + Padding( + padding: const EdgeInsets.only(left: 25), + child: Text( + 'Upload photo', + style: TextStyle( + fontFamily: 'Manrope', + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w300, + fontSize: 15, + color: DarkGray, + ), + ), + ), + InkWell( + onTap: () { + showModalBottomSheet( + context: context, + builder: (BuildContext context) { + return Container( + height: 200, + color: Colors.white, + child: Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + SizedBox( + height: 20, + ), + Text( + "Choose You Image", + style: TextStyle( + fontSize: 20, + fontFamily: 'Manrope', + fontStyle: FontStyle.normal, + fontWeight: FontWeight.bold), + ), + SizedBox(height: 30), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + IconButton( + onPressed: () {}, + icon: Icon(Icons.camera), + iconSize: 30, + ), + Text( + 'Camera', + style: TextStyle( + fontSize: 15, + fontFamily: 'Manrope', + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w300, + color: Color(0xFF333333), + ), + ), + SizedBox( + width: 50, + ), + IconButton( + onPressed: () {}, + icon: Icon(Icons.image_rounded), + iconSize: 30, + ), + Text( + 'Gallery', + style: TextStyle( + fontSize: 15, + fontFamily: 'Manrope', + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w300, + color: Color(0xFF333333), + ), + ), + ], + ) + ], + ), + ), + ); + }, + ); + }, + child: Padding( + padding: const EdgeInsets.only(left: 25, top: 5), + child: DottedBorder( + padding: EdgeInsets.all(45), + dashPattern: [4, 4, 4, 4], + radius: Radius.circular(10), + color: primaryColor, + child: Image.asset( + 'assets/images/insert_logo.png', + width: 30, + height: 30, + color: primaryColor, + ), + ), + ), + ), + Spacer(), + Row( + children: [ + Expanded( + child: Padding( + padding: const EdgeInsets.only(left: 24, bottom: 24), + child: MaterialButton( + height: 50, + minWidth: double.infinity, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(4)), onPressed: () { Navigator.pop(context); }, - ), - SizedBox( - width: 20, - ), - Text( - 'Add Business Detail', - style: TextStyle( - fontSize: 15, - color: Color(0xff3D3D3D), - fontFamily: 'assets/fonts/Manrope-Medium.ttf', - ), - ), - ], - ), - ), - Padding( - padding: const EdgeInsets.only(left: 25, top: 20, right: 20), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'Item Name', - style: TextStyle( - fontFamily: 'Manrope', - fontStyle: FontStyle.normal, - fontWeight: FontWeight.w300, - fontSize: 15, - color: Color(0xff333333), - ), - ), - SizedBox( - height: 20, - ), - TextField( - decoration: InputDecoration( - contentPadding: - EdgeInsets.only(left: 10, top: 10, bottom: 10), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(5)), - hintText: 'Type here...', - ), - ), - SizedBox( - height: 20, - ), - Text( - 'Category', - style: TextStyle( - fontFamily: 'Manrope', - fontStyle: FontStyle.normal, - fontWeight: FontWeight.w300, - fontSize: 15, - color: Color(0xff333333), - ), - ), - ], - ), - ), - SizedBox( - height: 20, - ), - Padding( - padding: const EdgeInsets.only(left: 25, right: 20), - child: Expanded( - child: InputDecorator( - decoration: InputDecoration( - contentPadding: EdgeInsets.only( - left: 10, top: 1, bottom: 1, right: 5), - border: OutlineInputBorder( - borderRadius: BorderRadius.all(Radius.circular(5)), - ), - ), - child: DropdownButtonHideUnderline( - child: new DropdownButton( - borderRadius: BorderRadius.circular(5), - value: selected, - items: listDrop, - icon: Icon(Icons.keyboard_arrow_down, size: 24), - hint: new Text('Choose...'), - onChanged: (value) { - selected = value as String?; - setState(() {}); - }, + child: Text( + "Cancel", + style: TextStyle(color: Gray), ), ), ), ), - ), - SizedBox( - height: 20, - ), - Padding( - padding: const EdgeInsets.only(left: 25), - child: Text( - 'Price', - style: TextStyle( - fontFamily: 'Manrope', - fontStyle: FontStyle.normal, - fontWeight: FontWeight.w300, - fontSize: 15, - color: Color(0xff333333), - ), - ), - ), - SizedBox( - height: 20, - ), - Padding( - padding: const EdgeInsets.only(left: 25, right: 20), - child: TextField( - keyboardType: TextInputType.number, - decoration: InputDecoration( - prefixIcon: Image.asset( - 'assets/images/dollor.png', - width: 10, - height: 10, - ), - contentPadding: - EdgeInsets.only(left: 10, top: 10, bottom: 10), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(5), - ), - hintText: '00.00', - ), - ), - ), - SizedBox( - height: 20, - ), - Padding( - padding: const EdgeInsets.only(left: 25), - child: Text( - 'Upload photo', - style: TextStyle( - fontFamily: 'Manrope', - fontStyle: FontStyle.normal, - fontWeight: FontWeight.w300, - fontSize: 15, - color: Color(0xff333333), - ), - ), - ), - InkWell( - onTap: () { - showModalBottomSheet( - context: context, - builder: (BuildContext context) { - return Container( - height: 200, - color: Colors.white, - child: Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - children: [ - SizedBox( - height: 20, - ), - Text( - "Choose You Image", - style: TextStyle( - fontSize: 20, - fontFamily: 'Manrope', - fontStyle: FontStyle.normal, - fontWeight: FontWeight.bold), - ), - SizedBox(height: 30), - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - IconButton( - onPressed: () {}, - icon: Icon(Icons.camera), - iconSize: 30, - ), - Text( - 'Camera', - style: TextStyle( - fontSize: 15, - fontFamily: 'Manrope', - fontStyle: FontStyle.normal, - fontWeight: FontWeight.w300, - color: Color(0xFF333333), - ), - ), - SizedBox( - width: 50, - ), - IconButton( - onPressed: () {}, - icon: Icon(Icons.image_rounded), - iconSize: 30, - ), - Text( - 'Gallery', - style: TextStyle( - fontSize: 15, - fontFamily: 'Manrope', - fontStyle: FontStyle.normal, - fontWeight: FontWeight.w300, - color: Color(0xFF333333), - ), - ), - ], - ) - ], - ), - ), - ); - }, - ); - }, - child: Padding( - padding: const EdgeInsets.only(left: 25, top: 5), - child: DottedBorder( - padding: EdgeInsets.all(45), - dashPattern: [4, 4, 4, 4], - radius: Radius.circular(10), - color: Color(0xFF09CD99), - child: Image.asset( - 'assets/images/insert_logo.png', - width: 30, - height: 30, + Expanded( + child: Padding( + padding: const EdgeInsets.only(right: 24, bottom: 24), + child: MaterialButton( + height: 50, + minWidth: double.infinity, + color: primaryColor, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(4)), + onPressed: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (_) => businessdetail())); + }, + child: Text( + 'Save', + style: TextStyle(color: White, fontSize: 15), + ), ), ), ), - ), - ], - ), + ], + ), + ], ), ), ); diff --git a/openclosenew/lib/businessaddedsuccess.dart b/openclosenew/lib/businessaddedsuccess.dart index 54dfaf6..7509eda 100644 --- a/openclosenew/lib/businessaddedsuccess.dart +++ b/openclosenew/lib/businessaddedsuccess.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:openclosenew/businessempty.dart'; +import 'package:openclosenew/colors.dart'; class businessaddedsuccess extends StatelessWidget { const businessaddedsuccess({Key? key}) : super(key: key); @@ -25,7 +26,7 @@ class businessaddedsuccess extends StatelessWidget { "Yay!", style: TextStyle( fontSize: 24, - color: Color(0xff12C193), + color: primaryColor, ), ), SizedBox( @@ -35,14 +36,14 @@ class businessaddedsuccess extends StatelessWidget { "Your business added successfully", style: TextStyle( fontSize: 15, - color: Colors.black, + color: DarkGray, ), ), Spacer(), MaterialButton( height: 50, minWidth: double.infinity, - color: Color(0xff12C193), + color: primaryColor, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(4)), onPressed: () { @@ -51,7 +52,7 @@ class businessaddedsuccess extends StatelessWidget { }, child: Text( 'Let’s Explore', - style: TextStyle(color: Colors.white, fontSize: 15), + style: TextStyle(color: White, fontSize: 15), ), ), ], diff --git a/openclosenew/lib/businessdetail.dart b/openclosenew/lib/businessdetail.dart index 6699d0c..96aa4f0 100644 --- a/openclosenew/lib/businessdetail.dart +++ b/openclosenew/lib/businessdetail.dart @@ -3,6 +3,8 @@ import 'package:flutter_switch/flutter_switch.dart'; import 'package:openclosenew/14_businessdetailsempty.dart'; import 'package:smooth_page_indicator/smooth_page_indicator.dart'; +import 'colors.dart'; + class businessdetail extends StatefulWidget { const businessdetail({Key? key}) : super(key: key); @@ -44,7 +46,7 @@ class _businessdetailState extends State { Container( height: 250, decoration: BoxDecoration( - color: Colors.grey.withOpacity(0.5), + color: Colors.grey.withOpacity(0.6), borderRadius: BorderRadius.only( bottomLeft: Radius.circular(20), bottomRight: Radius.circular(20), @@ -60,7 +62,7 @@ class _businessdetailState extends State { child: Icon( Icons.arrow_back, size: 24, - color: Color(0xFF3D3D3D), + color: DarkGray, ), mini: true, backgroundColor: Colors.white, @@ -113,8 +115,8 @@ class _businessdetailState extends State { boxShadow: [ BoxShadow( color: Colors.grey.shade500, - offset: Offset(4.0, 4.0), - blurRadius: 10.0, + offset: Offset(4.0, 5.0), + blurRadius: 5.0, spreadRadius: 1.0, ), ], @@ -150,7 +152,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, fontSize: 20, - color: Colors.black, + color: DarkGray, ), ), ), @@ -184,7 +186,7 @@ class _businessdetailState extends State { IconButton( icon: Image.asset( 'assets/images/edit_pen.png', - color: Colors.black, + color: DarkGray, ), onPressed: () { Navigator.push( @@ -221,7 +223,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, fontSize: 13, - color: Colors.black), + color: Gray), ), SizedBox( width: 10, @@ -241,7 +243,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, fontSize: 13, - color: Colors.black), + color: Gray), ), ], ), @@ -268,7 +270,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, fontSize: 12, - color: Color(0xFF5C5C5C), + color: Gray, ), ), ], @@ -297,7 +299,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, fontSize: 12, - color: Color(0xFF5C5C5C), + color: Gray, ), ), ], @@ -323,7 +325,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, fontSize: 12, - color: Color(0xFF5C5C5C), + color: Gray, ), ), ], @@ -350,7 +352,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, fontSize: 12, - color: Color(0xFF5C5C5C), + color: Gray, ), ), ], @@ -411,7 +413,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w700, fontSize: 20, - color: Color(0xFF09CD99), + color: primaryColor, ), ), Text( @@ -421,7 +423,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, fontSize: 15, - color: Color(0xFF5C5C5C), + color: Gray, ), ), ], @@ -468,7 +470,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w700, fontSize: 20, - color: Color(0xFF09CD99), + color: primaryColor, ), ), Text( @@ -478,7 +480,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, fontSize: 15, - color: Color(0xFF5C5C5C), + color: Gray, ), ), ], @@ -514,7 +516,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, fontSize: 20, - color: Color(0xFF3D3D3D), + color: DarkGray, ), ), Spacer(), @@ -567,7 +569,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, fontSize: 15, - color: Color(0xFF3D3D3D), + color: DarkGray, ), ), Text( @@ -577,7 +579,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, fontSize: 15, - color: Color(0xFF3D3D3D), + color: DarkGray, ), ), ], @@ -614,7 +616,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, fontSize: 15, - color: Color(0xFF3D3D3D), + color: DarkGray, ), ), Text( @@ -624,7 +626,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, fontSize: 15, - color: Color(0xFF3D3D3D), + color: DarkGray, ), ), ], @@ -663,7 +665,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, fontSize: 15, - color: Color(0xFF3D3D3D), + color: DarkGray, ), ), Text( @@ -673,7 +675,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, fontSize: 15, - color: Color(0xFF3D3D3D), + color: DarkGray, ), ), ], @@ -697,7 +699,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, fontSize: 20, - color: Color(0xFF3D3D3D), + color: DarkGray, ), ), Spacer(), @@ -798,7 +800,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, fontSize: 20, - color: Color(0xFF3D3D3D), + color: DarkGray, ), ), Spacer(), @@ -851,7 +853,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, fontSize: 15, - color: Color(0xFF3D3D3D), + color: DarkGray, ), ), Text( @@ -861,7 +863,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, fontSize: 12, - color: Color(0xFF3D3D3D), + color: DarkGray, ), ), ], @@ -898,7 +900,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, fontSize: 15, - color: Color(0xFF3D3D3D), + color: DarkGray, ), ), Text( @@ -908,7 +910,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, fontSize: 12, - color: Color(0xFF3D3D3D), + color: DarkGray, ), ), ], @@ -947,7 +949,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, fontSize: 15, - color: Color(0xFF3D3D3D), + color: DarkGray, ), ), Text( @@ -957,7 +959,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, fontSize: 12, - color: Color(0xFF3D3D3D), + color: DarkGray, ), ), ], @@ -981,7 +983,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, fontSize: 20, - color: Color(0xFF3D3D3D), + color: DarkGray, ), ), Spacer(), @@ -1035,7 +1037,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w700, fontSize: 20, - color: Color(0xFF09CD99), + color: primaryColor, ), ), Text( @@ -1045,7 +1047,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, fontSize: 15, - color: Color(0xFF5C5C5C), + color: Gray, ), ), ], @@ -1086,7 +1088,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w700, fontSize: 20, - color: Color(0xFF09CD99), + color: primaryColor, ), ), Text( @@ -1096,7 +1098,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, fontSize: 15, - color: Color(0xFF5C5C5C), + color: Gray, ), ), ], @@ -1121,7 +1123,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, fontSize: 20, - color: Color(0xFF3D3D3D), + color: DarkGray, ), ), Spacer(), @@ -1177,7 +1179,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w700, fontSize: 20, - color: Color(0xFF09CD99), + color: primaryColor, ), ), Padding( @@ -1197,7 +1199,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, fontSize: 15, - color: Color(0xFF5C5C5C), + color: Gray, ), ), ], @@ -1240,7 +1242,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w700, fontSize: 20, - color: Color(0xFF09CD99), + color: primaryColor, ), ), Padding( @@ -1260,7 +1262,7 @@ class _businessdetailState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, fontSize: 15, - color: Color(0xFF5C5C5C), + color: Gray, ), ), ], diff --git a/openclosenew/lib/businessempty.dart b/openclosenew/lib/businessempty.dart index 7b323be..65d14ad 100644 --- a/openclosenew/lib/businessempty.dart +++ b/openclosenew/lib/businessempty.dart @@ -2,6 +2,8 @@ import 'package:flutter/material.dart'; import 'package:dotted_border/dotted_border.dart'; import 'package:openclosenew/11_busiesshome.dart'; +import 'colors.dart'; + class businessempty extends StatefulWidget { const businessempty({Key? key}) : super(key: key); @@ -55,7 +57,7 @@ class _businessemptyState extends State { margin: EdgeInsets.all(20), decoration: BoxDecoration( borderRadius: BorderRadius.circular(50), - color: Colors.grey, + color: Gray, ), ), Column( @@ -67,7 +69,7 @@ class _businessemptyState extends State { Text( 'Hi, Sudharsan', style: TextStyle( - color: Colors.black, + color: DarkGray, fontSize: 16, fontFamily: 'Manrope', fontStyle: FontStyle.normal, @@ -81,6 +83,7 @@ class _businessemptyState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w500, fontSize: 11, + color: Gray, ), ), ], @@ -105,7 +108,7 @@ class _businessemptyState extends State { children: [ DottedBorder( dashPattern: [5, 5, 5, 5], - color: Color(0xff09CD99), + color: primaryColor, padding: EdgeInsets.all(5), radius: Radius.circular(6), child: Container( @@ -115,7 +118,10 @@ class _businessemptyState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ IconButton( - icon: Image.asset('assets/images/shop.png'), + icon: Image.asset( + 'assets/images/shop.png', + color: primaryColor, + ), onPressed: () { Navigator.push( context, @@ -130,7 +136,7 @@ class _businessemptyState extends State { fontStyle: FontStyle.normal, fontWeight: FontWeight.w400, fontSize: 14, - color: Color(0xff09CD99), + color: primaryColor, ), ) ], @@ -178,7 +184,7 @@ class _businessemptyState extends State { ), ], currentIndex: _selectedIndex, - selectedItemColor: Color(0xff09CD99), + selectedItemColor: primaryColor, onTap: _onItemTapped, ), ], diff --git a/openclosenew/lib/businessstart_page.dart b/openclosenew/lib/businessstart_page.dart index 59e5979..6071f32 100644 --- a/openclosenew/lib/businessstart_page.dart +++ b/openclosenew/lib/businessstart_page.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:openclosenew/07_addbusiness.dart'; +import 'package:openclosenew/colors.dart'; import 'businessempty.dart'; @@ -24,7 +25,7 @@ class _businessState extends State { 'Let’s add your business...', style: TextStyle( fontSize: 15, - color: Colors.black, + color: DarkGray, ), ), Spacer(), @@ -44,8 +45,7 @@ class _businessState extends State { }, child: Text( 'Skip', - style: - TextStyle(color: Colors.grey.shade600, fontSize: 15), + style: TextStyle(color: Gray, fontSize: 15), ), ), ), @@ -56,7 +56,7 @@ class _businessState extends State { child: MaterialButton( height: 50, minWidth: double.infinity, - color: Color(0xff12C193), + color: primaryColor, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(4)), onPressed: () { @@ -65,7 +65,7 @@ class _businessState extends State { }, child: Text( 'Add Now', - style: TextStyle(color: Colors.white, fontSize: 15), + style: TextStyle(color: White, fontSize: 15), ), ), ), diff --git a/openclosenew/lib/colors.dart b/openclosenew/lib/colors.dart new file mode 100644 index 0000000..17af353 --- /dev/null +++ b/openclosenew/lib/colors.dart @@ -0,0 +1,6 @@ +import 'package:flutter/material.dart'; + +const Color primaryColor = Color(0xFF09CD99); +const Color DarkGray = Color(0xFF333333); +const Color Gray = Color(0xFF5C5C5C); +const Color White = Color(0xFFFFFFFF); diff --git a/openclosenew/lib/fontsize.dart b/openclosenew/lib/fontsize.dart new file mode 100644 index 0000000..d91b9d4 --- /dev/null +++ b/openclosenew/lib/fontsize.dart @@ -0,0 +1,3 @@ +double TitleText = 24; +double HeadText = 15; +double SubText = 12; diff --git a/openclosenew/lib/home_screen.dart b/openclosenew/lib/home_screen.dart index e4a3d33..c1dd546 100644 --- a/openclosenew/lib/home_screen.dart +++ b/openclosenew/lib/home_screen.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:openclosenew/colors.dart'; import 'package:openclosenew/verification.dart'; class Register extends StatelessWidget { @@ -24,7 +25,7 @@ class Register extends StatelessWidget { "Welcome!", style: TextStyle( fontSize: 24, - color: Color(0xff12C193), + color: primaryColor, ), ), SizedBox( @@ -34,7 +35,7 @@ class Register extends StatelessWidget { "Enter your mobile number to verification ", style: TextStyle( fontSize: 12, - color: Colors.black, + color: DarkGray, ), ), SizedBox( @@ -65,7 +66,7 @@ class Register extends StatelessWidget { MaterialButton( height: 50, minWidth: double.infinity, - color: Color(0xff12C193), + color: primaryColor, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(4)), onPressed: () { @@ -74,7 +75,7 @@ class Register extends StatelessWidget { }, child: Text( 'Get OTP', - style: TextStyle(color: Colors.white, fontSize: 15), + style: TextStyle(color: White, fontSize: 15), ), ), ], diff --git a/openclosenew/lib/iintroduction_screen.dart b/openclosenew/lib/iintroduction_screen.dart index d2b75ae..ada551f 100644 --- a/openclosenew/lib/iintroduction_screen.dart +++ b/openclosenew/lib/iintroduction_screen.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:openclosenew/colors.dart'; import 'package:openclosenew/home_screen.dart'; class PageViewModel { @@ -82,7 +83,7 @@ class _IntroScreenState extends State { margin: EdgeInsets.only(right: 8), decoration: BoxDecoration( color: (pageIndex == i) - ? Colors.green + ? primaryColor : Colors.green.shade100, borderRadius: BorderRadius.circular(8)), ), @@ -96,10 +97,10 @@ class _IntroScreenState extends State { MaterialPageRoute(builder: (_) => Register())); }, elevation: 0, - backgroundColor: Colors.green, + backgroundColor: primaryColor, child: Icon( Icons.arrow_forward_rounded, - color: Colors.white, + color: White, ), ) : TextButton( @@ -108,7 +109,7 @@ class _IntroScreenState extends State { }, child: Text( "Skip", - style: TextStyle(color: Colors.grey.shade600), + style: TextStyle(color: Gray), ), ), ], diff --git a/openclosenew/lib/main.dart b/openclosenew/lib/main.dart index e09dc4a..6e0eb5d 100644 --- a/openclosenew/lib/main.dart +++ b/openclosenew/lib/main.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:openclosenew/iintroduction_screen.dart'; +import 'colors.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); @@ -12,7 +13,7 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { return MaterialApp( - color: Colors.white, + color: White, debugShowCheckedModeBanner: false, theme: ThemeData(fontFamily: 'Manrope'), home: const Splash(), diff --git a/openclosenew/lib/thankyou.dart b/openclosenew/lib/thankyou.dart index 1d7a326..f815a66 100644 --- a/openclosenew/lib/thankyou.dart +++ b/openclosenew/lib/thankyou.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:openclosenew/businessstart_page.dart'; +import 'colors.dart'; class thankyou extends StatelessWidget { const thankyou({Key? key}) : super(key: key); @@ -25,7 +26,7 @@ class thankyou extends StatelessWidget { "Thank You!", style: TextStyle( fontSize: 24, - color: Color(0xff12C193), + color: primaryColor, ), ), SizedBox( @@ -35,14 +36,14 @@ class thankyou extends StatelessWidget { "Your mobile number verified successfully", style: TextStyle( fontSize: 15, - color: Colors.black, + color: DarkGray, ), ), Spacer(), MaterialButton( height: 50, minWidth: double.infinity, - color: Color(0xff12C193), + color: primaryColor, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(4)), onPressed: () { @@ -51,7 +52,7 @@ class thankyou extends StatelessWidget { }, child: Text( 'Let’s Explore', - style: TextStyle(color: Colors.white, fontSize: 15), + style: TextStyle(color: White, fontSize: 15), ), ), ], diff --git a/openclosenew/lib/verification.dart b/openclosenew/lib/verification.dart index 25eb7b4..a5dbde5 100644 --- a/openclosenew/lib/verification.dart +++ b/openclosenew/lib/verification.dart @@ -1,5 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_otp_text_field/flutter_otp_text_field.dart'; +import 'package:openclosenew/colors.dart'; +import 'package:openclosenew/fontsize.dart'; import 'package:openclosenew/thankyou.dart'; class verification extends StatelessWidget { @@ -28,15 +30,15 @@ class verification extends StatelessWidget { Text( 'Verification', style: TextStyle( - fontSize: 24, - color: Color(0xff12C193), + fontSize: TitleText, + color: primaryColor, ), ), Spacer(), Text( 'Enter Verification code', style: TextStyle( - fontSize: 12, + fontSize: SubText, ), ), Row( @@ -45,7 +47,7 @@ class verification extends StatelessWidget { padding: const EdgeInsets.only(top: 15), child: OtpTextField( numberOfFields: 5, - borderColor: Colors.black, + borderColor: DarkGray, ), ), ], @@ -59,13 +61,14 @@ class verification extends StatelessWidget { TextSpan( text: 'Didn’t receive code? ', style: TextStyle( - color: Color(0xff333333), + fontSize: SubText, + color: DarkGray, ), ), TextSpan( text: ' Resend OTP ', style: TextStyle( - color: Color(0xff12C193), + color: primaryColor, decoration: TextDecoration.underline, ), ), @@ -75,12 +78,14 @@ class verification extends StatelessWidget { ), Spacer(), Text( - 'By clicking “Verify” you are accepting our Terms & Conditions'), - Spacer(), + 'By clicking “Verify” you are accepting our Terms & Conditions', + style: TextStyle(fontSize: SubText), + ), + SizedBox(height: 20), MaterialButton( height: 50, minWidth: double.infinity, - color: Color(0xff12C193), + color: primaryColor, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(4)), onPressed: () { @@ -89,7 +94,7 @@ class verification extends StatelessWidget { }, child: Text( 'Verify', - style: TextStyle(color: Colors.white, fontSize: 15), + style: TextStyle(color: White, fontSize: HeadText), ), ), ],