diff --git a/openclosenew/assets/images/bell.png b/openclosenew/assets/images/bell.png new file mode 100644 index 0000000..12536b1 Binary files /dev/null and b/openclosenew/assets/images/bell.png differ diff --git a/openclosenew/assets/images/pro.png b/openclosenew/assets/images/pro.png new file mode 100644 index 0000000..f9a37fd Binary files /dev/null and b/openclosenew/assets/images/pro.png differ diff --git a/openclosenew/assets/images/shop.png b/openclosenew/assets/images/shop.png new file mode 100644 index 0000000..55bc9a8 Binary files /dev/null and b/openclosenew/assets/images/shop.png differ diff --git a/openclosenew/lib/07_addbusiness.dart b/openclosenew/lib/07_addbusiness.dart index 67a6a18..4fe9353 100644 --- a/openclosenew/lib/07_addbusiness.dart +++ b/openclosenew/lib/07_addbusiness.dart @@ -1,6 +1,4 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:openclosenew/businessaddedsuccess.dart'; class addbusiness extends StatefulWidget { @@ -235,8 +233,11 @@ class _addbusinessState extends State { contentPadding: EdgeInsets.only( left: 10, top: 1, bottom: 1, right: 5), border: OutlineInputBorder( - borderRadius: - BorderRadius.all(Radius.circular(5))), + borderRadius: BorderRadius.only( + topLeft: Radius.circular(5), + bottomLeft: Radius.circular(5), + ), + ), ), child: DropdownButtonHideUnderline( child: new DropdownButton( @@ -258,8 +259,11 @@ class _addbusinessState extends State { contentPadding: EdgeInsets.only( left: 10, top: 1, bottom: 1, right: 5), border: OutlineInputBorder( - borderRadius: - BorderRadius.all(Radius.circular(5))), + borderRadius: BorderRadius.only( + topRight: Radius.circular(5), + bottomRight: Radius.circular(5), + ), + ), ), child: DropdownButtonHideUnderline( child: new DropdownButton( @@ -317,27 +321,25 @@ class _addbusinessState extends State { ), ], ), - SizedBox( - height: 20, - ), - 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: 20, + ), + 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/businessaddedsuccess.dart b/openclosenew/lib/businessaddedsuccess.dart index 293bd40..54dfaf6 100644 --- a/openclosenew/lib/businessaddedsuccess.dart +++ b/openclosenew/lib/businessaddedsuccess.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:openclosenew/07_addbusiness.dart'; +import 'package:openclosenew/businessempty.dart'; class businessaddedsuccess extends StatelessWidget { const businessaddedsuccess({Key? key}) : super(key: key); @@ -47,7 +47,7 @@ class businessaddedsuccess extends StatelessWidget { borderRadius: BorderRadius.circular(4)), onPressed: () { Navigator.push(context, - MaterialPageRoute(builder: (_) => addbusiness())); + MaterialPageRoute(builder: (_) => businessempty())); }, child: Text( 'Let’s Explore', diff --git a/openclosenew/lib/businessempty.dart b/openclosenew/lib/businessempty.dart new file mode 100644 index 0000000..6207425 --- /dev/null +++ b/openclosenew/lib/businessempty.dart @@ -0,0 +1,119 @@ +import 'package:flutter/material.dart'; +import 'package:dotted_border/dotted_border.dart'; + +class businessempty extends StatelessWidget { + const businessempty({Key? key}) : super(key: key); + + @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(), + Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + DottedBorder( + color: Color(0xff09CD99), + padding: EdgeInsets.all(5), + radius: Radius.circular(6), + child: Container( + height: 100, + width: 330, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + IconButton( + icon: Image.asset('assets/images/shop.png'), + onPressed: () { + Navigator.pop(context); + }, + ), + Text( + 'Add your Business', + style: TextStyle( + fontFamily: 'Manrope', + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w400, + fontSize: 14, + color: Color(0xff09CD99), + ), + ) + ], + ), + ), + ), + ], + ), + Spacer(), + MaterialButton( + height: 50, + minWidth: double.infinity, + color: Color(0xff12C193), + onPressed: () {}, + child: Text( + 'Save', + style: TextStyle(color: Colors.white, fontSize: 15), + ), + ), + ], + ), + ); + } +} diff --git a/openclosenew/lib/businessstart_page.dart b/openclosenew/lib/businessstart_page.dart index e3649b7..ae8dd1e 100644 --- a/openclosenew/lib/businessstart_page.dart +++ b/openclosenew/lib/businessstart_page.dart @@ -1,6 +1,8 @@ import 'package:flutter/material.dart'; import 'package:openclosenew/07_addbusiness.dart'; +import 'businessempty.dart'; + class business extends StatefulWidget { const business({Key? key}) : super(key: key); @@ -31,7 +33,10 @@ class _businessState extends State { Padding( padding: const EdgeInsets.only(left: 55, right: 20, bottom: 24), child: TextButton( - onPressed: () {}, + onPressed: () { + Navigator.push(context, + MaterialPageRoute(builder: (_) => businessempty())); + }, child: Text( "Skip", style: TextStyle(color: Colors.grey.shade600), diff --git a/openclosenew/pubspec.lock b/openclosenew/pubspec.lock index 92f177e..331ffbd 100644 --- a/openclosenew/pubspec.lock +++ b/openclosenew/pubspec.lock @@ -56,7 +56,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" cross_file: dependency: transitive description: @@ -78,6 +78,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.4" + dotted_border: + dependency: "direct main" + description: + name: dotted_border + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0+2" equatable: dependency: transitive description: @@ -91,7 +98,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" ffi: dependency: transitive description: @@ -225,7 +232,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.3" + version: "0.6.4" libphonenumber: dependency: transitive description: @@ -274,7 +281,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "0.1.4" meta: dependency: transitive description: @@ -288,7 +295,21 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" + path_drawing: + dependency: transitive + description: + name: path_drawing + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + path_parsing: + dependency: transitive + description: + name: path_parsing + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" path_provider: dependency: transitive description: @@ -440,7 +461,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" stack_trace: dependency: transitive description: @@ -475,7 +496,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" + version: "0.4.9" typed_data: dependency: transitive description: @@ -496,7 +517,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" win32: dependency: transitive description: @@ -526,5 +547,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.16.2 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" flutter: ">=2.10.0-0" diff --git a/openclosenew/pubspec.yaml b/openclosenew/pubspec.yaml index 19cce59..e881452 100644 --- a/openclosenew/pubspec.yaml +++ b/openclosenew/pubspec.yaml @@ -30,6 +30,7 @@ dependencies: flutter: sdk: flutter snippet_coder_utils: ^1.0.8 + dotted_border: ^2.0.0+2 # The following adds the Cupertino Icons fonts to your application.