diff --git a/openclosenew/lib/18-AddProductFrom.dart b/openclosenew/lib/18-AddProductFrom.dart index 992899b..4cd47ba 100644 --- a/openclosenew/lib/18-AddProductFrom.dart +++ b/openclosenew/lib/18-AddProductFrom.dart @@ -38,12 +38,17 @@ class _addproductfromState extends State { resizeToAvoidBottomInset: false, backgroundColor: White, body: SafeArea( +<<<<<<< HEAD child: Padding( padding: const EdgeInsets.only(top: 10, left: 20, right: 20), +======= + child: SingleChildScrollView( +>>>>>>> 1bac9350fef3aa7e3830178bea6bf079700678b9 child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ Row( +<<<<<<< HEAD children: [ InkWell( child: Icon(Icons.arrow_back, size: 24), @@ -66,61 +71,387 @@ class _addproductfromState extends State { ), Spacer(), Row( +======= +>>>>>>> 1bac9350fef3aa7e3830178bea6bf079700678b9 children: [ - Expanded( - child: MaterialButton( - color: (status == true) ? White : primaryColor, - height: 50, - minWidth: double.infinity, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.only( - topLeft: Radius.circular(4), - bottomLeft: Radius.circular(4), + 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, + ), + ), + ], + ), + Padding( + padding: const EdgeInsets.only(top: 20, left: 15, right: 15), + child: Row( + children: [ + Expanded( + child: MaterialButton( + color: (status == true) ? White : primaryColor, + height: 40, + minWidth: double.infinity, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(4), + bottomLeft: Radius.circular(4), + ), + ), + onPressed: () { + setState(() { + status = !status; + }); + }, + child: Text( + "Veg", + style: TextStyle( + color: (status == true) ? Gray : White, + fontSize: HeadText, + fontFamily: Font, + ), ), ), - onPressed: () { - setState(() { - status = !status; - }); - }, - child: Text( - "Veg", - style: TextStyle( - color: (status == true) ? Gray : White, - fontSize: HeadText, - fontFamily: Font, + ), + Expanded( + child: MaterialButton( + color: (status == true) ? primaryColor : White, + height: 40, + minWidth: double.infinity, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.only( + topRight: Radius.circular(4), + bottomRight: Radius.circular(4), + ), + ), + onPressed: () { + setState(() { + status = !status; + }); + }, + child: Text( + "Non Veg", + style: TextStyle( + color: (status == true) ? White : Gray, + 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( + 'Description', + style: TextStyle( + fontFamily: Font, + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w300, + fontSize: HeadText, + color: DarkGray, + ), + ), + ), + SizedBox( + height: 20, + ), + 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, + ), + 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: DarkGray, + ), + ), + 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: DarkGray, + ), + ), + ], + ) + ], + ), + ), + ); + }, + ); + }, + 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, + ), + ), + ), + ), + SizedBox( + height: 55, + ), + 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: MaterialButton( - color: (status == true) ? primaryColor : White, - height: 50, - minWidth: double.infinity, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.only( - topRight: Radius.circular(4), - bottomRight: Radius.circular(4), - ), - ), - onPressed: () { - setState(() { - status = !status; - }); - }, - child: Text( - "Non Veg", - style: TextStyle( - color: (status == true) ? White : Gray, - fontSize: HeadText, - fontFamily: Font, + 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, + ), ), ), ), ), ], ), +<<<<<<< HEAD Spacer(), Text( 'Item Name', @@ -368,6 +699,8 @@ class _addproductfromState extends State { ], ), ), +======= +>>>>>>> 1bac9350fef3aa7e3830178bea6bf079700678b9 ], ), ),