kishan.bhuta/GSFV2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

conflict resolved

Browse Source
This commit is contained in:
priyanka
2024-04-22 04:35:13 -07:00
parent 13cc99735f e7bbb72336
commit ec325568be
14 changed files with 446 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

144
.dart_tool/package_config.json
View File

@@ -3,415 +3,419 @@
"packages": [
{
"name": "_fe_analyzer_shared",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/_fe_analyzer_shared-31.0.0",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/_fe_analyzer_shared-31.0.0",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "analyzer",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/analyzer-2.8.0",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/analyzer-2.8.0",
"packageUri": "lib/",
"languageVersion": "2.14"
},
{
"name": "args",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/args-2.4.0",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/args-2.4.0",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "async",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.10.0",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/async-2.10.0",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "boolean_selector",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/boolean_selector-2.1.1",
"packageUri": "lib/",
"languageVersion": "2.17"
},
{
"name": "build",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/build-2.0.3",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/build-2.0.3",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "build_config",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/build_config-0.4.7",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/build_config-0.4.7",
"packageUri": "lib/",
"languageVersion": "2.11"
},
{
"name": "build_daemon",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/build_daemon-2.1.10",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/build_daemon-2.1.10",
"packageUri": "lib/",
"languageVersion": "2.11"
},
{
"name": "build_resolvers",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/build_resolvers-2.0.6",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/build_resolvers-2.0.6",
"packageUri": "lib/",
"languageVersion": "2.14"
},
{
"name": "build_runner",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/build_runner-1.12.2",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/build_runner-1.12.2",
"packageUri": "lib/",
"languageVersion": "2.11"
},
{
"name": "build_runner_core",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/build_runner_core-6.1.12",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/build_runner_core-6.1.12",
"packageUri": "lib/",
"languageVersion": "2.11"
},
{
"name": "built_collection",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/built_collection-5.1.1",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/built_collection-5.1.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "built_value",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/built_value-8.4.3",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/built_value-8.4.3",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "change_app_package_name",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/change_app_package_name-1.1.0",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/change_app_package_name-1.1.0",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "characters",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.2.1",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/characters-1.2.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "checked_yaml",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/checked_yaml-2.0.2",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/checked_yaml-2.0.2",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "cli_util",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/cli_util-0.3.5",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/cli_util-0.3.5",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "clock",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/clock-1.1.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "code_builder",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/code_builder-3.7.0",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/code_builder-3.7.0",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "collection",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.0",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/collection-1.17.0",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "convert",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/convert-3.1.1",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/convert-3.1.1",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "crypto",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/crypto-3.0.2",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/crypto-3.0.2",
"packageUri": "lib/",
"languageVersion": "2.14"
},
{
"name": "dart_style",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/dart_style-2.2.1",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/dart_style-2.2.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "fake_async",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/fake_async-1.3.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "file",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/file-6.1.4",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/file-6.1.4",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "fixnum",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/fixnum-1.1.0",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/fixnum-1.1.0",
"packageUri": "lib/",
"languageVersion": "2.19"
},
{
"name": "flutter",
"rootUri": "file:///C:/Flutter_SDK/flutter/packages/flutter",
"rootUri": "file:///Users/macbookpro/flutteroldversion/flutter/packages/flutter",
"packageUri": "lib/",
"languageVersion": "2.17"
},
{
"name": "flutter_lints",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.1",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/flutter_lints-2.0.1",
"packageUri": "lib/",
"languageVersion": "2.17"
},
{
"name": "flutter_test",
"rootUri": "file:///C:/Flutter_SDK/flutter/packages/flutter_test",
"rootUri": "file:///Users/macbookpro/flutteroldversion/flutter/packages/flutter_test",
"packageUri": "lib/",
"languageVersion": "2.17"
},
{
"name": "glob",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/glob-2.1.1",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/glob-2.1.1",
"packageUri": "lib/",
"languageVersion": "2.15"
},
{
"name": "graphs",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/graphs-1.0.0",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/graphs-1.0.0",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "http_multi_server",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/http_multi_server-3.2.1",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/http_multi_server-3.2.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "http_parser",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/http_parser-4.0.2",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/http_parser-4.0.2",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "intl",
<<<<<<< HEAD
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/intl-0.17.0",
=======
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/intl-0.17.0",
>>>>>>> e7bbb72336ba03e8b8757d19328ddc518db13fae
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "io",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/io-1.0.4",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/io-1.0.4",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "js",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/js-0.6.5",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/js-0.6.5",
"packageUri": "lib/",
"languageVersion": "2.16"
},
{
"name": "json_annotation",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/json_annotation-4.6.0",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/json_annotation-4.6.0",
"packageUri": "lib/",
"languageVersion": "2.14"
},
{
"name": "json_serializable",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/json_serializable-6.3.1",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/json_serializable-6.3.1",
"packageUri": "lib/",
"languageVersion": "2.14"
},
{
"name": "lints",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.0.1",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/lints-2.0.1",
"packageUri": "lib/",
"languageVersion": "2.17"
},
{
"name": "logging",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/logging-1.1.1",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/logging-1.1.1",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "matcher",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.13",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/matcher-0.12.13",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "material_color_utilities",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.2.0",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/material_color_utilities-0.2.0",
"packageUri": "lib/",
"languageVersion": "2.13"
},
{
"name": "meta",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.8.0",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/meta-1.8.0",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "mime",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/mime-1.0.4",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/mime-1.0.4",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "package_config",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/package_config-2.1.0",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/package_config-2.1.0",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "path",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.2",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/path-1.8.2",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "pedantic",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/pedantic-1.11.1",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/pedantic-1.11.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "plugin_platform_interface",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/plugin_platform_interface-2.1.4",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/plugin_platform_interface-2.1.4",
"packageUri": "lib/",
"languageVersion": "2.17"
},
{
"name": "pool",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/pool-1.5.1",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/pool-1.5.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "pub_semver",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/pub_semver-2.1.3",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/pub_semver-2.1.3",
"packageUri": "lib/",
"languageVersion": "2.17"
},
{
"name": "pubspec_parse",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/pubspec_parse-1.2.1",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/pubspec_parse-1.2.1",
"packageUri": "lib/",
"languageVersion": "2.14"
},
{
"name": "shelf",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/shelf-1.4.0",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/shelf-1.4.0",
"packageUri": "lib/",
"languageVersion": "2.17"
},
{
"name": "shelf_web_socket",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/shelf_web_socket-1.0.3",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/shelf_web_socket-1.0.3",
"packageUri": "lib/",
"languageVersion": "2.17"
},
{
"name": "sky_engine",
"rootUri": "file:///C:/Flutter_SDK/flutter/bin/cache/pkg/sky_engine",
"rootUri": "file:///Users/macbookpro/flutteroldversion/flutter/bin/cache/pkg/sky_engine",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "source_gen",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/source_gen-1.0.5",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/source_gen-1.0.5",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "source_helper",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/source_helper-1.3.2",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/source_helper-1.3.2",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "source_span",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.9.1",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/source_span-1.9.1",
"packageUri": "lib/",
"languageVersion": "2.14"
},
{
"name": "stack_trace",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/stack_trace-1.11.0",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "stream_channel",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/stream_channel-2.1.1",
"packageUri": "lib/",
"languageVersion": "2.14"
},
{
"name": "stream_transform",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/stream_transform-2.1.0",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/stream_transform-2.1.0",
"packageUri": "lib/",
"languageVersion": "2.14"
},
{
"name": "string_scanner",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/string_scanner-1.2.0",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "term_glyph",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/term_glyph-1.2.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "test_api",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.4.16",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/test_api-0.4.16",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "timing",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/timing-1.0.1",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/timing-1.0.1",
"packageUri": "lib/",
"languageVersion": "2.14"
},
{
"name": "typed_data",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/typed_data-1.3.1",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/typed_data-1.3.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "vector_math",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/vector_math-2.1.4",
"packageUri": "lib/",
"languageVersion": "2.14"
},
{
"name": "watcher",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/watcher-1.0.2",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/watcher-1.0.2",
"packageUri": "lib/",
"languageVersion": "2.14"
},
{
"name": "web_socket_channel",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/web_socket_channel-2.3.0",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/web_socket_channel-2.3.0",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "yaml",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/yaml-3.1.1",
"rootUri": "file:///Users/macbookpro/.pub-cache/hosted/pub.dev/yaml-3.1.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
@@ -422,7 +426,11 @@
"languageVersion": "2.17"
}
],
<<<<<<< HEAD
"generated": "2024-04-18T09:34:08.334722Z",
=======
"generated": "2024-04-19T10:17:06.404139Z",
>>>>>>> e7bbb72336ba03e8b8757d19328ddc518db13fae
"generator": "pub",
"generatorVersion": "2.19.6"
}

