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

Compare commits

base: kishan.bhuta:8c18b76ecde371a1973987c9ec2a60ccc25f63ba
Branches Tags
kishan.bhuta:hotfix24 kishan.bhuta:14octDev
kishan.bhuta:release
...
compare: kishan.bhuta:release
Branches Tags
kishan.bhuta:14octDev kishan.bhuta:hotfix24
kishan.bhuta:release

17 Commits
8c18b76ecd ... release

Author SHA1 Message Date
kishan06
2189c5454b menstrual design change,step count homepage fix 2024-06-25 12:55:48 +05:30
kishan06
b6047fb91f delete api removed 2024-05-29 15:42:46 +05:30
kishan06
451027251e quiz hotfix 2024-05-10 13:38:48 +05:30
kishan06
635429092c latest live code on stores 2024-05-05 10:45:54 +05:30
kishan06
839e6f4cb8 moodometer improved,menstrual fixed 2024-04-25 14:57:00 +05:30
kishan06
edc625430c conflicts resolved 2024-04-24 15:22:34 +05:30
kishan06
27d67a65f0 my subs changed 2024-04-24 15:00:27 +05:30
priyankahadpad
391109f255 Merge pull request #11 from kishan06/priyanka 
print statements and unwanted imports removed
 2024-04-23 12:21:06 +05:30
priyanka
d43730744e print statements and unwanted imports removed 2024-04-22 23:50:28 -07:00
priyankahadpad
a5327c39e0 Merge pull request #10 from kishan06/priyanka 
changes done in rating screen
 2024-04-22 17:05:36 +05:30
priyanka
ec325568be conflict resolved 2024-04-22 04:35:13 -07:00
priyanka
13cc99735f changes done in rating screen 2024-04-22 04:29:48 -07:00
Kishan Bhuta
e7bbb72336 Merge pull request #9 from kishan06/ioschanges 
Ioschanges
 2024-04-22 16:41:28 +05:30
kishan06
3af401464b client changes 2024-04-22 16:40:42 +05:30
kishan06
b18717188f home page dead code removed 2024-04-22 15:07:54 +05:30
Kishan Bhuta
9bdb233b29 Merge pull request #8 from kishan06/ioschanges 
minor bug fix
 2024-04-22 12:10:20 +05:30
kishan06
20ecfb069d minor bug fix 2024-04-22 12:09:56 +05:30
101 changed files with 1499 additions and 1456 deletions
Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

154
.dart_tool/package_config.json
View File

@@ -3,421 +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",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/intl-0.18.1",
<<<<<<< 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": "timeago",
"rootUri": "file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/timeago-3.6.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"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"
},
@@ -428,7 +426,11 @@
"languageVersion": "2.17"
}
],
"generated": "2024-04-17T13:38:49.333490Z",
<<<<<<< HEAD
"generated": "2024-04-18T09:34:08.334722Z",
=======
"generated": "2024-04-19T10:17:06.404139Z",
>>>>>>> e7bbb72336ba03e8b8757d19328ddc518db13fae
"generator": "pub",
"generatorVersion": "2.19.6"
}

306
.dart_tool/package_config_subset
View File

@@ -1,285 +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
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/intl-0.18.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/intl-0.18.1/lib/
<<<<<<< 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/
timeago
2.12
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/timeago-3.6.1/
file:///C:/Users/WDI-/AppData/Local/Pub/Cache/hosted/pub.dev/timeago-3.6.1/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

1
.idea/vcs.xml generated
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="$PROJECT_DIR$/gsf" vcs="Git" />
</component>
</project>

5
.vscode/settings.json vendored
View File

@@ -1,3 +1,6 @@
{
"dart.flutterSdkPath": "C:\\Flutter_SDK\\flutter"
"dart.flutterSdkPath": "C:\\Flutter_SDK\\flutter",
"Codegeex.Chat.LanguagePreference": "English",
"Codegeex.Comment.LanguagePreference": "English",
"Codegeex.SidebarUI.LanguagePreference": "English"
}

4
gsf/android/app/build.gradle
View File

@@ -58,11 +58,11 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.getsetfit.gsf"
// You can update the following values to match your application needs.
// You can update the following values to match yourx application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdkVersion 26
targetSdkVersion 33
versionCode 14//flutterVersionCode.toInteger()//3
versionCode 21//flutterVersionCode.toInteger()//3
versionName "1.0"//flutterVersionName //"1.0"
manifestPlaceholders['foregroundServiceType'] = 'health'

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

6
gsf/assets/image/sidebarIcons/delete.svg Normal file
View File

@@ -0,0 +1,6 @@
<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M2.125 4.25H3.54167H14.875" stroke="#DD4A4A" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M13.4577 4.25033V14.167C13.4577 14.5427 13.3084 14.9031 13.0428 15.1687C12.7771 15.4344 12.4167 15.5837 12.041 15.5837H4.95768C4.58196 15.5837 4.22162 15.4344 3.95595 15.1687C3.69027 14.9031 3.54102 14.5427 3.54102 14.167V4.25033M5.66602 4.25033V2.83366C5.66602 2.45794 5.81527 2.0976 6.08095 1.83192C6.34662 1.56625 6.70696 1.41699 7.08268 1.41699H9.91602C10.2917 1.41699 10.6521 1.56625 10.9178 1.83192C11.1834 2.0976 11.3327 2.45794 11.3327 2.83366V4.25033" stroke="#DD4A4A" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M7.08398 7.79199V12.042" stroke="#DD4A4A" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M9.91602 7.79199V12.042" stroke="#DD4A4A" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1016 B

141
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,13 +32,31 @@ 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)
- GoogleUtilities/Logger (~> 7.8)
- FirebaseCoreExtension (10.18.0):
- FirebaseCoreExtension (10.27.0):
- FirebaseCore (~> 10.0)
- FirebaseCoreInternal (10.18.0):
- FirebaseCoreInternal (10.27.0):
- "GoogleUtilities/NSData+zlib (~> 7.8)"
- FirebaseCrashlytics (10.17.0):
- FirebaseCore (~> 10.5)
@@ -39,18 +66,19 @@ PODS:
- GoogleUtilities/Environment (~> 7.8)
- nanopb (< 2.30910.0, >= 2.30908.0)
- PromisesObjC (~> 2.1)
- FirebaseInstallations (10.18.0):
- FirebaseInstallations (10.27.0):
- FirebaseCore (~> 10.0)
- GoogleUtilities/Environment (~> 7.8)
- GoogleUtilities/UserDefaults (~> 7.8)
- PromisesObjC (~> 2.1)
- FirebaseSessions (10.18.0):
- FirebaseSessions (10.27.0):
- FirebaseCore (~> 10.5)
- FirebaseCoreExtension (~> 10.0)
- FirebaseInstallations (~> 10.0)
- GoogleDataTransport (~> 9.2)
- GoogleUtilities/Environment (~> 7.10)
- nanopb (< 2.30910.0, >= 2.30908.0)
- GoogleUtilities/Environment (~> 7.13)
- GoogleUtilities/UserDefaults (~> 7.13)
- nanopb (< 2.30911.0, >= 2.30908.0)
- PromisesSwift (~> 2.1)
- Flutter (1.0.0)
- flutter_blue_plus (0.0.1):
@@ -69,22 +97,63 @@ PODS:
- fluttertoast (0.0.2):
- Flutter
- Toast
- FMDB (2.7.5):
- FMDB/standard (= 2.7.5)
- FMDB/standard (2.7.5)
- FMDB (2.7.11):
- FMDB/standard (= 2.7.11)
- FMDB/standard (2.7.11)
- geolocator_apple (1.2.0):
- Flutter
- GoogleDataTransport (9.2.5):
- GoogleUtilities/Environment (~> 7.7)
- 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.4.1):
- GoogleUtilities/Environment (~> 7.7)
- nanopb (< 2.30911.0, >= 2.30908.0)
- PromisesObjC (< 3.0, >= 1.2)
- GoogleUtilities/Environment (7.12.0):
- PromisesObjC (< 3.0, >= 1.2)
- GoogleUtilities/Logger (7.12.0):
- GoogleUtilities/AppDelegateSwizzler (7.13.3):
- GoogleUtilities/Environment
- "GoogleUtilities/NSData+zlib (7.12.0)"
- GoogleUtilities/UserDefaults (7.12.0):
- GoogleUtilities/Logger
- GoogleUtilities/Network
- GoogleUtilities/Privacy
- GoogleUtilities/Environment (7.13.3):
- GoogleUtilities/Privacy
- PromisesObjC (< 3.0, >= 1.2)
- GoogleUtilities/Logger (7.13.3):
- GoogleUtilities/Environment
- GoogleUtilities/Privacy
- GoogleUtilities/MethodSwizzler (7.13.3):
- GoogleUtilities/Logger
- GoogleUtilities/Privacy
- GoogleUtilities/Network (7.13.3):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
- GoogleUtilities/Privacy
- GoogleUtilities/Reachability
- "GoogleUtilities/NSData+zlib (7.13.3)":
- GoogleUtilities/Privacy
- GoogleUtilities/Privacy (7.13.3)
- GoogleUtilities/Reachability (7.13.3):
- GoogleUtilities/Logger
- GoogleUtilities/Privacy
- GoogleUtilities/UserDefaults (7.13.3):
- GoogleUtilities/Logger
- GoogleUtilities/Privacy
- health (1.0.4):
- Flutter
- icdevicemanager_flutter (1.0.0):
@@ -125,10 +194,10 @@ PODS:
- Flutter
- permission_handler_apple (9.0.4):
- Flutter
- PromisesObjC (2.3.1)
- PromisesSwift (2.3.1):
- PromisesObjC (= 2.3.1)
- ReachabilitySwift (5.0.0)
- PromisesObjC (2.4.0)
- PromisesSwift (2.4.0):
- PromisesObjC (= 2.4.0)
- ReachabilitySwift (5.2.3)
- share_plus (0.0.1):
- Flutter
- shared_preferences_foundation (0.0.1):
@@ -139,7 +208,7 @@ PODS:
- FMDB (>= 2.7.5)
- syncfusion_flutter_pdfviewer (0.0.1):
- Flutter
- Toast (4.0.0)
- Toast (4.1.1)
- TOCropViewController (2.6.1)
- uni_links (0.0.1):
- Flutter
@@ -162,6 +231,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 +272,7 @@ SPEC REPOS:
trunk:
- BranchSDK
- Firebase
- FirebaseAnalytics
- FirebaseCore
- FirebaseCoreExtension
- FirebaseCoreInternal
@@ -209,6 +280,7 @@ SPEC REPOS:
- FirebaseInstallations
- FirebaseSessions
- FMDB
- GoogleAppMeasurement
- GoogleDataTransport
- GoogleUtilities
- nanopb
@@ -230,6 +302,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,14 +379,16 @@ 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
FirebaseCoreExtension: 4ec89dd0c6de93d6becde32122d68b7c35f6bf5d
FirebaseCoreInternal: 4b297a2d56063dbea2c1d0d04222d44a8d058862
FirebaseCrashlytics: d78651ad7db206ef98269e103ac38d69d569200a
FirebaseInstallations: e842042ec6ac1fd2e37d7706363ebe7f662afea4
FirebaseSessions: f90fe9212ee2818641eda051c0835c9c4e30d9ae
FirebaseInstallations: 766dabca09fd94aef922538aaf144cc4a6fb6869
FirebaseSessions: 2fdf949f9e58295a57703ae8f2efc44f9fa3aa16
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_blue_plus: 5cb46a0d66c6cacebf7551e0e5a6bfa345ccc224
flutter_branch_sdk: cc0393df011973fe6ab0380bc54bce1a3726e8a3
@@ -321,10 +397,11 @@ SPEC CHECKSUMS:
flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
flutter_pdfview: 25f53dd6097661e6395b17de506e6060585946bd
fluttertoast: 48c57db1b71b0ce9e6bba9f31c940ff4b001293c
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
FMDB: 57486c1117fd8e0e6b947b2f54c3f42bf8e57a4e
geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401
GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2
GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34
GoogleAppMeasurement: 4dcddfc7f102825c1c4e6422cb35567b101881a7
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
health: 5a380c0f6c4f619535845992993964293962e99e
icdevicemanager_flutter: 88e2e000e6de2590bfe51a0af7f8c789d35edc44
image_cropper: 60c2789d1f1a78c873235d4319ca0c34a69f2d98
@@ -338,14 +415,14 @@ SPEC CHECKSUMS:
path_provider_foundation: c68054786f1b4f3343858c1e1d0caaded73f0be9
pedometer: 381969883680ade42559782cc41a3bbd453d8234
permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
PromisesSwift: 28dca69a9c40779916ac2d6985a0192a5cb4a265
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
ReachabilitySwift: 7f151ff156cea1481a8411701195ac6a984f4979
share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
syncfusion_flutter_pdfviewer: bb9998884b864cfedf72628df3503bdf57e397c0
Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4

101
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>";
@@ -171,6 +171,7 @@
9AD36002AE69EB67FA0E045C /* Frameworks */,
);
sourceTree = "<group>";
usesTabs = 0;
};
97C146EF1CF9000F007C117D /* Products */ = {
isa = PBXGroup;
@@ -211,8 +212,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 +225,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 +243,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 +330,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 +367,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 +382,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 +404,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 +473,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 +510,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 +544,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";
@@ -655,6 +637,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 78P6PBS6GZ;
ENABLE_BITCODE = NO;
@@ -669,6 +653,7 @@
MARKETING_VERSION = 1.3.27;
PRODUCT_BUNDLE_IDENTIFIER = com.getsetfit;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@@ -798,6 +783,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 78P6PBS6GZ;
ENABLE_BITCODE = NO;
@@ -813,6 +800,7 @@
MARKETING_VERSION = 1.3.27;
PRODUCT_BUNDLE_IDENTIFIER = com.getsetfit;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@@ -833,6 +821,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 78P6PBS6GZ;
ENABLE_BITCODE = NO;
@@ -847,6 +837,7 @@
MARKETING_VERSION = 1.3.27;
PRODUCT_BUNDLE_IDENTIFIER = com.getsetfit;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;

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
}

7
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.5.11</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@@ -55,6 +55,8 @@
<string>Getsetfit use calendar to get current datetime</string>
<key>NSCameraUsageDescription</key>
<string>To capture profile photo please grant camera access</string>
<key>NSFaceIDUsageDescription</key>
<string>For user authentication</string>
<key>NSHealthShareUsageDescription</key>
<string>We will sync your data with the Apple Health app to give you better insights</string>
<key>NSHealthUpdateUsageDescription</key>
@@ -75,12 +77,11 @@
<string>Allow access to photo library</string>
<key>NSSpeechRecognitionUsageDescription</key>
<string>sprecg</string>
<key>NSFaceIDUsageDescription</key>
<string>For user authentication</string>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
<key>UIBackgroundModes</key>
<array>
<string>audio</string>
<string>processing</string>
</array>
<key>UILaunchStoryboardName</key>

