From ac4c87faf00105649c6c5134a81ff16d8bc13d6f Mon Sep 17 00:00:00 2001 From: Jayesh Date: Fri, 8 Mar 2024 22:46:51 +0530 Subject: [PATCH] Design Changes as per following: 1. Decoration added for search box dialog \n --- .dart_tool/package_config.json | 88 +++++++----- .dart_tool/package_config_subset | 128 ++++++++++-------- .dart_tool/version | 2 +- .idea/.gitignore | 2 + .idea/libraries/Dart_Packages.xml | 86 +++++++----- .idea/libraries/Dart_SDK.xml | 40 +++--- .idea/misc.xml | 1 - example/android/app/build.gradle | 4 +- .../com/altafrazzaque/example/MainActivity.kt | 2 +- example/android/build.gradle | 6 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/lib/main.dart | 20 ++- example/pubspec.lock | 78 +++++++---- example/pubspec.yaml | 2 +- lib/csc_picker.dart | 3 + lib/dropdown_with_search.dart | 21 ++- pubspec.lock | 78 +++++++---- 17 files changed, 348 insertions(+), 215 deletions(-) diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index c363d65..45a4336 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -3,130 +3,148 @@ "packages": [ { "name": "async", - "rootUri": "file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.10.0", + "rootUri": "file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.11.0", "packageUri": "lib/", "languageVersion": "2.18" }, { "name": "boolean_selector", - "rootUri": "file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1", + "rootUri": "file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "characters", - "rootUri": "file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.2.1", + "rootUri": "file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.3.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "clock", - "rootUri": "file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1", + "rootUri": "file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "collection", - "rootUri": "file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.0", + "rootUri": "file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.18.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "2.18" }, { "name": "fake_async", - "rootUri": "file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1", + "rootUri": "file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "flutter", - "rootUri": "file:///C:/flutter/packages/flutter", + "rootUri": "file:///C:/dev/flutter/packages/flutter", "packageUri": "lib/", - "languageVersion": "2.17" + "languageVersion": "3.2" }, { "name": "flutter_test", - "rootUri": "file:///C:/flutter/packages/flutter_test", + "rootUri": "file:///C:/dev/flutter/packages/flutter_test", "packageUri": "lib/", - "languageVersion": "2.17" + "languageVersion": "3.2" }, { - "name": "js", - "rootUri": "file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/js-0.6.5", + "name": "leak_tracker", + "rootUri": "file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker-10.0.0", "packageUri": "lib/", - "languageVersion": "2.16" + "languageVersion": "3.1" + }, + { + "name": "leak_tracker_flutter_testing", + "rootUri": "file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker_flutter_testing-2.0.1", + "packageUri": "lib/", + "languageVersion": "3.1" + }, + { + "name": "leak_tracker_testing", + "rootUri": "file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker_testing-2.0.1", + "packageUri": "lib/", + "languageVersion": "3.1" }, { "name": "matcher", - "rootUri": "file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.13", + "rootUri": "file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.16+1", "packageUri": "lib/", - "languageVersion": "2.18" + "languageVersion": "3.0" }, { "name": "material_color_utilities", - "rootUri": "file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.2.0", + "rootUri": "file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.8.0", "packageUri": "lib/", - "languageVersion": "2.13" + "languageVersion": "2.17" }, { "name": "meta", - "rootUri": "file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.8.0", + "rootUri": "file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.11.0", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "path", - "rootUri": "file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.2", + "rootUri": "file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.9.0", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "3.0" }, { "name": "sky_engine", - "rootUri": "file:///C:/flutter/bin/cache/pkg/sky_engine", + "rootUri": "file:///C:/dev/flutter/bin/cache/pkg/sky_engine", "packageUri": "lib/", - "languageVersion": "2.12" + "languageVersion": "3.2" }, { "name": "source_span", - "rootUri": "file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.9.1", + "rootUri": "file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0", "packageUri": "lib/", - "languageVersion": "2.14" + "languageVersion": "2.18" }, { "name": "stack_trace", - "rootUri": "file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0", + "rootUri": "file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.1", "packageUri": "lib/", "languageVersion": "2.18" }, { "name": "stream_channel", - "rootUri": "file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1", + "rootUri": "file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.2", "packageUri": "lib/", - "languageVersion": "2.14" + "languageVersion": "2.19" }, { "name": "string_scanner", - "rootUri": "file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0", + "rootUri": "file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0", "packageUri": "lib/", "languageVersion": "2.18" }, { "name": "term_glyph", - "rootUri": "file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1", + "rootUri": "file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1", "packageUri": "lib/", "languageVersion": "2.12" }, { "name": "test_api", - "rootUri": "file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.4.16", + "rootUri": "file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.6.1", "packageUri": "lib/", - "languageVersion": "2.18" + "languageVersion": "3.0" }, { "name": "vector_math", - "rootUri": "file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4", + "rootUri": "file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4", "packageUri": "lib/", "languageVersion": "2.14" }, + { + "name": "vm_service", + "rootUri": "file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/vm_service-13.0.0", + "packageUri": "lib/", + "languageVersion": "3.0" + }, { "name": "csc_picker", "rootUri": "../", @@ -134,7 +152,7 @@ "languageVersion": "2.12" } ], - "generated": "2023-02-02T04:34:46.408317Z", + "generated": "2024-03-08T16:05:26.951233Z", "generator": "pub", - "generatorVersion": "2.19.0" + "generatorVersion": "3.3.0" } diff --git a/.dart_tool/package_config_subset b/.dart_tool/package_config_subset index 68d17fd..e0c6285 100644 --- a/.dart_tool/package_config_subset +++ b/.dart_tool/package_config_subset @@ -1,89 +1,101 @@ async 2.18 -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.10.0/ -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.10.0/lib/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.11.0/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.11.0/lib/ boolean_selector 2.17 -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/ -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/lib/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/lib/ characters 2.12 -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.2.1/ -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.2.1/lib/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.3.0/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.3.0/lib/ clock 2.12 -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/ -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/lib/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/lib/ collection -2.12 -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.0/ -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.0/lib/ +2.18 +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.18.0/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.18.0/lib/ fake_async 2.12 -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/ -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/lib/ -js -2.16 -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/js-0.6.5/ -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/js-0.6.5/lib/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/lib/ +leak_tracker +3.1 +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker-10.0.0/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker-10.0.0/lib/ +leak_tracker_flutter_testing +3.1 +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker_flutter_testing-2.0.1/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker_flutter_testing-2.0.1/lib/ +leak_tracker_testing +3.1 +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker_testing-2.0.1/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/leak_tracker_testing-2.0.1/lib/ matcher -2.18 -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.13/ -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.13/lib/ +3.0 +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.16+1/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.16+1/lib/ material_color_utilities -2.13 -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.2.0/ -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.2.0/lib/ +2.17 +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.8.0/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.8.0/lib/ meta 2.12 -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.8.0/ -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.8.0/lib/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.11.0/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.11.0/lib/ path -2.12 -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.2/ -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.2/lib/ +3.0 +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.9.0/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.9.0/lib/ source_span -2.14 -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.9.1/ -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.9.1/lib/ +2.18 +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/lib/ stack_trace 2.18 -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0/ -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0/lib/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.1/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.1/lib/ stream_channel -2.14 -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1/ -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1/lib/ +2.19 +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.2/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.2/lib/ string_scanner 2.18 -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/ -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/lib/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/lib/ term_glyph 2.12 -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/ -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/lib/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/lib/ test_api -2.18 -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.4.16/ -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.4.16/lib/ +3.0 +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.6.1/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.6.1/lib/ vector_math 2.14 -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4/ -file:///C:/Users/Oras/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4/lib/ -csc_picker -2.12 -file:///C:/Users/Oras/Documents/GitHub/csc_picker/ -file:///C:/Users/Oras/Documents/GitHub/csc_picker/lib/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4/lib/ +vm_service +3.0 +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/vm_service-13.0.0/ +file:///C:/Users/jay22/AppData/Local/Pub/Cache/hosted/pub.dev/vm_service-13.0.0/lib/ sky_engine -2.12 -file:///C:/flutter/bin/cache/pkg/sky_engine/ -file:///C:/flutter/bin/cache/pkg/sky_engine/lib/ +3.2 +file:///C:/dev/flutter/bin/cache/pkg/sky_engine/ +file:///C:/dev/flutter/bin/cache/pkg/sky_engine/lib/ flutter -2.17 -file:///C:/flutter/packages/flutter/ -file:///C:/flutter/packages/flutter/lib/ +3.2 +file:///C:/dev/flutter/packages/flutter/ +file:///C:/dev/flutter/packages/flutter/lib/ flutter_test -2.17 -file:///C:/flutter/packages/flutter_test/ -file:///C:/flutter/packages/flutter_test/lib/ +3.2 +file:///C:/dev/flutter/packages/flutter_test/ +file:///C:/dev/flutter/packages/flutter_test/lib/ +csc_picker +2.12 +file:///D:/Projects/Open%20Source/csc_picker/ +file:///D:/Projects/Open%20Source/csc_picker/lib/ 2 diff --git a/.dart_tool/version b/.dart_tool/version index 240bba9..ccbb4b8 100644 --- a/.dart_tool/version +++ b/.dart_tool/version @@ -1 +1 @@ -3.7.0 \ No newline at end of file +3.19.1 \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore index 26d3352..8f00030 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -1,3 +1,5 @@ # Default ignored files /shelf/ /workspace.xml +# GitHub Copilot persisted chat sessions +/copilot/chatSessions diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml index 364fd85..2f606ed 100644 --- a/.idea/libraries/Dart_Packages.xml +++ b/.idea/libraries/Dart_Packages.xml @@ -5,7 +5,7 @@ - @@ -19,7 +19,7 @@ - @@ -33,7 +33,7 @@ - @@ -54,77 +54,91 @@ - - - + - + + + + + + + + + + + + - - - - - - - - @@ -145,7 +159,7 @@ - @@ -156,31 +170,41 @@ + + + + + + - + - + - + - - - - - - - - + + + + + + + + + + - + - - - + + + + diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml index c6628b5..7fcb1ec 100644 --- a/.idea/libraries/Dart_SDK.xml +++ b/.idea/libraries/Dart_SDK.xml @@ -1,25 +1,27 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index c333ca1..d002923 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index fa9d1bc..fc8759e 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 29 + compileSdkVersion 33 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -39,7 +39,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.altafrazzaque.example" - minSdkVersion 16 + minSdkVersion flutter.minSdkVersion targetSdkVersion 29 versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/example/android/app/src/main/kotlin/com/altafrazzaque/example/MainActivity.kt b/example/android/app/src/main/kotlin/com/altafrazzaque/example/MainActivity.kt index 86ca961..359be47 100644 --- a/example/android/app/src/main/kotlin/com/altafrazzaque/example/MainActivity.kt +++ b/example/android/app/src/main/kotlin/com/altafrazzaque/example/MainActivity.kt @@ -1,6 +1,6 @@ package com.altafrazzaque.example -import io.flutter.embedding.android.FlutterActivity + import androidx.annotation.NonNull import io.flutter.embedding.android.FlutterActivity diff --git a/example/android/build.gradle b/example/android/build.gradle index 3100ad2..5451038 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.9.10' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:7.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -26,6 +26,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 296b146..6b66533 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/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-5.6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip diff --git a/example/lib/main.dart b/example/lib/main.dart index 5516859..c5ec586 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -21,7 +21,7 @@ class MyApp extends StatelessWidget { } class MyHomePage extends StatefulWidget { - MyHomePage({Key key, this.title}) : super(key: key); + MyHomePage({required this.title}); final String title; @@ -89,7 +89,11 @@ class _MyHomePageState extends State { ///defaultCountry: CscCountry.India, ///Country Filter [OPTIONAL PARAMETER] - countryFilter: [CscCountry.India,CscCountry.United_States,CscCountry.Canada], + countryFilter: [ + CscCountry.India, + CscCountry.United_States, + CscCountry.Canada + ], ///Disable country dropdown (Note: use it with default country) //disableCountry: true, @@ -118,11 +122,17 @@ class _MyHomePageState extends State { ///Search bar radius [OPTIONAL PARAMETER] searchBarRadius: 10.0, + ///search bar dialog box decoration [OPTIONAL PARAMETER] + searchDialogDecoration: BoxDecoration( + borderRadius: BorderRadius.all(Radius.circular(10)), + color: Colors.white, + ), + ///triggers once country selected in dropdown onCountryChanged: (value) { setState(() { ///store value in country variable - countryValue = value; + countryValue = value!; }); }, @@ -130,7 +140,7 @@ class _MyHomePageState extends State { onStateChanged: (value) { setState(() { ///store value in state variable - stateValue = value; + stateValue = value!; }); }, @@ -138,7 +148,7 @@ class _MyHomePageState extends State { onCityChanged: (value) { setState(() { ///store value in city variable - cityValue = value; + cityValue = value!; }); }, diff --git a/example/pubspec.lock b/example/pubspec.lock index b5027a5..d0a83da 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" boolean_selector: dependency: transitive description: @@ -21,10 +21,10 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" clock: dependency: transitive description: @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.18.0" csc_picker: dependency: "direct main" description: @@ -74,46 +74,62 @@ packages: description: flutter source: sdk version: "0.0.0" - js: + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + url: "https://pub.dev" + source: hosted + version: "10.0.0" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + url: "https://pub.dev" + source: hosted + version: "2.0.1" + leak_tracker_testing: dependency: transitive description: - name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + name: leak_tracker_testing + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "2.0.1" matcher: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.11.0" path: dependency: transitive description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.9.0" sky_engine: dependency: transitive description: flutter @@ -123,26 +139,26 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -163,10 +179,10 @@ packages: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.6.1" vector_math: dependency: transitive description: @@ -175,6 +191,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + url: "https://pub.dev" + source: hosted + version: "13.0.0" sdks: - dart: ">=2.18.0 <3.0.0" + dart: ">=3.2.0-0 <4.0.0" flutter: ">=1.17.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index adabcc1..525a8ba 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev version: 1.0.0+1 environment: - sdk: ">=2.7.0 <3.0.0" + sdk: '>=2.12.0 <3.0.0' dependencies: flutter: diff --git a/lib/csc_picker.dart b/lib/csc_picker.dart index 405df36..55a8224 100644 --- a/lib/csc_picker.dart +++ b/lib/csc_picker.dart @@ -522,6 +522,7 @@ class CSCPicker extends StatefulWidget { Key? key, this.onCountryChanged, this.onStateChanged, + this.searchDialogDecoration, this.onCityChanged, this.selectedItemStyle, this.dropdownHeadingStyle, @@ -576,6 +577,7 @@ class CSCPicker extends StatefulWidget { final Layout layout; final double? searchBarRadius; final double? dropdownDialogRadius; + final BoxDecoration? searchDialogDecoration; final CscCountry? defaultCountry; @@ -903,6 +905,7 @@ class CSCPickerState extends State { return DropdownWithSearch( title: widget.countryDropdownLabel, placeHolder: widget.countrySearchPlaceholder, + searchDialogDecoration : widget.searchDialogDecoration, selectedItemStyle: widget.selectedItemStyle, dropdownHeadingStyle: widget.dropdownHeadingStyle, itemStyle: widget.dropdownItemStyle, diff --git a/lib/dropdown_with_search.dart b/lib/dropdown_with_search.dart index b9a3feb..2caf617 100644 --- a/lib/dropdown_with_search.dart +++ b/lib/dropdown_with_search.dart @@ -9,9 +9,11 @@ class DropdownWithSearch extends StatelessWidget { final TextStyle? selectedItemStyle; final TextStyle? dropdownHeadingStyle; final TextStyle? itemStyle; + final Decoration? searchDialogDecoration; final BoxDecoration? decoration, disabledDecoration; final double? searchBarRadius; final double? dialogRadius; + final Decoration? dropDownDecoration; final bool disabled; final String label; @@ -27,6 +29,8 @@ class DropdownWithSearch extends StatelessWidget { this.selectedItemPadding, this.selectedItemStyle, this.dropdownHeadingStyle, + this.dropDownDecoration, + this.searchDialogDecoration, this.itemStyle, this.decoration, this.disabledDecoration, @@ -47,6 +51,7 @@ class DropdownWithSearch extends StatelessWidget { builder: (context) => SearchDialog( placeHolder: placeHolder, title: title, + searchDialogDecoration: searchDialogDecoration, searchInputRadius: searchBarRadius, dialogRadius: dialogRadius, titleStyle: dropdownHeadingStyle, @@ -104,7 +109,7 @@ class SearchDialog extends StatefulWidget { final TextStyle? titleStyle; final TextStyle? itemStyle; final double? searchInputRadius; - + final Decoration? searchDialogDecoration; final double? dialogRadius; const SearchDialog( @@ -112,6 +117,7 @@ class SearchDialog extends StatefulWidget { required this.title, required this.placeHolder, required this.items, + this.searchDialogDecoration, this.titleStyle, this.searchInputRadius, this.dialogRadius, @@ -159,8 +165,17 @@ class _SearchDialogState extends State { borderRadius: widget.dialogRadius != null ? BorderRadius.circular(widget.dialogRadius!) : BorderRadius.circular(14)), - child: ClipRRect( - borderRadius: BorderRadius.circular(12.0), + child: Container( + // borderRadius: BorderRadius.circular(12.0), + // decoration: BoxDecoration( + // borderRadius: BorderRadius.all(widget.dialogRadius != null + // ? Radius.circular(widget.dialogRadius!) + // : Radius.circular(5)), + // color: widget.searchBackgroundColor != null + // ? widget.searchBackgroundColor + // : Colors.white, + // ), + decoration: widget.searchDialogDecoration, child: Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ diff --git a/pubspec.lock b/pubspec.lock index fa04c20..e0f0b10 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" boolean_selector: dependency: transitive description: @@ -21,10 +21,10 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" clock: dependency: transitive description: @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.18.0" fake_async: dependency: transitive description: @@ -59,46 +59,62 @@ packages: description: flutter source: sdk version: "0.0.0" - js: + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + url: "https://pub.dev" + source: hosted + version: "10.0.0" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + url: "https://pub.dev" + source: hosted + version: "2.0.1" + leak_tracker_testing: dependency: transitive description: - name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + name: leak_tracker_testing + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "2.0.1" matcher: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.11.0" path: dependency: transitive description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.9.0" sky_engine: dependency: transitive description: flutter @@ -108,26 +124,26 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -148,10 +164,10 @@ packages: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.6.1" vector_math: dependency: transitive description: @@ -160,6 +176,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + url: "https://pub.dev" + source: hosted + version: "13.0.0" sdks: - dart: ">=2.18.0 <4.0.0" + dart: ">=3.2.0-0 <4.0.0" flutter: ">=1.17.0"