From b5a1369297e14aada0e83b87953acc5ee50e51e8 Mon Sep 17 00:00:00 2001 From: Sai Naw Wun Date: Mon, 30 Nov 2020 04:53:56 +0630 Subject: [PATCH] fix package delete filter --- .gitignore | 8 +++ .vscode/launch.json | 24 +++++++ lib/pages/package/model/package_model.dart | 1 + pubspec.lock | 81 ++++++++++------------ pubspec.yaml | 12 ++-- 5 files changed, 73 insertions(+), 53 deletions(-) diff --git a/.gitignore b/.gitignore index 2adc0e1..60ad1dd 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,11 @@ android/key.jks android/app/src/prod/AndroidManifest.xml android/app/src/prod/google-services.json android/app/src/prod/res/values/strings.xml +.gradle/5.6.2/gc.properties +.gradle/5.6.2/executionHistory/executionHistory.bin +.gradle/5.6.2/executionHistory/executionHistory.lock +.gradle/5.6.2/fileChanges/last-build.bin +.gradle/5.6.2/fileHashes/fileHashes.lock +.gradle/buildOutputCleanup/buildOutputCleanup.lock +.gradle/buildOutputCleanup/cache.properties +.gradle/vcs-1/gc.properties diff --git a/.vscode/launch.json b/.vscode/launch.json index a367bd1..1f5e1fb 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -24,6 +24,18 @@ "--flavor", "dev" ], + }, + { + "name": "Local Dev2", + "request": "launch", + "type": "dart", + "program": "lib/main-local.dart", + "args": [ + "-t", + "lib/main-local.dart", + "--flavor", + "dev" + ], }, { "name": "Dev", @@ -37,6 +49,18 @@ "dev" ], }, + { + "name": "Dev2", + "request": "launch", + "type": "dart", + "program": "lib/main-dev.dart", + "args": [ + "-t", + "lib/main-dev.dart", + "--flavor", + "dev" + ], + }, { "name": "Dev iOS", "request": "launch", diff --git a/lib/pages/package/model/package_model.dart b/lib/pages/package/model/package_model.dart index f3f5470..7ee7672 100644 --- a/lib/pages/package/model/package_model.dart +++ b/lib/pages/package/model/package_model.dart @@ -156,6 +156,7 @@ class PackageModel extends BaseModel { var snaps = await Firestore.instance .collection("$path") .where("tracking_id", isEqualTo: trackingID) + .where("is_deleted", isEqualTo: false) .getDocuments(source: Source.server); if (snaps.documents.length == 1) { var snap = snaps.documents[0]; diff --git a/pubspec.lock b/pubspec.lock index cf0475c..7bcd555 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.4.2" + version: "2.5.0-nullsafety.1" barcode_scan: dependency: "direct main" description: @@ -21,7 +21,7 @@ packages: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0-nullsafety.1" cached_network_image: dependency: "direct main" description: @@ -42,21 +42,21 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.1.0-nullsafety.3" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.1.3" + version: "1.2.0-nullsafety.1" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.1.0-nullsafety.1" cloud_firestore: dependency: "direct main" description: @@ -84,14 +84,14 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.13" + version: "1.15.0-nullsafety.3" connectivity: dependency: "direct main" description: name: connectivity url: "https://pub.dartlang.org" source: hosted - version: "0.4.9+2" + version: "2.0.2" connectivity_for_web: dependency: transitive description: @@ -175,7 +175,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0-nullsafety.1" ffi: dependency: transitive description: @@ -398,14 +398,14 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.8" + version: "0.12.10-nullsafety.1" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.8" + version: "1.3.0-nullsafety.3" mime: dependency: transitive description: @@ -447,7 +447,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0-nullsafety.1" path_provider: dependency: "direct main" description: @@ -525,13 +525,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.2.1" - platform_detect: - dependency: transitive - description: - name: platform_detect - url: "https://pub.dartlang.org" - source: hosted - version: "1.4.0" plugin_platform_interface: dependency: transitive description: @@ -560,13 +553,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "4.3.2+1" - pub_semver: - dependency: transitive - description: - name: pub_semver - url: "https://pub.dartlang.org" - source: hosted - version: "1.4.4" quill_delta: dependency: transitive description: @@ -601,7 +587,7 @@ packages: name: share url: "https://pub.dartlang.org" source: hosted - version: "0.6.5" + version: "0.6.5+4" shared_preferences: dependency: "direct main" description: @@ -648,7 +634,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0-nullsafety.2" sqflite: dependency: transitive description: @@ -669,21 +655,21 @@ packages: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.9.5" + version: "1.10.0-nullsafety.1" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0-nullsafety.1" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "1.1.0-nullsafety.1" synchronized: dependency: transitive description: @@ -697,14 +683,14 @@ packages: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0-nullsafety.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.17" + version: "0.2.19-nullsafety.2" timeline_list: dependency: "direct main" description: @@ -718,14 +704,14 @@ packages: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0-nullsafety.3" url_launcher: dependency: "direct main" description: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "5.5.0" + version: "5.7.10" url_launcher_linux: dependency: transitive description: @@ -746,14 +732,21 @@ packages: name: url_launcher_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.7" + version: "1.0.9" url_launcher_web: dependency: transitive description: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "0.1.2+1" + version: "0.1.5+1" + url_launcher_windows: + dependency: transitive + description: + name: url_launcher_windows + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.1+3" uuid: dependency: "direct main" description: @@ -767,7 +760,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.1.0-nullsafety.3" win32: dependency: transitive description: @@ -785,12 +778,10 @@ packages: zefyr: dependency: "direct main" description: - path: "packages/zefyr" - ref: HEAD - resolved-ref: "20b890b7714fd54ccd0028da5b354d3d8ac68251" - url: "git://github.com/masewo/zefyr.git" - source: git - version: "0.11.0" + name: zefyr + url: "https://pub.dartlang.org" + source: hosted + version: "0.12.0" sdks: - dart: ">=2.9.0 <3.0.0" - flutter: ">=1.20.0 <2.0.0" + dart: ">=2.10.0-110 <2.11.0" + flutter: ">=1.22.0 <2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 3e93c9f..b530941 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -35,15 +35,11 @@ dependencies: photo_view: ^0.9.0 uuid: ^2.0.4 zefyr: - git: - url: git://github.com/masewo/zefyr.git - path: packages/zefyr - commit: 2e379982e97cc9b5aeb4fc0fcd85d6d32833f4ea path_provider: ^1.6.11 camera: ^0.4.2 - url_launcher: ^5.4.1 + url_launcher: ^5.7.10 device_info: ^0.4.1+4 - connectivity: ^0.4.8+1 + connectivity: ^2.0.2 logging: ^0.11.4 permission_handler: ^4.0.0 country_code_picker: ^1.3.12 @@ -53,8 +49,8 @@ dependencies: timeline_list: ^0.0.5 barcode_scan: ^2.0.2 flutter_pdfview: ^1.0.3 - flutter_local_notifications: ^1.4.4+4 - share: ^0.6.5 + flutter_local_notifications: ^1.4.4+4 + share: '>=0.6.5+4 <2.0.0' cached_network_image: ^2.3.2+1 flutter_cache_manager: ^2.0.0