3
gsf/lib/api/network_api.dart
View File

@@ -1,11 +1,10 @@
import 'dart:convert';
import 'package:dio/dio.dart';
import 'package:flutter/foundation.dart';
import 'package:get_storage/get_storage.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'base_manager.dart';
import 'package:http/http.dart' as http;
class NetworkApi {
Dio dio = Dio();

131
gsf/lib/main.dart
View File

@@ -1,4 +1,5 @@
import 'dart:async';
import 'dart:developer';
import 'dart:io';
// import 'package:firebase_dynamic_links/firebase_dynamic_links.dart';
@@ -22,6 +23,7 @@ import 'package:onesignal_flutter/onesignal_flutter.dart';
import 'package:pedometer/pedometer.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'repository/services/rateUs/ratingController.dart';
import 'views/pages/intro/get_started.dart';
import 'views/short_video_player/svp_lib/injection.dart';
@@ -96,6 +98,8 @@ class MyApp extends StatefulWidget {
State<MyApp> createState() => _MyAppState();
}
final RatingController ratingController = Get.put(RatingController());
class _MyAppState extends State<MyApp> {
//pedometer module variables
late Stream<StepCount> _stepCountStream;
@@ -110,6 +114,7 @@ class _MyAppState extends State<MyApp> {
void initState() {
super.initState();
// initShortClipLinks();
ratingController.loadRatingFromPrefs();
LocalStorage.init();
IcBluetoothSdk.instance.initSDK(ICDeviceManagerConfig());
checkLocationStatus();
@@ -124,9 +129,14 @@ class _MyAppState extends State<MyApp> {
}
storeSteps() {
Timer.periodic(const Duration(minutes: 1), (timer) {
Timer.periodic(const Duration(seconds: 30), (timer) {
Map<String, dynamic> updata = {"step_count": _appStepCount};
StepCounts().storeSteps(updata);
// log("without condition updatxa ${updata["step_count"]}");
// if (updata["step_count"] != 0) {
// log("updata ${updata["step_count"]}");
// }
});
}
@@ -148,28 +158,106 @@ class _MyAppState extends State<MyApp> {
}
int finalSteps = 0;
void onStepCount(StepCount event) async {
if (_appStepCount == null) {
// Set the initial step count when the stream first emits a value
_storedStepCount = event.steps;
await storeFirstEmittedValueOfDay(_storedStepCount);
int stepsSinceLastStoredCount = event.steps - _storedStepCount;
stepController.appStepCountGlobal.value = stepsSinceLastStoredCount;
updateAndPersistStepCount(stepsSinceLastStoredCount);
_appStepCount = stepsSinceLastStoredCount;
} else {
_storedStepCount = await getFirstEmittedValueOfDay();
finalSteps = event.steps - _storedStepCount;
_appStepCount = finalSteps;
stepController.appStepCountGlobal.value = finalSteps;
}
// old step count
// void onStepCount(StepCount event) async {
// if (_appStepCount == null) {
// // Set the initial step count when the stream first emits a value
// _storedStepCount = event.steps;
// await storeFirstEmittedValueOfDay(_storedStepCount);
// int stepsSinceLastStoredCount = event.steps - _storedStepCount;
// stepController.appStepCountGlobal.value = stepsSinceLastStoredCount;
// updateAndPersistStepCount(stepsSinceLastStoredCount);
// _appStepCount = stepsSinceLastStoredCount;
// } else {
// _storedStepCount = await getFirstEmittedValueOfDay();
// finalSteps = event.steps - _storedStepCount;
// _appStepCount = finalSteps;
// stepController.appStepCountGlobal.value = finalSteps;
// }
// // 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);
// // // 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 onStepCount(StepCount event) async {
// if (_appStepCount == null) {
// // Set the initial step count when the stream first emits a value
// _storedStepCount = event.steps;
// await storeFirstEmittedValueOfDay(_storedStepCount);
// int stepsSinceLastStoredCount = event.steps - _storedStepCount;
// stepController.appStepCountGlobal.value = stepsSinceLastStoredCount;
// updateAndPersistStepCount(stepsSinceLastStoredCount);
// _appStepCount = stepsSinceLastStoredCount;
// } else {
// _storedStepCount = await getFirstEmittedValueOfDay();
// finalSteps = event.steps - _storedStepCount;
// _appStepCount = finalSteps;
// stepController.appStepCountGlobal.value = finalSteps;
// }
//New Logic 25-Mar-2024
if (_appStepCount == null) {
savePrevStepData(event.steps);
stepController.appStepCountGlobal.value = 0;
_appStepCount = 0;
} else {
var totalSteps = event.steps;
var _currentSteps = await loadCurrentStepData();
var _previousSteps = await loadPreviousSteps();
if (totalSteps == 0 || totalSteps < _previousSteps) {
_previousSteps = totalSteps;
savePrevStepData(_previousSteps);
}
_currentSteps = _currentSteps + (totalSteps - _previousSteps);
_previousSteps = totalSteps;
saveCurrentStepData(_currentSteps);
savePrevStepData(_previousSteps);
stepController.appStepCountGlobal.value = _currentSteps;
_appStepCount = _currentSteps;
}
}
savePrevStepData(steps) async {
final prefs = await SharedPreferences.getInstance();
final currentDateKey = _currentDate
.toLocal()
.toString()
.split(' ')[0]; // Use the date as the key
prefs.setInt(currentDateKey, steps);
}
loadPreviousSteps() async {
final prefs = await SharedPreferences.getInstance();
final currentDateKey = _currentDate
.toLocal()
.toString()
.split(' ')[0]; // Use the date as the key
return prefs.getInt(currentDateKey);
}
saveCurrentStepData(steps) async {
final prefs = await SharedPreferences.getInstance();
final currentDateKey = "current" +
_currentDate
.toLocal()
.toString()
.split(' ')[0]; // Use the date as the key
prefs.setInt(currentDateKey, steps);
}
loadCurrentStepData() async {
final prefs = await SharedPreferences.getInstance();
final currentDateKey =
"current" + _currentDate.toLocal().toString().split(' ')[0];
var _storedCount = prefs.getInt(currentDateKey);
_appStepCount = _storedCount;
stepController.appStepCountGlobal.value = _appStepCount ?? 0;
return _storedCount ?? 0;
}
storeFirstEmittedValueOfDay(_storedStepCount) async {
@@ -262,7 +350,6 @@ class _MyAppState extends State<MyApp> {
Permission.storage,
Permission.bluetooth,
].request();
// print(statuses[Permission.location]);
}
@override

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;
}
}

2
gsf/lib/repository/endpoints.dart
View File

@@ -1,7 +1,9 @@
//chaitanya
class Endpoints {
static const _staging = "https://gsf.betadelivery.com/api/";
static const _base = "https://thegsf.co/api/";
// static const _base = "https://gsf.betadelivery.com/api/";
static const login = _base + "login";
static const generateOtp = _base + "otp/generate";

28
gsf/lib/repository/services/blog_services.dart
View File

@@ -43,31 +43,3 @@ class BlogService {
}
// class CategoryViewModel extends GetxController {
// var categories = <Category>[].obs;
// var searchModel = <SearchModel>[].obs;
// // var searchList = <>[].obs;
// @override
// void onInit() {
// super.onInit();
// fetchCategories();
// }
// Future<List<BlogModel>> fetchCategories() async {
// final response = await http.get(
// Uri.parse(Endpoints.getBlog),
// );
// print('response of faq ${response.body}');
// final jsonData = jsonDecode(response.body);
// final List<dynamic> categoryList = jsonData['result']['category'] as List;
// categories.assignAll(
// categoryList.map<Category>((json) => Category.fromJson(json)).toList());
// return categoryList
// .map<BlogModel>((json) => BlogModel.fromJson(json))
// .toList();
// }
// }

4
gsf/lib/repository/services/cj/get_notification_count_service.dart
View File

@@ -1,6 +1,3 @@
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart';
import 'package:gsp_app/repository/endpoints.dart';
@@ -17,7 +14,6 @@ class GetNotificationCount extends GetConnect {
"access-token": GetStorage().read('token'),
},
);
// print('Notification data ${response.body}');
if (response.body == null && response.body.toString().contains("<!DOCTYPE html>")) {
return const ResponseModel(

3
gsf/lib/repository/services/cj/leader_board_ranking.dart
View File

@@ -49,7 +49,6 @@ class RankingLeaderboard extends GetConnect {
}, headers: {
"access-token": GetStorage().read("token"),
});
// debugPrint('LeaderBoard ranking ${response.body}');
if (response.body == null &&
response.body.toString().contains("<!DOCTYPE html>")) {
@@ -74,7 +73,7 @@ class RankingLeaderboard extends GetConnect {
}
}
Future<ResponseModel> getLeaderBoardDataWithoutFilter() async {
Future<ResponseModel> getLeaderBoardDataWithoutFilter() async {
var response = await post(Endpoints.getLeaderboraderRanking, {}, headers: {
"access-token": GetStorage().read("token"),
});

1
gsf/lib/repository/services/cj/live_activity_service.dart
View File

@@ -13,7 +13,6 @@ class LiveActivityServices extends GetConnect {
"access-token": GetStorage().read("token"),
});
// debugPrint('check reponse of getActivity data ${response.body}');
if (response.body == null && response.body.contains("<!DOCTYPE html>")) {
return const ResponseModel(

6
gsf/lib/repository/services/cj/moodOmeter_services.dart
View File

@@ -9,7 +9,8 @@ class MoodOMeterService extends GetConnect {
HomeApiController homeApiController = Get.put(HomeApiController());
Future<ResponseModel> getMoodOMeter() async {
var _token = GetStorage().read("token");
print("token $_token ");
Response response = await get(
Endpoints.moodOmeterGet,
headers: {
@@ -29,8 +30,7 @@ class MoodOMeterService extends GetConnect {
// print('moodOmeterResult new $moodOmeterResult');
homeApiController.setMoodOMeterResult(moodOmeterResult);
// print("moodOmeterResult data $moodOmeterResult");
// print("moodOmeterResult data $moodOmeterResult");
if (moodOmeterResult != null) {
return ResponseModel(

3
gsf/lib/repository/services/cj/past_session_services.dart
View File

@@ -1,6 +1,5 @@
import 'dart:convert';
import 'package:dio/dio.dart';
import 'package:flutter/foundation.dart';
// import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart';
import 'package:gsp_app/modals/PastSessionModel.dart';

1
gsf/lib/repository/services/complete_profile_service.dart
View File

@@ -210,7 +210,6 @@ class CompleteProfileController extends GetxController {
var responseData = await response.stream.toBytes();
var responseString = String.fromCharCodes(responseData);
var data = jsonDecode(responseString);
print('status of api on complete profile $data');
print(data["success"]);
if (data["success"] == true) {
clearFormAndSubmit();

1
gsf/lib/repository/services/faq_service.dart
View File

@@ -15,7 +15,6 @@ class FaqService {
);
print('response of faq ${response.body}');
final parsed = jsonDecode(response.body)['user'] as List;
print('response of faq ${parsed}');
return parsed.map<FaqModel>((json) => FaqModel.fromJson(json)).toList();
}
}

8
gsf/lib/repository/services/feedbackServices.dart
View File

@@ -7,8 +7,8 @@ GetFeedbackModel? getFeedback;
class FeedbackServices {
Future<ResponseData<dynamic>> feedbackApi(var data) async {
// SharedPreferences prefs = await SharedPreferences.getInstance();
final response = await NetworkApi().postApi(
url: 'https://gsf.betadelivery.com/api/updateFeedback', data: data);
final response = await NetworkApi()
.postApi(url: 'https://thegsf.co/api/updateFeedback', data: data);
if (response.data['success'] == true) {
return ResponseData<dynamic>(
@@ -20,8 +20,8 @@ class FeedbackServices {
}
Future<ResponseData<dynamic>> getFeedbackApi() async {
final response = await NetworkApi()
.getApi('https://gsf.betadelivery.com/api/getFeedback');
final response =
await NetworkApi().getApi('https://thegsf.co/api/getFeedback');
if (response.data['success'] == true) {
getFeedback = GetFeedbackModel.fromJson(response.data);

8
gsf/lib/repository/services/rate_usServices.dart → gsf/lib/repository/services/rateUs/rate_usServices.dart
View File

@@ -1,10 +1,10 @@
import '../../api/ResponseManager.dart';
import '../../api/network_api.dart';
import '../../../api/ResponseManager.dart';
import '../../../api/network_api.dart';
class RateUsServices {
Future<ResponseData<dynamic>> postRateUs(updata) async {
final response = await NetworkApi().postApi(
url: 'https://gsf.betadelivery.com/api/updateRateUs', data: updata);
final response = await NetworkApi()
.postApi(url: 'https://thegsf.co/api/updateRateUs', data: updata);
if (response.data['success'] == true) {
return ResponseData<dynamic>(

39
gsf/lib/repository/services/rateUs/ratingController.dart Normal file
View File

@@ -0,0 +1,39 @@
import 'package:get/get.dart';
import 'package:shared_preferences/shared_preferences.dart';
// loadRatingFromPrefs(int val) async {
// SharedPreferences prefs = await SharedPreferences.getInstance();
// prefs.getInt('rating') ?? 0;
// }
class RatingController extends GetxController {
var rating = 0;
@override
void onInit() {
super.onInit();
loadRatingFromPrefs();
}
Future<void> loadRatingFromPrefs() async {
try {
SharedPreferences prefs = await SharedPreferences.getInstance();
rating = prefs.getInt('rating') ?? 0;
update();
} catch (error) {
print('Error loading rating from SharedPreferences: $error');
rating = 0;
}
}
Future<void> updateRating(int newRating) async {
try {
SharedPreferences prefs = await SharedPreferences.getInstance();
await prefs.setInt('rating', newRating);
rating = newRating;
update();
} catch (error) {
print('Error updating rating in SharedPreferences: $error');
}
}
}

2
gsf/lib/repository/services/short_clip_service.dart
View File

@@ -19,7 +19,6 @@ class ShortClipService {
var decodedNew = jsonDecode(withoutDecoded);
var decoded = jsonDecode(response.body);
// print('decoded in new ${decoded}');
if (decodedNew['status'] == "Token is Expired") {
Get.showSnackbar(const GetSnackBar(
@@ -42,7 +41,6 @@ class ShortClipService {
String? result = response.body;
String? finalresult = jsonDecode(result)['message'];
// print('object only $finalresult');
if (finalresult == "you liked" || finalresult == "You Like a post") {
return true;
} else {

7
gsf/lib/repository/services/sign_in_service.dart
View File

@@ -38,12 +38,7 @@ class SignInController extends GetxController {
},
);
var data = jsonDecode(response.body);
// debugPrint("DATA ${data['authorisation']['user_data']['full_name']}");
// debugPrint(' data ${data}');
// print(' $data object5');
// print(' data name ${data['authorisation']['user_data']['full_name']}');
// debugPrint(data["status"]);
// debugPrint(' token :- ${data['authorisation']["token"]}');
SignInData.data = data["status"];
SignInData.token = data["authorisation"]["token"];
SignInData.name = data['authorisation']['user_data']['full_name'];

7
gsf/lib/repository/services/subscriptionDataService.dart
View File

@@ -1,4 +1,3 @@
import '../../api/ResponseManager.dart';
import '../../api/network_api.dart';
import '../../modals/subscriptionDataModel.dart';
@@ -7,10 +6,10 @@ SubscriptionDataModel? subscriptionObj;
class SubscriptionDataService {
Future<ResponseData<dynamic>> fetchSubscriptionData() async {
final response = await NetworkApi()
.getApi('https://gsf.betadelivery.com/api/userSubscriptionData');
final response =
await NetworkApi().getApi('https://thegsf.co/api/userSubscriptionData');
if (response.data['success'] == true) {
if (response.data['success'] == true) {
subscriptionObj = SubscriptionDataModel.fromJson(response.data);
return ResponseData<dynamic>(
response.data['message'], ResponseStatus.SUCCESS);

1
gsf/lib/scale/page/device_scan_page.dart
View File

@@ -166,7 +166,6 @@ class _DeviceScanPageState extends State<DeviceScanPage>
itemBuilder: (context, index) {
return GestureDetector(
onTap: () {
print('scale datas');
// GetStorage().write('addScale', true);
// homePageController.updateBottomNavIndex(1);
// homePageController.updateBottomNavIndex(2);

5
gsf/lib/scale/page/rope_home_page.dart
View File

@@ -709,7 +709,7 @@ class _RopePageState extends State<RopePage>
@override
void onDeviceConnectionChanged(ICDevice device, ICDeviceConnectState state) {
print("onDeviceConnectionChanged ${device.macAddr}");
mac = device.macAddr;
setState(() {
connectState = state == ICDeviceConnectState.ICDeviceConnectStateConnected
@@ -745,7 +745,7 @@ class _RopePageState extends State<RopePage>
@override
void onReceiveHistorySkipData(ICDevice device, ICSkipData data) {
print("onReceiveHistorySkipData ${device.macAddr}");
mac = device.macAddr;
setState(() {
connectState = "Connected";
@@ -779,7 +779,6 @@ class _RopePageState extends State<RopePage>
@override
void onReceiveSkipData(ICDevice device, ICSkipData data) {
print("onReceiveSkipData ${device.macAddr}");
mac = device.macAddr;
setState(() {
connectState = "Connected";

2
gsf/lib/view_model/GetMoodometerValue.dart
View File

@@ -7,7 +7,7 @@ import '../api/base_manager.dart';
class GetMoodometerValue {
Future<ResponseData<dynamic>> getmoodValue() async {
final response = await NetworkApi().getApi(Endpoints.getMoodOMeterValue);
print("response of mood value $response");
if (response.status == ResponseStatus.SUCCESS) {
if (response.data['success']) {

4
gsf/lib/view_model/QuizApis.dart
View File

@@ -1,4 +1,3 @@
import 'package:get/get.dart';
import 'package:gsp_app/api/network_api.dart';
import 'package:gsp_app/modals/QuizModel.dart';
import 'package:gsp_app/repository/endpoints.dart';
@@ -15,7 +14,6 @@ class QuizeApis {
if (response.status == ResponseStatus.SUCCESS) {
showQuizbool = false;
}
print("response from store points $response");
return response;
}
@@ -30,7 +28,7 @@ class QuizeApis {
final response = await NetworkApi().getApi(Endpoints.showQuiz);
List? quizResultlist = response.data['result'];
if (quizResultlist != null && quizResultlist.isEmpty) {
print("no data present");
showQuizbool = true;
} else {
String isactive = response.data['result'].first['is_active'];

3
gsf/lib/view_model/Stepcounts.dart
View File

@@ -5,8 +5,7 @@ import '../api/base_manager.dart';
class StepCounts {
Future<ResponseData<dynamic>> storeSteps(updata) async {
final response =
await NetworkApi().postApi(url: Endpoints.storeSteps, data: updata);
final response = await NetworkApi().postApi(url: Endpoints.storeSteps, data: updata);
print("response from step count $response");
return response;
}

1
gsf/lib/view_model/connectivity.dart
View File

@@ -32,7 +32,6 @@ class ConnectivityController extends GetxController {
if (connectionResult == ConnectivityResult.wifi) {
connectionType.value = "Wifi";
isConnected.value = true;
// print('wifi');
// Get.snackbar('Wifi c ', 'Please check you\'r Inernt connection');
Get.snackbar(
'Internet Connection ',

195
gsf/lib/views/components/mood_meter.dart
View File

@@ -13,10 +13,9 @@ import '../theme.dart';
int activeIndexMoodOMeter = -1;
class MoodOMeter extends StatefulWidget {
const MoodOMeter({Key? key}) : super(key: key);
MoodOMeter({Key? key, this.fromHomePage}) : super(key: key);
bool? fromHomePage;
@override
State<MoodOMeter> createState() => _MoodOMeterState();
}
@@ -39,31 +38,29 @@ class _MoodOMeterState extends State<MoodOMeter> {
children: [
GestureDetector(
onTap: () {
setState(() => isLoading = !isLoading);
MoodOMeterService()
.uploadMood("Very Happy")
.then((value) async {
var jsonResp = jsonDecode(value.body);
homeApiController.setMoodOMeterResp(jsonResp);
// SetMoodResponse setMoodResponse = SetMoodResponse();
// setMoodResponse = SetMoodResponse.fromJson(jsonResp);
// print("setMoodResponse $setMoodResponse");
// // SetMoodRespon;
// // setMoodResponse.success;
// print( "setMoodResponse ${setMoodResponse.success}");
// print("pro ${setMoodResponse.progressBar}");
if (widget.fromHomePage ?? false) {
setState(() {
activeIndexMoodOMeter = 0;
});
} else {
setState(() => isLoading = !isLoading);
MoodOMeterService()
.uploadMood("Very Happy")
.then((value) async {
var jsonResp = jsonDecode(value.body);
homeApiController.setMoodOMeterResp(jsonResp);
// print("uploadMood $value");
var moodResult = await MoodOMeterService().getMoodOMeter();
// if()
if(moodResult.responseStatus == ResponseStatus.success ){
setState(() {
activeIndexMoodOMeter = 0;
isLoading = !isLoading;
});
}
var moodResult =
await MoodOMeterService().getMoodOMeter();
// if()
if (moodResult.responseStatus == ResponseStatus.success) {
setState(() {
activeIndexMoodOMeter = 0;
isLoading = !isLoading;
});
}
);
});
}
},
child: SvgPicture.asset(
activeIndexMoodOMeter == 0
@@ -75,26 +72,26 @@ class _MoodOMeterState extends State<MoodOMeter> {
),
GestureDetector(
onTap: () {
setState(() => isLoading = !isLoading);
MoodOMeterService()
.uploadMood("Happy")
.then((value) async {
var jsonResp = jsonDecode(value.body);
homeApiController.setMoodOMeterResp(jsonResp);
var moodResult = await MoodOMeterService().getMoodOMeter();
// if()
if(moodResult.responseStatus == ResponseStatus.success ){
setState(() {
activeIndexMoodOMeter = 1;
isLoading = !isLoading;
});
}
if (widget.fromHomePage ?? false) {
setState(() {
activeIndexMoodOMeter = 1;
});
} else {
MoodOMeterService().uploadMood("Happy").then((value) async {
var jsonResp = jsonDecode(value.body);
homeApiController.setMoodOMeterResp(jsonResp);
var moodResult =
await MoodOMeterService().getMoodOMeter();
// if()
if (moodResult.responseStatus == ResponseStatus.success) {
setState(() {
activeIndexMoodOMeter = 1;
isLoading = !isLoading;
});
}
// => setState(() {
// activeIndexMoodOMeter = 1;
// isLoading = !isLoading;
// })
);
});
}
},
child: SvgPicture.asset(
activeIndexMoodOMeter == 1
@@ -106,26 +103,27 @@ class _MoodOMeterState extends State<MoodOMeter> {
),
GestureDetector(
onTap: () {
setState(() => isLoading = !isLoading);
MoodOMeterService()
.uploadMood("Ok")
.then((value) async {
var jsonResp = jsonDecode(value.body);
homeApiController.setMoodOMeterResp(jsonResp);
var moodResult = await MoodOMeterService().getMoodOMeter();
// if()
if(moodResult.responseStatus == ResponseStatus.success ){
setState(() {
activeIndexMoodOMeter = 2;
isLoading = !isLoading;
});
}
if (widget.fromHomePage ?? false) {
setState(() {
activeIndexMoodOMeter = 2;
});
} else {
setState(() => isLoading = !isLoading);
MoodOMeterService().uploadMood("Ok").then((value) async {
var jsonResp = jsonDecode(value.body);
homeApiController.setMoodOMeterResp(jsonResp);
var moodResult =
await MoodOMeterService().getMoodOMeter();
// if()
if (moodResult.responseStatus == ResponseStatus.success) {
setState(() {
activeIndexMoodOMeter = 2;
isLoading = !isLoading;
});
}
// => setState(() {
// activeIndexMoodOMeter = 2;
// isLoading = !isLoading;
// })
);
});
}
},
child: SvgPicture.asset(
activeIndexMoodOMeter == 2
@@ -139,27 +137,29 @@ class _MoodOMeterState extends State<MoodOMeter> {
borderRadius: BorderRadius.circular(100),
child: GestureDetector(
onTap: () {
setState(() => isLoading = !isLoading);
MoodOMeterService().uploadMood("Whatever").then(
(value) async {
if (widget.fromHomePage ?? false) {
setState(() {
activeIndexMoodOMeter = 3;
});
} else {
setState(() => isLoading = !isLoading);
MoodOMeterService()
.uploadMood("Whatever")
.then((value) async {
var jsonResp = jsonDecode(value.body);
homeApiController.setMoodOMeterResp(jsonResp);
var moodResult = await MoodOMeterService().getMoodOMeter();
var moodResult =
await MoodOMeterService().getMoodOMeter();
// if()
if(moodResult.responseStatus == ResponseStatus.success ){
if (moodResult.responseStatus ==
ResponseStatus.success) {
setState(() {
activeIndexMoodOMeter = 3;
isLoading = !isLoading;
});
}
}
// => setState(
// () {
// activeIndexMoodOMeter = 3;
// isLoading = !isLoading;
// },
// ),
);
});
}
},
child: SvgPicture.asset(
activeIndexMoodOMeter == 3
@@ -172,26 +172,31 @@ class _MoodOMeterState extends State<MoodOMeter> {
),
GestureDetector(
onTap: () {
setState(() => isLoading = !isLoading);
MoodOMeterService()
.uploadMood("Sad")
.then((value) async {
var jsonResp = jsonDecode(value.body);
homeApiController.setMoodOMeterResp(jsonResp);
var moodResult = await MoodOMeterService().getMoodOMeter();
// if()
if(moodResult.responseStatus == ResponseStatus.success ){
setState(() {
activeIndexMoodOMeter = 4;
isLoading = !isLoading;
});
}
if (widget.fromHomePage ?? false) {
setState(() {
activeIndexMoodOMeter = 4;
});
} else {
setState(() => isLoading = !isLoading);
MoodOMeterService().uploadMood("Sad").then((value) async {
var jsonResp = jsonDecode(value.body);
homeApiController.setMoodOMeterResp(jsonResp);
var moodResult =
await MoodOMeterService().getMoodOMeter();
// if()
if (moodResult.responseStatus == ResponseStatus.success) {
setState(() {
activeIndexMoodOMeter = 4;
isLoading = !isLoading;
});
}
// => setState(() {
// activeIndexMoodOMeter = 4;
// isLoading = !isLoading;
// })
}
// => setState(() {
// activeIndexMoodOMeter = 4;
// isLoading = !isLoading;
// })
);
}
},
child: SvgPicture.asset(
activeIndexMoodOMeter == 4

1
gsf/lib/views/components/notification_icon.dart
View File

@@ -53,7 +53,6 @@ class _NotificationIconState extends State<NotificationIcon>
if (snapshot.connectionState == ConnectionState.done &&
snapshot.hasData) {
NotificationModel data = snapshot.data!.data;
// print('Snap all data of notifications ${data.success}');
List filteredNotifications = data.notificationList
.where((notification) => notification.isRead == "0")
.toList();

7
gsf/lib/views/pages/MenstrualCycleTracker/AddNewPeriod.dart
View File

@@ -1,14 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter/src/widgets/framework.dart';
import 'package:flutter/src/widgets/placeholder.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:fluttertoast/fluttertoast.dart';
import 'package:get/get.dart';
import 'package:gsp_app/views/components/appbar.dart';
import 'package:gsp_app/views/components/btn.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/Helper/HelperMethods.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/OverviewPage.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/SecondQuestion.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/TrackerHomePage.dart';
import 'package:gsp_app/views/theme.dart';
import 'package:syncfusion_flutter_datepicker/datepicker.dart';
@@ -128,7 +122,6 @@ class _AddNewPeriodState extends State<AddNewPeriod> {
maxDate: DateTime.now(),
onSelectionChanged:
(DateRangePickerSelectionChangedArgs args) {
print("selected date is :- ${args.value} ");
helperController.pickerdateRange.value = args.value;
// print("range value is :- ${pickerdateRange.first}");
},

7
gsf/lib/views/pages/MenstrualCycleTracker/DemoPage.dart
View File

@@ -1,9 +1,5 @@
import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter/src/widgets/framework.dart';
import 'package:flutter/src/widgets/placeholder.dart';
import 'package:get_storage/get_storage.dart';
import 'package:syncfusion_flutter_datepicker/datepicker.dart';
class DemoPage extends StatefulWidget {
@@ -21,7 +17,6 @@ class _DemoPageState extends State<DemoPage> {
return Scaffold(
body: SfDateRangePicker(
onSubmit: (p0) {
print("final value $p0");
},
showActionButtons: false,
showNavigationArrow: true,
@@ -38,7 +33,7 @@ class _DemoPageState extends State<DemoPage> {
args.value as List<PickerDateRange>?;
if (selectedRanges != null && selectedRanges.isNotEmpty) {
print("Selected ranges:");
}
// Example: Adding a new PickerDateRange to the pickerdateRange list

286
gsf/lib/views/pages/MenstrualCycleTracker/FirstQuestion.dart
View File

@@ -1,11 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter/src/widgets/framework.dart';
import 'package:flutter/src/widgets/placeholder.dart';
import 'package:fluttertoast/fluttertoast.dart';
import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart';
import 'package:gsp_app/views/components/appbar.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/Helper/HelperMethods.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/SecondQuestion.dart';
import 'viewModel/StoringDates.dart';
@@ -55,151 +51,157 @@ class _FirstQuestionState extends State<FirstQuestion> {
body: SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.all(16),
child: Container(
width: double.infinity,
decoration: const BoxDecoration(
color: Color(0xFF383838), // Set the background color
borderRadius: BorderRadius.only(
topLeft: Radius.circular(12.0),
topRight: Radius.circular(12.0),
child: GestureDetector(
onTap: () {
FocusManager.instance.primaryFocus?.unfocus();
},
child: Container(
width: double.infinity,
decoration: const BoxDecoration(
color: Color(0xFF383838), // Set the background color
borderRadius: BorderRadius.only(
topLeft: Radius.circular(12.0),
topRight: Radius.circular(12.0),
),
),
),
child: Column(
children: [
const SizedBox(
height: 64,
),
Image.asset(
'assets/image/cycle_time.png',
height: 64,
width: 64,
),
const SizedBox(
height: 31,
),
const Text(
"How long do your periods usually last?",
style: TextStyle(fontSize: 18),
),
const SizedBox(
height: 20,
),
Container(
width: 147,
height: 43,
decoration: ShapeDecoration(
color: const Color(0xFFBBF046),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(25.50),
),
child: Column(
children: [
const SizedBox(
height: 64,
),
child: Center(
child: showTextField
? GestureDetector(
onTap: () {
setState(() {
showTextField = !showTextField;
});
},
child: const Text(
'Period Length',
style: TextStyle(
fontSize: 14, // Adjust the font size as needed
color: Colors.black,
),
))
: TextFormField(
//textAlign: TextAlign.center,
autofocus: true,
maxLength: 3,
keyboardType: TextInputType.number,
controller: periodLength,
decoration: const InputDecoration(
border: InputBorder.none,
counterText: '', // Hide the character counter
contentPadding:
EdgeInsets.only(left: 60, right: 10),
),
style: const TextStyle(
// Adjust the text style as needed
color: Colors.black,
),
onChanged: (value) {
if (value.isEmpty) {
Image.asset(
'assets/image/cycle_time.png',
height: 64,
width: 64,
),
const SizedBox(
height: 31,
),
const Text(
"How long do your periods usually last?",
style: TextStyle(fontSize: 18),
),
const SizedBox(
height: 20,
),
Container(
width: 147,
height: 43,
decoration: ShapeDecoration(
color: const Color(0xFFBBF046),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(25.50),
),
),
child: Center(
child: showTextField
? GestureDetector(
onTap: () {
setState(() {
showTextField = !showTextField;
});
}
},
),
),
),
const SizedBox(
height: 5,
),
const Text(
"Days",
style: TextStyle(fontSize: 16),
),
const SizedBox(
height: 10,
),
const Text(
"From the first day of bleeding to the last.",
style: TextStyle(fontSize: 18),
),
const SizedBox(
height: 100,
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 15),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
GestureDetector(
onTap: () {
Get.back();
},
child: Container(
width: 147,
height: 39,
decoration: ShapeDecoration(
color: const Color(0xFFBBF046),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(25.50),
},
child: const Text(
'Period Length',
style: TextStyle(
fontSize:
14, // Adjust the font size as needed
color: Colors.black,
),
))
: TextFormField(
//textAlign: TextAlign.center,
autofocus: true,
maxLength: 3,
keyboardType: TextInputType.number,
controller: periodLength,
decoration: const InputDecoration(
border: InputBorder.none,
counterText: '', // Hide the character counter
contentPadding:
EdgeInsets.only(left: 60, right: 10),
),
style: const TextStyle(
// Adjust the text style as needed
color: Colors.black,
),
onChanged: (value) {
if (value.isEmpty) {
setState(() {
showTextField = !showTextField;
});
}
},
),
),
child: const Center(
child: Text(
"Back",
style: TextStyle(color: Colors.black),
)),
),
),
GestureDetector(
onTap: () {
_validateAnswer();
},
child: Container(
width: 147,
height: 39,
decoration: ShapeDecoration(
shape: RoundedRectangleBorder(
side: const BorderSide(
width: 1, color: Colors.white),
borderRadius: BorderRadius.circular(25.50),
),
),
child: const Center(child: Text("Next")),
),
)
],
),
),
),
SizedBox(
height: 20,
)
],
const SizedBox(
height: 5,
),
const Text(
"Days",
style: TextStyle(fontSize: 16),
),
const SizedBox(
height: 10,
),
const Text(
"From the first day of bleeding to the last.",
style: TextStyle(fontSize: 18),
),
const SizedBox(
height: 100,
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 15),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
GestureDetector(
onTap: () {
Get.back();
},
child: Container(
width: 147,
height: 39,
decoration: ShapeDecoration(
color: const Color(0xFFBBF046),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(25.50),
),
),
child: const Center(
child: Text(
"Back",
style: TextStyle(color: Colors.black),
)),
),
),
GestureDetector(
onTap: () {
_validateAnswer();
},
child: Container(
width: 147,
height: 39,
decoration: ShapeDecoration(
shape: RoundedRectangleBorder(
side: const BorderSide(
width: 1, color: Colors.white),
borderRadius: BorderRadius.circular(25.50),
),
),
child: const Center(child: Text("Next")),
),
)
],
),
),
SizedBox(
height: 20,
)
],
),
),
),
),

4
gsf/lib/views/pages/MenstrualCycleTracker/Helper/HelperMethods.dart
View File

@@ -1,6 +1,5 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/viewModel/StoringDates.dart';
import 'package:intl/intl.dart';
import 'package:syncfusion_flutter_datepicker/datepicker.dart';
@@ -15,7 +14,7 @@ class HelperMethods extends GetxController {
RxString observableDateTimeOnTrackerHomePage =
DateFormat('dd MMMM').format(DateTime.now()).obs;
Rx<DateTime?> updateDateForHomepage = DateTime.now().obs;
RxBool overviewButtonColorTransparent = false.obs;
changeObservableDateTimeOnTrackerHomePage(bool front) {
DateTime currentDate =
DateFormat('dd MMMM').parse(observableDateTimeOnTrackerHomePage.value);
@@ -250,7 +249,6 @@ class HelperMethods extends GetxController {
disabledNext = true.obs;
}
update();
print("calculateOutOfDays: ${currentPeriodCycle.value} ");
}
RxBool showNext = true.obs;

7
gsf/lib/views/pages/MenstrualCycleTracker/OverviewPage.dart
View File

@@ -1,4 +1,3 @@
import 'dart:math';
import 'package:flutter/material.dart';
@@ -6,7 +5,6 @@ import 'package:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart';
import 'package:intl/intl.dart';
import 'package:gsp_app/views/components/appbar.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/Helper/HelperMethods.dart';
import 'package:gsp_app/views/theme.dart';
import 'package:syncfusion_flutter_datepicker/datepicker.dart';
@@ -86,7 +84,6 @@ class _OverviewPageState extends State<OverviewPage> {
formateDate();
calculatePeriodDateForCalender();
final data = StorageService().readinitialSetup();
print("pickerRange from storage $data");
super.initState();
}
@@ -265,7 +262,7 @@ class _OverviewPageState extends State<OverviewPage> {
selectionMode: DateRangePickerSelectionMode.single,
onSelectionChanged:
(DateRangePickerSelectionChangedArgs args) {
print("selected date is :- ${args.value} ");
_changeFertilityFromDate(args.value);
helperController.formatDateTime(args.value);
helperController.formatDateTime2(args.value);
@@ -294,7 +291,7 @@ class _OverviewPageState extends State<OverviewPage> {
selectionMode: DateRangePickerSelectionMode.range,
onSelectionChanged:
(DateRangePickerSelectionChangedArgs args) {
print("selected date is :- ${args.value} ");
},
onViewChanged: (DateRangePickerViewChangedArgs args) {
final DateRangePickerView _visibleView = args.view;

2
gsf/lib/views/pages/MenstrualCycleTracker/PeriodCalendarWidget.dart
View File

@@ -1,6 +1,4 @@
import 'package:flutter/material.dart';
import 'package:flutter/src/widgets/framework.dart';
import 'package:flutter/src/widgets/placeholder.dart';
import 'package:syncfusion_flutter_datepicker/datepicker.dart';
class PeriodCalendar extends StatefulWidget {

3
gsf/lib/views/pages/MenstrualCycleTracker/PeriodSelection.dart
View File

@@ -1,11 +1,8 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart';
import 'package:gsp_app/views/components/appbar.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/FirstQuestion.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/Helper/HelperMethods.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/SecondQuestion.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/viewModel/StoringDates.dart';
import 'package:gsp_app/views/theme.dart';
import 'package:syncfusion_flutter_datepicker/datepicker.dart';

291
gsf/lib/views/pages/MenstrualCycleTracker/SecondQuestion.dart
View File

@@ -1,10 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter/src/widgets/framework.dart';
import 'package:flutter/src/widgets/placeholder.dart';
import 'package:fluttertoast/fluttertoast.dart';
import 'package:get/get.dart';
import 'package:gsp_app/views/components/appbar.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/Helper/HelperMethods.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/TrackerHomePage.dart';
import 'viewModel/StoringDates.dart';
@@ -53,154 +50,160 @@ class _SecondQuestionState extends State<SecondQuestion> {
body: SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.all(16),
child: Container(
width: double.infinity,
decoration: const BoxDecoration(
color: Color(0xFF383838), // Set the background color
borderRadius: BorderRadius.only(
topLeft: Radius.circular(12.0),
topRight: Radius.circular(12.0),
child: GestureDetector(
onTap: () {
FocusManager.instance.primaryFocus?.unfocus();
},
child: Container(
width: double.infinity,
decoration: const BoxDecoration(
color: Color(0xFF383838), // Set the background color
borderRadius: BorderRadius.only(
topLeft: Radius.circular(12.0),
topRight: Radius.circular(12.0),
),
),
),
child: Column(
children: [
const SizedBox(
height: 64,
),
Image.asset(
'assets/image/cycle_time.png',
height: 64,
width: 64,
),
const SizedBox(
height: 31,
),
const Text(
"How long do your Cycle usually last?",
style: TextStyle(fontSize: 18),
),
const SizedBox(
height: 20,
),
Container(
width: 147,
height: 43,
decoration: ShapeDecoration(
color: const Color(0xFFBBF046),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(25.50),
),
child: Column(
children: [
const SizedBox(
height: 64,
),
child: Center(
child: showTextField
? GestureDetector(
onTap: () {
setState(() {
showTextField = !showTextField;
});
},
child: const Text(
'Period Length',
style: TextStyle(
fontSize: 14, // Adjust the font size as needed
color: Colors.black,
),
))
: TextFormField(
//textAlign: TextAlign.center,
autofocus: true,
maxLength: 3,
keyboardType: TextInputType.number,
controller: periodCycleLength,
decoration: const InputDecoration(
border: InputBorder.none,
counterText: '', // Hide the character counter
contentPadding:
EdgeInsets.only(left: 60, right: 10),
),
style: const TextStyle(
// Adjust the text style as needed
color: Colors.black,
),
onChanged: (value) {
if (value.isEmpty) {
Image.asset(
'assets/image/cycle_time.png',
height: 64,
width: 64,
),
const SizedBox(
height: 31,
),
const Text(
"How long do your Cycle usually last?",
style: TextStyle(fontSize: 18),
),
const SizedBox(
height: 20,
),
Container(
width: 147,
height: 43,
decoration: ShapeDecoration(
color: const Color(0xFFBBF046),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(25.50),
),
),
child: Center(
child: showTextField
? GestureDetector(
onTap: () {
setState(() {
showTextField = !showTextField;
});
}
},
),
),
),
const SizedBox(
height: 5,
),
const Text(
"Days",
style: TextStyle(fontSize: 16),
),
const SizedBox(
height: 10,
),
const Padding(
padding: EdgeInsets.symmetric(horizontal: 14),
child: Text(
"From the day one period starts until the next one starts.",
style: TextStyle(fontSize: 18),
),
),
const SizedBox(
height: 100,
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 15),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
GestureDetector(
onTap: () {
Get.back();
},
child: Container(
width: 147,
height: 39,
decoration: ShapeDecoration(
color: const Color(0xFFBBF046),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(25.50),
},
child: const Text(
'Period Length',
style: TextStyle(
fontSize:
14, // Adjust the font size as needed
color: Colors.black,
),
))
: TextFormField(
//textAlign: TextAlign.center,
autofocus: true,
maxLength: 3,
keyboardType: TextInputType.number,
controller: periodCycleLength,
decoration: const InputDecoration(
border: InputBorder.none,
counterText: '', // Hide the character counter
contentPadding:
EdgeInsets.only(left: 60, right: 10),
),
style: const TextStyle(
// Adjust the text style as needed
color: Colors.black,
),
onChanged: (value) {
if (value.isEmpty) {
setState(() {
showTextField = !showTextField;
});
}
},
),
),
child: const Center(
child: Text(
"Back",
style: TextStyle(color: Colors.black),
)),
),
),
GestureDetector(
onTap: () {
_validateAnswer();
},
child: Container(
width: 147,
height: 39,
decoration: ShapeDecoration(
shape: RoundedRectangleBorder(
side: const BorderSide(
width: 1, color: Colors.white),
borderRadius: BorderRadius.circular(25.50),
),
),
child: const Center(child: Text("Next")),
),
)
],
),
),
),
const SizedBox(
height: 20,
)
],
const SizedBox(
height: 5,
),
const Text(
"Days",
style: TextStyle(fontSize: 16),
),
const SizedBox(
height: 10,
),
const Padding(
padding: EdgeInsets.symmetric(horizontal: 14),
child: Text(
"From the day one period starts until the next one starts.",
style: TextStyle(fontSize: 18),
),
),
const SizedBox(
height: 100,
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 15),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
GestureDetector(
onTap: () {
Get.back();
},
child: Container(
width: 147,
height: 39,
decoration: ShapeDecoration(
color: const Color(0xFFBBF046),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(25.50),
),
),
child: const Center(
child: Text(
"Back",
style: TextStyle(color: Colors.black),
)),
),
),
GestureDetector(
onTap: () {
_validateAnswer();
},
child: Container(
width: 147,
height: 39,
decoration: ShapeDecoration(
shape: RoundedRectangleBorder(
side: const BorderSide(
width: 1, color: Colors.white),
borderRadius: BorderRadius.circular(25.50),
),
),
child: const Center(child: Text("Next")),
),
)
],
),
),
const SizedBox(
height: 20,
)
],
),
),
),
),

99
gsf/lib/views/pages/MenstrualCycleTracker/TrackerHomePage.dart
View File

@@ -1,18 +1,13 @@
import 'package:flutter/material.dart';
import 'package:flutter/src/widgets/framework.dart';
import 'package:flutter/src/widgets/placeholder.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:fluttertoast/fluttertoast.dart';
import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart';
import 'package:gsp_app/views/components/appbar.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/AddNewPeriod.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/Helper/HelperMethods.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/Helper/StorageService.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/OverviewPage.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/SecondQuestion.dart';
import 'package:intl/intl.dart';
import 'package:syncfusion_flutter_datepicker/datepicker.dart';
import 'viewModel/StoringDates.dart';
@@ -33,6 +28,9 @@ class _TrackerHomePageState extends State<TrackerHomePage> {
void initState() {
isFilled = StorageService().readinitialSetup();
if (isFilled!) {
Future.delayed(const Duration(seconds: 1), () {
helperController.isLoading.value = false;
});
} else {
callCalculations();
}
@@ -66,6 +64,9 @@ class _TrackerHomePageState extends State<TrackerHomePage> {
await helperController.calculateFirstTime();
await helperController.calculatePeriodDateForCalender();
await helperController.calculateOutOfDays();
Future.delayed(const Duration(seconds: 1), () {
setState(() {});
});
}
@override
@@ -381,6 +382,13 @@ class _TrackerHomePageState extends State<TrackerHomePage> {
() {
if (helperController.ovulatingDate.contains(
helperController.updateDateForHomepage.value)) {
Future.delayed(const Duration(milliseconds: 500),
() {
helperController.overviewButtonColorTransparent
.value = true;
});
helperController
.overviewButtonColorTransparent.value = true;
return Image.asset(
'assets/image/MCT_purple_new.png',
width: 156,
@@ -388,18 +396,32 @@ class _TrackerHomePageState extends State<TrackerHomePage> {
);
} else if (helperController.allDatesList.contains(
helperController.updateDateForHomepage.value)) {
Future.delayed(const Duration(milliseconds: 500),
() {
helperController.overviewButtonColorTransparent
.value = true;
});
return Image.asset(
'assets/image/MCT_red_new.png',
width: 156,
height: 156,
);
} else if (helperController.disabledNext.value) {
Future.delayed(const Duration(milliseconds: 500),
() {
helperController.overviewButtonColorTransparent
.value = false;
});
return Image.asset(
'assets/image/MCT_disabled_center_new.png',
width: 156,
height: 156,
);
} else {
// Future.delayed(const Duration(seconds: 1), () {
// helperController.overviewButtonColorTransparent
// .value = false; // Prints after 1 second.
// });
return Image.asset(
'assets/image/Icon5MCT_new.png',
width: 156,
@@ -446,21 +468,56 @@ class _TrackerHomePageState extends State<TrackerHomePage> {
],
),
),
Positioned(
bottom: 45,
right: 47,
child: InkWell(
onTap: () {
Get.to(() => const OverviewPage());
},
child: const Text(
"Overview",
style: TextStyle(
color: Color.fromRGBO(0, 0, 0, 1),
fontSize: 14,
),
),
),
Obx(
() => helperController
.overviewButtonColorTransparent.value
? Positioned(
bottom: 45,
right: 47,
child: InkWell(
onTap: () {
Get.to(() => const OverviewPage());
},
child: const Text(
"Overview",
style: TextStyle(
color: Color.fromRGBO(0, 0, 0, 1),
fontSize: 14,
),
),
),
)
: Positioned(
bottom: 40,
right: 41,
child: Container(
decoration: BoxDecoration(
color: const Color(0xFFBBF046),
borderRadius: BorderRadius.circular(
20.0), // Adjust the radius as needed
border: Border.all(
color: const Color(
0xFFBBF046), // Border color
),
),
child: InkWell(
onTap: () {
Get.to(() => const OverviewPage());
},
child: const Padding(
padding: EdgeInsets.all(
4), // Adjust padding as needed
child: Text(
"Overview",
style: TextStyle(
color: Color.fromRGBO(0, 0, 0, 1),
fontSize: 14,
),
),
),
),
),
),
)
],
),
@@ -496,7 +553,7 @@ class _TrackerHomePageState extends State<TrackerHomePage> {
Obx(() => !helperController.endOfCycle.value
? const Text("Start of new Cycle")
: helperController.disabledNext.value
? const Text("Not tracking")
? const Text("Enter Latest Dates")
: const Text("")),
const SizedBox(
height: 80,

26
gsf/lib/views/pages/MenstrualCycleTracker/viewModel/DeleteDatesOnLogout.dart Normal file
View File

@@ -0,0 +1,26 @@
import '../../../../api/base_manager.dart';
import '../../../../api/network_api.dart';
class DeleteDatesOnLogout {
Future<ResponseData<dynamic>> deleteDates(updata) async {
final response = await NetworkApi()
.postApi(url: "https://thegsf.co/api/deletePeriodDates", data: updata);
if (response.status == ResponseStatus.SUCCESS) {
print("success $response");
}
print("failed $response");
return response;
}
Future<ResponseData<dynamic>> deleteAccount(updata) async {
final response = await NetworkApi()
.postApi(url: "https://thegsf.co/api/delete_user", data: updata);
if (response.status == ResponseStatus.SUCCESS) {
print("success $response");
}
print("failed $response");
return response;
}
}

1
gsf/lib/views/pages/MenstrualCycleTracker/viewModel/StoringDates.dart
View File

@@ -13,7 +13,6 @@ import '../../../../api/base_manager.dart';
QuizeModel? quizData;
RxList<PickerDateRange> pickerdateRange = <PickerDateRange>[].obs;
final HelperMethods helperController = Get.put(HelperMethods());
class StoringDates {

2
gsf/lib/views/pages/StepCount/HealthApp.dart
View File

@@ -99,7 +99,7 @@ class calculateStepsFromHealthApp extends GetxController {
Future storeStepsInDB() async {
Map<String, dynamic> updata = {"step_count": finalSteps.value};
StepCounts().storeSteps(updata);
await StepCounts().storeSteps(updata);
}
Future fetchStepDataForAndroid() async {

1
gsf/lib/views/pages/audio_player/audio_plyer_with_url.dart
View File

@@ -108,7 +108,6 @@ class _AudioPlayersSState extends State<AudioPlayersS> {
onChangeEnd: (newValue) async {
setState(() {
value = newValue;
print(newValue);
});
player.pause();
await player.seek(Duration(seconds: newValue.toInt()));

4
gsf/lib/views/pages/bioMaker/calendar.dart
View File

@@ -126,14 +126,10 @@ class _HorizontalCalendarState extends State<HorizontalCalendar> {
aController.getDAte.value = tapDateTimeFormated;
})
: null;
print('FORMATEDDATE $formateedDate');
print('FORMATEDDATE CLICKED DATE ${aController.getDAte.value}');
if (formateedDate != aController.getDAte.value) {
aController.checDate.value = false;
print('True Ones ${aController.checDate.value}');
} else {
aController.checDate.value = true;
print('false Ones ${aController.checDate.value}');
}
},
child: Container(

1
gsf/lib/views/pages/bioMaker/overview.dart
View File

@@ -479,7 +479,6 @@ class _OverviewState extends State<Overview>
final brightness = Get.theme.brightness;
_animationController.forward();
GlobalController globalContoller = Get.find();
print('object New Ones');
DateFormat dateFormat = DateFormat('y-M-d');

1
gsf/lib/views/pages/biomateric.dart/account_controller.dart
View File

@@ -1,5 +1,4 @@
import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart';
class AccountController extends GetxController {
// final box = GetStorage();

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

@@ -3,11 +3,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_html/flutter_html.dart';
import 'package:get/get.dart';
import 'package:gsp_app/repository/services/blog_services.dart';
import 'package:intl/intl.dart';
import '../../../modals/blog_model.dart';
import '../../../modals/search_blogModel.dart';
import '../../components/appbar.dart';
import '../../theme.dart';
@@ -53,7 +48,7 @@ class BlogDetails extends StatelessWidget {
child: Row(
children: [
Text(
tages!,
tages ?? "",
style: TextStyle(
fontSize: 18,
color: ColorConstants.kWhite,
@@ -62,7 +57,7 @@ class BlogDetails extends StatelessWidget {
),
Spacer(),
Text(
formattedtime!,
formattedtime ?? "",
style: TextStyle(
fontSize: 18,
color: ColorConstants.kWhite,

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

@@ -5,7 +5,6 @@ import 'dart:async';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:gsp_app/modals/blog_model.dart';
import 'package:gsp_app/repository/services/blog_services.dart';
import 'package:gsp_app/views/components/page_animation.dart';
import 'package:intl/intl.dart';
@@ -109,63 +108,6 @@ class _BlogMainState extends State<BlogMain> with TickerProviderStateMixin {
),
);
}
// Widget allWidgetTab(Category category) {
// return Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// Text(
// 'Top News',
// style: TextStyle(
// fontSize: 22,
// color: Color(0xff858585),
// fontFamily: 'SFPRO',
// fontWeight: FontWeight.w700,
// ),
// ),
// SizedBox(height: 15),
// (category.articles != null && category.articles!.isNotEmpty)
// ? SizedBox(
// height: 280,
// child: ListView.builder(
// itemCount: category.articles!.length,
// scrollDirection: Axis.horizontal,
// itemBuilder: (context, index) {
// var updatedAtTime = category.articles![index].updatedAt;
// DateTime updatedAt = DateTime.parse(updatedAtTime!);
// Duration difference =
// DateTime.now().difference(updatedAt);
// String formattedDifference =
// DateFormat().add_Hm().format(updatedAt);
// return philosophyCard(
// ArticleName: category.articles![index].shortText ?? '',
// shortText: category.articles![index].articleName ?? '',
// image_upload:
// category.articles![index].thumbnailPath ?? '',
// updatedAtTime: formattedDifference,
// articleid: category.articles![index],
// );
// }),
// )
// : Center(child: Text('No Articles found')),
// SizedBox(height: 10),
// Expanded(
// child: ListView.builder(
// itemCount: category.articles!.length,
// physics: ScrollPhysics(),
// shrinkWrap: true,
// itemBuilder: (context, index) => cardList(
// articleName: category.articles![index].articleName ?? '',
// thumbnailimg: category.articles![index].thumbnailPath ?? '',
// updatedTime: category.articles![index].updatedAt ?? '',
// articleid: category.articles![index],
// ),
// ),
// )
// ],
// );
// }
}
class NewsBody extends StatefulWidget {
@@ -288,14 +230,14 @@ class _NewsBodyState extends State<NewsBody> {
}
return philosophyCard(
ArticleName: searchArticle!
articleName: searchArticle!
.result![index].shortText ??
'',
shortText: searchArticle!
.result![index].articleName ??
'',
image_upload: searchArticle!
.result![index].thumbnailPath ??
imageupload: searchArticle!
.result![index].imageUpload ??
'',
updatedAtTime: formatDateTime2(
searchArticle!.result![index]
@@ -303,14 +245,14 @@ class _NewsBodyState extends State<NewsBody> {
categoryId:
searchArticle!.result![index].id ??
0,
InnerimageUpload: searchArticle!
innerImageUpload: searchArticle!
.result![index].imageUpload ??
'',
Innertages:
innerTages:
searchArticle!.result![index].tags,
InnerDescription: searchArticle!
innerDescription: searchArticle!
.result![index].description,
Innerformattedtime: formatDateTime2(
innerFormattedtime: formatDateTime2(
searchArticle!.result![index]
.updatedAt as String),
@@ -356,30 +298,27 @@ class _NewsBodyState extends State<NewsBody> {
.result![index].articleName ??
'',
thumbnailimg: searchArticle!
.result![index].thumbnailPath ??
.result![index].imageUpload ??
'',
updatedTime: formatDateTime(searchArticle!
.result![index].updatedAt ??
''),
categoryId:
searchArticle!.result![index].id ?? 0,
InnerimageUpload: searchArticle!
innerimageUpload: searchArticle!
.result![index].imageUpload ??
'',
Innertages:
innerTages:
searchArticle!.result![index].tags,
InnerDescription: searchArticle!
innerDescription: searchArticle!
.result![index].description,
Innerformattedtime: formatDateTime2(
innerformattedtime: formatDateTime2(
searchArticle!.result![index]
.updatedAt as String) ??
'',
// articleid: widget.category.articles![index],
);
}),
// SizedBox(
// height: 400,
// )
],
),
),
@@ -401,14 +340,14 @@ class _NewsBodyState extends State<NewsBody> {
philosophyCard({
required String shortText,
required String ArticleName,
required String image_upload,
required String articleName,
required String imageupload,
required String updatedAtTime,
required int categoryId,
required InnerimageUpload,
required Innertages,
required InnerDescription,
required Innerformattedtime,
required innerImageUpload,
required innerTages,
required innerDescription,
required innerFormattedtime,
}) {
return OpenContainerWrappers(
closeBuild: Padding(
@@ -422,7 +361,7 @@ philosophyCard({
// width: Get.size.width * 0.8,
decoration: BoxDecoration(
image: DecorationImage(
image: NetworkImage(image_upload),
image: NetworkImage(imageupload),
fit: BoxFit.fitWidth,
alignment: Alignment.topCenter,
),
@@ -488,7 +427,7 @@ philosophyCard({
),
SizedBox(height: 10),
Text(
ArticleName,
articleName,
maxLines: 1,
style: TextStyle(
overflow: TextOverflow.ellipsis,
@@ -507,10 +446,10 @@ philosophyCard({
),
openBuild: BlogDetails(
articleId: categoryId,
imageUpload: InnerimageUpload,
tages: Innertages,
description: InnerDescription,
formattedtime: Innerformattedtime,
imageUpload: innerImageUpload,
tages: innerTages,
description: innerDescription,
formattedtime: innerFormattedtime,
));
}
@@ -519,10 +458,10 @@ cardList({
required String articleName,
required String updatedTime,
required int categoryId,
required InnerimageUpload,
required Innertages,
required InnerDescription,
required Innerformattedtime,
required innerimageUpload,
required innerTages,
required innerDescription,
required innerformattedtime,
// required Articles articleid,
}) {
return OpenContainerWrappers(
@@ -591,9 +530,9 @@ cardList({
),
openBuild: BlogDetails(
articleId: categoryId,
imageUpload: InnerimageUpload,
tages: Innertages,
description: InnerDescription,
formattedtime: Innerformattedtime,
imageUpload: innerimageUpload,
tages: innerTages,
description: innerDescription,
formattedtime: innerformattedtime,
));
}

1
gsf/lib/views/pages/community/community.dart
View File

@@ -331,7 +331,6 @@ class _CommunityMemberState extends State<CommunityMember> {
isScrollControlled: true,
backgroundColor: Colors.transparent,
builder: (context) {
// print(data.img);
return StatefulBuilder(
builder: (BuildContext context, StateSetter setState) {

1
gsf/lib/views/pages/faq/about_gsf_accordian.dart
View File

@@ -77,7 +77,6 @@ class _AboutGetSetFitState extends State<AboutGetSetFit> {
body: FutureBuilder<List<FaqModel>>(
future: FaqService().fetchFaq(),
builder: (context, snapshot) {
print('snapshot of data faq ${snapshot}');
if (snapshot.connectionState == ConnectionState.done &&
snapshot.hasData) {
List<FaqModel> faqModels = snapshot.data!;

26
gsf/lib/views/pages/feedback/feedback.dart
View File

@@ -93,9 +93,9 @@ class _FeedBackState extends State<FeedBack> {
final resp = await FeedbackServices().feedbackApi(updata);
if (resp.status == ResponseStatus.SUCCESS) {
// btnController.reset();
Get.to(() => Home());
print('data---$data');
FeedbackServices().getFeedbackApi();
Get.back();
// Get.to(() => Home());
Flushbar(
backgroundColor: Colors.green,
message: 'Your feedback is sent successfully!',
@@ -147,7 +147,6 @@ class _FeedBackState extends State<FeedBack> {
// active.value =false;
active.value = !active.value;
active1.value = false;
print('activevaluebad---${active.value}');
},
child: Obx(() {
// var data = isActive == '1';
@@ -169,20 +168,15 @@ class _FeedBackState extends State<FeedBack> {
onTap: () {
active1.value = !active1.value;
active.value = false;
print('active1valueGood---${active1.value}');
},
child: Obx(() {
// var data1 = isActive == '0';
// print('data of good emoji$data1');
return
// data1 == active1.value
active1.value
? SvgPicture.asset(
'assets/image/feedback/happy_active.svg',
)
: SvgPicture.asset(
'assets/image/feedback/happy_unactive.svg',
);
return active1.value
? SvgPicture.asset(
'assets/image/feedback/happy_active.svg',
)
: SvgPicture.asset(
'assets/image/feedback/happy_unactive.svg',
);
}),
)),
],

1
gsf/lib/views/pages/forgotPassword/reset_otp.dart
View File

@@ -271,7 +271,6 @@ class _OtpScreenState extends State<OtpScreen> {
}
});
// print('object');
},
child: Text(
'Resend Otp',

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

@@ -1,9 +1,7 @@
// ignore_for_file: prefer_const_constructors
import 'dart:async';
import 'dart:developer';
import 'dart:io';
import 'dart:ui';
// import 'package:flutter_background_service/flutter_background_service.dart';
// import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import 'package:gsp_app/view_model/QuizApis.dart';
@@ -11,7 +9,6 @@ import 'package:gsp_app/views/components/floating_action_btn.dart';
import 'package:gsp_app/views/pages/podcast/viewModel/PodcastApis.dart';
import 'package:gsp_app/views/pages/quiz/quiz_home.dart';
import 'package:gsp_app/views/pages/splash.dart';
import 'package:workmanager/workmanager.dart';
// import 'package:flutter_background_service_android/flutter_background_service_android.dart';
import '../../../repository/services/feedbackServices.dart';
@@ -39,17 +36,13 @@ import 'package:gsp_app/views/pages/courses/courses_overview.dart';
import 'package:lottie/lottie.dart';
import 'package:package_info_plus/package_info_plus.dart';
import 'package:pedometer/pedometer.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:skeletons/skeletons.dart';
import '../../../modals/leaderboard_ranking_model.dart';
import '../../../modals/rank_position.dart';
import '../../../modals/share_thoughts.dart';
import '../../../modals/upcoming_session_model.dart';
import '../../../repository/response_data.dart';
import '../../../repository/services/cj/leader_board_ranking.dart';
import '../../../repository/services/cj/moodOmeter_services.dart';
import '../../../repository/services/cj/upcoming_activity_service.dart';
import '../../../repository/services/home_controller.dart';
import '../../../repository/services/share_thoughts_service.dart';
import '../../../view_model/common_functions.dart';
@@ -70,14 +63,8 @@ import '../../short_video_player/svp_main.dart';
import '../bioMaker/controller.dart';
import '../diet_plan/diet_chart_preview.dart';
import '../insta/insta_clip_list.dart';
import '../insta/intsa_overview.dart';
import '../podcast/podcast.dart';
import '../podcast/podcast_list.dart';
import '../podcast/podcast_list_audio.dart';
import '../Sessions/count_me.dart';
import '../shareThoutgh/mission_impossible.dart';
import 'app_tour_guid.dart';
import '../Sessions/live_session_detail.dart';
import '../settings/setting_main.dart';
import '../../components/bottom_navigation.dart';
import '../../components/btn.dart';
@@ -258,7 +245,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 +252,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 +272,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 +283,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 +302,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 +448,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 +464,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 +506,6 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
() => Settings(),
);
},
//
// Get.to(
// () => const Settings(),
// ),
child: Icon(
Icons.settings_outlined,
color: ColorConstants.kWhite,
@@ -652,7 +531,6 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
)
],
),
body: showMoodOMeterAfterAppTour ?? false
? HomePageSkeleton()
: FutureBuilder(
@@ -660,27 +538,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 +574,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));
@@ -839,18 +703,15 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
barrierDismissible: false,
barrierColor: ColorConstants.kBlack.withOpacity(0.9),
builder: (BuildContext context) {
// print('mission impossible');
return Padding(
padding: EdgeInsets.symmetric(horizontal: context.width * 0.05),
child: FutureBuilder<ResponseModel>(
future: GetOurThoughts().getShareThoughtsData(),
builder: (context, snapshot) {
// print("Get thouths dtata news ${snapshot.data!.data}");
if (snapshot.connectionState == ConnectionState.done &&
snapshot.hasData) {
ShareOurthoutghs shareThoughts = snapshot.data!.data;
final yourThoutghs = shareThoughts.userThoughts.split('-');
// print('yourThoutghs ${yourThoutghs}');
return Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
@@ -962,22 +823,22 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
);
}
calculateMood(int index) {
calculateMood(int index) async {
switch (index) {
case 0:
MoodOMeterService().uploadMood("Very Happy");
await MoodOMeterService().uploadMood("Very Happy");
break;
case 1:
MoodOMeterService().uploadMood("Happy");
await MoodOMeterService().uploadMood("Happy");
break;
case 2:
MoodOMeterService().uploadMood("Ok");
await MoodOMeterService().uploadMood("Ok");
break;
case 3:
MoodOMeterService().uploadMood("Whatever");
await MoodOMeterService().uploadMood("Whatever");
break;
case 4:
MoodOMeterService().uploadMood("Sad");
await MoodOMeterService().uploadMood("Sad");
break;
default:
Get.snackbar(
@@ -1079,11 +940,13 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
),
),
const SizedBox(height: 34),
const MoodOMeter(),
MoodOMeter(
fromHomePage: true,
),
const SizedBox(height: 34),
FullWdtBtn(
btnText: 'Share your thoughts!',
onTap: () {
onTap: () async {
if (activeIndexMoodOMeter == -1) {
Get.snackbar(
'Error',
@@ -1093,7 +956,7 @@ class _HomeState extends State<Home> with SingleTickerProviderStateMixin {
colorText: Colors.white,
);
} else {
calculateMood(activeIndexMoodOMeter);
await calculateMood(activeIndexMoodOMeter);
box.write('showMoodOmeter', false);
Get.back();
missionPossible(context);
@@ -2725,38 +2588,30 @@ class _BannerContentState extends State<BannerContent> {
bodyfatRangeTxt =
((aControllerFind.localbodyFat.value == '- -') ? '- -' : 'Low');
bodyFatRangeClr = 0xFFF44336;
// print('New BFlow');
} else if (bodyFatPercentage > 10 && bodyFatPercentage <= 21) {
bodyfatRangeTxt = 'Standard';
bodyFatRangeClr = 0xffFFFE00;
// print('New BFStandard');
} else if (bodyFatPercentage > 21 && bodyFatPercentage <= 26) {
bodyfatRangeTxt = 'High';
bodyFatRangeClr = 0xFF8ED34A;
// print('New BFHigh');
} else if (bodyFatPercentage > 26 && bodyFatPercentage <= 100) {
bodyfatRangeTxt = 'Too High';
bodyFatRangeClr = 0xFFF44336;
// print('New BFToo High');
}
} else if (gender == 'female') {
if (bodyFatPercentage <= 10) {
bodyfatRangeTxt =
((aControllerFind.localbodyFat.value == '- -') ? '- -' : 'Low');
bodyFatRangeClr = 0xFFF44336;
// print('New BFlow');
} else if (bodyFatPercentage > 10 && bodyFatPercentage <= 21) {
bodyfatRangeTxt = 'Standard';
bodyFatRangeClr = 0xffFFFE00;
// print('New BFStandard');
} else if (bodyFatPercentage > 21 && bodyFatPercentage <= 26) {
bodyfatRangeTxt = 'High';
bodyFatRangeClr = 0xFF8ED34A;
// print('New BFHigh');
} else if (bodyFatPercentage > 26 && bodyFatPercentage <= 100) {
bodyfatRangeTxt = 'Too High';
bodyFatRangeClr = 0xFFF44336;
// print('New BFToo High');
}
}

1
gsf/lib/views/pages/home/home_page.dart
View File

@@ -55,7 +55,6 @@ class _HomePageState extends State<HomePage> {
listenDynamicLinks();
callingBannerApiForHomeScreen();
analytics.setAnalyticsCollectionEnabled(true);
super.initState();
}

5
gsf/lib/views/pages/my_ranking/elites_leaderboard.dart
View File

@@ -1,4 +1,3 @@
import 'dart:ui';
import 'package:animations/animations.dart';
import 'package:flutter/material.dart';
@@ -6,11 +5,7 @@ import 'package:get/get.dart';
import '../../components/appbar.dart';
import '../../components/bottom_navigation.dart';
import '../../../view_model/bottom_navigation_controller.dart';
import '../../theme.dart';
import 'company_my_ranking.dart';
import 'filter_elites_leaderboard.dart';
import 'friends_my_ranking.dart';
import 'global_my_ranking.dart';
class MyRanking extends StatefulWidget {

3
gsf/lib/views/pages/my_ranking/filter_elites_leaderboard.dart
View File

@@ -358,9 +358,6 @@ class _FilterLeaderboardState extends State<FilterLeaderboard> {
myRankingController.groupLevel.value =
selectedGroupLevel;
Get.back();
print(
'from apply btn click group level $selectedGroupLevel');
print('from apply btn click gender $selectedGender');
},
child: const Center(
child: Text(

3
gsf/lib/views/pages/my_ranking/global_my_ranking.dart
View File

@@ -1,11 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart';
import 'package:gsp_app/views/pages/home/home.dart';
import '../../components/leaderboard_element.dart';
import '../../theme.dart';
import '../profile/pages/view_profile.dart';
class GlobalMyRanking extends StatefulWidget {
const GlobalMyRanking({Key? key}) : super(key: key);

10
gsf/lib/views/pages/my_ranking/mvp_elites_leaderboard.dart
View File

@@ -5,12 +5,10 @@ import 'dart:io';
import 'dart:ui';
import 'package:animations/animations.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:get/get.dart';
import 'package:gsp_app/repository/response_data.dart';
import 'package:gsp_app/view_model/StepcountController.dart';
import 'package:gsp_app/view_model/app_data_controller.dart';
import 'package:gsp_app/view_model/common_functions.dart';
import 'package:gsp_app/view_model/global_controller.dart';
@@ -54,7 +52,9 @@ class _MVPelitesBoardState extends State<MVPelitesBoard>
void _startTimer() {
_timer = Timer.periodic(Duration(seconds: 25), (Timer timer) async {
if (Platform.isIOS) {
await stepscontroller.storeStepsInDB();
await stepscontroller
.fetchStepData()
.then((value) => stepscontroller.storeStepsInDB());
}
setState(() {});
@@ -66,7 +66,9 @@ class _MVPelitesBoardState extends State<MVPelitesBoard>
super.initState();
_startTimer();
if (Platform.isIOS) {
stepscontroller.storeStepsInDB();
stepscontroller
.fetchStepData()
.then((value) => stepscontroller.storeStepsInDB());
}
_animationController = AnimationController(
value: 0.0,

6
gsf/lib/views/pages/notification.dart
View File

@@ -2,9 +2,6 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:gsp_app/views/components/appbar.dart';
import 'package:gsp_app/views/pages/bioMaker/add_scale.dart';
import 'package:gsp_app/views/pages/home/home.dart';
import 'package:gsp_app/views/pages/home/home_page.dart';
import 'package:skeletons/skeletons.dart';
import '../../modals/notification_model.dart';
import '../../repository/response_data.dart';
@@ -12,8 +9,6 @@ import '../../repository/services/cj/get_notification_count_service.dart';
import '../../view_model/home_page_controller.dart';
import '../theme.dart';
import '../../view_model/home_controller.dart';
import 'bioMaker/overview.dart';
import 'profile/pages/profile_page.dart';
class Notifications extends StatefulWidget {
const Notifications({Key? key}) : super(key: key);
@@ -89,7 +84,6 @@ class _NotificationsState extends State<Notifications> {
calculateTimeAgo();
return GestureDetector(
// print()
onTap: () {
if (notificvationListReversed[index]
.notificationMasterData

1
gsf/lib/views/pages/podcast/podcast.dart
View File

@@ -5,7 +5,6 @@ import 'package:get/get.dart';
import 'package:gsp_app/views/pages/podcast/podcats_manager.dart';
import '../../components/appbar.dart';
import '../../components/page_animation.dart';
import '../../theme.dart';
import 'podcast_list_audio.dart';
import 'viewModel/PodcastApis.dart';

1
gsf/lib/views/pages/podcast/podcast_list.dart
View File

@@ -298,7 +298,6 @@ class _PodcastListState extends State<PodcastList> with WidgetsBindingObserver {
onChangeEnd: (newValue) async {
setState(() {
value = newValue;
// print(newValue);
});
player.pause();
await player.seek(

1
gsf/lib/views/pages/podcast/podcats_manager.dart
View File

@@ -1,6 +1,5 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart';
import 'package:gsp_app/views/pages/podcast/viewModel/PodcastApis.dart';
import 'package:just_audio/just_audio.dart';

4
gsf/lib/views/pages/podcast/viewModel/PodcastApis.dart
View File

@@ -1,9 +1,7 @@
import 'package:get/get.dart';
import 'package:gsp_app/api/network_api.dart';
import 'package:gsp_app/modals/PodcastsModel.dart';
import 'package:gsp_app/modals/QuizModel.dart';
import 'package:gsp_app/repository/endpoints.dart';
import 'package:gsp_app/views/pages/quiz/quiz_home.dart';
import '../../../../api/base_manager.dart';

1
gsf/lib/views/pages/profile/SampleChart.dart
View File

@@ -18,7 +18,6 @@ class _SampleChartState extends State<SampleChart> {
late TooltipBehavior _tooltipBehavior;
@override
void initState() {
print("list of date is ${widget.dateList!}");
// _chartData = getChartData();
_tooltipBehavior = TooltipBehavior(enable: true);
super.initState();

2
gsf/lib/views/pages/profile/body_age.dart
View File

@@ -8,7 +8,6 @@ import 'package:gsp_app/views/pages/profile/SampleChart.dart';
import '../../../view_model/app_data_controller.dart';
import '../../theme.dart';
import '../bioMaker/controller.dart';
import 'pages/SampleChart2.dart';
class BodyAge extends StatefulWidget {
final String bodyAgeApi;
@@ -36,7 +35,6 @@ class _BodyAgeState extends State<BodyAge> {
dateList.add(allDatesData!.authorisation!.userData![i].createdAt!);
priceList.add(allDatesData!.authorisation!.userData![i].age!);
}
print("date val is ${dateList.length}");
// isonce = false;
//
}

2
gsf/lib/views/pages/profile/body_fat.dart
View File

@@ -9,7 +9,6 @@ import '../../../api/base_manager.dart';
import '../../../view_model/app_data_controller.dart';
import '../../theme.dart';
import '../bioMaker/controller.dart';
import 'pages/SampleChart2.dart';
class BodyFat extends StatefulWidget {
final String bFat;
@@ -37,7 +36,6 @@ class _BodyFatState extends State<BodyFat> {
dateList.add(allDatesData!.authorisation!.userData![i].createdAt!);
priceList.add(allDatesData!.authorisation!.userData![i].bodyFat!);
}
print("date val is ${dateList.length}");
// isonce = false;
//
}

7
gsf/lib/views/pages/profile/bone_mass.dart
View File

@@ -1,19 +1,13 @@
// ignore_for_file: unrelated_type_equality_checks
import 'dart:async';
import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart';
import 'package:gsp_app/api/StreamEnum.dart';
import 'package:gsp_app/modals/BioscalOverviewForallDates.dart';
import 'package:gsp_app/view_model/BioscaleOverview.dart';
import 'package:gsp_app/views/pages/profile/SampleChart.dart';
import '../../../view_model/app_data_controller.dart';
import '../../theme.dart';
import '../bioMaker/controller.dart';
import 'pages/SampleChart2.dart';
class BoneMass extends StatefulWidget {
final String skeletalMuscleApi;
@@ -41,7 +35,6 @@ class _BoneMassState extends State<BoneMass> {
dateList.add(allDatesData!.authorisation!.userData![i].createdAt!);
priceList.add(allDatesData!.authorisation!.userData![i].skeletalMuscle!);
}
print("date val is ${dateList.length}");
// isonce = false;
//
}

1
gsf/lib/views/pages/profile/moisture.dart
View File

@@ -6,7 +6,6 @@ import 'package:gsp_app/views/pages/profile/SampleChart.dart';
import '../../../view_model/app_data_controller.dart';
import '../../theme.dart';
import '../bioMaker/controller.dart';
import 'pages/SampleChart2.dart';
class Moisture extends StatefulWidget {
final String water;

1
gsf/lib/views/pages/profile/muscle_rate.dart
View File

@@ -9,7 +9,6 @@ import 'package:gsp_app/views/pages/profile/SampleChart.dart';
import '../../../view_model/app_data_controller.dart';
import '../../theme.dart';
import '../bioMaker/controller.dart';
import 'pages/SampleChart2.dart';
class MuscleRate extends StatefulWidget {
final String mrValueDateWise;

1
gsf/lib/views/pages/profile/pages/SampleChart2.dart
View File

@@ -18,7 +18,6 @@ class _ColumnChartSampleState extends State<ColumnChartSample> {
@override
void initState() {
print("list of date is ${widget.dateList!}");
// _chartData = getChartData();
_tooltipBehavior = TooltipBehavior(enable: true);
super.initState();

2
gsf/lib/views/pages/profile/pages/company_profile.dart
View File

@@ -196,7 +196,7 @@ class _CompanyProfileState extends State<CompanyProfile> {
),
),
const SizedBox(height: 16),
const Padding(
Padding(
padding: EdgeInsets.symmetric(horizontal: 22.0),
child: MoodOMeter(),
),

5
gsf/lib/views/pages/profile/pages/edit_profile.dart
View File

@@ -48,10 +48,6 @@ class _EditProfileState extends State<EditProfile> {
@override
Widget build(BuildContext context) {
print(
'isFileNetwork bool value ${completeProfileController.isFileNetwork.value}');
print(
'profile image path value ${completeProfileController.selectedImagePath.value}');
final brightness = Get.theme.brightness;
return WillPopScope(
child: Scaffold(
@@ -73,7 +69,6 @@ class _EditProfileState extends State<EditProfile> {
child: FutureBuilder<EditProfileModel>(
future: getProfileDatas.fetchUserData(),
builder: (context, snapshot) {
// print('fetchdata ${snapshot}');
if (snapshot.connectionState == ConnectionState.done &&
snapshot.hasData) {
// setState(() {});

9
gsf/lib/views/pages/profile/pages/profile_page.dart
View File

@@ -1,6 +1,5 @@
import 'package:animations/animations.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:get/get.dart';
import 'package:gsp_app/view_model/global_controller.dart';
import 'package:skeletons/skeletons.dart';
@@ -10,18 +9,11 @@ import '../../../../repository/response_data.dart';
import '../../../../repository/services/cj/leader_board_ranking.dart';
import '../../../../repository/services/cj/user_dashboard_chart_service.dart';
import '../../../components/appbar.dart';
import '../../../components/bottom_navigation.dart';
import '../../../../view_model/bottom_navigation_controller.dart';
import '../../../../modals/edit_profile_model.dart';
import '../../../../repository/services/complete_profile_service.dart';
import '../../../../repository/services/edit_profile_service.dart';
import '../../../../repository/services/view_profile_services.dart';
import '../../../theme.dart';
import '../../../components/custom_skeleton.dart';
import 'user_dashboard.dart';
import 'user_profile.dart';
import 'package:async/async.dart';
class ProfilePage extends StatefulWidget {
const ProfilePage({Key? key}) : super(key: key);
@@ -167,7 +159,6 @@ class _ProfilePageState extends State<ProfilePage>
if (snapshot.connectionState == ConnectionState.done &&
snapshot.hasData) {
UserDashboardChartModel data = snapshot.data!.data;
// print('New all data ${data}');
return UserDashboard(data: data);
}

24
gsf/lib/views/pages/profile/pages/user_dashboard.dart
View File

@@ -1,28 +1,17 @@
// ignore_for_file: must_be_immutable
import 'dart:async';
import 'dart:developer';
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:gsp_app/repository/response_data.dart';
import 'package:gsp_app/view_model/StepcountController.dart';
import 'package:gsp_app/view_model/app_data_controller.dart';
import 'package:gsp_app/view_model/common_functions.dart';
import 'package:gsp_app/views/components/page_animation.dart';
import 'package:gsp_app/views/pages/Sessions/count_me.dart';
import 'package:gsp_app/views/pages/StepCount/HealthApp.dart';
import 'package:gsp_app/views/pages/home/home.dart';
import 'package:health/health.dart';
import 'package:pedometer/pedometer.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:skeletons/skeletons.dart';
import '../../../../modals/upcoming_session_model.dart';
import '../../../../modals/user_dashboard_chart_model.dart';
import '../../../../repository/services/cj/upcoming_activity_service.dart';
import '../../../../view_model/global_controller.dart';
import '../../../components/mood_meter.dart';
import '../../../../view_model/home_page_controller.dart';
@@ -136,9 +125,9 @@ class _UserDashboardState extends State<UserDashboard> {
],
];
// if (Platform.isIOS) {
// _startTimer();
// }
if (Platform.isIOS) {
_executeStoringOfSteps();
}
// if (Platform.isAndroid) {
// permissionDialog();
@@ -163,6 +152,11 @@ class _UserDashboardState extends State<UserDashboard> {
// stepscontroller.fetchStepData();
// });
// }
_executeStoringOfSteps() async {
await stepscontroller
.fetchStepData()
.then((value) => stepscontroller.storeStepsInDB());
}
@override
void dispose() {
@@ -464,7 +458,7 @@ class _UserDashboardState extends State<UserDashboard> {
),
),
const SizedBox(height: 8),
const Padding(
Padding(
padding: EdgeInsets.symmetric(horizontal: 22),
child: MoodOMeter(),
),

1
gsf/lib/views/pages/profile/pages/user_profile.dart
View File

@@ -1,4 +1,3 @@
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';

1
gsf/lib/views/pages/profile/pages/view_profile.dart
View File

@@ -44,7 +44,6 @@ class _ViewProfileState extends State<ViewProfile> {
@override
Widget build(BuildContext context) {
print('Mumbai new s${widget.viewFrndProfileModels.userData!.city}');
// final brightness = Get.theme.brightness;
GlobalController globalController = Get.find();
return Scaffold(

3
gsf/lib/views/pages/profile/profile_slider.dart
View File

@@ -28,8 +28,7 @@ class _ProfileSliderState extends State<ProfileSlider> {
}
int _current = 0;
final ProfileSliderController slidercontrollers =
Get.put(ProfileSliderController());
final ProfileSliderController slidercontrollers = Get.put(ProfileSliderController());
@override
Widget build(BuildContext context) {

1
gsf/lib/views/pages/profile/protein_rate.dart
View File

@@ -8,7 +8,6 @@ import 'package:gsp_app/views/pages/profile/SampleChart.dart';
import '../../../view_model/app_data_controller.dart';
import '../../theme.dart';
import '../bioMaker/controller.dart';
import 'pages/SampleChart2.dart';
class ProteinRate extends StatefulWidget {
final String proteinApi;

8
gsf/lib/views/pages/quiz/quiz_home.dart
View File

@@ -1,3 +1,4 @@
import 'package:firebase_analytics/firebase_analytics.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:get/get.dart';
@@ -17,6 +18,13 @@ class QuizHome extends StatefulWidget {
}
class _QuizHomeState extends State<QuizHome> {
@override
void initState() {
FirebaseAnalytics.instance.logScreenView(screenName: "QuizHome");
super.initState();
}
@override
Widget build(BuildContext context) {
final screenSize = Get.mediaQuery.size;

91
gsf/lib/views/pages/settings/ratings.dart
View File

@@ -6,7 +6,8 @@ import 'package:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart';
import '../../../api/ResponseManager.dart';
import '../../../repository/services/rate_usServices.dart';
import '../../../repository/services/rateUs/ratingController.dart';
import '../../../repository/services/rateUs/rate_usServices.dart';
import '../../components/appbar.dart';
import '../../components/btn.dart';
import '../../theme.dart';
@@ -18,13 +19,20 @@ class Ratings extends StatefulWidget {
State<Ratings> createState() => _RatingsState();
}
var _rating = 0;
// var _rating = 0;
class _RatingsState extends State<Ratings> {
@override
void initState() {
// TODO: implement initState
super.initState();
ratingController.loadRatingFromPrefs();
}
final RatingController ratingController = Get.put(RatingController());
@override
Widget build(BuildContext context) {
_RateUsbutton() async {
if (_rating == 0) {
if (ratingController.rating == 0) {
Flushbar(
backgroundColor: Colors.red,
message: 'Rate your experience!',
@@ -33,23 +41,28 @@ class _RatingsState extends State<Ratings> {
return;
}
Map<String, String> updata = {
"rate_us": _rating.toString(),
"rate_us": ratingController.rating.toString(),
};
final resp = await RateUsServices().postRateUs(updata);
if (resp.status == ResponseStatus.SUCCESS) {
// btnController.reset();
// Get.to(() => BlogMain());
Flushbar(
Get.snackbar(
"Success !",
'Your rating successfully added!',
duration: Duration(seconds: 1),
animationDuration: Duration(seconds: 1),
colorText: Colors.white,
backgroundColor: Colors.green,
message: 'Your feedback is sent successfully!',
duration: Duration(seconds: 3),
).show(context);
setState(() {
_rating = 0;
});
// _textarea.clear();
margin: EdgeInsets.all(8),
snackStyle: SnackStyle.FLOATING,
snackPosition: SnackPosition.BOTTOM,
);
// setState(() {
// _rating = 0;
// });
ratingController.updateRating(ratingController.rating);
} else if (resp.status == ResponseStatus.FAILED) {
if (resp.data["success"] == false) {
log("failed error msg is :- ${resp.data} ");
@@ -101,30 +114,34 @@ class _RatingsState extends State<Ratings> {
const SizedBox(height: 10),
Padding(
padding: const EdgeInsets.only(left: 8),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: List.generate(
5,
(index) => IconButton(
onPressed: () {
setState(() {
_rating = index + 1;
print('rating------$_rating');
});
},
icon: index < _rating
? const Icon(
Icons.star,
color: ColorConstants.kPrimaryColor,
size: 30,
)
: const Icon(
Icons.star_border,
color: ColorConstants.kPrimaryColor,
size: 30,
),
),
),
child: GetBuilder<RatingController>(
init: ratingController,
builder: (controller) {
return Row(
mainAxisAlignment: MainAxisAlignment.center,
children: List.generate(
5,
(index) => IconButton(
onPressed: () {
setState(() {
ratingController.rating = index + 1;
});
},
icon: index < ratingController.rating
? const Icon(
Icons.star,
color: ColorConstants.kPrimaryColor,
size: 30,
)
: const Icon(
Icons.star_border,
color: ColorConstants.kPrimaryColor,
size: 30,
),
),
),
);
},
),
),
const SizedBox(height: 20),

4
gsf/lib/views/pages/settings/setting_main.dart
View File

@@ -83,7 +83,7 @@ class _SettingsState extends State<Settings> {
const Spacer(),
if (Platform.isIOS)
Text(
packageInfo?.version ?? "1.3.12",
packageInfo?.version ?? "1.5.10",
style: TextStyle(
fontSize: 19,
color: (brightness == Brightness.light)
@@ -93,7 +93,7 @@ class _SettingsState extends State<Settings> {
),
if (Platform.isAndroid)
Text(
packageInfo?.buildNumber ?? "14",
packageInfo?.buildNumber ?? "21",
style: TextStyle(
fontSize: 19,
color: (brightness == Brightness.light)

2
gsf/lib/views/pages/settings/update_otp.dart
View File

@@ -199,9 +199,7 @@ class _UpdateOtpState extends State<UpdateOtp> {
//do something or move to next screen when code complete
},
onChanged: (value) {
// print(value);
setState(() {
// print('$value');
});
},
);

2
gsf/lib/views/pages/shareThoutgh/share_thought.dart
View File

@@ -98,7 +98,7 @@ class _ShareThoughtState extends State<ShareThought> {
),
),
const SizedBox(height: 20),
const MoodOMeter(),
MoodOMeter(),
const SizedBox(height: 35),
FullWdtBtn(
btnText: 'Share your thoughts!',

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

@@ -1,34 +1,31 @@
import 'dart:io';
import 'package:firebase_analytics/firebase_analytics.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart';
import 'package:gsp_app/view_model/QuizApis.dart';
import 'package:gsp_app/view_model/app_data_controller.dart';
import 'package:gsp_app/view_model/common_functions.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/FirstQuestion.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/Helper/StorageService.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/PeriodSelection.dart';
import 'package:gsp_app/views/pages/MenstrualCycleTracker/TrackerHomePage.dart';
import 'package:gsp_app/views/pages/podcast/podcast.dart';
import 'package:gsp_app/views/pages/profile/pages/profile_page.dart';
import 'package:gsp_app/views/pages/quiz/quiz_home.dart';
import 'package:gsp_app/views/pages/signIn/complete_profile_before_sign_in.dart';
import 'package:gsp_app/views/pages/signIn/sign_in.dart';
import 'package:gsp_app/views/pages/subscription/my_subscription.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:url_launcher/url_launcher.dart';
import '../../view_model/global_controller.dart';
import '../../view_model/home_controller.dart';
import '../../repository/services/complete_profile_service.dart';
import '../../repository/services/edit_profile_service.dart';
import '../theme.dart';
import 'MenstrualCycleTracker/Helper/HelperMethods.dart';
import 'MenstrualCycleTracker/viewModel/DeleteDatesOnLogout.dart';
import 'MenstrualCycleTracker/viewModel/StoringDates.dart';
import 'blog/blog_main.dart';
import 'contact_us.dart';
import 'faq/about_gsf.dart';
import 'faq/about_gsf_accordian.dart';
import 'insta/insta_clip_list.dart';
import 'insta/insta_web_view.dart';
class AppDrawer extends StatefulWidget {
const AppDrawer({Key? key}) : super(key: key);
@@ -136,17 +133,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");
@@ -155,11 +149,30 @@ class _AppDrawerState extends State<AppDrawer> {
Get.back();
Get.to(() => TrackerHomePage());
} else {
Get.back();
Get.to(() => const PeriodSelection());
}
}, 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 +188,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 +202,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 +212,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 +221,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 +233,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 +250,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 +274,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();
@@ -364,6 +363,19 @@ class _AppDrawerState extends State<AppDrawer> {
)
: const SizedBox(),
),
SizedBox(
child: (controller.isLoggedIn)
? Column(
children: [
menuWidget('delete', 'Delete Account', () {
deleteAccountModalSheet();
}, false),
const SizedBox(height: 15),
],
)
: const SizedBox(),
),
],
),
),
@@ -376,7 +388,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 +416,17 @@ 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,
color: Colors.white,
),
const SizedBox(width: 10),
Text(
title,
@@ -436,6 +456,141 @@ class _AppDrawerState extends State<AppDrawer> {
);
}
deleteAccountModalSheet() {
return Get.bottomSheet(
SizedBox(
height: 250,
child: Obx(
() => Column(
children: [
const Spacer(),
Container(
width: 75,
height: 75,
decoration: BoxDecoration(
color: const Color(0xff212121),
border: Border.all(
width: 1,
color: Colors.white,
),
shape: BoxShape.circle,
),
child: appDataController.profilePicUrl.value.isEmpty
? const Icon(
Icons.person_rounded,
size: 36,
color: Colors.white,
)
: CircleAvatar(
backgroundImage: NetworkImage(
correctImgUrl(
appDataController.profilePicUrl.value,
),
),
backgroundColor: Colors.transparent,
),
),
const SizedBox(height: 10),
// Text(
// 'Hello ${appDataController.name.value}',
// style: TextStyle(
// fontSize: 16,
// color: !globalContoller.darkMode.value
// ? ColorConstants.kBlack
// : ColorConstants.kPrimaryColor,
// fontFamily: 'SFPRO',
// ),
// ),
// const SizedBox(height: 10),
Text(
'Are you sure you want to permanently your account?',
style: TextStyle(
fontSize: 16,
color: !globalContoller.darkMode.value
? ColorConstants.kBlack
: const Color(0xffD9D9D9),
fontFamily: 'SFPRO',
),
),
const SizedBox(height: 12),
Container(
decoration: BoxDecoration(
border: Border.all(
width: 1,
color: ColorConstants.kPrimaryColor,
),
borderRadius: BorderRadius.circular(30),
),
child: InkWell(
onTap: () async {
SharedPreferences preferences =
await SharedPreferences.getInstance();
await preferences.clear();
await DeleteDatesOnLogout().deleteDates("");
await DeleteDatesOnLogout().deleteAccount("");
GetStorage().erase();
pickerdateRange.clear();
helperController.predictedDate.clear();
helperController.ovulatingDate.clear();
box.write('isLoggedIn', false).then((value) {
Get.back();
Get.back();
Get.off(const SignIn());
});
},
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 15.0, vertical: 8),
child: Text(
'DELETE ACCOUNT',
style: TextStyle(
fontSize: 16,
color: !globalContoller.darkMode.value
? ColorConstants.kBlack
: ColorConstants.kPrimaryColor,
fontFamily: 'SFPRO',
fontWeight: FontWeight.w500,
),
),
),
),
),
const SizedBox(height: 10),
InkWell(
onTap: () => Get.back(),
child: const Text(
'Cancel',
style: TextStyle(
fontSize: 14,
color: Color(0xff858585),
fontFamily: 'SFPRO',
),
),
),
const Spacer(),
],
),
)),
// barrierColor: Colors.red[0],
isDismissible: false,
backgroundColor: !globalContoller.darkMode.value
? ColorConstants.kWhite
: const Color(0xff212121),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(20),
topRight: Radius.circular(20),
),
// side: BorderSide(width: 5, color: Colors.black),
),
// enableDrag: false,
);
}
logoutModalSheet() {
// final brightness = Get.theme.brightness;
return Get.bottomSheet(
@@ -515,9 +670,23 @@ class _AppDrawerState extends State<AppDrawer> {
borderRadius: BorderRadius.circular(30),
),
child: InkWell(
onTap: () {
onTap: () async {
// box.write('isLoggedIn', false);
// Get.offAll(() => const SignIn());
SharedPreferences preferences =
await SharedPreferences.getInstance();
await preferences.clear();
// await DeleteDatesOnLogout().deleteDates("");
GetStorage().erase();
// Get.delete<HelperMethods>();
// Get.find<HelperMethods>().onClose();
// helperController.dispose();
pickerdateRange.clear();
helperController.predictedDate.clear();
helperController.ovulatingDate.clear();
box.write('isLoggedIn', false).then((value) {
Get.back();
Get.back();

2
gsf/lib/views/pages/signIn/complete_profile_before_sign_in.dart
View File

@@ -3,12 +3,10 @@ import 'dart:io';
import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart';
import 'package:gsp_app/modals/user_model.dart';
import 'package:gsp_app/modals/view_frnd_profile_model.dart';
import 'package:gsp_app/repository/response_data.dart';
import 'package:gsp_app/repository/services/cj/update_profile_service.dart';
import 'package:gsp_app/repository/services/cj/user_data_service.dart';
import 'package:gsp_app/view_model/app_data_controller.dart';
import 'package:gsp_app/view_model/common_functions.dart';
import 'package:gsp_app/view_model/global_controller.dart';

8
gsf/lib/views/pages/splash.dart
View File

@@ -11,7 +11,6 @@ import 'package:gsp_app/views/pages/home/home_page.dart';
import 'package:gsp_app/views/pages/signIn/sign_in.dart';
import 'package:gsp_app/views/theme.dart';
import 'package:local_auth/local_auth.dart';
import 'package:video_player/video_player.dart';
import '../../modals/manage_banner_model.dart';
import '../../modals/short_clip_likes_model.dart';
import '../../modals/short_clip_model.dart';
@@ -70,21 +69,18 @@ class _SplashScreenState extends State<SplashScreen> {
List<BiometricType> availableBiometrics =
await authentication.getAvailableBiometrics();
final isDeviceSupported = await authentication.isDeviceSupported();
print(_hasBioSensor);
print(availableBiometrics);
print("device support $isDeviceSupported");
if (_hasBioSensor!) {
_getAuthwithfinger();
} else {
_getAuth();
print("fingerprint not available");
}
// ignore: empty_catches
} on PlatformException {}
}
Future<void> _getAuthwithfinger() async {
print("getauth called");
bool isAuth = false;
try {
isAuth = await authentication.authenticate(

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

@@ -1,6 +1,4 @@
import 'package:flutter/material.dart';
import 'package:flutter/src/widgets/framework.dart';
import 'package:flutter/src/widgets/placeholder.dart';
import 'package:get/get.dart';
import 'package:intl/intl.dart';
@@ -68,80 +66,6 @@ class _MySubscriptionState extends State<MySubscription> {
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Column(
children: [
SizedBox(
height: 60,
),
Container(
// height: 400,
width: double.infinity,
decoration: BoxDecoration(
color: !globalController.darkMode.value
? ColorConstants.kWhite
: const Color(0xff212121),
boxShadow: [
BoxShadow(
spreadRadius: 2,
blurRadius: 10,
color: !globalController.darkMode.value
? ColorConstants.kBlack.withOpacity(0.3)
: ColorConstants.kWhite.withOpacity(0),
)
],
borderRadius: BorderRadius.circular(30),
),
child: Padding(
padding: const EdgeInsets.all(16),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'Current active plan:-',
style: TextStyle(
fontSize: 22,
color: !globalController.darkMode.value
? ColorConstants.kBlack
: ColorConstants.kWhite,
fontFamily: 'SFPRO',
),
),
Text(
subscriptionObj!.result!.utmSource ?? '',
style: TextStyle(
fontSize: 22,
color: !globalController.darkMode.value
? ColorConstants.kBlack
: ColorConstants.kWhite,
fontFamily: 'SFPRO',
),
),
// rowTile(
// text:
// 'Unlimited access to live virtual fitness classes led by certified trainers.'),
// SizedBox(
// height: 20,
// ),
// rowTile(
// text:
// 'Access to a library of workout videos covering various fitness levels and goals.'),
// SizedBox(
// height: 20,
// ),
// rowTile(
// text:
// 'Progress tracking to monitor your achievements and stay motivated.'),
// SizedBox(
// height: 20,
// ),
// rowTile(
// text:
// 'Basic nutrition guidance and meal planning tips.'),
// SizedBox(
// height: 20,
// ),
],
),
),
),
SizedBox(
height: 25,
),
@@ -188,7 +112,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

1
gsf/lib/views/short_video_player/sv_player.dart
View File

@@ -94,7 +94,6 @@ class _SvPlayer extends State<SvPlayer> {
//:cached Url Data
storeUrlInCache(String url) async {
await DefaultCacheManager().getSingleFile(url).then((value) {
print('downloaded successfully done for $url');
});
}

2
gsf/lib/views/short_video_player/sv_webview.dart
View File

@@ -1,11 +1,9 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:gsp_app/modals/short_clip_model.dart';
import 'package:webview_flutter/webview_flutter.dart';
import 'package:share_plus/share_plus.dart';
import '../components/appbar.dart';
import '../theme.dart';
//
class SvpWebView extends StatefulWidget {

3
gsf/lib/views/short_video_player/svp_lib/main.dart
View File

@@ -1,14 +1,11 @@
import 'dart:isolate';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:injectable/injectable.dart';
import 'core/constants.dart';
import 'service/api_service.dart';
import 'bloc/preload_bloc.dart';
import 'core/build_context.dart';
import 'injection.dart';
// void main() async {
// WidgetsFlutterBinding.ensureInitialized();

4
gsf/lib/views/short_video_player/svp_lib/video_page.dart
View File

@@ -1,7 +1,5 @@
import 'package:another_flushbar/flushbar.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_branch_sdk/flutter_branch_sdk.dart';
import 'package:get/get.dart';
import 'package:share_plus/share_plus.dart';
@@ -11,8 +9,6 @@ import '../../../modals/short_clip_likes_model.dart';
import '../../../modals/short_clip_model.dart';
import '../../../repository/services/short_clip_service.dart';
import '../../theme.dart';
import 'bloc/preload_bloc.dart';
import 'injection.dart';
class VideoPage extends StatefulWidget {
VideoPage({

9
gsf/lib/views/short_video_player/svp_main.dart
View File

@@ -1,19 +1,14 @@
import 'dart:async';
import 'dart:math';
import 'package:another_flushbar/flushbar.dart';
import 'package:firebase_analytics/firebase_analytics.dart';
// import 'package:firebase_dynamic_links/firebase_dynamic_links.dart';
import 'package:flutter/material.dart';
import 'package:flutter_branch_sdk/flutter_branch_sdk.dart';
import 'package:flutter_cache_manager/flutter_cache_manager.dart';
import 'package:get/get.dart';
import 'package:get_storage/get_storage.dart';
import 'package:gsp_app/repository/services/short_clip_service.dart';
import 'package:gsp_app/views/pages/splash.dart';
import 'package:gsp_app/views/short_video_player/sv_player.dart';
import 'package:gsp_app/views/short_video_player/svp_lib/service/api_service.dart';
import 'package:gsp_app/views/short_video_player/svp_lib/video_page.dart';
import 'package:pod_player/pod_player.dart';
// import 'package:pod_player_new/pod_player_new.dart';
import 'package:share_plus/share_plus.dart';
@@ -379,8 +374,6 @@ class _SvpMain extends State<SvpMain> {
if (index > prevPgIndex) {
int prevVideoDuration = secondsVideoWatched;
secondsVideoWatched = 0;
print("video ran for $prevVideoDuration");
print("video ran for ${fetchedClips[index - 1].title}");
FirebaseAnalytics.instance
.logEvent(name: "video_views", parameters: {
"video_title": fetchedClips[index - 1].title,
@@ -540,10 +533,8 @@ class _SvpMain extends State<SvpMain> {
ShortClipService()
.likeOrUnlikeClip(shortClipModel.id)
.then((isLiked) {
print('isLiked only $isLiked');
setLikeBtnSet(() {
shortClipLikesModel.isLiked = isLiked;
// print('isLikedOnly ${isLiked}');
isLiked
? shortClipModel.likes++
: shortClipModel.likes--;

Some files were not shown because too many files have changed in this diff Show More