diff --git a/openclosenew/lib/07_addbusiness.dart b/openclosenew/lib/07_addbusiness.dart index 6583a76..0431ed9 100644 --- a/openclosenew/lib/07_addbusiness.dart +++ b/openclosenew/lib/07_addbusiness.dart @@ -50,289 +50,303 @@ class _addbusinessState extends State { loadData(); loadData1(); return Scaffold( - resizeToAvoidBottomInset: false, backgroundColor: Colors.white, body: SafeArea( - child: Column( - children: [ - Padding( - padding: const EdgeInsets.only(left: 15, right: 24), - child: Row( - children: [ - IconButton( - icon: Icon(Icons.arrow_back, size: 24), - onPressed: () { - Navigator.pop(context); - }, - ), - SizedBox( - width: 20, - ), - Text( - 'Add Business', - style: TextStyle( - fontSize: 15, - color: Color(0xff3D3D3D), - fontFamily: 'assets/fonts/Manrope-Medium.ttf', + child: SingleChildScrollView( + child: Column( + children: [ + Padding( + padding: const EdgeInsets.only(left: 15, right: 24), + child: Row( + children: [ + IconButton( + icon: Icon(Icons.arrow_back, size: 24), + onPressed: () { + Navigator.pop(context); + }, ), - ), - ], - ), - ), - Container( - child: Column( - children: [ - Image.asset( - 'assets/images/gallery-icon.png', - ), - SizedBox( - height: 10, - ), - Text( - 'Uploading Logo', - style: TextStyle( - color: Colors.grey, - fontSize: 14, - fontWeight: FontWeight.w400, - fontFamily: 'Manrope'), - ), - ], - ), - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.white, - ), - margin: EdgeInsets.all(15), - padding: EdgeInsets.all(30), - ), - Container( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.only( - left: 24, - right: 24, + SizedBox( + width: 20, ), - child: Text( - 'Business Name', + Text( + 'Add Business', style: TextStyle( - fontFamily: "Manrope", - fontSize: 14, - color: Color(0xff333333), + fontSize: 15, + color: Color(0xff3D3D3D), + fontFamily: 'assets/fonts/Manrope-Medium.ttf', ), ), - ), - Padding( - padding: const EdgeInsets.only(left: 24, right: 24, top: 5), - child: TextField( - decoration: InputDecoration( - contentPadding: - EdgeInsets.only(left: 10, top: 5, bottom: 5), - border: OutlineInputBorder( - borderRadius: BorderRadius.all( - Radius.circular(5), - ), - ), - hintText: 'Type here...', - ), + ], + ), + ), + Container( + child: Column( + children: [ + Image.asset( + 'assets/images/gallery-icon.png', ), - ), - Padding( - padding: const EdgeInsets.only( - left: 24, - top: 5, - right: 24, + SizedBox( + height: 10, ), - child: Text( - 'Contact Number', + Text( + 'Uploading Logo', style: TextStyle( - fontFamily: "Manrope", - fontSize: 14, - color: Color(0xff333333), + color: Colors.grey, + fontSize: 14, + fontWeight: FontWeight.w400, + fontFamily: 'Manrope'), + ), + ], + ), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.white, + ), + margin: EdgeInsets.all(15), + padding: EdgeInsets.all(30), + ), + Container( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: const EdgeInsets.only( + left: 24, + right: 24, + ), + child: Text( + 'Business Name', + style: TextStyle( + fontFamily: "Manrope", + fontSize: 14, + color: Color(0xff333333), + ), ), ), - ), - Padding( - padding: const EdgeInsets.only(left: 24, right: 24, top: 5), - child: TextField( - decoration: InputDecoration( - contentPadding: - EdgeInsets.only(left: 10, top: 5, bottom: 5), - border: OutlineInputBorder( - borderRadius: BorderRadius.all( - Radius.circular(5), + Padding( + padding: + const EdgeInsets.only(left: 24, right: 24, top: 5), + child: TextField( + decoration: InputDecoration( + contentPadding: + EdgeInsets.only(left: 10, top: 5, bottom: 5), + border: OutlineInputBorder( + borderRadius: BorderRadius.all( + Radius.circular(5), + ), ), + hintText: 'Type here...', ), - hintText: 'Type here...', - ), - keyboardType: TextInputType.number, - ), - ), - Padding( - padding: const EdgeInsets.only(left: 24, top: 5, right: 24), - child: Text( - 'Tell about your business...', - style: TextStyle( - fontFamily: "Manrope", - fontSize: 14, - color: Color(0xff333333), ), ), - ), - Padding( - padding: const EdgeInsets.only(left: 24, right: 24, top: 5), - child: TextField( - maxLines: 4, - keyboardType: TextInputType.multiline, - decoration: InputDecoration( - contentPadding: - EdgeInsets.only(left: 10, top: 5, bottom: 5), - border: OutlineInputBorder( - borderRadius: BorderRadius.all( - Radius.circular(5), + Padding( + padding: const EdgeInsets.only( + left: 24, + top: 5, + right: 24, + ), + child: Text( + 'Contact Number', + style: TextStyle( + fontFamily: "Manrope", + fontSize: 14, + color: Color(0xff333333), + ), + ), + ), + Padding( + padding: + const EdgeInsets.only(left: 24, right: 24, top: 5), + child: TextField( + decoration: InputDecoration( + contentPadding: + EdgeInsets.only(left: 10, top: 5, bottom: 5), + border: OutlineInputBorder( + borderRadius: BorderRadius.all( + Radius.circular(5), + ), ), + hintText: 'Type here...', ), - hintText: 'Type here...', + keyboardType: TextInputType.number, ), ), - ), - Padding( - padding: const EdgeInsets.only(top: 5), - child: Row( - children: [ - SizedBox( - width: 28, + Padding( + padding: + const EdgeInsets.only(left: 24, top: 5, right: 24), + child: Text( + 'Tell about your business...', + style: TextStyle( + fontFamily: "Manrope", + fontSize: 14, + color: Color(0xff333333), ), - Text('Industry'), - SizedBox( - width: 120, - ), - Text('Category'), - ], + ), ), - ), - Padding( - padding: const EdgeInsets.only(top: 5, right: 24), - child: Row( - children: [ - SizedBox( - width: 28, + Padding( + padding: + const EdgeInsets.only(left: 24, right: 24, top: 5), + child: TextField( + maxLines: 4, + keyboardType: TextInputType.multiline, + decoration: InputDecoration( + contentPadding: + EdgeInsets.only(left: 10, top: 5, bottom: 5), + border: OutlineInputBorder( + borderRadius: BorderRadius.all( + Radius.circular(5), + ), + ), + hintText: 'Type here...', ), - Expanded( - child: InputDecorator( - decoration: InputDecoration( - contentPadding: EdgeInsets.only( - left: 10, top: 1, bottom: 1, right: 5), - border: OutlineInputBorder( - borderRadius: BorderRadius.only( - topLeft: Radius.circular(5), - bottomLeft: Radius.circular(5), + ), + ), + Padding( + padding: const EdgeInsets.only(top: 5), + child: Row( + children: [ + SizedBox( + width: 28, + ), + Text('Industry'), + SizedBox( + width: 120, + ), + Text('Category'), + ], + ), + ), + Padding( + padding: const EdgeInsets.only(top: 5, right: 24), + child: Row( + children: [ + SizedBox( + width: 28, + ), + Expanded( + child: InputDecorator( + decoration: InputDecoration( + contentPadding: EdgeInsets.only( + left: 10, top: 1, bottom: 1, right: 5), + border: OutlineInputBorder( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(5), + bottomLeft: Radius.circular(5), + ), + ), + ), + child: DropdownButtonHideUnderline( + child: new DropdownButton( + borderRadius: BorderRadius.circular(10), + value: selected, + items: listDrop, + icon: + Icon(Icons.keyboard_arrow_down, size: 24), + hint: new Text('Choose...'), + onChanged: (value) { + selected = value as String?; + setState(() {}); + }, ), ), ), - child: DropdownButtonHideUnderline( - child: new DropdownButton( - value: selected, - items: listDrop, - icon: Icon(Icons.keyboard_arrow_down, size: 24), - hint: new Text('Choose...'), - onChanged: (value) { - selected = value as String?; - setState(() {}); - }, + ), + Expanded( + child: InputDecorator( + decoration: InputDecoration( + contentPadding: EdgeInsets.only( + left: 10, top: 1, bottom: 1, right: 5), + border: OutlineInputBorder( + borderRadius: BorderRadius.only( + topRight: Radius.circular(5), + bottomRight: Radius.circular(5), + ), + ), + ), + child: DropdownButtonHideUnderline( + child: new DropdownButton( + borderRadius: BorderRadius.circular(10), + value: selected1, + items: listDrop1, + icon: + Icon(Icons.keyboard_arrow_down, size: 24), + hint: new Text('Choose...'), + onChanged: (value) { + selected1 = value as String?; + setState(() {}); + }, + ), + ), + ), + ), + ], + ), + ), + SizedBox( + height: 5, + ), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Padding( + padding: const EdgeInsets.only(left: 28), + child: Text( + 'Address', + style: TextStyle( + fontFamily: "Manrope", + fontSize: 14, + color: Color(0xff333333), + ), + ), + ), + SizedBox( + height: 5, + ), + Padding( + padding: const EdgeInsets.only(left: 28, right: 24), + child: TextField( + decoration: InputDecoration( + contentPadding: + EdgeInsets.only(left: 10, top: 5, bottom: 5), + border: OutlineInputBorder( + borderRadius: BorderRadius.all( + Radius.circular(5), + ), + ), + hintText: 'Type here...', + suffixIcon: Icon( + Icons.location_on_outlined, + color: Color(0xff09CD99), ), ), ), ), - Expanded( - child: InputDecorator( - decoration: InputDecoration( - contentPadding: EdgeInsets.only( - left: 10, top: 1, bottom: 1, right: 5), - border: OutlineInputBorder( - borderRadius: BorderRadius.only( - topRight: Radius.circular(5), - bottomRight: Radius.circular(5), - ), - ), - ), - child: DropdownButtonHideUnderline( - child: new DropdownButton( - value: selected1, - items: listDrop1, - icon: Icon(Icons.keyboard_arrow_down, size: 24), - hint: new Text('Choose...'), - onChanged: (value) { - selected1 = value as String?; - setState(() {}); - }, - ), - ), + SizedBox( + height: 50, + ), + 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: 5, - ), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.only(left: 28), - child: Text( - 'Address', - style: TextStyle( - fontFamily: "Manrope", - fontSize: 14, - color: Color(0xff333333), - ), - ), - ), - SizedBox( - height: 5, - ), - Padding( - padding: const EdgeInsets.only(left: 28, right: 24), - child: TextField( - decoration: InputDecoration( - contentPadding: - EdgeInsets.only(left: 10, top: 5, bottom: 5), - border: OutlineInputBorder( - borderRadius: BorderRadius.all( - Radius.circular(5), - ), - ), - hintText: 'Type here...', - suffixIcon: Icon( - Icons.location_on_outlined, - color: Color(0xff09CD99), - ), - ), - ), - ), - ], - ), - ], + ], + ), ), - ), - Spacer(), - 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), - ), - ), - ], + ], + ), ), ), ); diff --git a/openclosenew/lib/11_busiesshome.dart b/openclosenew/lib/11_busiesshome.dart index 5b4dcfe..887560d 100644 --- a/openclosenew/lib/11_busiesshome.dart +++ b/openclosenew/lib/11_busiesshome.dart @@ -1,9 +1,9 @@ -import 'dart:ffi'; - import 'package:flutter/material.dart'; import 'package:openclosenew/businessempty.dart'; import 'package:flutter_switch/flutter_switch.dart'; +import '07_addbusiness.dart'; + class businesshome extends StatefulWidget { const businesshome({Key? key}) : super(key: key); @@ -12,9 +12,9 @@ class businesshome extends StatefulWidget { } class _businesshomeState extends State { - bool status = true; - - static const Color newColor = Colors.black; + bool status = false; + bool status1 = false; + bool status2 = false; int _selectedIndex = 0; static const TextStyle optionStyle = TextStyle( @@ -115,16 +115,21 @@ class _businesshomeState extends State { child: InkWell( onTap: () {}, child: Container( - width: 320, + width: 350, margin: EdgeInsets.only(right: 10), decoration: BoxDecoration( image: const DecorationImage( alignment: Alignment.centerRight, image: AssetImage('assets/images/status.png'), ), - color: Color(0xFF09CD99), borderRadius: BorderRadius.all( - Radius.circular(5), + Radius.circular(10), + ), + gradient: LinearGradient( + colors: [ + Color(0xFF09CD99), + Color(0xFF09B5CD), + ], ), ), child: Padding( @@ -173,7 +178,8 @@ class _businesshomeState extends State { child: InkWell( onTap: () {}, child: Container( - width: 320, + alignment: Alignment.center, + width: 350, margin: EdgeInsets.only(right: 10), decoration: BoxDecoration( image: const DecorationImage( @@ -182,7 +188,13 @@ class _businesshomeState extends State { ), color: Color(0xFF09CD99), borderRadius: BorderRadius.all( - Radius.circular(5), + Radius.circular(10), + ), + gradient: LinearGradient( + colors: [ + Color(0xFF09CD99), + Color(0xFF09B5CD), + ], ), ), child: Padding( @@ -231,7 +243,7 @@ class _businesshomeState extends State { child: InkWell( onTap: () {}, child: Container( - width: 320, + width: 330, margin: EdgeInsets.only(right: 10), decoration: BoxDecoration( image: const DecorationImage( @@ -240,7 +252,13 @@ class _businesshomeState extends State { ), color: Color(0xFF09CD99), borderRadius: BorderRadius.all( - Radius.circular(5), + Radius.circular(10), + ), + gradient: LinearGradient( + colors: [ + Color(0xFF09CD99), + Color(0xFF09B5CD), + ], ), ), child: Padding( @@ -320,7 +338,10 @@ class _businesshomeState extends State { color: Color(0xFF09CD99), ), ), - onPressed: () {}, + onPressed: () { + Navigator.push(context, + MaterialPageRoute(builder: (_) => addbusiness())); + }, ), ), ], @@ -331,15 +352,14 @@ class _businesshomeState extends State { scrollDirection: Axis.vertical, children: [ Padding( - padding: const EdgeInsets.only(left: 24), + padding: const EdgeInsets.only(left: 15), child: InkWell( onTap: () {}, child: Container( - width: 165, + width: 170, height: 200, - margin: EdgeInsets.only(right: 20), + margin: EdgeInsets.only(right: 15), decoration: BoxDecoration( - color: newColor, image: const DecorationImage( image: AssetImage('assets/images/bg.png'), fit: BoxFit.fitHeight, @@ -391,9 +411,10 @@ class _businesshomeState extends State { ), ), ), + Spacer(), Padding( - padding: - const EdgeInsets.only(top: 100, left: 3), + padding: const EdgeInsets.only( + top: 100, left: 3, right: 3), child: FlutterSwitch( width: 105, height: 40, @@ -454,60 +475,247 @@ class _businesshomeState extends State { ), ), Padding( - padding: const EdgeInsets.only(left: 22), + padding: const EdgeInsets.only(left: 15, top: 10), child: InkWell( onTap: () {}, child: Container( - width: 160, + width: 170, height: 200, - margin: EdgeInsets.only(right: 10, top: 10), + margin: EdgeInsets.only(right: 15), decoration: BoxDecoration( image: const DecorationImage( - alignment: Alignment.centerRight, - image: AssetImage('assets/images/status.png'), + image: AssetImage('assets/images/bg.png'), + fit: BoxFit.fitHeight, ), - color: Color(0xFF09CD99), borderRadius: BorderRadius.all( Radius.circular(5), ), ), - child: Padding( - padding: const EdgeInsets.all(14), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - "Today", - style: TextStyle( - fontFamily: 'Manrope', - fontStyle: FontStyle.normal, - fontWeight: FontWeight.w400, - fontSize: 14, - color: Colors.white, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Row( + children: [ + Padding( + padding: const EdgeInsets.only( + left: 15, + top: 100, + ), + child: RichText( + text: TextSpan( + text: "Barbeque Nation ", + style: TextStyle( + fontFamily: 'Manrope', + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w600, + fontSize: 18, + color: Colors.white, + ), + children: [ + TextSpan( + text: "42 ", + style: TextStyle( + fontFamily: 'Manrope', + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w400, + fontSize: 15, + color: Color(0xFFFFBE3F), + ), + ), + WidgetSpan( + child: Icon( + Icons.star, + color: Color(0xFFFFBE3F), + size: 18, + ), + ), + ], + ), + ), + ), + Spacer(), + Padding( + padding: const EdgeInsets.only( + top: 100, left: 3, right: 3), + child: FlutterSwitch( + width: 105, + height: 40, + valueFontSize: 15, + toggleSize: 25, + value: status1, + borderRadius: 30.0, + padding: 8.0, + showOnOff: true, + onToggle: (val) { + setState(() { + status1 = val; + }); + }, + activeText: "OPEN", + activeTextColor: Colors.white, + activeTextFontWeight: FontWeight.w600, + activeColor: Color(0xFF09CD99), + inactiveText: "CLOSED", + inactiveTextColor: Colors.white, + inactiveTextFontWeight: FontWeight.w600, + inactiveColor: Color(0xFFFF4B4C), + ), + ), + ], + ), + Padding( + padding: const EdgeInsets.only( + left: 10, + ), + child: RichText( + text: TextSpan( + children: [ + WidgetSpan( + child: Icon( + Icons.location_on_outlined, + color: Colors.white, + size: 20, + ), + ), + TextSpan( + text: "Town Hall, Coimbatore", + style: TextStyle( + fontFamily: 'Manrope', + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w400, + fontSize: 14, + color: Colors.white, + ), + ), + ], ), ), - Text( - "42", - style: TextStyle( - fontFamily: 'Manrope', - fontStyle: FontStyle.normal, - fontWeight: FontWeight.w400, - fontSize: 26, - color: Colors.white, - ), - ), - Text( - "Visitors viewed Barbeque Nation", - style: TextStyle( - fontFamily: 'Manrope', - fontStyle: FontStyle.normal, - fontWeight: FontWeight.w400, - fontSize: 12, - color: Colors.white, - ), - ), - ], + ), + ], + ), + ), + ), + ), + Padding( + padding: const EdgeInsets.only(left: 15, top: 10), + child: InkWell( + onTap: () {}, + child: Container( + width: 170, + height: 200, + margin: EdgeInsets.only(right: 15), + decoration: BoxDecoration( + image: const DecorationImage( + image: AssetImage('assets/images/bg.png'), + fit: BoxFit.fitHeight, ), + borderRadius: BorderRadius.all( + Radius.circular(5), + ), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Row( + children: [ + Padding( + padding: const EdgeInsets.only( + left: 15, + top: 100, + ), + child: RichText( + text: TextSpan( + text: "Barbeque Nation ", + style: TextStyle( + fontFamily: 'Manrope', + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w600, + fontSize: 18, + color: Colors.white, + ), + children: [ + TextSpan( + text: "42 ", + style: TextStyle( + fontFamily: 'Manrope', + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w400, + fontSize: 15, + color: Color(0xFFFFBE3F), + ), + ), + WidgetSpan( + child: Icon( + Icons.star, + color: Color(0xFFFFBE3F), + size: 18, + ), + ), + ], + ), + ), + ), + Spacer(), + Padding( + padding: const EdgeInsets.only( + top: 100, left: 3, right: 3), + child: FlutterSwitch( + width: 105, + height: 40, + valueFontSize: 15, + toggleSize: 25, + value: status2, + borderRadius: 30.0, + padding: 8.0, + showOnOff: true, + onToggle: (val) { + setState(() { + status2 = val; + }); + }, + activeText: "OPEN", + activeTextColor: Colors.white, + activeTextFontWeight: FontWeight.w600, + activeColor: Color(0xFF09CD99), + inactiveText: "CLOSED", + inactiveTextColor: Colors.white, + inactiveTextFontWeight: FontWeight.w600, + inactiveColor: Color(0xFFFF4B4C), + ), + ), + ], + ), + Padding( + padding: const EdgeInsets.only( + left: 10, + ), + child: RichText( + text: TextSpan( + children: [ + WidgetSpan( + child: Icon( + Icons.location_on_outlined, + color: Colors.white, + size: 20, + ), + ), + TextSpan( + text: "Town Hall, Coimbatore", + style: TextStyle( + fontFamily: 'Manrope', + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w400, + fontSize: 14, + color: Colors.white, + ), + ), + ], + ), + ), + ), + ], ), ), ), diff --git a/openclosenew/lib/main.dart b/openclosenew/lib/main.dart index ddd45c9..e09dc4a 100644 --- a/openclosenew/lib/main.dart +++ b/openclosenew/lib/main.dart @@ -12,8 +12,9 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { return MaterialApp( + color: Colors.white, debugShowCheckedModeBanner: false, - theme: ThemeData(primarySwatch: Colors.green, fontFamily: 'Manrope'), + theme: ThemeData(fontFamily: 'Manrope'), home: const Splash(), ); }