diff --git a/openclosenew/assets/images/bell.png b/openclosenew/assets/images/bell.png index 12536b1..1d9e41d 100644 Binary files a/openclosenew/assets/images/bell.png and b/openclosenew/assets/images/bell.png differ diff --git a/openclosenew/assets/images/discount.png b/openclosenew/assets/images/discount.png new file mode 100644 index 0000000..4c65695 Binary files /dev/null and b/openclosenew/assets/images/discount.png differ diff --git a/openclosenew/assets/images/location.png b/openclosenew/assets/images/location.png index 01b723f..5cff60e 100644 Binary files a/openclosenew/assets/images/location.png and b/openclosenew/assets/images/location.png differ diff --git a/openclosenew/assets/images/messages.png b/openclosenew/assets/images/messages.png new file mode 100644 index 0000000..43d61b6 Binary files /dev/null and b/openclosenew/assets/images/messages.png differ diff --git a/openclosenew/assets/images/profile.png b/openclosenew/assets/images/profile.png new file mode 100644 index 0000000..75df574 Binary files /dev/null and b/openclosenew/assets/images/profile.png differ diff --git a/openclosenew/assets/images/setting.png b/openclosenew/assets/images/setting.png new file mode 100644 index 0000000..3865cb6 Binary files /dev/null and b/openclosenew/assets/images/setting.png differ diff --git a/openclosenew/assets/images/status.png b/openclosenew/assets/images/status.png new file mode 100644 index 0000000..be84005 Binary files /dev/null and b/openclosenew/assets/images/status.png differ diff --git a/openclosenew/assets/images/store.png b/openclosenew/assets/images/store.png index 02b4a51..86e385a 100644 Binary files a/openclosenew/assets/images/store.png and b/openclosenew/assets/images/store.png differ diff --git a/openclosenew/lib/07_addbusiness.dart b/openclosenew/lib/07_addbusiness.dart index 4fe9353..6583a76 100644 --- a/openclosenew/lib/07_addbusiness.dart +++ b/openclosenew/lib/07_addbusiness.dart @@ -50,14 +50,11 @@ class _addbusinessState extends State { loadData(); loadData1(); return Scaffold( + resizeToAvoidBottomInset: false, backgroundColor: Colors.white, - body: SingleChildScrollView( - reverse: true, + body: SafeArea( child: Column( children: [ - SizedBox( - height: 50, - ), Padding( padding: const EdgeInsets.only(left: 15, right: 24), child: Row( @@ -78,7 +75,7 @@ class _addbusinessState extends State { color: Color(0xff3D3D3D), fontFamily: 'assets/fonts/Manrope-Medium.ttf', ), - ) + ), ], ), ), @@ -115,7 +112,6 @@ class _addbusinessState extends State { Padding( padding: const EdgeInsets.only( left: 24, - top: 10, right: 24, ), child: Text( @@ -128,8 +124,7 @@ class _addbusinessState extends State { ), ), Padding( - padding: - const EdgeInsets.only(left: 24, right: 24, top: 10), + padding: const EdgeInsets.only(left: 24, right: 24, top: 5), child: TextField( decoration: InputDecoration( contentPadding: @@ -146,7 +141,7 @@ class _addbusinessState extends State { Padding( padding: const EdgeInsets.only( left: 24, - top: 10, + top: 5, right: 24, ), child: Text( @@ -159,8 +154,7 @@ class _addbusinessState extends State { ), ), Padding( - padding: - const EdgeInsets.only(left: 24, right: 24, top: 10), + padding: const EdgeInsets.only(left: 24, right: 24, top: 5), child: TextField( decoration: InputDecoration( contentPadding: @@ -176,8 +170,7 @@ class _addbusinessState extends State { ), ), Padding( - padding: - const EdgeInsets.only(left: 24, top: 10, right: 24), + padding: const EdgeInsets.only(left: 24, top: 5, right: 24), child: Text( 'Tell about your business...', style: TextStyle( @@ -188,8 +181,7 @@ class _addbusinessState extends State { ), ), Padding( - padding: - const EdgeInsets.only(left: 24, right: 24, top: 10), + padding: const EdgeInsets.only(left: 24, right: 24, top: 5), child: TextField( maxLines: 4, keyboardType: TextInputType.multiline, @@ -206,7 +198,7 @@ class _addbusinessState extends State { ), ), Padding( - padding: const EdgeInsets.only(top: 10), + padding: const EdgeInsets.only(top: 5), child: Row( children: [ SizedBox( @@ -314,8 +306,10 @@ class _addbusinessState extends State { ), ), hintText: 'Type here...', - suffixIcon: - Image.asset('assets/images/location.png'), + suffixIcon: Icon( + Icons.location_on_outlined, + color: Color(0xff09CD99), + ), ), ), ), @@ -324,9 +318,7 @@ class _addbusinessState extends State { ], ), ), - SizedBox( - height: 20, - ), + Spacer(), MaterialButton( height: 50, minWidth: double.infinity, diff --git a/openclosenew/lib/11_busiesshome.dart b/openclosenew/lib/11_busiesshome.dart new file mode 100644 index 0000000..afbb84c --- /dev/null +++ b/openclosenew/lib/11_busiesshome.dart @@ -0,0 +1,314 @@ +import 'package:flutter/material.dart'; +import 'package:dotted_border/dotted_border.dart'; + +class businesshome extends StatefulWidget { + const businesshome({Key? key}) : super(key: key); + + @override + State createState() => _businesshomeState(); +} + +class _businesshomeState 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(() { + _selectedIndex = index; + }); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + backgroundColor: Colors.white, + body: Column( + children: [ + SafeArea( + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Container( + height: 50, + width: 50, + margin: EdgeInsets.all(20), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(50), + color: Colors.grey, + ), + ), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + height: 25, + ), + Text( + 'Hi, Sudharsan', + style: TextStyle( + color: Colors.black, + fontSize: 16, + fontFamily: 'Manrope', + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w600, + ), + ), + Text( + 'Mon, 02 May 2022', + style: TextStyle( + fontFamily: 'Manrope', + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w500, + fontSize: 11, + ), + ), + ], + ), + Spacer(), + Padding( + padding: const EdgeInsets.only(top: 20), + child: IconButton( + icon: Image.asset('assets/images/bell.png'), + onPressed: () { + Navigator.pop(context); + }, + ), + ), + ], + ), + ), + Spacer(), + SingleChildScrollView( + scrollDirection: Axis.horizontal, + child: Container( + margin: const EdgeInsets.symmetric(vertical: 20, horizontal: 20), + child: FittedBox( + fit: BoxFit.fill, + alignment: Alignment.topCenter, + child: Row( + children: [ + Container( + width: 350, + margin: EdgeInsets.only(right: 10), + height: 100, + decoration: BoxDecoration( + image: const DecorationImage( + alignment: Alignment.centerRight, + image: AssetImage('assets/images/status.png'), + ), + 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, + ), + ), + 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, + ), + ), + ], + ), + ), + ), + Container( + width: 350, + margin: EdgeInsets.only(right: 10), + height: 100, + decoration: BoxDecoration( + image: const DecorationImage( + alignment: Alignment.centerRight, + image: AssetImage('assets/images/status.png'), + ), + color: Color(0xFF09CD99), + borderRadius: BorderRadius.all(Radius.circular(5))), + child: Padding( + padding: const EdgeInsets.all(12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "Today", + 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, + ), + ), + ], + ), + ), + ), + Container( + width: 350, + margin: EdgeInsets.only(right: 10), + height: 100, + decoration: BoxDecoration( + image: const DecorationImage( + alignment: Alignment.centerRight, + image: AssetImage('assets/images/status.png'), + ), + color: Color(0xFF09CD99), + borderRadius: BorderRadius.all(Radius.circular(5))), + child: Padding( + padding: const EdgeInsets.all(12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "Today", + 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, + ), + ), + ], + ), + ), + ), + ], + ), + ), + ), + ), + Spacer(), + BottomNavigationBar( + iconSize: 20, + unselectedFontSize: 12, + selectedFontSize: 12, + type: BottomNavigationBarType.fixed, + items: const [ + BottomNavigationBarItem( + icon: ImageIcon( + AssetImage('assets/images/store.png'), + ), + label: 'Business', + ), + BottomNavigationBarItem( + icon: ImageIcon( + AssetImage('assets/images/messages.png'), + ), + label: 'Chat', + ), + BottomNavigationBarItem( + icon: ImageIcon( + AssetImage('assets/images/discount.png'), + ), + label: 'Offer', + ), + BottomNavigationBarItem( + icon: ImageIcon( + AssetImage('assets/images/profile.png'), + ), + label: 'Profile', + ), + BottomNavigationBarItem( + icon: ImageIcon( + AssetImage('assets/images/setting.png'), + ), + label: 'Settings', + ), + ], + currentIndex: _selectedIndex, + selectedItemColor: Color(0xff09CD99), + onTap: _onItemTapped, + ), + ], + ), + ); + } +} diff --git a/openclosenew/lib/businessempty.dart b/openclosenew/lib/businessempty.dart index d81cfb2..58a3ff9 100644 --- a/openclosenew/lib/businessempty.dart +++ b/openclosenew/lib/businessempty.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:dotted_border/dotted_border.dart'; +import 'package:openclosenew/11_busiesshome.dart'; class businessempty extends StatefulWidget { const businessempty({Key? key}) : super(key: key); @@ -115,7 +116,10 @@ class _businessemptyState extends State { IconButton( icon: Image.asset('assets/images/shop.png'), onPressed: () { - Navigator.pop(context); + Navigator.push( + context, + MaterialPageRoute( + builder: (_) => businesshome())); }, ), Text( @@ -136,28 +140,39 @@ class _businessemptyState extends State { ), Spacer(), BottomNavigationBar( + iconSize: 20, unselectedFontSize: 12, selectedFontSize: 12, type: BottomNavigationBarType.fixed, items: const [ BottomNavigationBarItem( - icon: Icon(Icons.storefront_rounded), + icon: ImageIcon( + AssetImage('assets/images/store.png'), + ), label: 'Business', ), BottomNavigationBarItem( - icon: Icon(Icons.snapchat_outlined), + icon: ImageIcon( + AssetImage('assets/images/messages.png'), + ), label: 'Chat', ), BottomNavigationBarItem( - icon: Icon(Icons.discount_rounded), + icon: ImageIcon( + AssetImage('assets/images/discount.png'), + ), label: 'Offer', ), BottomNavigationBarItem( - icon: Icon(Icons.school), + icon: ImageIcon( + AssetImage('assets/images/profile.png'), + ), label: 'Profile', ), BottomNavigationBarItem( - icon: Icon(Icons.settings_outlined), + icon: ImageIcon( + AssetImage('assets/images/setting.png'), + ), label: 'Settings', ), ], diff --git a/openclosenew/lib/main.dart b/openclosenew/lib/main.dart index 1860000..ddd45c9 100644 --- a/openclosenew/lib/main.dart +++ b/openclosenew/lib/main.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:openclosenew/iintroduction_screen.dart';