298
.dart_tool/package_config_subset
View File

@@ -1,281 +1,291 @@
icdevicemanager_flutter
2.17
file:///C:/Flutter%20Project/GSF/
file:///C:/Flutter%20Project/GSF/lib/
sky_engine
2.12
file:///C:/Flutter_SDK/flutter/bin/cache/pkg/sky_engine/
file:///C:/Flutter_SDK/flutter/bin/cache/pkg/sky_engine/lib/
flutter
2.17
file:///C:/Flutter_SDK/flutter/packages/flutter/
file:///C:/Flutter_SDK/flutter/packages/flutter/lib/
flutter_test
2.17
file:///C:/Flutter_SDK/flutter/packages/flutter_test/
file:///C:/Flutter_SDK/flutter/packages/flutter_test/lib/
_fe_analyzer_shared
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/_fe_analyzer_shared-31.0.0/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/_fe_analyzer_shared-31.0.0/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/_fe_analyzer_shared-31.0.0/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/_fe_analyzer_shared-31.0.0/lib/
analyzer
2.14
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/analyzer-2.8.0/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/analyzer-2.8.0/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/analyzer-2.8.0/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/analyzer-2.8.0/lib/
args
2.18
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/args-2.4.0/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/args-2.4.0/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/args-2.4.0/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/args-2.4.0/lib/
async
2.18
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.10.0/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.10.0/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/async-2.10.0/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/async-2.10.0/lib/
boolean_selector
2.17
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/boolean_selector-2.1.1/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/boolean_selector-2.1.1/lib/
build
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/build-2.0.3/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/build-2.0.3/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/build-2.0.3/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/build-2.0.3/lib/
build_config
2.11
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/build_config-0.4.7/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/build_config-0.4.7/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/build_config-0.4.7/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/build_config-0.4.7/lib/
build_daemon
2.11
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/build_daemon-2.1.10/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/build_daemon-2.1.10/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/build_daemon-2.1.10/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/build_daemon-2.1.10/lib/
build_resolvers
2.14
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/build_resolvers-2.0.6/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/build_resolvers-2.0.6/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/build_resolvers-2.0.6/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/build_resolvers-2.0.6/lib/
build_runner
2.11
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/build_runner-1.12.2/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/build_runner-1.12.2/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/build_runner-1.12.2/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/build_runner-1.12.2/lib/
build_runner_core
2.11
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/build_runner_core-6.1.12/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/build_runner_core-6.1.12/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/build_runner_core-6.1.12/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/build_runner_core-6.1.12/lib/
built_collection
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/built_collection-5.1.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/built_collection-5.1.1/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/built_collection-5.1.1/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/built_collection-5.1.1/lib/
built_value
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/built_value-8.4.3/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/built_value-8.4.3/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/built_value-8.4.3/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/built_value-8.4.3/lib/
change_app_package_name
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/change_app_package_name-1.1.0/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/change_app_package_name-1.1.0/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/change_app_package_name-1.1.0/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/change_app_package_name-1.1.0/lib/
characters
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.2.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.2.1/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/characters-1.2.1/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/characters-1.2.1/lib/
checked_yaml
2.18
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/checked_yaml-2.0.2/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/checked_yaml-2.0.2/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/checked_yaml-2.0.2/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/checked_yaml-2.0.2/lib/
cli_util
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/cli_util-0.3.5/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/cli_util-0.3.5/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/cli_util-0.3.5/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/cli_util-0.3.5/lib/
clock
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/clock-1.1.1/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/clock-1.1.1/lib/
code_builder
2.7
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/code_builder-3.7.0/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/code_builder-3.7.0/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/code_builder-3.7.0/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/code_builder-3.7.0/lib/
collection
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.0/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.0/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/collection-1.17.0/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/collection-1.17.0/lib/
convert
2.18
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/convert-3.1.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/convert-3.1.1/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/convert-3.1.1/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/convert-3.1.1/lib/
crypto
2.14
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/crypto-3.0.2/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/crypto-3.0.2/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/crypto-3.0.2/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/crypto-3.0.2/lib/
dart_style
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/dart_style-2.2.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/dart_style-2.2.1/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/dart_style-2.2.1/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/dart_style-2.2.1/lib/
fake_async
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/fake_async-1.3.1/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/fake_async-1.3.1/lib/
file
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/file-6.1.4/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/file-6.1.4/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/file-6.1.4/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/file-6.1.4/lib/
fixnum
2.19
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/fixnum-1.1.0/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/fixnum-1.1.0/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/fixnum-1.1.0/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/fixnum-1.1.0/lib/
flutter_lints
2.17
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.1/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/flutter_lints-2.0.1/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/flutter_lints-2.0.1/lib/
glob
2.15
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/glob-2.1.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/glob-2.1.1/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/glob-2.1.1/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/glob-2.1.1/lib/
graphs
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/graphs-1.0.0/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/graphs-1.0.0/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/graphs-1.0.0/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/graphs-1.0.0/lib/
http_multi_server
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/http_multi_server-3.2.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/http_multi_server-3.2.1/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/http_multi_server-3.2.1/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/http_multi_server-3.2.1/lib/
http_parser
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/http_parser-4.0.2/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/http_parser-4.0.2/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/http_parser-4.0.2/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/http_parser-4.0.2/lib/
intl
2.12
<<<<<<< HEAD
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/intl-0.17.0/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/intl-0.17.0/lib/
=======
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/intl-0.17.0/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/intl-0.17.0/lib/
>>>>>>> e7bbb72336ba03e8b8757d19328ddc518db13fae
io
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/io-1.0.4/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/io-1.0.4/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/io-1.0.4/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/io-1.0.4/lib/
js
2.16
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/js-0.6.5/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/js-0.6.5/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/js-0.6.5/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/js-0.6.5/lib/
json_annotation
2.14
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/json_annotation-4.6.0/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/json_annotation-4.6.0/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/json_annotation-4.6.0/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/json_annotation-4.6.0/lib/
json_serializable
2.14
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/json_serializable-6.3.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/json_serializable-6.3.1/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/json_serializable-6.3.1/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/json_serializable-6.3.1/lib/
lints
2.17
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.0.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.0.1/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/lints-2.0.1/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/lints-2.0.1/lib/
logging
2.18
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/logging-1.1.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/logging-1.1.1/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/logging-1.1.1/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/logging-1.1.1/lib/
matcher
2.18
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.13/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.13/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/matcher-0.12.13/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/matcher-0.12.13/lib/
material_color_utilities
2.13
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.2.0/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.2.0/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/material_color_utilities-0.2.0/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/material_color_utilities-0.2.0/lib/
meta
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.8.0/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.8.0/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/meta-1.8.0/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/meta-1.8.0/lib/
mime
2.18
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/mime-1.0.4/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/mime-1.0.4/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/mime-1.0.4/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/mime-1.0.4/lib/
package_config
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/package_config-2.1.0/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/package_config-2.1.0/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/package_config-2.1.0/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/package_config-2.1.0/lib/
path
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.2/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.2/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/path-1.8.2/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/path-1.8.2/lib/
pedantic
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/pedantic-1.11.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/pedantic-1.11.1/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/pedantic-1.11.1/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/pedantic-1.11.1/lib/
plugin_platform_interface
2.17
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/plugin_platform_interface-2.1.4/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/plugin_platform_interface-2.1.4/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/plugin_platform_interface-2.1.4/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/plugin_platform_interface-2.1.4/lib/
pool
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/pool-1.5.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/pool-1.5.1/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/pool-1.5.1/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/pool-1.5.1/lib/
pub_semver
2.17
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/pub_semver-2.1.3/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/pub_semver-2.1.3/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/pub_semver-2.1.3/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/pub_semver-2.1.3/lib/
pubspec_parse
2.14
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/pubspec_parse-1.2.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/pubspec_parse-1.2.1/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/pubspec_parse-1.2.1/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/pubspec_parse-1.2.1/lib/
shelf
2.17
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/shelf-1.4.0/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/shelf-1.4.0/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/shelf-1.4.0/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/shelf-1.4.0/lib/
shelf_web_socket
2.17
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/shelf_web_socket-1.0.3/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/shelf_web_socket-1.0.3/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/shelf_web_socket-1.0.3/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/shelf_web_socket-1.0.3/lib/
source_gen
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/source_gen-1.0.5/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/source_gen-1.0.5/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/source_gen-1.0.5/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/source_gen-1.0.5/lib/
source_helper
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/source_helper-1.3.2/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/source_helper-1.3.2/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/source_helper-1.3.2/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/source_helper-1.3.2/lib/
source_span
2.14
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.9.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.9.1/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/source_span-1.9.1/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/source_span-1.9.1/lib/
stack_trace
2.18
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/stack_trace-1.11.0/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/stack_trace-1.11.0/lib/
stream_channel
2.14
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/stream_channel-2.1.1/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/stream_channel-2.1.1/lib/
stream_transform
2.14
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/stream_transform-2.1.0/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/stream_transform-2.1.0/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/stream_transform-2.1.0/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/stream_transform-2.1.0/lib/
string_scanner
2.18
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/string_scanner-1.2.0/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/string_scanner-1.2.0/lib/
term_glyph
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/term_glyph-1.2.1/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/term_glyph-1.2.1/lib/
test_api
2.18
<<<<<<< HEAD
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.4.16/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.4.16/lib/
=======
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/test_api-0.4.16/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/test_api-0.4.16/lib/
>>>>>>> e7bbb72336ba03e8b8757d19328ddc518db13fae
timing
2.14
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/timing-1.0.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/timing-1.0.1/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/timing-1.0.1/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/timing-1.0.1/lib/
typed_data
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/typed_data-1.3.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/typed_data-1.3.1/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/typed_data-1.3.1/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/typed_data-1.3.1/lib/
vector_math
2.14
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/vector_math-2.1.4/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/vector_math-2.1.4/lib/
watcher
2.14
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/watcher-1.0.2/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/watcher-1.0.2/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/watcher-1.0.2/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/watcher-1.0.2/lib/
web_socket_channel
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/web_socket_channel-2.3.0/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/web_socket_channel-2.3.0/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/web_socket_channel-2.3.0/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/web_socket_channel-2.3.0/lib/
yaml
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/yaml-3.1.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/yaml-3.1.1/lib/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/yaml-3.1.1/
file:///Users/macbookpro/.pub-cache/hosted/pub.dev/yaml-3.1.1/lib/
icdevicemanager_flutter
2.17
file:///Users/macbookpro/Desktop/Flutter%20Projects%20/GSFV8/
file:///Users/macbookpro/Desktop/Flutter%20Projects%20/GSFV8/lib/
sky_engine
2.12
file:///Users/macbookpro/flutteroldversion/flutter/bin/cache/pkg/sky_engine/
file:///Users/macbookpro/flutteroldversion/flutter/bin/cache/pkg/sky_engine/lib/
flutter
2.17
file:///Users/macbookpro/flutteroldversion/flutter/packages/flutter/
file:///Users/macbookpro/flutteroldversion/flutter/packages/flutter/lib/
flutter_test
2.17
file:///Users/macbookpro/flutteroldversion/flutter/packages/flutter_test/
file:///Users/macbookpro/flutteroldversion/flutter/packages/flutter_test/lib/
2

