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 4f84da2..e431625 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 548f268..e564e70 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 ab700a4..054be61 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 723f173..72e2748 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 643589d..3554214 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/14_businessdetailsempty.dart b/openclosenew/lib/14_businessdetailsempty.dart index 8540aaf..c83cc44 100644 --- a/openclosenew/lib/14_businessdetailsempty.dart +++ b/openclosenew/lib/14_businessdetailsempty.dart @@ -174,7 +174,7 @@ class _businessdetailsemptyState extends State { fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, - fontSize: TitleText, + fontSize: 20, color: DarkGray, ), ), diff --git a/openclosenew/lib/17-BusinessProfileFormSuccess.dart b/openclosenew/lib/17-BusinessProfileFormSuccess.dart index 56657c9..c7da807 100644 --- a/openclosenew/lib/17-BusinessProfileFormSuccess.dart +++ b/openclosenew/lib/17-BusinessProfileFormSuccess.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:openclosenew/colors.dart'; -import '19-AddProductFrom.dart'; +import '18-AddProductFrom.dart'; import 'FontFamily.dart'; import 'fontsize.dart'; diff --git a/openclosenew/lib/18-AddProductFrom.dart b/openclosenew/lib/18-AddProductFrom.dart new file mode 100644 index 0000000..624534a --- /dev/null +++ b/openclosenew/lib/18-AddProductFrom.dart @@ -0,0 +1,115 @@ +import 'package:dotted_border/dotted_border.dart'; +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); + + @override + State createState() => _addproductfromState(); +} + +class _addproductfromState extends State { + List> listDrop = []; + String? selected = null; + void loadData() { + listDrop = []; + listDrop.add(new DropdownMenuItem( + child: new Text('Rice'), + value: 'val-1', + )); + listDrop.add(new DropdownMenuItem( + child: new Text('Others'), + value: 'val-2', + )); + } + + bool status = false; + var Color = primaryColor; + @override + Widget build(BuildContext context) { + loadData(); + return Scaffold( + backgroundColor: White, + 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 Food Item', + style: TextStyle( + fontSize: HeadText, + color: DarkGray, + fontFamily: Font, + ), + ), + ], + ), + ), + 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: () {}, + child: Text( + "Veg", + style: TextStyle( + color: Gray, + fontFamily: Font, + ), + ), + ), + ), + ), + 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: () {}, + child: Text( + 'Non Veg', + style: TextStyle( + color: White, + fontSize: HeadText, + fontFamily: Font, + ), + ), + ), + ), + ), + ], + ), + ], + ), + ), + ); + } +} diff --git a/openclosenew/lib/19-AddProductFrom.dart b/openclosenew/lib/19-AddProductFrom.dart deleted file mode 100644 index dde7af4..0000000 --- a/openclosenew/lib/19-AddProductFrom.dart +++ /dev/null @@ -1,384 +0,0 @@ -import 'package:dotted_border/dotted_border.dart'; -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); - - @override - State createState() => _addproductfromState(); -} - -class _addproductfromState extends State { - List> listDrop = []; - String? selected = null; - void loadData() { - listDrop = []; - listDrop.add(new DropdownMenuItem( - child: new Text('Non-Veg'), - value: 'val-1', - )); - listDrop.add(new DropdownMenuItem( - child: new Text('Veg'), - value: 'val-2', - )); - } - - @override - Widget build(BuildContext context) { - loadData(); - return Scaffold( - body: SafeArea( - child: SingleChildScrollView( - 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: HeadText, - color: DarkGray, - fontFamily: Font, - ), - ), - ], - ), - ), - 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); - }, - child: Text( - "Cancel", - style: TextStyle( - color: Gray, - fontFamily: Font, - ), - ), - ), - ), - ), - 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: HeadText, - fontFamily: Font, - ), - ), - ), - ), - ), - ], - ), - Padding( - padding: const EdgeInsets.only(left: 25, top: 15, right: 20), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - 'Item Name', - style: TextStyle( - fontFamily: Font, - fontStyle: FontStyle.normal, - fontWeight: FontWeight.w300, - fontSize: HeadText, - 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: Font, - fontStyle: FontStyle.normal, - fontWeight: FontWeight.w300, - fontSize: HeadText, - 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: Font, - fontStyle: FontStyle.normal, - fontWeight: FontWeight.w300, - fontSize: HeadText, - 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: Font, - fontStyle: FontStyle.normal, - fontWeight: FontWeight.w300, - fontSize: HeadText, - 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: Font, - 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: Font, - 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: Font, - 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, - ), - ), - ), - ), - 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); - }, - child: Text( - "Cancel", - style: TextStyle( - color: Gray, - fontFamily: Font, - ), - ), - ), - ), - ), - 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: HeadText, - fontFamily: Font, - ), - ), - ), - ), - ), - ], - ), - ], - ), - ), - ), - ); - } -} diff --git a/openclosenew/lib/businessdetail.dart b/openclosenew/lib/businessdetail.dart index 531adb2..1569ade 100644 --- a/openclosenew/lib/businessdetail.dart +++ b/openclosenew/lib/businessdetail.dart @@ -153,7 +153,7 @@ class _businessdetailState extends State { fontFamily: Font, fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, - fontSize: TitleText, + fontSize: 20, color: DarkGray, ), ), diff --git a/openclosenew/lib/businessstart_page.dart b/openclosenew/lib/businessstart_page.dart index 8129f3f..e50f048 100644 --- a/openclosenew/lib/businessstart_page.dart +++ b/openclosenew/lib/businessstart_page.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:openclosenew/07_addbusiness.dart'; import 'package:openclosenew/colors.dart'; +import 'BottomNavigation.dart'; import 'FontFamily.dart'; -import 'businessempty.dart'; import 'fontsize.dart'; class business extends StatefulWidget { @@ -43,8 +43,10 @@ class _businessState extends State { shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(4)), onPressed: () { - Navigator.push(context, - MaterialPageRoute(builder: (_) => businessempty())); + Navigator.push( + context, + MaterialPageRoute( + builder: (_) => bottomnavigation())); }, child: Text( 'Skip',