diff --git a/openclosenew/.gradle/7.0.2/dependencies-accessors/dependencies-accessors.lock b/openclosenew/.gradle/7.0.2/dependencies-accessors/dependencies-accessors.lock new file mode 100644 index 0000000..fdf56a4 Binary files /dev/null and b/openclosenew/.gradle/7.0.2/dependencies-accessors/dependencies-accessors.lock differ diff --git a/openclosenew/.gradle/7.0.2/dependencies-accessors/gc.properties b/openclosenew/.gradle/7.0.2/dependencies-accessors/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/openclosenew/.gradle/7.0.2/fileChanges/last-build.bin b/openclosenew/.gradle/7.0.2/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/openclosenew/.gradle/7.0.2/fileChanges/last-build.bin differ diff --git a/openclosenew/.gradle/7.0.2/fileHashes/fileHashes.lock b/openclosenew/.gradle/7.0.2/fileHashes/fileHashes.lock new file mode 100644 index 0000000..6bdd951 Binary files /dev/null and b/openclosenew/.gradle/7.0.2/fileHashes/fileHashes.lock differ diff --git a/openclosenew/.gradle/7.0.2/gc.properties b/openclosenew/.gradle/7.0.2/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/openclosenew/.gradle/checksums/checksums.lock b/openclosenew/.gradle/checksums/checksums.lock new file mode 100644 index 0000000..962e09c Binary files /dev/null and b/openclosenew/.gradle/checksums/checksums.lock differ diff --git a/openclosenew/.gradle/vcs-1/gc.properties b/openclosenew/.gradle/vcs-1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/openclosenew/android/build.gradle b/openclosenew/android/build.gradle index 4256f91..b05ad98 100644 --- a/openclosenew/android/build.gradle +++ b/openclosenew/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:7.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/openclosenew/android/gradle/wrapper/gradle-wrapper.properties b/openclosenew/android/gradle/wrapper/gradle-wrapper.properties index 595fb86..562c5e4 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip diff --git a/openclosenew/lib/11_busiesshome.dart b/openclosenew/lib/11_busiesshome.dart index fd3a7e4..7b992d4 100644 --- a/openclosenew/lib/11_busiesshome.dart +++ b/openclosenew/lib/11_busiesshome.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter_switch/flutter_switch.dart'; - import '07_addbusiness.dart'; import 'businessdetail.dart'; @@ -298,9 +297,8 @@ class _businesshomeState extends State { ), ), ), - Spacer(), Padding( - padding: const EdgeInsets.only(right: 5, top: 10, bottom: 15), + padding: const EdgeInsets.only(right: 15, top: 10, bottom: 15), child: TextButton.icon( icon: Icon( Icons.add, @@ -325,7 +323,7 @@ class _businesshomeState extends State { ], ), Container( - height: 380, + height: 400, child: ListView( scrollDirection: Axis.vertical, children: [ @@ -337,6 +335,8 @@ class _businesshomeState extends State { MaterialPageRoute(builder: (_) => businessdetail())); }, child: Container( + height: 200, + width: double.infinity, margin: EdgeInsets.only(right: 15), decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(5)), @@ -350,6 +350,7 @@ class _businesshomeState extends State { children: [ Image.asset( 'assets/images/bg.png', + height: 250, ), Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -397,7 +398,7 @@ class _businesshomeState extends State { ), ), SizedBox( - width: 5, + width: 35, ), FlutterSwitch( width: 105, @@ -468,7 +469,8 @@ class _businesshomeState extends State { MaterialPageRoute(builder: (_) => businessdetail())); }, child: Container( - margin: EdgeInsets.only(right: 15), + height: 200, + margin: EdgeInsets.only(right: 15, top: 10), decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(5)), ), @@ -529,7 +531,7 @@ class _businesshomeState extends State { ), ), SizedBox( - width: 5, + width: 35, ), FlutterSwitch( width: 105, @@ -600,7 +602,8 @@ class _businesshomeState extends State { MaterialPageRoute(builder: (_) => businessdetail())); }, child: Container( - margin: EdgeInsets.only(right: 15), + height: 200, + margin: EdgeInsets.only(right: 15, top: 10), decoration: BoxDecoration( borderRadius: BorderRadius.all(Radius.circular(5)), ), @@ -661,7 +664,7 @@ class _businesshomeState extends State { ), ), SizedBox( - width: 5, + width: 35, ), FlutterSwitch( width: 105, diff --git a/openclosenew/lib/15_addbusinessdetails.dart b/openclosenew/lib/15_addbusinessdetails.dart index c8ec3cd..7202162 100644 --- a/openclosenew/lib/15_addbusinessdetails.dart +++ b/openclosenew/lib/15_addbusinessdetails.dart @@ -8,6 +8,9 @@ class addbusinessdetails extends StatefulWidget { } class _addbusinessdetailsState extends State { + final List items = ['All Days', 'Specific days & timing']; + String selectedItem = 'All Days'; + @override Widget build(BuildContext context) { return Scaffold( @@ -68,23 +71,43 @@ class _addbusinessdetailsState extends State { Text( "Your working days & hours", style: TextStyle( - fontFamily: "Manrope", - fontStyle: FontStyle.normal, - fontWeight: FontWeight.w300, - fontSize: 14, - color: Color(0xFF333333)), + fontFamily: "Manrope", + fontStyle: FontStyle.normal, + fontWeight: FontWeight.w300, + fontSize: 14, + color: Color(0xFF333333), + ), ), Row( children: [ - DropdownMenuItem( - child: Text("All Days"), + Expanded( + child: Container( + padding: EdgeInsets.all(10), + child: DropdownButtonHideUnderline( + child: Padding( + padding: const EdgeInsets.all(8.0), + child: DropdownButton( + icon: Icon(Icons.keyboard_arrow_down_rounded), + iconSize: 30, + value: selectedItem, + onChanged: (String? string) => + setState(() => selectedItem = string!), + selectedItemBuilder: (BuildContext context) { + return items.map((String item) { + return Text(item); + }).toList(); + }, + items: items.map((String item) { + return DropdownMenuItem( + value: item, + child: Text('$item'), + ); + }).toList(), + ), + ), + ), + ), ), - Spacer(), - Icon( - Icons.keyboard_arrow_down_rounded, - color: Color(0xFF5C5C5C), - size: 35, - ) ], ), ],