BIN
gsf/assets/image/menuicon/mysubscription.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

67
gsf/ios/Podfile.lock
View File

@@ -11,11 +11,20 @@ PODS:
- ReachabilitySwift
- device_info_plus (0.0.1):
- Flutter
- Firebase/Analytics (10.17.0):
- Firebase/Core
- Firebase/Core (10.17.0):
- Firebase/CoreOnly
- FirebaseAnalytics (~> 10.17.0)
- Firebase/CoreOnly (10.17.0):
- FirebaseCore (= 10.17.0)
- Firebase/Crashlytics (10.17.0):
- Firebase/CoreOnly
- FirebaseCrashlytics (~> 10.17.0)
- firebase_analytics (10.7.0):
- Firebase/Analytics (= 10.17.0)
- firebase_core
- Flutter
- firebase_core (2.22.0):
- Firebase/CoreOnly (= 10.17.0)
- Flutter
@@ -23,6 +32,24 @@ PODS:
- Firebase/Crashlytics (= 10.17.0)
- firebase_core
- Flutter
- FirebaseAnalytics (10.17.0):
- FirebaseAnalytics/AdIdSupport (= 10.17.0)
- FirebaseCore (~> 10.0)
- FirebaseInstallations (~> 10.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
- GoogleUtilities/MethodSwizzler (~> 7.11)
- GoogleUtilities/Network (~> 7.11)
- "GoogleUtilities/NSData+zlib (~> 7.11)"
- nanopb (< 2.30910.0, >= 2.30908.0)
- FirebaseAnalytics/AdIdSupport (10.17.0):
- FirebaseCore (~> 10.0)
- FirebaseInstallations (~> 10.0)
- GoogleAppMeasurement (= 10.17.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
- GoogleUtilities/MethodSwizzler (~> 7.11)
- GoogleUtilities/Network (~> 7.11)
- "GoogleUtilities/NSData+zlib (~> 7.11)"
- nanopb (< 2.30910.0, >= 2.30908.0)
- FirebaseCore (10.17.0):
- FirebaseCoreInternal (~> 10.0)
- GoogleUtilities/Environment (~> 7.8)
@@ -74,15 +101,47 @@ PODS:
- FMDB/standard (2.7.5)
- geolocator_apple (1.2.0):
- Flutter
- GoogleAppMeasurement (10.17.0):
- GoogleAppMeasurement/AdIdSupport (= 10.17.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
- GoogleUtilities/MethodSwizzler (~> 7.11)
- GoogleUtilities/Network (~> 7.11)
- "GoogleUtilities/NSData+zlib (~> 7.11)"
- nanopb (< 2.30910.0, >= 2.30908.0)
- GoogleAppMeasurement/AdIdSupport (10.17.0):
- GoogleAppMeasurement/WithoutAdIdSupport (= 10.17.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
- GoogleUtilities/MethodSwizzler (~> 7.11)
- GoogleUtilities/Network (~> 7.11)
- "GoogleUtilities/NSData+zlib (~> 7.11)"
- nanopb (< 2.30910.0, >= 2.30908.0)
- GoogleAppMeasurement/WithoutAdIdSupport (10.17.0):
- GoogleUtilities/AppDelegateSwizzler (~> 7.11)
- GoogleUtilities/MethodSwizzler (~> 7.11)
- GoogleUtilities/Network (~> 7.11)
- "GoogleUtilities/NSData+zlib (~> 7.11)"
- nanopb (< 2.30910.0, >= 2.30908.0)
- GoogleDataTransport (9.2.5):
- GoogleUtilities/Environment (~> 7.7)
- nanopb (< 2.30910.0, >= 2.30908.0)
- PromisesObjC (< 3.0, >= 1.2)
- GoogleUtilities/AppDelegateSwizzler (7.12.0):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
- GoogleUtilities/Network
- GoogleUtilities/Environment (7.12.0):
- PromisesObjC (< 3.0, >= 1.2)
- GoogleUtilities/Logger (7.12.0):
- GoogleUtilities/Environment
- GoogleUtilities/MethodSwizzler (7.12.0):
- GoogleUtilities/Logger
- GoogleUtilities/Network (7.12.0):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
- GoogleUtilities/Reachability
- "GoogleUtilities/NSData+zlib (7.12.0)"
- GoogleUtilities/Reachability (7.12.0):
- GoogleUtilities/Logger
- GoogleUtilities/UserDefaults (7.12.0):
- GoogleUtilities/Logger
- health (1.0.4):
@@ -162,6 +221,7 @@ DEPENDENCIES:
- bluetooth_enable_fork (from `.symlinks/plugins/bluetooth_enable_fork/ios`)
- connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
- device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
- firebase_analytics (from `.symlinks/plugins/firebase_analytics/ios`)
- firebase_core (from `.symlinks/plugins/firebase_core/ios`)
- firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`)
- Flutter (from `Flutter`)
@@ -202,6 +262,7 @@ SPEC REPOS:
trunk:
- BranchSDK
- Firebase
- FirebaseAnalytics
- FirebaseCore
- FirebaseCoreExtension
- FirebaseCoreInternal
@@ -209,6 +270,7 @@ SPEC REPOS:
- FirebaseInstallations
- FirebaseSessions
- FMDB
- GoogleAppMeasurement
- GoogleDataTransport
- GoogleUtilities
- nanopb
@@ -230,6 +292,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/connectivity_plus/ios"
device_info_plus:
:path: ".symlinks/plugins/device_info_plus/ios"
firebase_analytics:
:path: ".symlinks/plugins/firebase_analytics/ios"
firebase_core:
:path: ".symlinks/plugins/firebase_core/ios"
firebase_crashlytics:
@@ -305,8 +369,10 @@ SPEC CHECKSUMS:
connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
Firebase: f4ac0b02927af9253ae094d23deecf0890da7374
firebase_analytics: d6f520c1030d2c1215851f6e332d39a489a30bd2
firebase_core: efc9455611b8769fa90fbdae5da182600bd6901c
firebase_crashlytics: 6a564f58db90be49c49d9ac100bc5cc3fcbf8267
FirebaseAnalytics: b9284f9fff10157a843e0422e908711f7bf3b9f2
FirebaseCore: 534544dd98cabcf4bf8598d88ec683b02319a528
FirebaseCoreExtension: 62b201498aa10535801cdf3448c7f4db5e24ed80
FirebaseCoreInternal: 8eb002e564b533bdcf1ba011f33f2b5c10e2ed4a
@@ -323,6 +389,7 @@ SPEC CHECKSUMS:
fluttertoast: 48c57db1b71b0ce9e6bba9f31c940ff4b001293c
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401
GoogleAppMeasurement: 4dcddfc7f102825c1c4e6422cb35567b101881a7
GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2
GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34
health: 5a380c0f6c4f619535845992993964293962e99e

91
gsf/ios/Runner.xcodeproj/project.pbxproj
View File

@@ -11,7 +11,6 @@
1AF7D2922B8C725000853315 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1AF7D2912B8C725000853315 /* GoogleService-Info.plist */; };
227E28212AA8694400B81730 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 227E28202AA8694400B81730 /* NotificationService.swift */; };
227E28252AA8694400B81730 /* OneSignalNotificationServiceExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 227E281E2AA8694400B81730 /* OneSignalNotificationServiceExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
2CDFEB5386549600F95A3C4B /* Pods_OneSignalNotificationServiceExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 635852FDE7F8B5A361609B82 /* Pods_OneSignalNotificationServiceExtension.framework */; };
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
529068A52A8E5706004ABCB1 /* BranchSDK in Frameworks */ = {isa = PBXBuildFile; productRef = 529068A42A8E5706004ABCB1 /* BranchSDK */; };
529068A72A8E5864004ABCB1 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 529068A62A8E5864004ABCB1 /* CoreServices.framework */; };
@@ -24,11 +23,12 @@
529068B72A8E58B7004ABCB1 /* LinkPresentation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 529068B62A8E58B7004ABCB1 /* LinkPresentation.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
529068B82A8F4849004ABCB1 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 529068AC2A8E588C004ABCB1 /* WebKit.framework */; };
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
77FD1CDB4AA27371318067AA /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D8D2A580C012EBEDDAB8E4EB /* Pods_Runner.framework */; };
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
EAC2B08A5EF3DB337047B851 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
F28142B6420A67828003E26E /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 559CD4C37425C2E8E38C2D7D /* Pods_Runner.framework */; };
B6DC1A5EE20154177CFADB9F /* Pods_OneSignalNotificationServiceExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 31DB554B356A79F42EEA4758 /* Pods_OneSignalNotificationServiceExtension.framework */; };
EAC2B08A5EF3DB337047B851 /* (null) in Frameworks */ = {isa = PBXBuildFile; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -63,10 +63,10 @@
227E281E2AA8694400B81730 /* OneSignalNotificationServiceExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = OneSignalNotificationServiceExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
227E28202AA8694400B81730 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
227E28222AA8694400B81730 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
34CF38A11769EB9BFC905652 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
31DB554B356A79F42EEA4758 /* Pods_OneSignalNotificationServiceExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OneSignalNotificationServiceExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
40D73505D43048226496D7A7 /* Pods-OneSignalNotificationServiceExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OneSignalNotificationServiceExtension.debug.xcconfig"; path = "Target Support Files/Pods-OneSignalNotificationServiceExtension/Pods-OneSignalNotificationServiceExtension.debug.xcconfig"; sourceTree = "<group>"; };
50E3EF1F27202EA85837D946 /* Pods-OneSignalNotificationServiceExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OneSignalNotificationServiceExtension.release.xcconfig"; path = "Target Support Files/Pods-OneSignalNotificationServiceExtension/Pods-OneSignalNotificationServiceExtension.release.xcconfig"; sourceTree = "<group>"; };
3C249F76873F87E2E555AA12 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
3F9D48AF0731C7CFD02E9B6E /* Pods-OneSignalNotificationServiceExtension.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OneSignalNotificationServiceExtension.release.xcconfig"; path = "Target Support Files/Pods-OneSignalNotificationServiceExtension/Pods-OneSignalNotificationServiceExtension.release.xcconfig"; sourceTree = "<group>"; };
5209C85A2A8E3F4800868C46 /* OneSignal.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = OneSignal.xcframework; path = Pods/OneSignalXCFramework/iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework; sourceTree = "<group>"; };
529068A62A8E5864004ABCB1 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; };
529068A82A8E5873004ABCB1 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
@@ -78,13 +78,12 @@
529068B42A8E58AF004ABCB1 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
529068B62A8E58B7004ABCB1 /* LinkPresentation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LinkPresentation.framework; path = System/Library/Frameworks/LinkPresentation.framework; sourceTree = SDKROOT; };
52C0E9972BCD0407007842BA /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
559CD4C37425C2E8E38C2D7D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
635852FDE7F8B5A361609B82 /* Pods_OneSignalNotificationServiceExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OneSignalNotificationServiceExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; };
73E7677E7BC1C1EB29CDF77C /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
5CAEBEB1EB22D78FEE720524 /* Pods-OneSignalNotificationServiceExtension.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OneSignalNotificationServiceExtension.profile.xcconfig"; path = "Target Support Files/Pods-OneSignalNotificationServiceExtension/Pods-OneSignalNotificationServiceExtension.profile.xcconfig"; sourceTree = "<group>"; };
5F0437EAF2EA7FDF256B814F /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
6D53993F7AB1BCB29BBA7F99 /* Pods-OneSignalNotificationServiceExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OneSignalNotificationServiceExtension.debug.xcconfig"; path = "Target Support Files/Pods-OneSignalNotificationServiceExtension/Pods-OneSignalNotificationServiceExtension.debug.xcconfig"; sourceTree = "<group>"; };
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
8FCDD55BD2CD81F1D21914D2 /* Pods-OneSignalNotificationServiceExtension.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OneSignalNotificationServiceExtension.profile.xcconfig"; path = "Target Support Files/Pods-OneSignalNotificationServiceExtension/Pods-OneSignalNotificationServiceExtension.profile.xcconfig"; sourceTree = "<group>"; };
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -92,7 +91,8 @@
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
C3E19A11A483AD6983EC6356 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
9CFBA2BC099C711405BF79AE /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
D8D2A580C012EBEDDAB8E4EB /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -100,7 +100,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
2CDFEB5386549600F95A3C4B /* Pods_OneSignalNotificationServiceExtension.framework in Frameworks */,
B6DC1A5EE20154177CFADB9F /* Pods_OneSignalNotificationServiceExtension.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -118,8 +118,8 @@
529068A72A8E5864004ABCB1 /* CoreServices.framework in Frameworks */,
529068A52A8E5706004ABCB1 /* BranchSDK in Frameworks */,
529068B82A8F4849004ABCB1 /* WebKit.framework in Frameworks */,
EAC2B08A5EF3DB337047B851 /* BuildFile in Frameworks */,
F28142B6420A67828003E26E /* Pods_Runner.framework in Frameworks */,
EAC2B08A5EF3DB337047B851 /* (null) in Frameworks */,
77FD1CDB4AA27371318067AA /* Pods_Runner.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -129,12 +129,12 @@
17AC36FD4407D91AC2261E86 /* Pods */ = {
isa = PBXGroup;
children = (
40D73505D43048226496D7A7 /* Pods-OneSignalNotificationServiceExtension.debug.xcconfig */,
50E3EF1F27202EA85837D946 /* Pods-OneSignalNotificationServiceExtension.release.xcconfig */,
8FCDD55BD2CD81F1D21914D2 /* Pods-OneSignalNotificationServiceExtension.profile.xcconfig */,
C3E19A11A483AD6983EC6356 /* Pods-Runner.debug.xcconfig */,
34CF38A11769EB9BFC905652 /* Pods-Runner.release.xcconfig */,
73E7677E7BC1C1EB29CDF77C /* Pods-Runner.profile.xcconfig */,
6D53993F7AB1BCB29BBA7F99 /* Pods-OneSignalNotificationServiceExtension.debug.xcconfig */,
3F9D48AF0731C7CFD02E9B6E /* Pods-OneSignalNotificationServiceExtension.release.xcconfig */,
5CAEBEB1EB22D78FEE720524 /* Pods-OneSignalNotificationServiceExtension.profile.xcconfig */,
5F0437EAF2EA7FDF256B814F /* Pods-Runner.debug.xcconfig */,
3C249F76873F87E2E555AA12 /* Pods-Runner.release.xcconfig */,
9CFBA2BC099C711405BF79AE /* Pods-Runner.profile.xcconfig */,
);
path = Pods;
sourceTree = "<group>";
@@ -211,8 +211,8 @@
529068A82A8E5873004ABCB1 /* SystemConfiguration.framework */,
529068A62A8E5864004ABCB1 /* CoreServices.framework */,
5209C85A2A8E3F4800868C46 /* OneSignal.xcframework */,
635852FDE7F8B5A361609B82 /* Pods_OneSignalNotificationServiceExtension.framework */,
559CD4C37425C2E8E38C2D7D /* Pods_Runner.framework */,
31DB554B356A79F42EEA4758 /* Pods_OneSignalNotificationServiceExtension.framework */,
D8D2A580C012EBEDDAB8E4EB /* Pods_Runner.framework */,
);
name = Frameworks;
sourceTree = "<group>";
@@ -224,7 +224,7 @@
isa = PBXNativeTarget;
buildConfigurationList = 227E28262AA8694400B81730 /* Build configuration list for PBXNativeTarget "OneSignalNotificationServiceExtension" */;
buildPhases = (
13EB04CF12534CDD59BBA288 /* [CP] Check Pods Manifest.lock */,
94BDEDCAAC45ADE45D2B5275 /* [CP] Check Pods Manifest.lock */,
227E281A2AA8694400B81730 /* Sources */,
227E281B2AA8694400B81730 /* Frameworks */,
227E281C2AA8694400B81730 /* Resources */,
@@ -242,15 +242,14 @@
isa = PBXNativeTarget;
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
buildPhases = (
AD0A238C35E5294F8BAB6312 /* [CP] Check Pods Manifest.lock */,
A3BDE51BAD87866279EDCE9A /* [CP] Check Pods Manifest.lock */,
9740EEB61CF901F6004384FC /* Run Script */,
97C146EA1CF9000F007C117D /* Sources */,
97C146EB1CF9000F007C117D /* Frameworks */,
97C146EC1CF9000F007C117D /* Resources */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
226DE2242AA76AB30069AF32 /* Embed Foundation Extensions */,
C9D58640702688400651DCCA /* [CP] Embed Pods Frameworks */,
0566BE68C33393A00546891A /* FlutterFire: "flutterfire upload-crashlytics-symbols" */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
C0FE94159ACCD81B29D045F6 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
@@ -330,25 +329,22 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
0566BE68C33393A00546891A /* FlutterFire: "flutterfire upload-crashlytics-symbols" */ = {
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "FlutterFire: \"flutterfire upload-crashlytics-symbols\"";
outputFileListPaths = (
);
name = "Thin Binary";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\n#!/bin/bash\nPATH=${PATH}:$FLUTTER_ROOT/bin:$HOME/.pub-cache/bin\nflutterfire upload-crashlytics-symbols --upload-symbols-script-path=$PODS_ROOT/FirebaseCrashlytics/upload-symbols --platform=ios --apple-project-path=${SRCROOT} --env-platform-name=${PLATFORM_NAME} --env-configuration=${CONFIGURATION} --env-project-dir=${PROJECT_DIR} --env-built-products-dir=${BUILT_PRODUCTS_DIR} --env-dwarf-dsym-folder-path=${DWARF_DSYM_FOLDER_PATH} --env-dwarf-dsym-file-name=${DWARF_DSYM_FILE_NAME} --env-infoplist-path=${INFOPLIST_PATH} --default-config=default\n";
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
};
13EB04CF12534CDD59BBA288 /* [CP] Check Pods Manifest.lock */ = {
94BDEDCAAC45ADE45D2B5275 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
@@ -370,21 +366,6 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Thin Binary";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
};
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
@@ -400,7 +381,7 @@
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
};
AD0A238C35E5294F8BAB6312 /* [CP] Check Pods Manifest.lock */ = {
A3BDE51BAD87866279EDCE9A /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
@@ -422,7 +403,7 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
C9D58640702688400651DCCA /* [CP] Embed Pods Frameworks */ = {
C0FE94159ACCD81B29D045F6 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
@@ -491,7 +472,7 @@
/* Begin XCBuildConfiguration section */
227E28272AA8694400B81730 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 40D73505D43048226496D7A7 /* Pods-OneSignalNotificationServiceExtension.debug.xcconfig */;
baseConfigurationReference = 6D53993F7AB1BCB29BBA7F99 /* Pods-OneSignalNotificationServiceExtension.debug.xcconfig */;
buildSettings = {
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -528,7 +509,7 @@
};
227E28282AA8694400B81730 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 50E3EF1F27202EA85837D946 /* Pods-OneSignalNotificationServiceExtension.release.xcconfig */;
baseConfigurationReference = 3F9D48AF0731C7CFD02E9B6E /* Pods-OneSignalNotificationServiceExtension.release.xcconfig */;
buildSettings = {
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -562,7 +543,7 @@
};
227E28292AA8694400B81730 /* Profile */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 8FCDD55BD2CD81F1D21914D2 /* Pods-OneSignalNotificationServiceExtension.profile.xcconfig */;
baseConfigurationReference = 5CAEBEB1EB22D78FEE720524 /* Pods-OneSignalNotificationServiceExtension.profile.xcconfig */;
buildSettings = {
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";

15
gsf/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved Normal file
View File

@@ -0,0 +1,15 @@
{
"originHash" : "da338c7d827a9f8b10177e484783685675c8dff84a9dc59a904db0c53122e9f5",
"pins" : [
{
"identity" : "ios-branch-sdk-spm",
"kind" : "remoteSourceControl",
"location" : "https://github.com/BranchMetrics/ios-branch-sdk-spm",
"state" : {
"revision" : "7fbe3085821c8e60241a2037098c6eed76fd2798",
"version" : "2.2.0"
}
}
],
"version" : 3
}

2
gsf/ios/Runner/Info.plist
View File

@@ -23,7 +23,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.4.1</string>
<string>1.4.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>

72
gsf/lib/modals/blog_model.dart
View File

@@ -9,15 +9,15 @@ class BlogModel {
success = json['success'];
message = json['message'];
result =
json['result'] != null ? new Result.fromJson(json['result']) : null;
json['result'] != null ? Result.fromJson(json['result']) : null;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['success'] = this.success;
data['message'] = this.message;
if (this.result != null) {
data['result'] = this.result!.toJson();
final Map<String, dynamic> data = <String, dynamic>{};
data['success'] = success;
data['message'] = message;
if (result != null) {
data['result'] = result!.toJson();
}
return data;
}
@@ -32,15 +32,15 @@ class Result {
if (json['category'] != null) {
category = <Category>[];
json['category'].forEach((v) {
category!.add(new Category.fromJson(v));
category!.add(Category.fromJson(v));
});
}
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.category != null) {
data['category'] = this.category!.map((v) => v.toJson()).toList();
final Map<String, dynamic> data = <String, dynamic>{};
if (category != null) {
data['category'] = category!.map((v) => v.toJson()).toList();
}
return data;
}
@@ -50,7 +50,7 @@ class Category {
int? id;
String? categoryName;
String? isActive;
Null? deletedAt;
String? deletedAt;
String? createdAt;
String? updatedAt;
List<Articles>? articles;
@@ -74,21 +74,21 @@ class Category {
if (json['articles'] != null) {
articles = <Articles>[];
json['articles'].forEach((v) {
articles!.add(new Articles.fromJson(v));
articles!.add(Articles.fromJson(v));
});
}
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['category_name'] = this.categoryName;
data['is_active'] = this.isActive;
data['deleted_at'] = this.deletedAt;
data['created_at'] = this.createdAt;
data['updated_at'] = this.updatedAt;
if (this.articles != null) {
data['articles'] = this.articles!.map((v) => v.toJson()).toList();
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['category_name'] = categoryName;
data['is_active'] = isActive;
data['deleted_at'] = deletedAt;
data['created_at'] = createdAt;
data['updated_at'] = updatedAt;
if (articles != null) {
data['articles'] = articles!.map((v) => v.toJson()).toList();
}
return data;
}
@@ -105,7 +105,7 @@ class Articles {
String? tags;
String? thumbnailPath;
String? isActive;
Null? deletedAt;
String? deletedAt;
String? createdAt;
String? updatedAt;
@@ -141,20 +141,20 @@ class Articles {
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['category_id'] = this.categoryId;
data['article_name'] = this.articleName;
data['short_text'] = this.shortText;
data['description'] = this.description;
data['image_upload'] = this.imageUpload;
data['video_url'] = this.videoUrl;
data['tags'] = this.tags;
data['thumbnail_path'] = this.thumbnailPath;
data['is_active'] = this.isActive;
data['deleted_at'] = this.deletedAt;
data['created_at'] = this.createdAt;
data['updated_at'] = this.updatedAt;
final Map<String, dynamic> data = <String, dynamic>{};
data['id'] = id;
data['category_id'] = categoryId;
data['article_name'] = articleName;
data['short_text'] = shortText;
data['description'] = description;
data['image_upload'] = imageUpload;
data['video_url'] = videoUrl;
data['tags'] = tags;
data['thumbnail_path'] = thumbnailPath;
data['is_active'] = isActive;
data['deleted_at'] = deletedAt;
data['created_at'] = createdAt;
data['updated_at'] = updatedAt;
return data;
}
}

4
gsf/lib/views/pages/blog/blog_inner.dart
View File

@@ -53,7 +53,7 @@ class BlogDetails extends StatelessWidget {
child: Row(
children: [
Text(
tages!,
tages ?? "",
style: TextStyle(
fontSize: 18,
color: ColorConstants.kWhite,
@@ -62,7 +62,7 @@ class BlogDetails extends StatelessWidget {
),
Spacer(),
Text(
formattedtime!,
formattedtime ?? "",
style: TextStyle(
fontSize: 18,
color: ColorConstants.kWhite,

4
gsf/lib/views/pages/blog/blog_main.dart
View File

@@ -295,7 +295,7 @@ class _NewsBodyState extends State<NewsBody> {
.result![index].articleName ??
'',
image_upload: searchArticle!
.result![index].thumbnailPath ??
.result![index].imageUpload ??
'',
updatedAtTime: formatDateTime2(
searchArticle!.result![index]
@@ -356,7 +356,7 @@ class _NewsBodyState extends State<NewsBody> {
.result![index].articleName ??
'',
thumbnailimg: searchArticle!
.result![index].thumbnailPath ??
.result![index].imageUpload ??
'',
updatedTime: formatDateTime(searchArticle!
.result![index].updatedAt ??

125
gsf/lib/views/pages/home/home.dart
View File

@@ -258,7 +258,6 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
final TabsController controller = TabsController();
final NavigationCrontroller navController = Get.put(NavigationCrontroller());
// int _current = 0;
final CompleteProfileController completeProfileController =
Get.put(CompleteProfileController(), permanent: true);
@@ -266,10 +265,7 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
var members =
memberDetails.map((e) => MeetTheCommunityModel.fromJson(e)).toList();
// final ManageBanner manageBanners = Get.put(ManageBanner());
// var homePageApi = FutureGroup();
double textOpacity = 0.0;
// var shortClipNLikesFutureGrp = FutureGroup();
final EditProfileController getProfileDatas =
Get.put(EditProfileController());
AppDataController appDataController = Get.find();
@@ -289,8 +285,7 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
bannerMoodOMeterFutureGroup.add(FeedbackServices().getFeedbackApi());
QuizeApis().showQuiz();
bannerMoodOMeterFutureGroup.close();
// print('CURRENT POSITION OF USER ${appDataController.selfPosition.value}');
// print('feeadback api hit --- $feedbackGetGrp');
_animationController = AnimationController(
duration: const Duration(milliseconds: 600),
vsync: this,
@@ -301,7 +296,6 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
Future.delayed(const Duration(seconds: 1), () {
appTourController.startAppTour(context, () {
// Your callback code here
setState(() {
showMoodOMeterAfterAppTour = false;
});
@@ -321,13 +315,6 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
Future<void> _getAppVersion() async {
PackageInfo packageInfo = await PackageInfo.fromPlatform();
// print("current version is ${packageInfo.version}");
// print("current version is ${packageInfo.appName}");
// print("current version is ${packageInfo.buildNumber}");
// print("current version is ${packageInfo.installerStore}");
// appUpdateDialog(context);
if (Platform.isAndroid) {
var updata = {"old_version_android": packageInfo.buildNumber};
final data = await VersionControl().storeCurrentVersion(updata);
@@ -474,88 +461,8 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
});
}
// permissionDialog() async {
// Map<Permission, PermissionStatus> statuses = await [
// Permission.activityRecognition,
// ].request();
// if (statuses[Permission.activityRecognition]!.isGranted) {
// initPlatformState();
// }
// }
// void initPlatformState() {
// _stepCountStream = Pedometer.stepCountStream;
// _stepCountStream.listen(onStepCount).onError(onStepCountError);
// if (!mounted) return;
// }
// When you receive step count updates from the pedometer package:
// void onStepCount(StepCount event) {
// _steps = event.steps.toString();
// _appStepCount = _appStepCount + 1;
// stepController.appStepCountGlobal.value = _appStepCount;
// updateAndPersistStepCount(null);
// print("pedometer value ${event.steps}");
// // Timer.periodic(Duration(minutes: 7), (timer) {
// // Map<String, dynamic> updata = {"step_count": _appStepCount};
// // StepCounts().storeSteps(updata);
// // });
// // Check if the step count is a multiple of 1000
// if (_appStepCount % 1000 == 0) {
// // Call the API to store steps
// Map<String, dynamic> updata = {"step_count": _appStepCount};
// StepCounts().storeSteps(updata);
// }
// }
// void onStepCountError(error) {
// print('onStepCountError: $error');
// setState(() {
// _steps = 'Step Count not available';
// });
// }
// // Function to update and persist the step count
// void updateAndPersistStepCount(int? manualCount) async {
// final prefs = await SharedPreferences.getInstance();
// final currentDateKey = _currentDate
// .toLocal()
// .toString()
// .split(' ')[0]; // Use the date as the key
// prefs.setInt(currentDateKey, manualCount ?? _appStepCount);
// }
// // Function to check and update the current date
// void checkAndUpdateDate() {
// final today = DateTime.now();
// if (today.day != _currentDate.day) {
// // The date has changed, reset the step count and update the current date
// updateAndPersistStepCount(0);
// _currentDate = today;
// }
// }
// // Function to retrieve the step count from storage during app initialization
// void getStepCountFromStorage() async {
// final currentDateKey = _currentDate.toLocal().toString().split(' ')[0];
// final prefs = await SharedPreferences.getInstance();
// final storedCount = prefs.getInt(currentDateKey) ?? 0;
// setState(() {
// _appStepCount = storedCount;
// stepController.appStepCountGlobal.value = _appStepCount;
// });
// }
@override
Widget build(BuildContext context) {
// shortClipNLikesFutureGrp.add(shortClipService.fetchShortClips());
// shortClipNLikesFutureGrp.add();
// var shortClipService = ShortClipService();
// shortClipService.fetchShortClipLikes().then((value) => print("KSHAJFHDSJKFHJHFK${value}"));
//
aControllerFind.localWeight.value =
GetStorage().read('localWeight') ?? '- -';
aControllerFind.localMusclerate.value =
@@ -570,20 +477,10 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
aControllerFind.localBmr.value = GetStorage().read('localBmr') ?? '- -';
aControllerFind.localWater.value = GetStorage().read('localWater') ?? '- -';
aControllerFind.localAge.value = GetStorage().read('localAge') ?? '- -';
// ViewFriendsProfileService()
// .fetchFriendsProfile()
// .then((value) => debugPrint("ViewFriendsProfileService $value"));
// debugPrint(
// 'slected image value ${completeProfileController.selectedImagePath.value}');
// debugPrint("isLoggedIn: ${controller.isLoggedIn}");
// debugPrint("isScaled ${GetStorage().read("addScale")}");
// final brightness = Get.theme.brightness;
return Scaffold(
floatingActionButton:
Visibility(visible: showQuizbool, child: FlotingActionBtn()),
// backgroundColor:
// (brightness == Brightness.light) ? Colors.red : Colors.tealAccent,
key: controller.scaffoldKey,
drawer: AppDrawer(),
appBar: AppBar(
@@ -622,11 +519,6 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
() => Settings(),
);
},
//
// Get.to(
// () => const Settings(),
// ),
child: Icon(
Icons.settings_outlined,
color: ColorConstants.kWhite,
@@ -652,7 +544,6 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
)
],
),
body: showMoodOMeterAfterAppTour ?? false
? HomePageSkeleton()
: FutureBuilder(
@@ -660,27 +551,14 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
.future, //MoodOMeterService().getMoodOMeter(),
builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) {
// While waiting for the API response, show a loading indicator
return Center(child: HomePageSkeleton());
} else if (snapshot.hasError) {
// If an error occurred during the API call, display an error message
return Text('Error: ${snapshot.error}');
} else {
if (homeApiController.moodCheckResult == "1") {
moodOMeterDialog(context);
}
// API call was successful and data is available
// List<String> data = snapshot.data!;
// // Use the fetched data to build your UI
// return ListView.builder(
// itemCount: data.length,
// itemBuilder: (context, index) {
// return ListTile(
// title: Text(data[index]),
// );
// },
// );
return AnimatedBuilder(
child: GestureDetector(
child: Obx(
@@ -709,7 +587,6 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
}
rewardPointDialog(BuildContext context) async {
// AppDataController appDataController = Get.find();
print(
'homeApiController.setMoodResponse.progressBar ${homeApiController.setMoodResponse.progressBar}');
await Future.delayed(Duration(milliseconds: 10));

102
gsf/lib/views/pages/sidebar.dart
View File

@@ -136,17 +136,14 @@ class _AppDrawerState extends State<AppDrawer> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
headTitel('The Podium'),
menuWidget('quiz', 'Quiz Section', () {
FirebaseAnalytics.instance
.logScreenView(screenName: "Quiz");
// headTitel('The Podium'),
menuWidget('video', 'Profile', () {
Get.back();
Get.to(
() => const QuizHome(),
() => const ProfilePage(),
);
}, false),
}, true),
const SizedBox(height: 15),
menuWidget('quiz', 'Menstrual cycle tracker', () {
FirebaseAnalytics.instance.logScreenView(
screenName: "Menstrual cycle tracker");
@@ -160,6 +157,24 @@ class _AppDrawerState extends State<AppDrawer> {
}
}, false),
const SizedBox(height: 15),
menuWidget('news_articles', 'News & Articles', () {
FirebaseAnalytics.instance
.logScreenView(screenName: "News & Articles");
Get.to(
() => const BlogMain(),
);
}, false),
const SizedBox(height: 15),
// menuWidget('quiz', 'Quiz Section', () {
// FirebaseAnalytics.instance
// .logScreenView(screenName: "Quiz");
// Get.back();
// Get.to(
// () => const QuizHome(),
// );
// }, false),
// const SizedBox(height: 15),
// menuWidget('rank', 'LeaderBoard', () {
// homePageController.updateBottomNavIndex(3);
@@ -175,7 +190,7 @@ class _AppDrawerState extends State<AppDrawer> {
// 2;
// if (homePageController.bottomNavIndex.value ==
// 1) {
// homePageController.updateBottomNavIndex(0);
// homePageController.updateBottomNavIndex(0);
// homePageController.updateBottomNavIndex(1);
// Get.back();
// } else {
@@ -189,7 +204,7 @@ class _AppDrawerState extends State<AppDrawer> {
// : const SizedBox(),
// ),
// const SizedBox(height: 40),
headTitel('External Motivation'),
// headTitel('External Motivation'),
menuWidget('podcast', 'Podcasts', () {
FirebaseAnalytics.instance
.logScreenView(screenName: "Podcasts");
@@ -199,15 +214,6 @@ class _AppDrawerState extends State<AppDrawer> {
}, false),
const SizedBox(height: 15),
menuWidget('news_articles', 'News & Articles', () {
FirebaseAnalytics.instance
.logScreenView(screenName: "News & Articles");
Get.to(
() => const BlogMain(),
);
}, false),
const SizedBox(height: 15),
// menuWidget(
// 'instagram',
// 'GSF Instagram Handle',
@@ -217,7 +223,7 @@ class _AppDrawerState extends State<AppDrawer> {
// },
// ),
// const SizedBox(height: 40),
headTitel('All You need to know'),
// headTitel('All You need to know'),
// SizedBox(
// child: (controller.isLoggedIn)
// ? Column(
@@ -229,13 +235,13 @@ class _AppDrawerState extends State<AppDrawer> {
// )
// : const SizedBox(),
// ),
menuWidget(
'about',
'About GETSETFIT',
() => Get.to(
() => const AboutGSF(),
),
false),
// menuWidget(
// 'about',
// 'About GETSETFIT',
// () => Get.to(
// () => const AboutGSF(),
// ),
// false),
// const SizedBox(height: 15),
@@ -246,14 +252,9 @@ class _AppDrawerState extends State<AppDrawer> {
// () => const ProfileSkeleton(),
// ),
// ),
const SizedBox(height: 15),
menuWidget('video', 'Profile', () {
Get.back();
Get.to(
() => const ProfilePage(),
);
}, true),
const SizedBox(height: 15),
// const SizedBox(height: 15),
// const SizedBox(height: 15),
menuWidget('help_info', 'FAQs', () {
Get.back();
Get.to(
@@ -275,19 +276,19 @@ class _AppDrawerState extends State<AppDrawer> {
// )
// : const SizedBox(),
// ),
menuWidget('phone', 'Contact Us', () {
Get.back();
Get.to(
() => const ContactUs(),
);
}, false),
const SizedBox(height: 15),
// menuWidget('phone', 'Contact Us', () {
// Get.back();
// Get.to(
// () => const ContactUs(),
// );
// }, false),
//const SizedBox(height: 15),
menuWidget('phone', 'My Subscription', () {
Get.back();
Get.to(
() => const MySubscription(),
);
}, false),
}, false, isSubscription: true),
// const SizedBox(height: 15),
// menuWidget('phone', 'Test', () { Get.back();
@@ -376,7 +377,8 @@ class _AppDrawerState extends State<AppDrawer> {
}
menuWidget(String svgIcon, String title, VoidCallback ontap,
bool swapBitesWithProfile) {
bool swapBitesWithProfile,
{bool? isSubscription}) {
// final brightness = Get.theme.brightness;
TextStyle textstyle = TextStyle(
fontSize: 16,
@@ -403,10 +405,16 @@ class _AppDrawerState extends State<AppDrawer> {
width: 24,
height: 24,
)
: SvgPicture.asset(
'assets/image/sidebarIcons/${!globalContoller.darkMode.value ? svgIcon + '_black' : svgIcon}.svg',
width: 18,
),
: isSubscription ?? false
? Image.asset(
"assets/image/menuicon/mysubscription.png",
width: 24,
height: 24,
)
: SvgPicture.asset(
'assets/image/sidebarIcons/${!globalContoller.darkMode.value ? svgIcon + '_black' : svgIcon}.svg',
width: 18,
),
const SizedBox(width: 10),
Text(
title,

2
gsf/lib/views/pages/subscription/my_subscription.dart
View File

@@ -188,7 +188,7 @@ class _MySubscriptionState extends State<MySubscription> {
'Next renewal date : $formattedEndDate',
style: TextStyle(
fontSize: 14,
fontSize: 16,
height: 2.2,
color: !globalController.darkMode.value
? ColorConstants.kBlack