Merge branch 'main' of http://139.59.64.64/OpenCloseApp/BusinessAppFlutter

openclosenew/lib/07_addbusiness.dart

@@ -235,15 +235,11 @@ class _addbusinessState extends State<addbusiness> {
                               contentPadding: EdgeInsets.only(
                                   left: 10, top: 1, bottom: 1, right: 5),
                               border: OutlineInputBorder(
-                                borderRadius: BorderRadius.only(
+                                  borderRadius:
-                                  topLeft: Radius.circular(5),
+                                      BorderRadius.all(Radius.circular(5))),
-                                  bottomLeft: Radius.circular(5),
-                                ),
-                              ),
                             ),
                             child: DropdownButtonHideUnderline(
                               child: new DropdownButton(
-                                elevation: 1,
                                 value: selected,
                                 items: listDrop,
                                 icon: Icon(Icons.keyboard_arrow_down, size: 24),
@@ -262,15 +258,11 @@ class _addbusinessState extends State<addbusiness> {
                               contentPadding: EdgeInsets.only(
                                   left: 10, top: 1, bottom: 1, right: 5),
                               border: OutlineInputBorder(
-                                borderRadius: BorderRadius.only(
+                                  borderRadius:
-                                  topRight: Radius.circular(5),
+                                      BorderRadius.all(Radius.circular(5))),
-                                  bottomRight: Radius.circular(5),
-                                ),
-                              ),
                             ),
                             child: DropdownButtonHideUnderline(
                               child: new DropdownButton(
-                                elevation: 1,
                                 value: selected1,
                                 items: listDrop1,
                                 icon: Icon(Icons.keyboard_arrow_down, size: 24),
@@ -323,9 +315,12 @@ class _addbusinessState extends State<addbusiness> {
                           ),
                         ),
                       ),
-                      Padding(
+                    ],
-                        padding: const EdgeInsets.only(top: 15),
+                  ),
-                        child: MaterialButton(
+                  SizedBox(
+                    height: 20,
+                  ),
+                  MaterialButton(
                     height: 50,
                     minWidth: double.infinity,
                     color: Color(0xff12C193),
@@ -333,18 +328,13 @@ class _addbusinessState extends State<addbusiness> {
                       Navigator.push(
                           context,
                           MaterialPageRoute(
-                                builder: (_) => businessaddedsuccess(),
+                              builder: (_) => businessaddedsuccess()));
-                              ),
-                            );
                     },
                     child: Text(
                       'Save',
                       style: TextStyle(color: Colors.white, fontSize: 15),
                     ),
                   ),
-                      ),
-                    ],
-                  ),
                 ],
               ),
             ),

openclosenew/lib/businessaddedsuccess.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'businessempty.dart';
+import 'package:openclosenew/07_addbusiness.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: (_) => businessempty()));
+                        MaterialPageRoute(builder: (_) => addbusiness()));
                   },
                   child: Text(
                     'Let’s Explore',

openclosenew/pubspec.lock

@@ -57,6 +57,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.15.0"
+  cross_file:
+    dependency: transitive
+    description:
+      name: cross_file
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.3"
   crypto:
     dependency: transitive
     description:
@@ -118,13 +125,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.1"
-  flutter_screenutil:
+  flutter_plugin_android_lifecycle:
-    dependency: "direct main"
+    dependency: transitive
     description:
-      name: flutter_screenutil
+      name: flutter_plugin_android_lifecycle
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.5.2"
+    version: "2.0.6"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -170,6 +177,41 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.3"
+  image_picker:
+    dependency: transitive
+    description:
+      name: image_picker
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.8.5+1"
+  image_picker_android:
+    dependency: transitive
+    description:
+      name: image_picker_android
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.8.4+12"
+  image_picker_for_web:
+    dependency: transitive
+    description:
+      name: image_picker_for_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.7"
+  image_picker_ios:
+    dependency: transitive
+    description:
+      name: image_picker_ios
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.8.5+1"
+  image_picker_platform_interface:
+    dependency: transitive
+    description:
+      name: image_picker_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.4"
   intl_phone_number_input:
     dependency: "direct main"
     description:
@@ -385,6 +427,13 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.99"
+  snippet_coder_utils:
+    dependency: "direct main"
+    description:
+      name: snippet_coder_utils
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.12"
   source_span:
     dependency: transitive
     description:

openclosenew/pubspec.yaml

@@ -29,6 +29,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
+  snippet_coder_utils: ^1.0.8
 
 
   # The following adds the Cupertino Icons fonts to your application.
@@ -37,8 +38,6 @@ dependencies:
   shared_preferences: ^2.0.11
   intl_phone_number_input: ^0.7.0+2
   get: ^4.5.1
-  flutter_screenutil: ^5.5.2
-