diff --git a/openclosenew/android/gradle/wrapper/gradle-wrapper.properties b/openclosenew/android/gradle/wrapper/gradle-wrapper.properties index bc6a58a..595fb86 100644 --- a/openclosenew/android/gradle/wrapper/gradle-wrapper.properties +++ b/openclosenew/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip diff --git a/openclosenew/assets/images/insert_logo.png b/openclosenew/assets/images/insert_logo.png new file mode 100644 index 0000000..345209e Binary files /dev/null and b/openclosenew/assets/images/insert_logo.png differ diff --git a/openclosenew/lib/11_busiesshome.dart b/openclosenew/lib/11_busiesshome.dart index 16c9129..6fe709a 100644 --- a/openclosenew/lib/11_busiesshome.dart +++ b/openclosenew/lib/11_busiesshome.dart @@ -324,7 +324,7 @@ class _businesshomeState extends State { ], ), Container( - height: 400, + height: 350, child: ListView( scrollDirection: Axis.vertical, children: [ @@ -336,7 +336,7 @@ class _businesshomeState extends State { MaterialPageRoute(builder: (_) => businessdetail())); }, child: Container( - height: 200, + height: 160, width: double.infinity, margin: EdgeInsets.only(right: 15), decoration: BoxDecoration( @@ -399,7 +399,7 @@ class _businesshomeState extends State { ), ), SizedBox( - width: 35, + width: 5, ), FlutterSwitch( width: 105, @@ -470,7 +470,7 @@ class _businesshomeState extends State { MaterialPageRoute(builder: (_) => businessdetail())); }, child: Container( - height: 200, + height: 160, margin: EdgeInsets.only(right: 15, top: 10), decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(5)), @@ -532,7 +532,7 @@ class _businesshomeState extends State { ), ), SizedBox( - width: 35, + width: 5, ), FlutterSwitch( width: 105, @@ -603,7 +603,7 @@ class _businesshomeState extends State { MaterialPageRoute(builder: (_) => businessdetail())); }, child: Container( - height: 200, + height: 160, margin: EdgeInsets.only(right: 15, top: 10), decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(5)), @@ -665,7 +665,7 @@ class _businesshomeState extends State { ), ), SizedBox( - width: 35, + width: 5, ), FlutterSwitch( width: 105, diff --git a/openclosenew/lib/14_businessdetailsempty.dart b/openclosenew/lib/14_businessdetailsempty.dart index 456535e..69c297c 100644 --- a/openclosenew/lib/14_businessdetailsempty.dart +++ b/openclosenew/lib/14_businessdetailsempty.dart @@ -1,3 +1,4 @@ +import 'package:dotted_border/dotted_border.dart'; import 'package:flutter/material.dart'; import 'package:flutter_switch/flutter_switch.dart'; @@ -19,66 +20,300 @@ class _businessdetailsemptyState extends State { children: [ Container( height: 400, - width: double.infinity, - alignment: Alignment.topCenter, child: Stack( children: [ Container( height: 250, decoration: BoxDecoration( - image: DecorationImage( - image: AssetImage('assets/images/bg.png'), - fit: BoxFit.cover), + image: const DecorationImage( + image: AssetImage('assets/images/bg.png'), + fit: BoxFit.cover, + ), borderRadius: BorderRadius.only( bottomLeft: Radius.circular(20), bottomRight: Radius.circular(20), ), ), ), - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - FloatingActionButton( - child: Icon( - Icons.arrow_back, - size: 24, - color: Color(0xFF3D3D3D), + if (status == false) + Container( + height: 250, + decoration: BoxDecoration( + color: Colors.grey.withOpacity(0.5), + borderRadius: BorderRadius.only( + bottomLeft: Radius.circular(20), + bottomRight: Radius.circular(20), ), - mini: true, - backgroundColor: Colors.white, - onPressed: () { - Navigator.pop(context); - }, ), - Spacer(), - FlutterSwitch( - width: 107, - height: 50, - valueFontSize: 12, - toggleSize: 20, - value: status, - borderRadius: 30.0, - padding: 5, - showOnOff: true, - onToggle: (val) { - setState(() { - status = val; - }); - }, - activeText: "OPEN", - activeSwitchBorder: - Border.all(color: Colors.white, width: 10), - inactiveSwitchBorder: - Border.all(color: Colors.white, width: 10), - activeTextColor: Colors.white, - activeTextFontWeight: FontWeight.w600, - activeColor: Color(0xFF09CD99), - inactiveText: "CLOSED", - inactiveTextColor: Colors.white, - inactiveTextFontWeight: FontWeight.w600, - inactiveColor: Color(0xFFFF4B4C), + ), + Padding( + padding: EdgeInsets.only(bottom: 300), + child: Row( + children: [ + FloatingActionButton( + child: Icon( + Icons.arrow_back, + size: 24, + color: Color(0xFF3D3D3D), + ), + mini: true, + backgroundColor: Colors.white, + onPressed: () { + Navigator.pop(context); + }, + ), + Spacer(), + FlutterSwitch( + width: 107, + height: 50, + valueFontSize: 12, + toggleSize: 20, + value: status, + borderRadius: 30.0, + padding: 5, + showOnOff: true, + onToggle: (val) { + setState(() { + status = val; + }); + }, + activeText: "OPEN", + activeSwitchBorder: + Border.all(color: Colors.white, width: 10), + inactiveSwitchBorder: + Border.all(color: Colors.white, width: 10), + activeTextColor: Colors.white, + activeTextFontWeight: FontWeight.w600, + activeColor: Color(0xFF09CD99), + inactiveText: "CLOSED", + inactiveTextColor: Colors.white, + inactiveTextFontWeight: FontWeight.w600, + inactiveColor: Color(0xFFFF4B4C), + ), + ], + ), + ), + Align( + alignment: Alignment.center, + child: Container( + margin: EdgeInsets.only(right: 20, left: 20, top: 150), + padding: EdgeInsets.all(12), + height: 270, + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.all( + Radius.circular(10), + ), + boxShadow: [ + BoxShadow( + color: Colors.grey.shade500, + offset: Offset(4.0, 4.0), + blurRadius: 10.0, + spreadRadius: 1.0, + ), + ], ), - ], + foregroundDecoration: BoxDecoration( + color: status ? null : Colors.white, + backgroundBlendMode: + status ? null : BlendMode.saturation, + ), + child: Column( + children: [ + Row( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Padding( + padding: const EdgeInsets.only(left: 5, top: 5), + child: InkWell( + onTap: () { + Navigator.pop(context); + }, + child: Column( + children: [ + Image.asset( + 'assets/images/insert_logo.png', + width: 30, + height: 30, + ), + Text( + "LOGO", + style: TextStyle( + fontFamily: "Manrope", + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w600, + letterSpacing: 0.25, + color: Color(0xFF5C5C5C), + ), + ), + ], + ), + ), + ), + Padding( + padding: + const EdgeInsets.only(left: 15, top: 10), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + RichText( + text: TextSpan( + text: "Barbeque Nation ", + style: TextStyle( + fontFamily: 'Manrope', + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w600, + fontSize: 20, + color: Color(0xFF3D3D3D), + ), + ), + ), + RichText( + text: TextSpan( + children: [ + TextSpan( + text: "0.0 ", + style: TextStyle( + fontFamily: 'Manrope', + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w400, + fontSize: 15, + color: Color(0xFFFFBE3F), + ), + ), + WidgetSpan( + child: Icon( + Icons.star, + color: Color(0xFFFFBE3F), + size: 15, + ), + ), + ], + ), + ), + ], + ), + ), + Spacer(), + IconButton( + icon: Image.asset( + 'assets/images/edit_pen.png', + color: Colors.black, + ), + onPressed: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (_) => businessdetailsempty()), + ); + }, + ), + ], + ), + Align( + alignment: Alignment.topLeft, + child: Padding( + padding: const EdgeInsets.only(left: 5), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Padding( + padding: const EdgeInsets.only(top: 10), + child: RichText( + text: TextSpan( + children: [ + WidgetSpan( + child: Image.asset( + 'assets/images/call_icon.png', + width: 25, + height: 25, + ), + ), + TextSpan( + text: + " +91 98651 76796, +91 76786 85869", + style: TextStyle( + fontFamily: 'Manrope', + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w500, + fontSize: 12, + color: Color(0xFF5C5C5C), + ), + ), + ], + ), + ), + ), + ], + ), + Padding( + padding: const EdgeInsets.only(top: 10), + child: RichText( + text: TextSpan( + children: [ + WidgetSpan( + child: Image.asset( + 'assets/images/loc_logo.png', + width: 25, + height: 25, + ), + ), + TextSpan( + text: + " 112, Avinashi Road, Peelamedu, Coimbatore...", + style: TextStyle( + fontFamily: 'Manrope', + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w500, + fontSize: 12, + color: Color(0xFF5C5C5C), + ), + ), + ], + ), + ), + ), + DottedBorder( + color: Color(0xff09CD99), + padding: EdgeInsets.all(5), + radius: Radius.circular(20), + child: Container( + height: 50, + child: Row( + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Text( + 'This Business Profile looks incomplete', + style: TextStyle( + fontFamily: 'Manrope', + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w500, + fontSize: 12, + color: Color(0xff09CD99), + ), + ), + IconButton( + icon: Icon(Icons + .arrow_forward_ios_rounded), + onPressed: () { + Navigator.pop(context); + }, + ), + ], + ), + ), + ), + ], + ), + ), + ), + ], + ), + ), ), ], ), diff --git a/openclosenew/lib/businessdetail.dart b/openclosenew/lib/businessdetail.dart index 939fd4b..6699d0c 100644 --- a/openclosenew/lib/businessdetail.dart +++ b/openclosenew/lib/businessdetail.dart @@ -10,15 +10,13 @@ class businessdetail extends StatefulWidget { State createState() => _businessdetailState(); } -class _businessdetailState extends State - with TickerProviderStateMixin { +class _businessdetailState extends State { bool status = true; int pageIndex = 0; final _Controller = PageController(); @override Widget build(BuildContext context) { - TabController _tabController = TabController(length: 4, vsync: this); return Scaffold( backgroundColor: Colors.white, body: SafeArea( @@ -54,7 +52,8 @@ class _businessdetailState extends State ), ), Padding( - padding: EdgeInsets.only(bottom: 300), + padding: + EdgeInsets.only(bottom: 300, left: 10, right: 10), child: Row( children: [ FloatingActionButton( @@ -138,7 +137,7 @@ class _businessdetailState extends State ), Padding( padding: - const EdgeInsets.only(top: 10, left: 5), + const EdgeInsets.only(top: 8, left: 5), child: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -150,7 +149,7 @@ class _businessdetailState extends State fontFamily: 'Manrope', fontStyle: FontStyle.normal, fontWeight: FontWeight.w600, - fontSize: 16, + fontSize: 20, color: Colors.black, ), ), @@ -200,7 +199,8 @@ class _businessdetailState extends State Align( alignment: Alignment.topLeft, child: Padding( - padding: const EdgeInsets.only(left: 10), + padding: + const EdgeInsets.only(left: 10, top: 5), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [