diff --git a/.flutter-plugins b/.flutter-plugins index 35b9f36..286abce 100644 --- a/.flutter-plugins +++ b/.flutter-plugins @@ -5,8 +5,8 @@ firebase_analytics=C:\\Users\\bossa\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dar firebase_analytics_web=C:\\Users\\bossa\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dartlang.org\\firebase_analytics_web-0.5.1+8\\ firebase_auth=C:\\Users\\bossa\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dartlang.org\\firebase_auth-4.2.5\\ firebase_auth_web=C:\\Users\\bossa\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dartlang.org\\firebase_auth_web-5.2.4\\ -firebase_core=C:\\Users\\bossa\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dartlang.org\\firebase_core-2.4.1\\ -firebase_core_web=C:\\Users\\bossa\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dartlang.org\\firebase_core_web-2.1.0\\ +firebase_core=C:\\Users\\bossa\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dartlang.org\\firebase_core-2.5.0\\ +firebase_core_web=C:\\Users\\bossa\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dartlang.org\\firebase_core_web-2.1.1\\ firebase_messaging=C:\\Users\\bossa\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dartlang.org\\firebase_messaging-14.2.1\\ firebase_messaging_web=C:\\Users\\bossa\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dartlang.org\\firebase_messaging_web-3.2.11\\ firebase_remote_config=C:\\Users\\bossa\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dartlang.org\\firebase_remote_config-3.0.9\\ diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies index 8ac97b6..653eb5b 100644 --- a/.flutter-plugins-dependencies +++ b/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"device_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\device_info_plus-8.0.0\\\\","native_build":true,"dependencies":[]},{"name":"firebase_analytics","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_analytics-10.1.0\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_auth","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-4.2.5\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-2.4.1\\\\","native_build":true,"dependencies":[]},{"name":"firebase_messaging","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_messaging-14.2.1\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_remote_config","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_remote_config-3.0.9\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"flutter_facebook_auth","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_facebook_auth-5.0.7\\\\","native_build":true,"dependencies":[]},{"name":"flutter_secure_storage","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_secure_storage-7.0.1\\\\","native_build":true,"dependencies":[]},{"name":"google_sign_in_ios","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_ios-5.5.1\\\\","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-3.0.2\\\\","native_build":true,"dependencies":[]},{"name":"posthog_session","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\git\\\\posthog_session-6a620a202a47402cbc57a5896a32cff73ce2e24f\\\\","native_build":true,"dependencies":[]},{"name":"sentry_flutter","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sentry_flutter-6.19.0\\\\","native_build":true,"dependencies":["package_info_plus"]},{"name":"shared_preferences_foundation","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_foundation-2.1.2\\\\","native_build":true,"dependencies":[]},{"name":"sign_in_with_apple","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sign_in_with_apple-4.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"device_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\device_info_plus-8.0.0\\\\","native_build":true,"dependencies":[]},{"name":"firebase_analytics","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_analytics-10.1.0\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_auth","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-4.2.5\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-2.4.1\\\\","native_build":true,"dependencies":[]},{"name":"firebase_messaging","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_messaging-14.2.1\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_remote_config","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_remote_config-3.0.9\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"flutter_facebook_auth","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_facebook_auth-5.0.7\\\\","native_build":true,"dependencies":[]},{"name":"flutter_secure_storage","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_secure_storage-7.0.1\\\\","native_build":true,"dependencies":[]},{"name":"google_sign_in_android","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_android-6.1.5\\\\","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-3.0.2\\\\","native_build":true,"dependencies":[]},{"name":"posthog_session","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\git\\\\posthog_session-6a620a202a47402cbc57a5896a32cff73ce2e24f\\\\","native_build":true,"dependencies":[]},{"name":"sentry_flutter","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sentry_flutter-6.19.0\\\\","native_build":true,"dependencies":["package_info_plus"]},{"name":"shared_preferences_android","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_android-2.0.15\\\\","native_build":true,"dependencies":[]},{"name":"sign_in_with_apple","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sign_in_with_apple-4.3.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"device_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\device_info_plus-8.0.0\\\\","native_build":true,"dependencies":[]},{"name":"facebook_auth_desktop","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\facebook_auth_desktop-0.0.8\\\\","native_build":true,"dependencies":[]},{"name":"firebase_analytics","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_analytics-10.1.0\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_auth","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-4.2.5\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-2.4.1\\\\","native_build":true,"dependencies":[]},{"name":"firebase_messaging","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_messaging-14.2.1\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_remote_config","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_remote_config-3.0.9\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"flutter_secure_storage_macos","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_secure_storage_macos-2.0.1\\\\","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-3.0.2\\\\","native_build":true,"dependencies":[]},{"name":"sentry_flutter","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sentry_flutter-6.19.0\\\\","native_build":true,"dependencies":["package_info_plus"]},{"name":"shared_preferences_foundation","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_foundation-2.1.2\\\\","native_build":true,"dependencies":[]},{"name":"sign_in_with_apple","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sign_in_with_apple-4.3.0\\\\","native_build":true,"dependencies":[]}],"linux":[{"name":"device_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\device_info_plus-8.0.0\\\\","native_build":false,"dependencies":[]},{"name":"flutter_secure_storage_linux","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_secure_storage_linux-1.1.2\\\\","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-3.0.2\\\\","native_build":false,"dependencies":[]},{"name":"path_provider_linux","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-2.1.7\\\\","native_build":false,"dependencies":[]},{"name":"sentry_flutter","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sentry_flutter-6.19.0\\\\","native_build":true,"dependencies":["package_info_plus"]},{"name":"shared_preferences_linux","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_linux-2.1.3\\\\","native_build":false,"dependencies":["path_provider_linux"]}],"windows":[{"name":"device_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\device_info_plus-8.0.0\\\\","native_build":false,"dependencies":[]},{"name":"flutter_secure_storage_windows","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_secure_storage_windows-1.1.3\\\\","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-3.0.2\\\\","native_build":false,"dependencies":[]},{"name":"path_provider_windows","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_windows-2.1.3\\\\","native_build":false,"dependencies":[]},{"name":"sentry_flutter","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sentry_flutter-6.19.0\\\\","native_build":true,"dependencies":["package_info_plus"]},{"name":"shared_preferences_windows","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_windows-2.1.3\\\\","native_build":false,"dependencies":["path_provider_windows"]}],"web":[{"name":"device_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\device_info_plus-8.0.0\\\\","dependencies":[]},{"name":"firebase_analytics_web","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_analytics_web-0.5.1+8\\\\","dependencies":["firebase_core_web"]},{"name":"firebase_auth_web","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth_web-5.2.4\\\\","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core_web-2.1.0\\\\","dependencies":[]},{"name":"firebase_messaging_web","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_messaging_web-3.2.11\\\\","dependencies":["firebase_core_web"]},{"name":"firebase_remote_config_web","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_remote_config_web-1.1.18\\\\","dependencies":["firebase_core_web"]},{"name":"flutter_facebook_auth_web","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_facebook_auth_web-4.1.1\\\\","dependencies":[]},{"name":"flutter_secure_storage_web","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_secure_storage_web-1.1.1\\\\","dependencies":[]},{"name":"google_sign_in_web","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_web-0.10.2+1\\\\","dependencies":[]},{"name":"package_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-3.0.2\\\\","dependencies":[]},{"name":"posthog_session","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\git\\\\posthog_session-6a620a202a47402cbc57a5896a32cff73ce2e24f\\\\","dependencies":[]},{"name":"sentry_flutter","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sentry_flutter-6.19.0\\\\","dependencies":["package_info_plus"]},{"name":"shared_preferences_web","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_web-2.0.4\\\\","dependencies":[]},{"name":"sign_in_with_apple_web","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sign_in_with_apple_web-1.0.1\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"device_info_plus","dependencies":[]},{"name":"facebook_auth_desktop","dependencies":["flutter_secure_storage"]},{"name":"firebase_analytics","dependencies":["firebase_analytics_web","firebase_core"]},{"name":"firebase_analytics_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_auth","dependencies":["firebase_auth_web","firebase_core"]},{"name":"firebase_auth_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"firebase_messaging","dependencies":["firebase_core","firebase_messaging_web"]},{"name":"firebase_messaging_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_remote_config","dependencies":["firebase_core","firebase_remote_config_web"]},{"name":"firebase_remote_config_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"flutter_facebook_auth","dependencies":["flutter_facebook_auth_web","facebook_auth_desktop"]},{"name":"flutter_facebook_auth_web","dependencies":[]},{"name":"flutter_secure_storage","dependencies":["flutter_secure_storage_linux","flutter_secure_storage_macos","flutter_secure_storage_web","flutter_secure_storage_windows"]},{"name":"flutter_secure_storage_linux","dependencies":[]},{"name":"flutter_secure_storage_macos","dependencies":[]},{"name":"flutter_secure_storage_web","dependencies":[]},{"name":"flutter_secure_storage_windows","dependencies":[]},{"name":"google_sign_in","dependencies":["google_sign_in_android","google_sign_in_ios","google_sign_in_web"]},{"name":"google_sign_in_android","dependencies":[]},{"name":"google_sign_in_ios","dependencies":[]},{"name":"google_sign_in_web","dependencies":[]},{"name":"package_info_plus","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"posthog_session","dependencies":[]},{"name":"sentry_flutter","dependencies":["package_info_plus"]},{"name":"shared_preferences","dependencies":["shared_preferences_android","shared_preferences_foundation","shared_preferences_linux","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_android","dependencies":[]},{"name":"shared_preferences_foundation","dependencies":[]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"name":"sign_in_with_apple","dependencies":["sign_in_with_apple_web"]},{"name":"sign_in_with_apple_web","dependencies":[]}],"date_created":"2023-02-12 16:26:53.576542","version":"3.3.10"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"device_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\device_info_plus-8.0.0\\\\","native_build":true,"dependencies":[]},{"name":"firebase_analytics","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_analytics-10.1.0\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_auth","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-4.2.5\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-2.5.0\\\\","native_build":true,"dependencies":[]},{"name":"firebase_messaging","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_messaging-14.2.1\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_remote_config","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_remote_config-3.0.9\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"flutter_facebook_auth","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_facebook_auth-5.0.7\\\\","native_build":true,"dependencies":[]},{"name":"flutter_secure_storage","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_secure_storage-7.0.1\\\\","native_build":true,"dependencies":[]},{"name":"google_sign_in_ios","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_ios-5.5.1\\\\","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-3.0.2\\\\","native_build":true,"dependencies":[]},{"name":"posthog_session","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\git\\\\posthog_session-6a620a202a47402cbc57a5896a32cff73ce2e24f\\\\","native_build":true,"dependencies":[]},{"name":"sentry_flutter","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sentry_flutter-6.19.0\\\\","native_build":true,"dependencies":["package_info_plus"]},{"name":"shared_preferences_foundation","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_foundation-2.1.2\\\\","native_build":true,"dependencies":[]},{"name":"sign_in_with_apple","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sign_in_with_apple-4.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"device_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\device_info_plus-8.0.0\\\\","native_build":true,"dependencies":[]},{"name":"firebase_analytics","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_analytics-10.1.0\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_auth","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-4.2.5\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-2.5.0\\\\","native_build":true,"dependencies":[]},{"name":"firebase_messaging","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_messaging-14.2.1\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_remote_config","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_remote_config-3.0.9\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"flutter_facebook_auth","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_facebook_auth-5.0.7\\\\","native_build":true,"dependencies":[]},{"name":"flutter_secure_storage","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_secure_storage-7.0.1\\\\","native_build":true,"dependencies":[]},{"name":"google_sign_in_android","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_android-6.1.5\\\\","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-3.0.2\\\\","native_build":true,"dependencies":[]},{"name":"posthog_session","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\git\\\\posthog_session-6a620a202a47402cbc57a5896a32cff73ce2e24f\\\\","native_build":true,"dependencies":[]},{"name":"sentry_flutter","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sentry_flutter-6.19.0\\\\","native_build":true,"dependencies":["package_info_plus"]},{"name":"shared_preferences_android","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_android-2.0.15\\\\","native_build":true,"dependencies":[]},{"name":"sign_in_with_apple","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sign_in_with_apple-4.3.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"device_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\device_info_plus-8.0.0\\\\","native_build":true,"dependencies":[]},{"name":"facebook_auth_desktop","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\facebook_auth_desktop-0.0.8\\\\","native_build":true,"dependencies":[]},{"name":"firebase_analytics","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_analytics-10.1.0\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_auth","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-4.2.5\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-2.5.0\\\\","native_build":true,"dependencies":[]},{"name":"firebase_messaging","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_messaging-14.2.1\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"firebase_remote_config","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_remote_config-3.0.9\\\\","native_build":true,"dependencies":["firebase_core"]},{"name":"flutter_secure_storage_macos","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_secure_storage_macos-2.0.1\\\\","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-3.0.2\\\\","native_build":true,"dependencies":[]},{"name":"sentry_flutter","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sentry_flutter-6.19.0\\\\","native_build":true,"dependencies":["package_info_plus"]},{"name":"shared_preferences_foundation","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_foundation-2.1.2\\\\","native_build":true,"dependencies":[]},{"name":"sign_in_with_apple","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sign_in_with_apple-4.3.0\\\\","native_build":true,"dependencies":[]}],"linux":[{"name":"device_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\device_info_plus-8.0.0\\\\","native_build":false,"dependencies":[]},{"name":"flutter_secure_storage_linux","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_secure_storage_linux-1.1.2\\\\","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-3.0.2\\\\","native_build":false,"dependencies":[]},{"name":"path_provider_linux","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-2.1.7\\\\","native_build":false,"dependencies":[]},{"name":"sentry_flutter","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sentry_flutter-6.19.0\\\\","native_build":true,"dependencies":["package_info_plus"]},{"name":"shared_preferences_linux","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_linux-2.1.3\\\\","native_build":false,"dependencies":["path_provider_linux"]}],"windows":[{"name":"device_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\device_info_plus-8.0.0\\\\","native_build":false,"dependencies":[]},{"name":"flutter_secure_storage_windows","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_secure_storage_windows-1.1.3\\\\","native_build":true,"dependencies":[]},{"name":"package_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-3.0.2\\\\","native_build":false,"dependencies":[]},{"name":"path_provider_windows","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_windows-2.1.3\\\\","native_build":false,"dependencies":[]},{"name":"sentry_flutter","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sentry_flutter-6.19.0\\\\","native_build":true,"dependencies":["package_info_plus"]},{"name":"shared_preferences_windows","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_windows-2.1.3\\\\","native_build":false,"dependencies":["path_provider_windows"]}],"web":[{"name":"device_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\device_info_plus-8.0.0\\\\","dependencies":[]},{"name":"firebase_analytics_web","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_analytics_web-0.5.1+8\\\\","dependencies":["firebase_core_web"]},{"name":"firebase_auth_web","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth_web-5.2.4\\\\","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core_web-2.1.1\\\\","dependencies":[]},{"name":"firebase_messaging_web","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_messaging_web-3.2.11\\\\","dependencies":["firebase_core_web"]},{"name":"firebase_remote_config_web","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_remote_config_web-1.1.18\\\\","dependencies":["firebase_core_web"]},{"name":"flutter_facebook_auth_web","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_facebook_auth_web-4.1.1\\\\","dependencies":[]},{"name":"flutter_secure_storage_web","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_secure_storage_web-1.1.1\\\\","dependencies":[]},{"name":"google_sign_in_web","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_web-0.10.2+1\\\\","dependencies":[]},{"name":"package_info_plus","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-3.0.2\\\\","dependencies":[]},{"name":"posthog_session","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\git\\\\posthog_session-6a620a202a47402cbc57a5896a32cff73ce2e24f\\\\","dependencies":[]},{"name":"sentry_flutter","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sentry_flutter-6.19.0\\\\","dependencies":["package_info_plus"]},{"name":"shared_preferences_web","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_web-2.0.4\\\\","dependencies":[]},{"name":"sign_in_with_apple_web","path":"C:\\\\Users\\\\bossa\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dartlang.org\\\\sign_in_with_apple_web-1.0.1\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"device_info_plus","dependencies":[]},{"name":"facebook_auth_desktop","dependencies":["flutter_secure_storage"]},{"name":"firebase_analytics","dependencies":["firebase_analytics_web","firebase_core"]},{"name":"firebase_analytics_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_auth","dependencies":["firebase_auth_web","firebase_core"]},{"name":"firebase_auth_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"firebase_messaging","dependencies":["firebase_core","firebase_messaging_web"]},{"name":"firebase_messaging_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_remote_config","dependencies":["firebase_core","firebase_remote_config_web"]},{"name":"firebase_remote_config_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"flutter_facebook_auth","dependencies":["flutter_facebook_auth_web","facebook_auth_desktop"]},{"name":"flutter_facebook_auth_web","dependencies":[]},{"name":"flutter_secure_storage","dependencies":["flutter_secure_storage_linux","flutter_secure_storage_macos","flutter_secure_storage_web","flutter_secure_storage_windows"]},{"name":"flutter_secure_storage_linux","dependencies":[]},{"name":"flutter_secure_storage_macos","dependencies":[]},{"name":"flutter_secure_storage_web","dependencies":[]},{"name":"flutter_secure_storage_windows","dependencies":[]},{"name":"google_sign_in","dependencies":["google_sign_in_android","google_sign_in_ios","google_sign_in_web"]},{"name":"google_sign_in_android","dependencies":[]},{"name":"google_sign_in_ios","dependencies":[]},{"name":"google_sign_in_web","dependencies":[]},{"name":"package_info_plus","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"posthog_session","dependencies":[]},{"name":"sentry_flutter","dependencies":["package_info_plus"]},{"name":"shared_preferences","dependencies":["shared_preferences_android","shared_preferences_foundation","shared_preferences_linux","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_android","dependencies":[]},{"name":"shared_preferences_foundation","dependencies":[]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"name":"sign_in_with_apple","dependencies":["sign_in_with_apple_web"]},{"name":"sign_in_with_apple_web","dependencies":[]}],"date_created":"2023-02-12 22:30:10.421015","version":"3.3.10"} \ No newline at end of file diff --git a/README.md b/README.md index 9fb5c23..5f0191b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ Workout Test and Diet 4 You Common Util Functions +Version 1.0.3 + Warning fixes, webapi client + Version 1.0.2 Open AI API support diff --git a/lib/model/cache.dart b/lib/model/cache.dart index dafa997..a970eb2 100644 --- a/lib/model/cache.dart +++ b/lib/model/cache.dart @@ -139,7 +139,7 @@ class Cache with Logging { List? _exerciseTypes; List? _exerciseTree; - List? _evaluations; + List? evaluations; List? _exercises; ExercisePlan? _myExercisePlan; @@ -196,7 +196,7 @@ class Cache with Logging { Cache._internal() { String testEnv = EnvironmentConfig.test_env; testEnvironment = testEnv; - print("testEnv $testEnv"); + log("testEnv $testEnv"); if (testEnv == "1") { baseUrl = baseUrlTest; liveServer = false; @@ -280,11 +280,11 @@ class Cache with Logging { //String jsonPlan = savedTrainingPlanJson.replaceAllMapped(RegExp(r'[a-zA-Z]+\:'), (Match m) => "\"${m[0]}\""); Map map; try { - map = JsonDecoder().convert(savedTrainingPlanJson); - //print("Training plan: $savedTrainingPlanJson"); - this.myTrainingPlan = CustomerTrainingPlan.fromJsonWithDetails(map); + map = const JsonDecoder().convert(savedTrainingPlanJson); + //log("Training plan: $savedTrainingPlanJson"); + myTrainingPlan = CustomerTrainingPlan.fromJsonWithDetails(map); } on Exception catch (e) { - print(e.toString()); + log(e.toString()); } } @@ -294,8 +294,8 @@ class Cache with Logging { sharedPreferences = await prefs; sharedPreferences.remove(Cache.activeExercisePlanDateKey); - this.activeExercisePlan = null; - this.activeExercisePlanDetails = null; + activeExercisePlan = null; + activeExercisePlanDetails = null; } Future getActiveExercisePlan() async { @@ -312,29 +312,29 @@ class Cache with Logging { DateTime savedPlanDate; savedPlanDate = format.parse(savedPlanDateString); - print("Saved plan: $savedPlanDate"); + log("Saved plan: $savedPlanDate"); final DateTime now = DateTime.now(); - final DateTime added = savedPlanDate.add(Duration(days: 1)); + final DateTime added = savedPlanDate.add(const Duration(days: 1)); if (added.isBefore(now)) { return; } String? exercisePlanJson = sharedPreferences.getString(Cache.activeExercisePlanKey); if (exercisePlanJson != null) { - final Map map = JsonDecoder().convert(exercisePlanJson); - this.activeExercisePlan = ExercisePlan.fromJson(map); + final Map map = const JsonDecoder().convert(exercisePlanJson); + activeExercisePlan = ExercisePlan.fromJson(map); } String? detailsJson = sharedPreferences.getString(Cache.activeExercisePlanDetailsKey); if (detailsJson != null) { Iterable json = jsonDecode(detailsJson); - this.activeExercisePlanDetails = json.map((details) => ExercisePlanDetail.fromJsonWithExerciseList(details)).toList(); + activeExercisePlanDetails = json.map((details) => ExercisePlanDetail.fromJsonWithExerciseList(details)).toList(); } } Future setServer(bool live) async { - if (this.testEnvironment == "1") { + if (testEnvironment == "1") { liveServer = false; live = false; } @@ -366,23 +366,23 @@ class Cache with Logging { SharedPreferences sharedPreferences; sharedPreferences = await prefs; sharedPreferences.setBool(Cache.hardwareKey, hasHardware); - this.hasHardware = hasHardware; + hasHardware = hasHardware; } void setServerAddress(SharedPreferences prefs) { if (testEnvironment == "1") { baseUrl = baseUrlTest; - print("TestEnv $baseUrl"); + log("TestEnv $baseUrl"); return; } else if ( testEnvironment == "2") { baseUrl = baseUrlLocal; - print("TestEnv $baseUrl"); + log("TestEnv $baseUrl"); return; } final bool? live = prefs.getBool(Cache.serverKey); if (live == null) { baseUrl = baseUrlLive; - print("Live Env $baseUrl"); + log("Live Env $baseUrl"); liveServer = true; return; } @@ -393,7 +393,7 @@ class Cache with Logging { baseUrl = baseUrlTest; } - print("Env $baseUrl"); + log("Env $baseUrl"); } Future setLoginTypeFromPrefs() async { @@ -410,7 +410,7 @@ class Cache with Logging { } else if (loginType == LoginType.email.toString()) { type = LoginType.email; } - //print("LoginType: " + loginType == null ? "NULL" : loginType); + //log("LoginType: " + loginType == null ? "NULL" : loginType); Cache().setLoginType(type); } @@ -460,7 +460,7 @@ class Cache with Logging { } logout() async { - if (this.accessTokenFacebook != null) { + if (accessTokenFacebook != null) { await FirebaseApi().logOutFacebook(); } userLoggedIn = null; @@ -472,7 +472,7 @@ class Cache with Logging { _traineeExercisePlan = null; _exercises = []; _myExercisesPlanDetails = LinkedHashMap(); - log("Trainees is null? " + (_trainee == null).toString()); + log("Trainees is null? ${_trainee == null}"); Future prefs = SharedPreferences.getInstance(); await setPreferences(prefs, SharePrefsChange.logout, 0, ""); } @@ -504,60 +504,60 @@ class Cache with Logging { } void setExerciseTypes(List exerciseTypes) { - this._exerciseTypes = exerciseTypes; + _exerciseTypes = exerciseTypes; } void setExerciseTree(List exerciseTree) { - this._exerciseTree = exerciseTree; + _exerciseTree = exerciseTree; } - void setExercises(List exercises) => this._exercises = exercises; + void setExercises(List exercises) => _exercises = exercises; void setExercisesTrainee(List exercises) { - this._exercisesTrainee = exercises; + _exercisesTrainee = exercises; } void setWorkoutMenuTree(LinkedHashMap tree) { - this._tree = tree; + _tree = tree; } - List? getExerciseTypes() => this._exerciseTypes; + List? getExerciseTypes() => _exerciseTypes; ExerciseType? getExerciseTypeById(int exerciseTypeId) { ExerciseType? exerciseType; if (_exerciseTypes != null) { - this._exerciseTypes!.forEach((element) { + for (var element in _exerciseTypes!) { if (element.exerciseTypeId == exerciseTypeId) { exerciseType = element; } - }); + } } return exerciseType; } - List? getExerciseTree() => this._exerciseTree; + List? getExerciseTree() => _exerciseTree; - List? getExercises() => this._exercises; + List? getExercises() => _exercises; - List? getExercisesTrainee() => this._exercisesTrainee; + List? getExercisesTrainee() => _exercisesTrainee; - LinkedHashMap getWorkoutMenuTree() => this._tree; + LinkedHashMap getWorkoutMenuTree() => _tree; - void setPercentExercises(double percent) => this._percentExercises = percent; + void setPercentExercises(double percent) => _percentExercises = percent; - double getPercentExercises() => this._percentExercises; + double getPercentExercises() => _percentExercises; void addExercise(Exercise exercise) => _exercises!.add(exercise); void addExerciseTrainee(Exercise exercise) => _exercisesTrainee!.add(exercise); - Customer? getTrainee() => this._trainee; + Customer? getTrainee() => _trainee; void setTrainee(Customer trainee) => _trainee = trainee; - void setTraineeExercisePlan(ExercisePlan exercisePlan) => this._traineeExercisePlan = exercisePlan; + void setTraineeExercisePlan(ExercisePlan exercisePlan) => _traineeExercisePlan = exercisePlan; - ExercisePlan? getTraineesExercisePlan() => this._traineeExercisePlan; + ExercisePlan? getTraineesExercisePlan() => _traineeExercisePlan; void setMyExercisePlan(ExercisePlan exercisePlan) => _myExercisePlan = exercisePlan; @@ -573,31 +573,31 @@ class Cache with Logging { void resetMyExercisePlanDetails() => _myExercisesPlanDetails = LinkedHashMap(); void updateMyExercisePlanDetail(ExercisePlanDetail detail) { - this.addToMyExercisePlanDetails(detail); + addToMyExercisePlanDetails(detail); } - void deleteMyExercisePlanDetail(ExercisePlanDetail detail) => this.deleteMyExercisePlanDetailByExerciseTypeId(detail.exerciseTypeId); + void deleteMyExercisePlanDetail(ExercisePlanDetail detail) => deleteMyExercisePlanDetailByExerciseTypeId(detail.exerciseTypeId); void deletedMyExercisePlanDetail(ExercisePlanDetail detail) => - this._myExercisesPlanDetails[detail.exerciseTypeId]!.change = ModelChange.deleted; + _myExercisesPlanDetails[detail.exerciseTypeId]!.change = ModelChange.deleted; void deleteMyExercisePlanDetailByExerciseTypeId(int exerciseTypeId) { - this._myExercisesPlanDetails[exerciseTypeId]!.change = ModelChange.delete; + _myExercisesPlanDetails[exerciseTypeId]!.change = ModelChange.delete; } - void setProperties(List properties) => this._properties = properties; + void setProperties(List properties) => _properties = properties; List? getProperties() => _properties; List? getSports() => _sports; - void setSports(List sports) => this._sports = sports; + void setSports(List sports) => _sports = sports; - void setDevices(List devices) => this._devices = devices; + void setDevices(List devices) => _devices = devices; - List? getDevices() => this._devices; + List? getDevices() => _devices; - void setCustomerDevices(List devices) => this._customerDevices = devices; + void setCustomerDevices(List devices) => _customerDevices = devices; - List? getCustomerDevices() => this._customerDevices; + List? getCustomerDevices() => _customerDevices; LinkedHashMap getBadges() => _badges; @@ -634,17 +634,17 @@ class Cache with Logging { return; } customerRepository.setCustomer(userLoggedIn!); - int _ecto = customerRepository.getCustomerPropertyValue(PropertyEnum.Ectomorph.toStr()).toInt(); - int _mezo = customerRepository.getCustomerPropertyValue(PropertyEnum.Mesomorph.toStr()).toInt(); - int _endo = customerRepository.getCustomerPropertyValue(PropertyEnum.Endomorph.toStr()).toInt(); + int ecto = customerRepository.getCustomerPropertyValue(PropertyEnum.Ectomorph.toStr()).toInt(); + int mezo = customerRepository.getCustomerPropertyValue(PropertyEnum.Mesomorph.toStr()).toInt(); + int endo = customerRepository.getCustomerPropertyValue(PropertyEnum.Endomorph.toStr()).toInt(); - //print("endo " + _endo.toString() + " mezo " + _mezo.toString()); - if (this.userLoggedIn != null) { - if (this.userLoggedIn!.birthYear == null || this.userLoggedIn!.birthYear == 0) { + //log("endo " + _endo.toString() + " mezo " + _mezo.toString()); + if (userLoggedIn != null) { + if (userLoggedIn!.birthYear == null || userLoggedIn!.birthYear == 0) { setBadge("personalData", true); setBadge("account", true); } - if (this._customerDevices == null || this._customerDevices!.isEmpty) { + if (_customerDevices == null || _customerDevices!.isEmpty) { setBadge("customerDevice", true); setBadge("account", true); } @@ -662,11 +662,11 @@ class Cache with Logging { setBadge("My Body", true); setBadgeNr("home", 1); } - if (_ecto == 0 && _mezo == 0 && _endo == 0) { + if (ecto == 0 && mezo == 0 && endo == 0) { setBadge("account", true); setBadge("bodyType", true); } - if (this._exercises == null || this._exercises!.isEmpty) { + if (_exercises == null || _exercises!.isEmpty) { setBadge("home", true); setBadge("Custom Tests", true); setBadge("Start Training", true); @@ -685,7 +685,7 @@ class Cache with Logging { setBadge("FitnessLevel", true); setBadge("account", true); } - if (this._exercises != null && this._exercises!.isNotEmpty) { + if (_exercises != null && _exercises!.isNotEmpty) { if (!activitiesDone[ActivityDone.isExerciseLogSeen.toStr()]!) { setBadge("exerciseLog", true); setBadge("development", true); @@ -696,7 +696,7 @@ class Cache with Logging { } } } - log("Badges: " + _badges.toString()); + log("Badges: $_badges"); } List? get products => _products; @@ -727,11 +727,11 @@ class Cache with Logging { } await Future.forEach(ActivityDone.values, (element) async { - ActivityDone activity = element as ActivityDone; + ActivityDone activity = element; await isActivityDonePrefs(activity); }); - print("Firebase token save: $firebaseMessageToken"); + log("Firebase token save: $firebaseMessageToken"); if (firebaseMessageToken != null) { userLoggedIn!.firebaseRegToken = firebaseMessageToken; CustomerRepository customerRepository = CustomerRepository(); @@ -745,13 +745,13 @@ class Cache with Logging { } AccessToken? get getAccessTokenFacebook => accessTokenFacebook; - set setAccessTokenFacebook(AccessToken accessTokenFacebook) => this.accessTokenFacebook = accessTokenFacebook; + set setAccessTokenFacebook(AccessToken accessTokenFacebook) => accessTokenFacebook = accessTokenFacebook; LoginType? getLoginType() => loginType; - void setLoginType(LoginType type) => this.loginType = type; + void setLoginType(LoginType type) => loginType = type; - List get exercisePlanTemplates => this._exercisePlanTemplates; - setExercisePlanTemplates(value) => this._exercisePlanTemplates = value; + List get exercisePlanTemplates => _exercisePlanTemplates; + setExercisePlanTemplates(value) => _exercisePlanTemplates = value; isActivityDonePrefs(ActivityDone activity) async { Future prefs = SharedPreferences.getInstance(); @@ -772,42 +772,37 @@ class Cache with Logging { bool isActivityDone(ActivityDone activity) => activitiesDone[activity.toStr()] == true; - List? get evaluations => this._evaluations; - set evaluations(List? value) => this._evaluations = value; + List? get customerActivities => _customerActivities; + setCustomerActivities(List? value) => _customerActivities = value; - List? get customerActivities => this._customerActivities; - setCustomerActivities(List? value) => this._customerActivities = value; + List? get tutorials => _tutorials; + setTutorials(List? value) => _tutorials = value; - List? get tutorials => this._tutorials; - setTutorials(List? value) => this._tutorials = value; + FirebaseRemoteConfig? getRemoteConfig() => remoteConfig; + setRemoteConfig(FirebaseRemoteConfig? remoteConfig) => remoteConfig = remoteConfig; - FirebaseRemoteConfig? getRemoteConfig() => this.remoteConfig; - setRemoteConfig(FirebaseRemoteConfig? remoteConfig) => this.remoteConfig = remoteConfig; + List? getDescriptions() => _descriptions; + setDescriptions(List? value) => _descriptions = value; - List? getDescriptions() => this._descriptions; - setDescriptions(List? value) => this._descriptions = value; + List? getFaqs() => _faqs; + setFaqs(List? value) => _faqs = value; - List? getFaqs() => this._faqs; - setFaqs(List? value) => this._faqs = value; + List? getTrainingPlans() => _trainingPlans; + setTrainingPlans(List? value) => _trainingPlans = value; - List? getTrainingPlans() => this._trainingPlans; - setTrainingPlans(List? value) => this._trainingPlans = value; + List? getCustomerTrainingPlans() => _customerTrainingPlans; + setCustomerTrainingPlans(value) => _customerTrainingPlans = value; - List? getCustomerTrainingPlans() => this._customerTrainingPlans; - setCustomerTrainingPlans(value) => this._customerTrainingPlans = value; + List getSplitTests() => _splitTests; + setSplitTests(value) => _splitTests = value; - List getSplitTests() => this._splitTests; - setSplitTests(value) => this._splitTests = value; + List getTrainingPlanDays() => _trainingPlanDays; + setTrainingPlanDays(value) => _trainingPlanDays = value; - List getTrainingPlanDays() => this._trainingPlanDays; - setTrainingPlanDays(value) => this._trainingPlanDays = value; - - List? getCustomerPropertyAll() => this._customerPropertyAll; - setCustomerPropertyAll(value) => this._customerPropertyAll = value; + List? getCustomerPropertyAll() => _customerPropertyAll; + setCustomerPropertyAll(value) => _customerPropertyAll = value; addCustomerProperty(CustomerProperty property) { - if (this._customerPropertyAll == null) { - this._customerPropertyAll = []; - } - this._customerPropertyAll!.add(property); + _customerPropertyAll ??= []; + _customerPropertyAll!.add(property); } } diff --git a/lib/model/customer.dart b/lib/model/customer.dart index 2166df7..7c27104 100644 --- a/lib/model/customer.dart +++ b/lib/model/customer.dart @@ -33,56 +33,56 @@ class Customer { LinkedHashMap properties = LinkedHashMap(); Customer( - {this.customerId, - this.name, - this.firstname, - this.email, - this.sex, - this.age, - this.active, - this.password, - this.birthYear, - this.bodyType, - this.fitnessLevel, - this.goal, - this.admin, - this.trainer, - this.dataPolicyAllowed, - this.firebaseUid, - this.dateAdd, - this.dateChange}) { + {customerId, + name, + firstname, + email, + sex, + age, + active, + password, + birthYear, + bodyType, + fitnessLevel, + goal, + admin, + trainer, + dataPolicyAllowed, + firebaseUid, + dateAdd, + dateChange}) { dateAdd = DateTime.now(); dateChange = DateTime.now(); } Customer.fromJson(Map json) { - this.customerId = json['customerId']; - this.name = json['name']; - this.firstname = json['firstname']; - this.email = json['email']; - this.sex = json['sex']; - this.age = json['age']; - this.active = json['active']; - this.birthYear = json['birthYear']; - this.bodyType = json['bodyType']; - this.fitnessLevel = json['fitnessLevel']; - this.goal = json['goal']; - this.admin = json['admin']; - this.lifeLong = json['lifeLong']; + customerId = json['customerId']; + name = json['name']; + firstname = json['firstname']; + email = json['email']; + sex = json['sex']; + age = json['age']; + active = json['active']; + birthYear = json['birthYear']; + bodyType = json['bodyType']; + fitnessLevel = json['fitnessLevel']; + goal = json['goal']; + admin = json['admin']; + lifeLong = json['lifeLong']; - this.trainer = json['trainer']; - this.firebaseUid = json['firebaseUid']; - this.firebaseRegToken = json['firebaseRegToken']; - this.lang = json['lang']; + trainer = json['trainer']; + firebaseUid = json['firebaseUid']; + firebaseRegToken = json['firebaseRegToken']; + lang = json['lang']; - this.dataPolicyAllowed = json['dataPolicyAllowed']; - this.emailSubscription = json['emailSubscription']; - this.sportId = json['sportId']; - this.syncedDate = json['syncedDate'] == null ? null : DateTime.parse(json['syncedDate']); - this.trialDate = json['trialDate'] == null ? null : DateTime.parse(json['trialDate']); + dataPolicyAllowed = json['dataPolicyAllowed']; + emailSubscription = json['emailSubscription']; + sportId = json['sportId']; + syncedDate = json['syncedDate'] == null ? null : DateTime.parse(json['syncedDate']); + trialDate = json['trialDate'] == null ? null : DateTime.parse(json['trialDate']); - this.dateAdd = json['dateAdd'] == null ? DateTime.parse("0000-00-00") : DateTime.parse(json['dateAdd']); - this.dateChange = json['dateChange'] == null ? DateTime.parse("0000-00-00") : DateTime.parse(json['dateChange']); + dateAdd = json['dateAdd'] == null ? DateTime.parse("0000-00-00") : DateTime.parse(json['dateAdd']); + dateChange = json['dateChange'] == null ? DateTime.parse("0000-00-00") : DateTime.parse(json['dateChange']); } Map toJson() => { @@ -100,29 +100,29 @@ class Customer { "admin": admin, "trainer": trainer, "dataPolicyAllowed": dataPolicyAllowed, - "dateAdd": DateFormat('yyyy-MM-dd HH:mm:ss').format(this.dateAdd!), - "dateChange": DateFormat('yyyy-MM-dd HH:mm:ss').format(this.dateChange!), - "emailSubscription": this.emailSubscription, - "sportId": this.sportId, - "syncedDate": this.syncedDate == null ? null : DateFormat('yyyy-MM-dd HH:mm:ss').format(this.syncedDate!), - "trialDate": this.trialDate == null ? null : DateFormat('yyyy-MM-dd HH:mm:ss').format(this.trialDate!), - "firebaseRegToken": this.firebaseRegToken, - "lang": this.lang, - "lifeLong": this.lifeLong, + "dateAdd": DateFormat('yyyy-MM-dd HH:mm:ss').format(dateAdd!), + "dateChange": DateFormat('yyyy-MM-dd HH:mm:ss').format(dateChange!), + "emailSubscription": emailSubscription, + "sportId": sportId, + "syncedDate": syncedDate == null ? null : DateFormat('yyyy-MM-dd HH:mm:ss').format(syncedDate!), + "trialDate": trialDate == null ? null : DateFormat('yyyy-MM-dd HH:mm:ss').format(trialDate!), + "firebaseRegToken": firebaseRegToken, + "lang": lang, + "lifeLong": lifeLong, }; @override - String toString() => this.toJson().toString(); + String toString() => toJson().toString(); double getProperty(String propertyName) { - if (this.properties[propertyName] == null) { + if (properties[propertyName] == null) { return 0; } else { - return this.properties[propertyName]!.propertyValue; + return properties[propertyName]!.propertyValue; } } setProperty(String propertyName, double value) { - this.properties[propertyName]!.propertyValue = value; + properties[propertyName]!.propertyValue = value; } } diff --git a/lib/model/customer_activity.dart b/lib/model/customer_activity.dart index fb5899a..38ed822 100644 --- a/lib/model/customer_activity.dart +++ b/lib/model/customer_activity.dart @@ -1,4 +1,3 @@ -// ignore: depend_on_referenced_packages import 'package:intl/intl.dart'; class CustomerActivity { diff --git a/lib/model/customer_exercise_device.dart b/lib/model/customer_exercise_device.dart index 9564441..2c5d35f 100644 --- a/lib/model/customer_exercise_device.dart +++ b/lib/model/customer_exercise_device.dart @@ -1,4 +1,3 @@ -// ignore: depend_on_referenced_packages import 'package:intl/intl.dart'; class CustomerExerciseDevice { diff --git a/lib/model/customer_property.dart b/lib/model/customer_property.dart index ac5026d..bebf0ea 100644 --- a/lib/model/customer_property.dart +++ b/lib/model/customer_property.dart @@ -1,4 +1,3 @@ -// ignore: depend_on_referenced_packages import 'package:intl/intl.dart'; import '../util/logging.dart'; @@ -14,10 +13,10 @@ class CustomerProperty with Logging { bool newData = false; CustomerProperty( - {required this.propertyId, - required this.customerId, - required this.dateAdd, - required this.propertyValue}); + {required propertyId, + required customerId, + required dateAdd, + required propertyValue}); CustomerProperty.fromJson(Map json) { customerPropertyId = json['customerPropertyId']; @@ -33,38 +32,39 @@ class CustomerProperty with Logging { propertyValue = json['propertyValue']; - print("Json $json, ${toString()}"); + log("Json $json, ${toString()}"); } Map toJson() { if (customerPropertyId != null) { return { - "customerPropertyId": this.customerPropertyId, - "propertyId": this.propertyId, - "customerId": this.customerId, - "dateAdd": DateFormat('yyyy-MM-dd HH:mm:ss').format(this.dateAdd!), - "propertyValue": this.propertyValue + "customerPropertyId": customerPropertyId, + "propertyId": propertyId, + "customerId": customerId, + "dateAdd": DateFormat('yyyy-MM-dd HH:mm:ss').format(dateAdd!), + "propertyValue": propertyValue }; } else { return { - "propertyId": this.propertyId, - "customerId": this.customerId, - "dateAdd": DateFormat('yyyy-MM-dd HH:mm:ss').format(this.dateAdd!), - "propertyValue": this.propertyValue + "propertyId": propertyId, + "customerId": customerId, + "dateAdd": DateFormat('yyyy-MM-dd HH:mm:ss').format(dateAdd!), + "propertyValue": propertyValue }; } } + @override String toString() { Map json = { - "customerPropertyId": this.customerPropertyId, - "propertyId": this.propertyId, - "customerId": this.customerId, - "dateAdd": DateFormat('yyyy-MM-dd HH:mm:ss').format(this.dateAdd!), - "propertyValue": this.propertyValue, - "dateYmd": this.dateYmd, - "dateYm": this.dateYm, - "dateY": this.dateY, + "customerPropertyId": customerPropertyId, + "propertyId": propertyId, + "customerId": customerId, + "dateAdd": DateFormat('yyyy-MM-dd HH:mm:ss').format(dateAdd!), + "propertyValue": propertyValue, + "dateYmd": dateYmd, + "dateYm": dateYm, + "dateY": dateY, }; return json.toString(); } diff --git a/lib/model/customer_training_plan.dart b/lib/model/customer_training_plan.dart index c8cb00a..a040cf8 100644 --- a/lib/model/customer_training_plan.dart +++ b/lib/model/customer_training_plan.dart @@ -1,10 +1,10 @@ import 'dart:collection'; import 'dart:convert'; -// ignore: depend_on_referenced_packages import 'package:intl/intl.dart'; import 'package:workouttest_util/repository/exercise_type_repository.dart'; import 'package:workouttest_util/model/customer_training_plan_details.dart'; +import 'package:workouttest_util/util/logging.dart'; enum CustomerTrainingPlanType { custom, template, none } @@ -14,7 +14,7 @@ extension CustomerTrainingPlanTypeExt on CustomerTrainingPlanType { bool equalsStringTo(String type) => toStr() == type; } -class CustomerTrainingPlan { +class CustomerTrainingPlan with Logging { int? customerTrainingPlanId; int? customerId; int? trainingPlanId; @@ -59,15 +59,15 @@ class CustomerTrainingPlan { jsonDetails = jsonDetails.replaceAllMapped(RegExp(r'([0-9]{4}\-[0-9]{2}\-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2})'), (Match m) => "\"${m[0]}\""); - print("detail: $jsonDetails"); + log("detail: $jsonDetails"); Iterable iterable = jsonDecode(jsonDetails); this.details = iterable.map((detail) => CustomerTrainingPlanDetails.fromJsonWithExerciseList(detail)).toList(); - this.details.forEach((detail) { + for (var detail in this.details) { detail.alternatives = ExerciseTypeRepository.getExerciseTypeAlternatives(detail.exerciseTypeId); - }); + } } on Exception catch (e) { - print("JsonDecode error " + e.toString()); + log("JsonDecode error $e"); } } diff --git a/lib/model/customer_training_plan_details.dart b/lib/model/customer_training_plan_details.dart index 2d462ad..9f93764 100644 --- a/lib/model/customer_training_plan_details.dart +++ b/lib/model/customer_training_plan_details.dart @@ -3,8 +3,9 @@ import 'package:workouttest_util/model/exercise.dart'; import 'package:workouttest_util/model/exercise_plan_detail.dart'; import 'package:workouttest_util/model/exercise_type.dart'; import 'package:workouttest_util/repository/training_plan_day_repository.dart'; +import 'package:workouttest_util/util/logging.dart'; -class CustomerTrainingPlanDetails { +class CustomerTrainingPlanDetails with Logging { /// customerTrainingPlanDetails int? customerTrainingPlanDetailsId; @@ -45,86 +46,86 @@ class CustomerTrainingPlanDetails { CustomerTrainingPlanDetails(); CustomerTrainingPlanDetails.fromJson(Map json) { - this.customerTrainingPlanDetailsId = json['customerTrainingPlanDetailsId']; - this.exerciseTypeId = json['exerciseTypeId']; - this.set = json['set']; - this.repeats = json['repeats']; - this.weight = json['weight']; - this.restingTime = json['restingTime']; - this.parallel = json['parallel']; - this.day = json['day']; + customerTrainingPlanDetailsId = json['customerTrainingPlanDetailsId']; + exerciseTypeId = json['exerciseTypeId']; + set = json['set']; + repeats = json['repeats']; + weight = json['weight']; + restingTime = json['restingTime']; + parallel = json['parallel']; + day = json['day']; } CustomerTrainingPlanDetails.fromJsonWithExerciseList(Map json) { - this.customerTrainingPlanDetailsId = json['customerTrainingPlanDetailsId'] == "null" || json['customerTrainingPlanDetailsId'] == null + customerTrainingPlanDetailsId = json['customerTrainingPlanDetailsId'] == "null" || json['customerTrainingPlanDetailsId'] == null ? 0 : json['customerTrainingPlanDetailsId']; - this.trainingPlanDetailsId = json['trainingPlanDetailsId'] == "null" ? 0 : json['trainingPlanDetailsId']; - this.exerciseTypeId = json['exerciseTypeId']; - this.set = json['set']; - this.repeats = json['repeats'] == "null" ? -1 : json['repeats']; - this.weight = json['weight'] == "null" ? 0 : json['weight']; - this.restingTime = json['restingTime']; - this.parallel = json['parallel'] == "false" + trainingPlanDetailsId = json['trainingPlanDetailsId'] == "null" ? 0 : json['trainingPlanDetailsId']; + exerciseTypeId = json['exerciseTypeId']; + set = json['set']; + repeats = json['repeats'] == "null" ? -1 : json['repeats']; + weight = json['weight'] == "null" ? 0 : json['weight']; + restingTime = json['restingTime']; + parallel = json['parallel'] == "false" ? false : json['parallel'] == "true" ? true : null; - this.dayId = json['dayId'] == "null" ? null : json['dayId']; - TrainingPlanDayRepository trainingPlanDayRepository = TrainingPlanDayRepository(); - this.day = trainingPlanDayRepository.getNameById(this.dayId); + dayId = json['dayId'] == "null" ? null : json['dayId']; + TrainingPlanDayRepository trainingPlanDayRepository = const TrainingPlanDayRepository(); + day = trainingPlanDayRepository.getNameById(dayId); try { Iterable iterable = json['exercises']; - this.exercises = iterable.map((exercise) => Exercise.fromJson(exercise)).toList(); + exercises = iterable.map((exercise) => Exercise.fromJson(exercise)).toList(); } on Exception catch (e) { - print("JsonDecode error " + e.toString()); + log("JsonDecode error $e"); } if (json['state'] == ExercisePlanDetailState.finished.toStr()) { - this.state = ExercisePlanDetailState.finished; + state = ExercisePlanDetailState.finished; } else if (json['state'] == ExercisePlanDetailState.inProgress.toStr()) { - this.state = ExercisePlanDetailState.inProgress; + state = ExercisePlanDetailState.inProgress; } else if (json['state'] == ExercisePlanDetailState.skipped.toStr()) { - this.state = ExercisePlanDetailState.skipped; + state = ExercisePlanDetailState.skipped; } else { - this.state = ExercisePlanDetailState.start; + state = ExercisePlanDetailState.start; } - this.isTest = json['isTest'] == "true" ? true : false; + isTest = json['isTest'] == "true" ? true : false; - this.exerciseType = Cache().getExerciseTypeById(exerciseTypeId!); + exerciseType = Cache().getExerciseTypeById(exerciseTypeId!); - this.baseOneRepMax = json['baseOneRepMax'] == null ? 0 : json['baseOneRepMax']; + baseOneRepMax = json['baseOneRepMax'] ?? 0; } ExerciseType? getExerciseType() => exerciseType; Map toJson() => { - "customerTrainingPlanDetailsId": this.customerTrainingPlanDetailsId, - "exerciseTypeId": this.exerciseTypeId, - "set": this.set, - "repeats": this.repeats, - "weight": this.weight, - "restingTime": this.restingTime, - "parallel": this.parallel, - "day": this.day == null ? '1.' : this.day, + "customerTrainingPlanDetailsId": customerTrainingPlanDetailsId, + "exerciseTypeId": exerciseTypeId, + "set": set, + "repeats": repeats, + "weight": weight, + "restingTime": restingTime, + "parallel": parallel, + "day": day ?? '1.', }; Map toJsonWithExercises() { final Map jsonMap = { - "customerTrainingPlanDetailsId": this.customerTrainingPlanDetailsId, - "trainingPlanDetailsId": this.trainingPlanDetailsId, - "exerciseTypeId": this.exerciseTypeId, - "set": this.set, - "repeats": this.repeats, - "weight": this.weight, - "restingTime": this.restingTime, - "parallel": this.parallel, + "customerTrainingPlanDetailsId": customerTrainingPlanDetailsId, + "trainingPlanDetailsId": trainingPlanDetailsId, + "exerciseTypeId": exerciseTypeId, + "set": set, + "repeats": repeats, + "weight": weight, + "restingTime": restingTime, + "parallel": parallel, 'exercises': exercises.isEmpty ? [].toString() : exercises.map((exercise) => exercise.toJson()).toList().toString(), - 'state': this.state.toStr(), - "isTest": this.isTest, - "dayId": this.dayId, - "baseOneRepMax": this.baseOneRepMax, + 'state': state.toStr(), + "isTest": isTest, + "dayId": dayId, + "baseOneRepMax": baseOneRepMax, }; //print("Detail toJson $jsonMap"); @@ -132,31 +133,31 @@ class CustomerTrainingPlanDetails { } @override - String toString() => this.toJsonWithExercises().toString(); + String toString() => toJsonWithExercises().toString(); void copy(CustomerTrainingPlanDetails from) { - this.customerTrainingPlanDetailsId = from.customerTrainingPlanDetailsId; - this.trainingPlanDetailsId = from.trainingPlanDetailsId; - this.exerciseTypeId = from.exerciseTypeId; - this.exerciseType = from.exerciseType; - this.set = from.set; - this.repeats = from.repeats; - this.weight = from.weight; - this.restingTime = from.restingTime; - this.parallel = from.parallel; - this.exercises = from.exercises; - this.state = from.state; - this.isTest = from.isTest; - this.day = from.day; - this.dayId = from.dayId; - this.baseOneRepMax = from.baseOneRepMax; - if (from.exercises.length == 0) { - this.exercises = []; + customerTrainingPlanDetailsId = from.customerTrainingPlanDetailsId; + trainingPlanDetailsId = from.trainingPlanDetailsId; + exerciseTypeId = from.exerciseTypeId; + exerciseType = from.exerciseType; + set = from.set; + repeats = from.repeats; + weight = from.weight; + restingTime = from.restingTime; + parallel = from.parallel; + exercises = from.exercises; + state = from.state; + isTest = from.isTest; + day = from.day; + dayId = from.dayId; + baseOneRepMax = from.baseOneRepMax; + if (from.exercises.isEmpty) { + exercises = []; } - if (from.alternatives.length > 0) { - from.alternatives.forEach((alternative) { - this.alternatives.add(alternative); - }); + if (from.alternatives.isNotEmpty) { + for (var alternative in from.alternatives) { + alternatives.add(alternative); + } } } } diff --git a/lib/model/customer_training_plan_exercise.dart b/lib/model/customer_training_plan_exercise.dart index 5c05fb6..08fecc3 100644 --- a/lib/model/customer_training_plan_exercise.dart +++ b/lib/model/customer_training_plan_exercise.dart @@ -9,22 +9,22 @@ class CustomerTrainingPlanExercise { CustomerTrainingPlanExercise(); CustomerTrainingPlanExercise.fromJson(Map json) { - this.customerTrainingPlanExerciseId = json['customerTrainingPlanExerciseId']; - this.customerTrainingPlanDetailsId = json['customerTrainingPlanDetailsId']; - this.customerId = json['customerId']; - this.exerciseId = json['exerciseId']; - this.repeats = json['repeats']; - this.weight = json['weight']; + customerTrainingPlanExerciseId = json['customerTrainingPlanExerciseId']; + customerTrainingPlanDetailsId = json['customerTrainingPlanDetailsId']; + customerId = json['customerId']; + exerciseId = json['exerciseId']; + repeats = json['repeats']; + weight = json['weight']; } Map toJson() => { - "customerTrainingPlanDetailsId": this.customerTrainingPlanDetailsId, - "customerId": this.customerId, - "exerciseId": this.exerciseId, - "weight": this.weight, - "repeats": this.repeats + "customerTrainingPlanDetailsId": customerTrainingPlanDetailsId, + "customerId": customerId, + "exerciseId": exerciseId, + "weight": weight, + "repeats": repeats }; @override - String toString() => this.toJson().toString(); + String toString() => toJson().toString(); } diff --git a/lib/model/description.dart b/lib/model/description.dart index 9ec6d36..6c1f67b 100644 --- a/lib/model/description.dart +++ b/lib/model/description.dart @@ -12,29 +12,29 @@ class Description { String? descriptionTranslation; Description.fromJson(Map json) { - this.descriptionId = json['descriptionId']; - this.name = json['name']; - this.description = json['description']; - this.version = json['version']; - this.validFrom = json['validFrom']; - this.validTo = json['validTo']; + descriptionId = json['descriptionId']; + name = json['name']; + description = json['description']; + version = json['version']; + validFrom = json['validFrom']; + validTo = json['validTo']; if (json['translations'] != null && json['translations'].length > 0) { - this.descriptionTranslation = - AppLanguage().appLocal == Locale('hu') ? json['translations'][0]['descriptionTranslation'] : json['description']; + descriptionTranslation = + AppLanguage().appLocal == const Locale('hu') ? json['translations'][0]['descriptionTranslation'] : json['description']; } } Map toJson() => { - "descriptionId": this.descriptionId, - "name": this.name, - "description": this.description, - "version": this.version, - "validFrom": this.validFrom, - "validTo": this.validTo, - "descriptionTranslation": this.descriptionTranslation + "descriptionId": descriptionId, + "name": name, + "description": description, + "version": version, + "validFrom": validFrom, + "validTo": validTo, + "descriptionTranslation": descriptionTranslation }; @override - String toString() => this.toJson().toString(); + String toString() => toJson().toString(); } diff --git a/lib/model/evaluation.dart b/lib/model/evaluation.dart index ce654be..7a36419 100644 --- a/lib/model/evaluation.dart +++ b/lib/model/evaluation.dart @@ -12,16 +12,16 @@ class Evaluation { name = json['name']; exerciseTypeId = json['exerciseTypeId']; unit = json['unit']; - this.attributes = json['attributes'].map((attr) => EvaluationAttribute.fromJson(attr)).toList(); + attributes = json['attributes'].map((attr) => EvaluationAttribute.fromJson(attr)).toList(); } @override String toString() { Map json = { - 'evaluationId': this.evaluationId, - 'name': this.name, - 'exerciseTypeId': this.exerciseTypeId, - 'unit': this.unit + 'evaluationId': evaluationId, + 'name': name, + 'exerciseTypeId': exerciseTypeId, + 'unit': unit }; return json.toString(); } diff --git a/lib/model/evaluation_attribute.dart b/lib/model/evaluation_attribute.dart index 3d4caff..e042df5 100644 --- a/lib/model/evaluation_attribute.dart +++ b/lib/model/evaluation_attribute.dart @@ -26,15 +26,15 @@ class EvaluationAttribute { @override String toString() { Map json = { - 'evaluationAttrId': this.evaluationAttrId, - 'evaluationId': this.evaluationId, - 'name': this.name, - 'sex': this.sex, - 'ageMin': this.ageMin, - 'ageMax': this.ageMax, - 'valueMin': this.valueMin, - 'valueMax': this.valueMax, - 'evaluation_text': this.evaluationText, + 'evaluationAttrId': evaluationAttrId, + 'evaluationId': evaluationId, + 'name': name, + 'sex': sex, + 'ageMin': ageMin, + 'ageMax': ageMax, + 'valueMin': valueMin, + 'valueMax': valueMax, + 'evaluation_text': evaluationText, }; return json.toString(); } diff --git a/lib/model/exercise.dart b/lib/model/exercise.dart index 79ee76e..d3174c2 100644 --- a/lib/model/exercise.dart +++ b/lib/model/exercise.dart @@ -15,20 +15,20 @@ class Exercise { double? calculated; String? summary; - Exercise({this.exerciseTypeId, this.customerId, this.quantity, this.dateAdd}); + Exercise({exerciseTypeId, customerId, quantity, dateAdd}); Exercise.fromJson(Map json) { - this.exerciseId = json['exerciseId']; - this.exerciseTypeId = json['exerciseTypeId']; - this.customerId = json['customerId']; - this.quantity = json['quantity']; - this.unit = json['unit']; - this.unitQuantity = json['unitQuantity']; - this.dateAdd = DateTime.parse(json['dateAdd']); - this.datePart = DateFormat('yyyy-MM-dd').format(this.dateAdd!); - this.calculated = quantity; - this.exercisePlanDetailId = json['exercisePlanDetailId'] == "null" ? null : json['exercisePlanDetailId']; - this.trainingPlanDetailsId = json['trainingPlanDetailsId'] == "null" ? null : json['trainingPlanDetailsId']; + exerciseId = json['exerciseId']; + exerciseTypeId = json['exerciseTypeId']; + customerId = json['customerId']; + quantity = json['quantity']; + unit = json['unit']; + unitQuantity = json['unitQuantity']; + dateAdd = DateTime.parse(json['dateAdd']); + datePart = DateFormat('yyyy-MM-dd').format(dateAdd!); + calculated = quantity; + exercisePlanDetailId = json['exercisePlanDetailId'] == "null" ? null : json['exercisePlanDetailId']; + trainingPlanDetailsId = json['trainingPlanDetailsId'] == "null" ? null : json['trainingPlanDetailsId']; } Map toJson() => { @@ -37,7 +37,7 @@ class Exercise { "quantity": quantity, "unit": unit, "unitQuantity": unitQuantity, - "dateAdd": DateFormat('yyyy-MM-dd HH:mm:ss').format(this.dateAdd!), + "dateAdd": DateFormat('yyyy-MM-dd HH:mm:ss').format(dateAdd!), "exercisePlanDetailId": exercisePlanDetailId, "trainingPlanDetailsId": trainingPlanDetailsId, }; @@ -49,20 +49,20 @@ class Exercise { 'calculated': calculated, "unit": unit, "unitQuantity": unitQuantity, - "datePart": this.datePart, + "datePart": datePart, }; Exercise copy() { Exercise newExercise = - Exercise(exerciseTypeId: this.exerciseTypeId, customerId: this.customerId, quantity: this.quantity, dateAdd: this.dateAdd); - newExercise.unit = this.unit; - newExercise.unitQuantity = this.unitQuantity; - newExercise.exercisePlanDetailId = this.exercisePlanDetailId; + Exercise(exerciseTypeId: exerciseTypeId, customerId: customerId, quantity: quantity, dateAdd: dateAdd); + newExercise.unit = unit; + newExercise.unitQuantity = unitQuantity; + newExercise.exercisePlanDetailId = exercisePlanDetailId; return newExercise; } @override String toString() { - return this.toJson().toString(); + return toJson().toString(); } } diff --git a/lib/model/exercise_ability.dart b/lib/model/exercise_ability.dart index a73d32b..d4ce900 100644 --- a/lib/model/exercise_ability.dart +++ b/lib/model/exercise_ability.dart @@ -1,9 +1,9 @@ enum ExerciseAbility { oneRepMax, endurance, running, mini_test_set, paralell_test, training, training_execute, none } extension ExerciseAbilityExt on ExerciseAbility { - String enumToString() => this.toString().split(".").last; - bool equalsTo(ExerciseAbility ability) => this.toString() == ability.toString(); - bool equalsStringTo(String ability) => this.enumToString() == ability; + String enumToString() => toString().split(".").last; + bool equalsTo(ExerciseAbility ability) => toString() == ability.toString(); + bool equalsStringTo(String ability) => enumToString() == ability; String get description { switch (this) { case ExerciseAbility.endurance: diff --git a/lib/model/exercise_device.dart b/lib/model/exercise_device.dart index 68cc5e2..1c36623 100644 --- a/lib/model/exercise_device.dart +++ b/lib/model/exercise_device.dart @@ -10,12 +10,12 @@ class ExerciseDevice { bool? isGym; ExerciseDevice.fromJson(Map json) { - this.exerciseDeviceId = json['exerciseDeviceId']; - this.name = json['name']; - this.description = json['description']; - this.imageUrl = json['imageUrl']; - this.nameTranslation = json['translations'][0]['name']; - this.sort = json['sort']; - this.place = json['place'] == 1 ? true : false; + exerciseDeviceId = json['exerciseDeviceId']; + name = json['name']; + description = json['description']; + imageUrl = json['imageUrl']; + nameTranslation = json['translations'][0]['name']; + sort = json['sort']; + place = json['place'] == 1 ? true : false; } } diff --git a/lib/model/exercise_plan.dart b/lib/model/exercise_plan.dart index 1763c18..68cb77d 100644 --- a/lib/model/exercise_plan.dart +++ b/lib/model/exercise_plan.dart @@ -12,21 +12,21 @@ class ExercisePlan { int? exercisePlanTemplateId; ExercisePlan(String name, int customerId) { - this.customerId = customerId; - this.name = name; - this.dateUpd = DateTime.now(); + customerId = customerId; + name = name; + dateUpd = DateTime.now(); } ExercisePlan.fromJson(Map json) { - this.exercisePlanId = json['exercisePlanId']; - this.customerId = json['customerId']; - this.name = json['name']; - this.private = json['private']; - this.description = json['description']; - this.dateAdd = (json['dateAdd'] == null ? null : DateTime.parse(json['dateAdd']))!; - this.dateUpd = (json['dateUpd'] == null ? null : DateTime.parse(json['dateUpd']))!; - this.type = json['type']; - this.exercisePlanTemplateId = json['exercisePlanTemplateId']; + exercisePlanId = json['exercisePlanId']; + customerId = json['customerId']; + name = json['name']; + private = json['private']; + description = json['description']; + dateAdd = (json['dateAdd'] == null ? null : DateTime.parse(json['dateAdd']))!; + dateUpd = (json['dateUpd'] == null ? null : DateTime.parse(json['dateUpd']))!; + type = json['type']; + exercisePlanTemplateId = json['exercisePlanTemplateId']; } Map toJson() { diff --git a/lib/model/exercise_plan_detail.dart b/lib/model/exercise_plan_detail.dart index e4275a4..92fd4dd 100644 --- a/lib/model/exercise_plan_detail.dart +++ b/lib/model/exercise_plan_detail.dart @@ -2,16 +2,17 @@ import 'dart:convert'; import 'package:workouttest_util/model/exercise.dart'; import 'package:workouttest_util/model/exercise_type.dart'; +import 'package:workouttest_util/util/logging.dart'; enum ExercisePlanDetailState { start, inProgress, skipped, finished, extra } extension ExericisePlanDetailStateExt on ExercisePlanDetailState { - bool equalsTo(ExercisePlanDetailState state) => this.toString() == state.toString(); - bool equalsStringTo(String state) => this.toString() == state; - String toStr() => this.toString().split(".").last; + bool equalsTo(ExercisePlanDetailState state) => toString() == state.toString(); + bool equalsStringTo(String state) => toString() == state; + String toStr() => toString().split(".").last; } -class ExercisePlanDetail { +class ExercisePlanDetail with Logging { int? exercisePlanDetailId; int? exercisePlanId; late int exerciseTypeId; @@ -31,25 +32,25 @@ class ExercisePlanDetail { String? change; // 1: update -1:delete 0: new ExercisePlanDetail(int exerciseTypeId) { - this.exerciseTypeId = exerciseTypeId; + exerciseTypeId = exerciseTypeId; } ExercisePlanDetail.fromJson(Map json) { - this.exercisePlanDetailId = json['exercisePlanDetailId']; - this.exercisePlanId = json['exercisePlanId']; - this.exerciseTypeId = json['exerciseTypeId']; - this.serie = json['serie']; - this.repeats = json['repeats']; - this.weightEquation = json['weightEquation']; + exercisePlanDetailId = json['exercisePlanDetailId']; + exercisePlanId = json['exercisePlanId']; + exerciseTypeId = json['exerciseTypeId']; + serie = json['serie']; + repeats = json['repeats']; + weightEquation = json['weightEquation']; } ExercisePlanDetail.fromJsonWithExerciseList(Map json) { - this.exercisePlanDetailId = json['exercisePlanDetailId']; - this.exercisePlanId = json['exercisePlanId']; - this.exerciseTypeId = json['exerciseTypeId']; - this.serie = json['serie']; - this.repeats = json['repeats']; - this.weightEquation = json['weightEquation']; + exercisePlanDetailId = json['exercisePlanDetailId']; + exercisePlanId = json['exercisePlanId']; + exerciseTypeId = json['exerciseTypeId']; + serie = json['serie']; + repeats = json['repeats']; + weightEquation = json['weightEquation']; try { final String exercises = json['exercises']; String jsonExercises = exercises.replaceAllMapped( @@ -61,12 +62,12 @@ class ExercisePlanDetail { Iterable iterable = jsonDecode(jsonExercises); this.exercises = iterable.map((exercise) => Exercise.fromJson(exercise)).toList(); } on Exception catch (e) { - print("JsonDecode error " + e.toString()); + log("JsonDecode error $e"); } } Map toJson() => { - "exercisePlanId": exercisePlanId == null ? 0 : exercisePlanId, + "exercisePlanId": exercisePlanId ?? 0, "exerciseTypeId": exerciseTypeId, "serie": serie, "repeats": repeats, diff --git a/lib/model/exercise_plan_template.dart b/lib/model/exercise_plan_template.dart index dc1d710..62ec257 100644 --- a/lib/model/exercise_plan_template.dart +++ b/lib/model/exercise_plan_template.dart @@ -12,13 +12,13 @@ class ExercisePlanTemplate { List exerciseTypes = []; ExercisePlanTemplate.fromJson(Map json) { - this.exercisePlanTemplateId = json['exercisePlanId']; - this.name = json['name']; - this.description = json['description']; - this.templateType = json['templateType']; + exercisePlanTemplateId = json['exercisePlanId']; + name = json['name']; + description = json['description']; + templateType = json['templateType']; if (json['translations'].length > 0) { - this.nameTranslation = AppLanguage().appLocal == Locale('hu') ? json['translations'][0]['name'] : json['name']; - this.descriptionTranslation = AppLanguage().appLocal == Locale('hu') ? json['translations'][0]['description'] : json['description']; + nameTranslation = AppLanguage().appLocal == const Locale('hu') ? json['translations'][0]['name'] : json['name']; + descriptionTranslation = AppLanguage().appLocal == const Locale('hu') ? json['translations'][0]['description'] : json['description']; } if (json['details'] != null && (json['details']).length > 0) { @@ -30,9 +30,9 @@ class ExercisePlanTemplate { return a['sort'] < b['sort'] ? -1 : 1; } }); - details.forEach((element) { + for (var element in details) { exerciseTypes.add(element['exerciseTypeId']); - }); + } } } diff --git a/lib/model/exercise_result.dart b/lib/model/exercise_result.dart index 3924103..195b82d 100644 --- a/lib/model/exercise_result.dart +++ b/lib/model/exercise_result.dart @@ -27,20 +27,20 @@ class ExerciseResult { "exercisePlanId": exercisePlanId, "resultType": resultType, "value": value, - "dateFrom": DateFormat('yyyy-MM-dd HH:mm:ss').format(this.dateFrom), + "dateFrom": DateFormat('yyyy-MM-dd HH:mm:ss').format(dateFrom), "dateTo": formattedDateTo, }; } ExerciseResult.fromJson(Map json) { - this.exerciseResultId = json['exerciseResultId']; - this.exerciseId = json['exerciseId']; - this.exercisePlanId = json['exercisePlanId']; - this.customerId = json['customerId']; - this.resultType = json['resultType']; - this.value = json["value"]; - this.dateFrom = DateTime.parse(json['dateFrom']); - this.dateTo = DateTime.parse(json['dateTo']); - this.resultExtension = ResultExt(itemString: this.resultType); + exerciseResultId = json['exerciseResultId']; + exerciseId = json['exerciseId']; + exercisePlanId = json['exercisePlanId']; + customerId = json['customerId']; + resultType = json['resultType']; + value = json["value"]; + dateFrom = DateTime.parse(json['dateFrom']); + dateTo = DateTime.parse(json['dateTo']); + resultExtension = ResultExt(itemString: resultType); } } diff --git a/lib/model/exercise_tree.dart b/lib/model/exercise_tree.dart index b2ad6b0..f49e71a 100644 --- a/lib/model/exercise_tree.dart +++ b/lib/model/exercise_tree.dart @@ -28,18 +28,18 @@ class ExerciseTree { ExerciseTree(); ExerciseTree.fromJson(Map json) { - this.treeId = json['treeId']; - this.name = json['name']; - this.parentId = 0; - this.imageUrl = json['imageUrl']; - this.active = json['active']; - this.nameTranslation = json['translations'] != null && (json['translations']).length > 0 ? json['translations'][0]['name'] : this.name; - this.descriptionTranslation = + treeId = json['treeId']; + name = json['name']; + parentId = 0; + imageUrl = json['imageUrl']; + active = json['active']; + nameTranslation = json['translations'] != null && (json['translations']).length > 0 ? json['translations'][0]['name'] : name; + descriptionTranslation = json['translations'] != null && (json['translations']).length > 0 && json['translations'][0]['description'] != null ? json['translations'][0]['description'] - : this.description; - this.sort = 99; - this.internalName = json['internalName']; + : description; + sort = 99; + internalName = json['internalName']; } Map toJson() { @@ -57,19 +57,19 @@ class ExerciseTree { } @override - String toString() => this.toJson().toString(); + String toString() => toJson().toString(); ExerciseTree copy(int parentId) { ExerciseTree newTree = ExerciseTree(); - newTree.treeId = this.treeId; - newTree.name = this.name; - newTree.imageUrl = this.imageUrl; - newTree.nameTranslation = this.nameTranslation; + newTree.treeId = treeId; + newTree.name = name; + newTree.imageUrl = imageUrl; + newTree.nameTranslation = nameTranslation; if (parentId != -1) { newTree.parentId = parentId; } - newTree.active = this.active; - newTree.sort = this.sort == null ? 99 : this.sort; + newTree.active = active; + newTree.sort = sort ?? 99; return newTree; } diff --git a/lib/model/exercise_tree_parents.dart b/lib/model/exercise_tree_parents.dart index 829e894..6d897eb 100644 --- a/lib/model/exercise_tree_parents.dart +++ b/lib/model/exercise_tree_parents.dart @@ -5,9 +5,9 @@ class ExerciseTreeParents { late int sort; ExerciseTreeParents.fromJson(Map json) { - this.exerciseTreeParentsId = json['exerciseTreeParentsId']; - this.exerciseTreeParentId = json['exerciseTreeParentId']; - this.exerciseTreeChildId = json['exerciseTreeChildId']; - this.sort = json['sort']; + exerciseTreeParentsId = json['exerciseTreeParentsId']; + exerciseTreeParentId = json['exerciseTreeParentId']; + exerciseTreeChildId = json['exerciseTreeChildId']; + sort = json['sort']; } } diff --git a/lib/model/exercise_type.dart b/lib/model/exercise_type.dart index 0a6062c..ebd2334 100644 --- a/lib/model/exercise_type.dart +++ b/lib/model/exercise_type.dart @@ -55,49 +55,49 @@ class ExerciseType { /// custom training plan ExerciseTypeTrainingPlanState trainingPlanState = ExerciseTypeTrainingPlanState.none; - ExerciseType({required this.name, required this.description}); + ExerciseType({required name, required description}); ExerciseType.fromJson(Map json) { - this.exerciseTypeId = json['exerciseTypeId']; - //this.treeId = json['treeId']; - this.name = json['name']; - this.description = json['description']; - this.unit = json['unit']; - this.unitQuantity = json['unitQuantity']; - this.unitQuantityUnit = json['unitQuantityUnit']; - this.active = json['active']; - this.base = json['base']; - this.buddyWarning = json['buddyWarning']; + exerciseTypeId = json['exerciseTypeId']; + //treeId = json['treeId']; + name = json['name']; + description = json['description']; + unit = json['unit']; + unitQuantity = json['unitQuantity']; + unitQuantityUnit = json['unitQuantityUnit']; + active = json['active']; + base = json['base']; + buddyWarning = json['buddyWarning']; if (json['images'].length > 0) { - this.imageUrl = json['images'][0]['url']; + imageUrl = json['images'][0]['url']; } if (json['translations'].length > 0) { - this.nameTranslation = AppLanguage().appLocal == Locale('hu') ? json['translations'][0]['name'] : json['name']; - this.descriptionTranslation = AppLanguage().appLocal == Locale('hu') ? json['translations'][0]['description'] : json['description']; + nameTranslation = AppLanguage().appLocal == const Locale('hu') ? json['translations'][0]['name'] : json['name']; + descriptionTranslation = AppLanguage().appLocal == const Locale('hu') ? json['translations'][0]['description'] : json['description']; } if (json['devices'].length > 0) { final List jsonDevices = json['devices']; - jsonDevices.forEach((device) { - this.devices.add(device['exerciseDeviceId']); - }); + for (var device in jsonDevices) { + devices.add(device['exerciseDeviceId']); + } } if (json['parents'].length > 0) { final List jsonParents = json['parents']; - jsonParents.forEach((parent) { - this.parents.add(parent['exerciseTreeId']); - }); + for (var parent in jsonParents) { + parents.add(parent['exerciseTreeId']); + } } if (json['alternatives'].length > 0) { final List jsonAlternatives = json['alternatives']; - jsonAlternatives.forEach((alternative) { - this.alternatives.add(alternative['exerciseTypeChildId']); - }); + for (var alternative in jsonAlternatives) { + alternatives.add(alternative['exerciseTypeChildId']); + } } } @@ -110,25 +110,25 @@ class ExerciseType { "active": active, "base": base, "buddyWarning": buddyWarning, - "devices": this.devices.toString(), - "nameTranslation": this.nameTranslation, - "parents": this.parents.toString() + "devices": devices.toString(), + "nameTranslation": nameTranslation, + "parents": parents.toString() }; void setAbility(ExerciseAbility ability) { - this.ability = ability; + ability = ability; } ExerciseAbility getAbility() { - return this.ability!; + return ability!; } bool is1RM() { - return this.ability!.equalsTo(ExerciseAbility.oneRepMax); + return ability!.equalsTo(ExerciseAbility.oneRepMax); } @override String toString() { - return this.toJson().toString(); + return toJson().toString(); } } diff --git a/lib/model/exercise_type_device.dart b/lib/model/exercise_type_device.dart index c0e8c3b..0faff3a 100644 --- a/lib/model/exercise_type_device.dart +++ b/lib/model/exercise_type_device.dart @@ -5,7 +5,7 @@ class ExerciseTypeDevice { ExerciseTypeDevice(); ExerciseTypeDevice.fromJson(Map json) { - this.exerciseTypeDeviceId = json['exerciseTypeDeviceId']; - this.exerciseDeviceId = json['exerciseDeviceId']; + exerciseTypeDeviceId = json['exerciseTypeDeviceId']; + exerciseDeviceId = json['exerciseDeviceId']; } } diff --git a/lib/model/faq.dart b/lib/model/faq.dart index 2f4dd2c..8bf967e 100644 --- a/lib/model/faq.dart +++ b/lib/model/faq.dart @@ -10,10 +10,10 @@ class Faq { HashMap descriptionTranslations = HashMap(); Faq.fromJson(Map json) { - this.faqId = json['faqId']; - this.name = json['name']; - this.description = json['description']; - this.sort = json['sort']; + faqId = json['faqId']; + name = json['name']; + description = json['description']; + sort = json['sort']; nameTranslations['en'] = name; descriptionTranslations['en'] = description; @@ -26,12 +26,12 @@ class Faq { } Map toJson() => { - "faqId": this.faqId, - "name": this.name, - "description": this.description, - "nameTranslation": this.nameTranslations.toString(), + "faqId": faqId, + "name": name, + "description": description, + "nameTranslation": nameTranslations.toString(), }; @override - String toString() => this.toJson().toString(); + String toString() => toJson().toString(); } diff --git a/lib/model/fitness_state.dart b/lib/model/fitness_state.dart index e24c109..d2b7a86 100644 --- a/lib/model/fitness_state.dart +++ b/lib/model/fitness_state.dart @@ -8,13 +8,13 @@ class FitnessState { static String advanced = "advanced"; static String professional = "professional"; - FitnessState({required this.value, required this.stateText, required this.explanation}); + FitnessState({required value, required stateText, required explanation}); bool isEqual(FitnessState? state) { if (state == null) { return false; } - return state.value == this.value; + return state.value == value; } @override @@ -33,17 +33,17 @@ class FitnessItem { FitnessItem._internal() { elements.add(FitnessState( - value: FitnessState.beginner, stateText: _capitalize(FitnessState.beginner), explanation: "I am " + FitnessState.beginner)); + value: FitnessState.beginner, stateText: _capitalize(FitnessState.beginner), explanation: "I am ${FitnessState.beginner}")); elements.add(FitnessState( value: FitnessState.intermediate, stateText: _capitalize(FitnessState.intermediate), - explanation: "I am " + FitnessState.intermediate)); + explanation: "I am ${FitnessState.intermediate}")); elements.add(FitnessState( - value: FitnessState.advanced, stateText: _capitalize(FitnessState.advanced), explanation: "I am " + FitnessState.advanced)); + value: FitnessState.advanced, stateText: _capitalize(FitnessState.advanced), explanation: "I am ${FitnessState.advanced}")); elements.add(FitnessState( value: FitnessState.professional, stateText: _capitalize(FitnessState.professional), - explanation: "I am " + FitnessState.professional)); + explanation: "I am ${FitnessState.professional}")); } String _capitalize(String value) { @@ -53,15 +53,15 @@ class FitnessItem { List toList() => elements; FitnessState? getItem(String? value) { - if (value == null || value.length == 0) { + if (value == null || value.isEmpty) { return elements[0]; } FitnessState? selected; - elements.forEach((element) { + for (var element in elements) { if (element.value == value) { selected = element; } - }); + } return selected; } } diff --git a/lib/model/mautic.dart b/lib/model/mautic.dart index 056ed26..834dabb 100644 --- a/lib/model/mautic.dart +++ b/lib/model/mautic.dart @@ -42,5 +42,5 @@ class Mautic { } @override - String toString() => this.toJson().toString(); + String toString() => toJson().toString(); } diff --git a/lib/model/product.dart b/lib/model/product.dart index 0d3744e..27b9950 100644 --- a/lib/model/product.dart +++ b/lib/model/product.dart @@ -15,38 +15,38 @@ class Product { String? localizedPrice; Product.fromJson(Map json) { - this.productId = json['productId']; - this.name = json['name']; - this.description = json['description']; - this.type = json['type']; - this.appVersion = json['appVersion']; - this.sort = json['sort']; - this.productSet = json['productSet']; - this.validFrom = (json['validFrom'] == null ? null : DateTime.parse(json['validFrom']))!; - this.validTo = json['validTo'] == null ? null : DateTime.parse(json['validTo']); - this.productIdIos = json['productIdIos']; - this.productIdAndroid = json['productIdAndroid']; - this.priceIos = json['priceIos']; - this.priceAndroid = json['priceAndroid']; + productId = json['productId']; + name = json['name']; + description = json['description']; + type = json['type']; + appVersion = json['appVersion']; + sort = json['sort']; + productSet = json['productSet']; + validFrom = (json['validFrom'] == null ? null : DateTime.parse(json['validFrom']))!; + validTo = json['validTo'] == null ? null : DateTime.parse(json['validTo']); + productIdIos = json['productIdIos']; + productIdAndroid = json['productIdAndroid']; + priceIos = json['priceIos']; + priceAndroid = json['priceAndroid']; } @override String toString() { Map json = { - 'productId': this.productId, - 'name': this.name, - 'description': this.description, - 'type': this.type, - 'appVersion': this.appVersion, - 'sort': this.sort, - 'productSet': this.productSet, - 'validFrom': this.validFrom, + 'productId': productId, + 'name': name, + 'description': description, + 'type': type, + 'appVersion': appVersion, + 'sort': sort, + 'productSet': productSet, + 'validFrom': validFrom, 'validTo': validTo, - 'productIdIos': this.productIdIos, - 'productIdAndroid': this.productIdAndroid, - 'priceIos': this.priceIos, - 'priceAndroid': this.priceAndroid, - 'localizedPrice': this.localizedPrice + 'productIdIos': productIdIos, + 'productIdAndroid': productIdAndroid, + 'priceIos': priceIos, + 'priceAndroid': priceAndroid, + 'localizedPrice': localizedPrice }; return json.toString(); } diff --git a/lib/model/property.dart b/lib/model/property.dart index cb137bc..280397c 100644 --- a/lib/model/property.dart +++ b/lib/model/property.dart @@ -8,15 +8,16 @@ class Property { double? value; Property.fromJson(Map json) { - this.propertyId = json['propertyId']; - this.propertyName = json['propertyName']; - this.propertyUnit = json['propertyUnit']; - this.propertyNameTranslation = + propertyId = json['propertyId']; + propertyName = json['propertyName']; + propertyUnit = json['propertyUnit']; + propertyNameTranslation = json['translations'] != null && (json['translations']).length > 0 ? json['translations'][0]['propertyName'] - : this.propertyName; + : propertyName; } + @override String toString() { Map json = { "propertyId": propertyId, diff --git a/lib/model/purchase.dart b/lib/model/purchase.dart index 2e436ff..952f5b9 100644 --- a/lib/model/purchase.dart +++ b/lib/model/purchase.dart @@ -9,15 +9,15 @@ class Purchase { late double purchaseSum; late String currency; - Purchase({required this.customerId, required this.productId}); + Purchase({required customerId, required productId}); Purchase.fromJson(Map json) { - this.purchaseId = json['purchaseId']; - this.customerId = json['customerId']; - this.productId = json['productId']; - this.dateAdd = DateTime.parse(json['dateAdd']); - this.purchaseSum = json['purchaseSum']; - this.currency = json['currency']; + purchaseId = json['purchaseId']; + customerId = json['customerId']; + productId = json['productId']; + dateAdd = DateTime.parse(json['dateAdd']); + purchaseSum = json['purchaseSum']; + currency = json['currency']; } Map toJson() => { @@ -25,7 +25,7 @@ class Purchase { "customerId": customerId, "productId": productId, "purchaseSum": purchaseSum, - "dateAdd": DateFormat('yyyy-MM-dd HH:mm:ss').format(this.dateAdd), + "dateAdd": DateFormat('yyyy-MM-dd HH:mm:ss').format(dateAdd), "currency": currency, }; } diff --git a/lib/model/result.dart b/lib/model/result.dart index 9fabf3c..7d3e943 100644 --- a/lib/model/result.dart +++ b/lib/model/result.dart @@ -59,8 +59,8 @@ extension ResultItemExt on ResultItem { ResultItem.fatburn_percent: true, }; - bool equals(ResultItem item) => this.toString() == item.toString(); - bool equalsString(String item) => this.description == item; + bool equals(ResultItem item) => toString() == item.toString(); + bool equalsString(String item) => description == item; String? get description => ResultItemDesc[this]; String? get image => ResultItemImg[this]; @@ -78,24 +78,24 @@ class ResultExt { DateTime? dateTo; - ResultExt({required this.itemString}) { - ResultItem.values.forEach((element) { + ResultExt({required itemString}) { + for (var element in ResultItem.values) { if (element.equalsString(itemString)) { item = element; } - }); + } } String? getDescription() => item.description; - String getImage() => "asset/image/" + item.image!; + String getImage() => "asset/image/${item.image!}"; bool? isHardware() => item.isHardware; int? get getExerciseId => exerciseId; - set setExerciseId(int exerciseId) => this.exerciseId = exerciseId; - set setDateFrom(DateTime dateFrom) => this.dateFrom = dateFrom; + set setExerciseId(int exerciseId) => exerciseId = exerciseId; + set setDateFrom(DateTime dateFrom) => dateFrom = dateFrom; DateTime? get getDateFrom => dateFrom; - set setDateTo(DateTime dateTo) => this.dateTo = dateTo; + set setDateTo(DateTime dateTo) => dateTo = dateTo; DateTime? get getDateTo => dateTo; - bool equals(ResultItem item) => this.item.equals(item); + bool equals(ResultItem item) => item.equals(item); bool equalsString(String item) => this.item.equalsString(item); } diff --git a/lib/model/split_test.dart b/lib/model/split_test.dart index a2917c1..65ac79d 100644 --- a/lib/model/split_test.dart +++ b/lib/model/split_test.dart @@ -9,26 +9,26 @@ class SplitTest { DateTime? validTo; SplitTest.fromJson(Map json) { - this.testId = json['testId']; - this.name = json['name']; - this.remoteConfigKey = json['remoteConfigKey']; - this.remoteConfigValue = json['remoteConfigValue']; - this.testValue = json['testValue']; - this.source = json['source']; - this.active = json['active']; - this.validTo = json['validTo'] == null ? null : DateTime.parse(json['validTo']); + testId = json['testId']; + name = json['name']; + remoteConfigKey = json['remoteConfigKey']; + remoteConfigValue = json['remoteConfigValue']; + testValue = json['testValue']; + source = json['source']; + active = json['active']; + validTo = json['validTo'] == null ? null : DateTime.parse(json['validTo']); } @override String toString() { Map json = { - 'productId': this.testId, - 'name': this.name, - 'remoteConfigKey': this.remoteConfigKey, - 'remoteConfigValue': this.remoteConfigValue, - 'testValue': this.testValue, - 'source': this.source, - 'active': this.active, + 'productId': testId, + 'name': name, + 'remoteConfigKey': remoteConfigKey, + 'remoteConfigValue': remoteConfigValue, + 'testValue': testValue, + 'source': source, + 'active': active, 'validTo': validTo, }; return json.toString(); diff --git a/lib/model/sport.dart b/lib/model/sport.dart index 31a94c7..507110e 100644 --- a/lib/model/sport.dart +++ b/lib/model/sport.dart @@ -7,8 +7,8 @@ class Sport { HashMap nameTranslations = HashMap(); Sport.fromJson(Map json) { - this.sportId = json['sportId']; - this.name = json['name']; + sportId = json['sportId']; + name = json['name']; nameTranslations['en'] = name; if (json['translations'] != null && json['translations'].length > 0) { @@ -25,6 +25,6 @@ class Sport { @override String toString() { - return this.toJson().toString(); + return toJson().toString(); } } diff --git a/lib/model/tracking.dart b/lib/model/tracking.dart index e0d2c36..93b7003 100644 --- a/lib/model/tracking.dart +++ b/lib/model/tracking.dart @@ -14,11 +14,11 @@ class Tracking { Map toJson() => { "customerId": customerId, - "dateAdd": DateFormat('yyyy-MM-dd HH:mm:ss').format(this.dateAdd), + "dateAdd": DateFormat('yyyy-MM-dd HH:mm:ss').format(dateAdd), "event": event, "eventValue": eventValue, "area": Platform.localeName, "platform": Platform.isAndroid ? "Android" : "iOS", - "version": Cache().packageInfo != null ? Cache().packageInfo!.version + "+" + Cache().packageInfo!.buildNumber : "" + "version": Cache().packageInfo != null ? "${Cache().packageInfo!.version}+${Cache().packageInfo!.buildNumber}" : "" }; } diff --git a/lib/model/training_evaluation_exercise.dart b/lib/model/training_evaluation_exercise.dart index 72fe743..5a52b7f 100644 --- a/lib/model/training_evaluation_exercise.dart +++ b/lib/model/training_evaluation_exercise.dart @@ -5,9 +5,9 @@ import 'package:flutter/material.dart'; enum TrainingEvaluationExerciseType { weightBased, repeatBased, secondBased } extension TrainingEvaluationExerciseTypeExt on TrainingEvaluationExerciseType { - String toStr() => this.toString().split(".").last; - bool equalsTo(TrainingEvaluationExerciseType value) => this.toString() == value.toString(); - bool equalsStringTo(String value) => this.toString() == value; + String toStr() => toString().split(".").last; + bool equalsTo(TrainingEvaluationExerciseType value) => toString() == value.toString(); + bool equalsStringTo(String value) => toString() == value; } class TrainingEvaluationExercise { diff --git a/lib/model/training_plan.dart b/lib/model/training_plan.dart index a0789aa..48288c0 100644 --- a/lib/model/training_plan.dart +++ b/lib/model/training_plan.dart @@ -18,14 +18,14 @@ class TrainingPlan { List? details; TrainingPlan.fromJson(Map json) { - this.trainingPlanId = json['trainingPlanId']; - this.name = json['name']; - this.type = json['type']; - this.internalName = json['internalName']; - this.description = json['description']; - this.free = json['free']; - this.active = json['active']; - this.treeId = json['treeId']; + trainingPlanId = json['trainingPlanId']; + name = json['name']; + type = json['type']; + internalName = json['internalName']; + description = json['description']; + free = json['free']; + active = json['active']; + treeId = json['treeId']; nameTranslations['en'] = name; descriptionTranslations['en'] = description ?? ""; @@ -58,17 +58,17 @@ class TrainingPlan { } Map toJson() => { - "trainingPlanId": this.trainingPlanId, - "treeId": this.treeId, - "name": this.name, - "type": this.type, - "internalName": this.internalName, - "free": this.free, - "active": this.active, - "description": this.description, - "nameTranslation": this.nameTranslations.toString(), + "trainingPlanId": trainingPlanId, + "treeId": treeId, + "name": name, + "type": type, + "internalName": internalName, + "free": free, + "active": active, + "description": description, + "nameTranslation": nameTranslations.toString(), }; @override - String toString() => this.toJson().toString(); + String toString() => toJson().toString(); } diff --git a/lib/model/training_plan_day.dart b/lib/model/training_plan_day.dart index 8286eb7..79e2c97 100644 --- a/lib/model/training_plan_day.dart +++ b/lib/model/training_plan_day.dart @@ -7,8 +7,8 @@ class TrainingPlanDay { HashMap nameTranslations = HashMap(); TrainingPlanDay.fromJson(Map json) { - this.dayId = json['dayId']; - this.name = json['name']; + dayId = json['dayId']; + name = json['name']; nameTranslations['en'] = name; if (json['translations'] != null && json['translations'].length > 0) { @@ -19,11 +19,11 @@ class TrainingPlanDay { } Map toJson() => { - "dayId": this.dayId, - "name": this.name, - "nameTranslation": this.nameTranslations.toString(), + "dayId": dayId, + "name": name, + "nameTranslation": nameTranslations.toString(), }; @override - String toString() => this.toJson().toString(); + String toString() => toJson().toString(); } diff --git a/lib/model/training_plan_detail.dart b/lib/model/training_plan_detail.dart index ccac359..b6f0e3b 100644 --- a/lib/model/training_plan_detail.dart +++ b/lib/model/training_plan_detail.dart @@ -13,32 +13,32 @@ class TrainingPlanDetail { String? summary; TrainingPlanDetail.fromJson(Map json) { - this.trainingPlanDetailId = json['trainingPlanDetailId']; - this.trainingPlanId = json['trainingPlanId']; - this.exerciseTypeId = json['exerciseTypeId']; - this.sort = json['sort']; - this.set = json['set']; - this.repeats = json['repeats']; - this.weight = json['weight']; - this.restingTime = json['restingTime']; - this.parallel = json['parallel']; - this.dayId = json['dayId']; + trainingPlanDetailId = json['trainingPlanDetailId']; + trainingPlanId = json['trainingPlanId']; + exerciseTypeId = json['exerciseTypeId']; + sort = json['sort']; + set = json['set']; + repeats = json['repeats']; + weight = json['weight']; + restingTime = json['restingTime']; + parallel = json['parallel']; + dayId = json['dayId']; } Map toJson() => { - "trainingPlanDetailId": this.trainingPlanDetailId, - "trainingPlanId": this.trainingPlanId, - "exerciseType": this.exerciseTypeId, - "sort": this.sort, - "repeats": this.repeats, - "weight": this.weight, - "restingTime": this.restingTime, - "parallel": this.parallel, - "dayId": this.dayId, - "day": this.day, - "summary": this.summary, + "trainingPlanDetailId": trainingPlanDetailId, + "trainingPlanId": trainingPlanId, + "exerciseType": exerciseTypeId, + "sort": sort, + "repeats": repeats, + "weight": weight, + "restingTime": restingTime, + "parallel": parallel, + "dayId": dayId, + "day": day, + "summary": summary, }; @override - String toString() => this.toJson().toString(); + String toString() => toJson().toString(); } diff --git a/lib/model/tutorial.dart b/lib/model/tutorial.dart index 15cd9aa..8ee5937 100644 --- a/lib/model/tutorial.dart +++ b/lib/model/tutorial.dart @@ -9,8 +9,8 @@ class Tutorial { List? steps; Tutorial.fromJson(Map json) { - this.tutorialId = json['tutorialId']; - this.name = json['name']; + tutorialId = json['tutorialId']; + name = json['name']; if (json['steps'] != null && json['steps'].length > 0) { steps = json['steps'].map((step) => TutorialStep.fromJson(step)).toList(); @@ -30,8 +30,8 @@ class Tutorial { } } - Map toJson() => {'tutorialId': this.tutorialId, 'name': this.name, 'steps': steps.toString()}; + Map toJson() => {'tutorialId': tutorialId, 'name': name, 'steps': steps.toString()}; @override - String toString() => this.toJson().toString(); + String toString() => toJson().toString(); } diff --git a/lib/model/tutorial_step.dart b/lib/model/tutorial_step.dart index d999b44..0e2bcb9 100644 --- a/lib/model/tutorial_step.dart +++ b/lib/model/tutorial_step.dart @@ -18,33 +18,33 @@ class TutorialStepAction { late int parent; TutorialStepAction.fromJson(Map json) { - this.direction = json['direction']; - this.top = json['top']; - this.left = json['left']; - this.showBubble = json['show_bubble']; - this.bubbleX = json['bubble_x']; - this.bubbleY = json['bubble_y']; - this.bubbleWidth = json['bubble_width']; - this.bubbleHeight = json['bubble_height']; - this.showCheckText = json['show_check_text']; - this.parent = json['parent']; + direction = json['direction']; + top = json['top']; + left = json['left']; + showBubble = json['show_bubble']; + bubbleX = json['bubble_x']; + bubbleY = json['bubble_y']; + bubbleWidth = json['bubble_width']; + bubbleHeight = json['bubble_height']; + showCheckText = json['show_check_text']; + parent = json['parent']; } Map toJson() => { - "direction": this.direction, - "top": this.top, - "left": this.left, - "showBubble": this.showBubble, - "bubbleX": this.bubbleX, - "bubbleY": this.bubbleY, - "bubbleWidth": this.bubbleWidth, - "bubbleHeight": this.bubbleHeight, - "showCheckText": this.showCheckText, - "parent": this.parent, + "direction": direction, + "top": top, + "left": left, + "showBubble": showBubble, + "bubbleX": bubbleX, + "bubbleY": bubbleY, + "bubbleWidth": bubbleWidth, + "bubbleHeight": bubbleHeight, + "showCheckText": showCheckText, + "parent": parent, }; @override - String toString() => this.toJson().toString(); + String toString() => toJson().toString(); } class TutorialStep { @@ -63,36 +63,36 @@ class TutorialStep { String? errorTextTranslation; TutorialStep.fromJson(Map json) { - this.tutorialStepId = json['tutorialStepId']; - this.tutorialId = json['tutorialId']; - this.step = json['step']; - this.tutorialText = json['tutorialText']; - this.checkText = json['checkText']; - this.condition = json['condition']; - if (this.condition != null) { - this.condition = condition!.replaceAll(r'\\', "replace"); - this.action = TutorialStepAction.fromJson(jsonDecode(condition!)); + tutorialStepId = json['tutorialStepId']; + tutorialId = json['tutorialId']; + step = json['step']; + tutorialText = json['tutorialText']; + checkText = json['checkText']; + condition = json['condition']; + if (condition != null) { + condition = condition!.replaceAll(r'\\', "replace"); + action = TutorialStepAction.fromJson(jsonDecode(condition!)); } if (json['translations'] != null && json['translations'].length > 0) { - this.tutorialTextTranslation = - AppLanguage().appLocal == Locale('hu') ? json['translations'][0]['tutorialText'] : json['tutorialText']; - this.errorTextTranslation = AppLanguage().appLocal == Locale('hu') ? json['translations'][0]['errorText'] : json['errorText']; + tutorialTextTranslation = + AppLanguage().appLocal == const Locale('hu') ? json['translations'][0]['tutorialText'] : json['tutorialText']; + errorTextTranslation = AppLanguage().appLocal == const Locale('hu') ? json['translations'][0]['errorText'] : json['errorText']; } } Map toJson() => { - "tutorialStepId": this.tutorialStepId, - "tutorialId": this.tutorialId, - "step": this.step, - "tutorialText": this.tutorialText, - "checkText": this.checkText, - "tutorialTextTranslation": this.tutorialTextTranslation, - "errorTextTranslation": this.errorTextTranslation, - "condition": this.condition, - "action": this.action != null ? this.action!.toJson() : "" + "tutorialStepId": tutorialStepId, + "tutorialId": tutorialId, + "step": step, + "tutorialText": tutorialText, + "checkText": checkText, + "tutorialTextTranslation": tutorialTextTranslation, + "errorTextTranslation": errorTextTranslation, + "condition": condition, + "action": action != null ? action!.toJson() : "" }; @override - String toString() => this.toJson().toString(); + String toString() => toJson().toString(); } diff --git a/lib/model/workout_menu_tree.dart b/lib/model/workout_menu_tree.dart index cd1943c..7928ce7 100644 --- a/lib/model/workout_menu_tree.dart +++ b/lib/model/workout_menu_tree.dart @@ -12,8 +12,8 @@ extension WorkoutTypeExt on WorkoutType { WorkoutType.staticExercise: "Static" }; - bool equals(WorkoutType type) => this.toString() == type.toString(); - bool equalsString(String type) => this.toString() == type; + bool equals(WorkoutType type) => toString() == type.toString(); + bool equalsString(String type) => toString() == type; String? get menu => WorkoutTypeMenu[this]; } @@ -43,23 +43,23 @@ class WorkoutMenuTree { late String internalName; WorkoutMenuTree( - this.id, - this.parent, - this.name, - this.imageName, - this.color, - this.fontSize, - this.child, - this.exerciseTypeId, - this.exerciseType, - this.base, - this.is1RM, - this.isRunning, - this.nameEnglish, - this.parentName, - this.parentNameEnglish, - this.sort, - this.internalName); + id, + parent, + name, + imageName, + color, + fontSize, + child, + exerciseTypeId, + exerciseType, + base, + is1RM, + isRunning, + nameEnglish, + parentName, + parentNameEnglish, + sort, + internalName); Map toJson() { return { @@ -81,6 +81,6 @@ class WorkoutMenuTree { @override String toString() { - return this.toJson().toString(); + return toJson().toString(); } } diff --git a/lib/repository/customer_exercise_device_repository.dart b/lib/repository/customer_exercise_device_repository.dart index 2f43554..3bd82ce 100644 --- a/lib/repository/customer_exercise_device_repository.dart +++ b/lib/repository/customer_exercise_device_repository.dart @@ -7,26 +7,26 @@ import 'package:workouttest_util/service/customer_exercise_device_service.dart'; class CustomerExerciseDeviceRepository { List _devices = []; - List getDevices() => this._devices; + List getDevices() => _devices; - void setDevices(List devices) => this._devices = devices; + void setDevices(List devices) => _devices = devices; Future?> getDBDevices() async { if (Cache().userLoggedIn != null) { final int customerId = Cache().userLoggedIn!.customerId!; - this._devices = await CustomerExerciseDeviceApi().getDevices(customerId); + _devices = await CustomerExerciseDeviceApi().getDevices(customerId); } - return this._devices; + return _devices; } Future addDevice(ExerciseDevice device) async { CustomerExerciseDevice? found; - this._devices.forEach((element) { + for (var element in _devices) { if (element.exerciseDeviceId == device.exerciseDeviceId) { found = element; } - }); + } if (found == null) { int? customerId; @@ -37,7 +37,7 @@ class CustomerExerciseDeviceRepository { CustomerExerciseDevice(customerId: customerId!, exerciseDeviceId: device.exerciseDeviceId, favourite: false); newDevice.change = ModelChange.add; CustomerExerciseDevice saved = await CustomerExerciseDeviceApi().addDevice(newDevice); - this._devices.add(saved); + _devices.add(saved); Cache().setCustomerDevices(_devices); } } @@ -45,16 +45,16 @@ class CustomerExerciseDeviceRepository { Future removeDevice(ExerciseDevice device) async { CustomerExerciseDevice? found; - this._devices.forEach((element) { + for (var element in _devices) { if (element.exerciseDeviceId == device.exerciseDeviceId) { found = element; } - }); + } if (found != null) { - this._devices.remove(found); + _devices.remove(found); //if (found.change != ModelChange.add) { - await CustomerExerciseDeviceApi().removeDevice(found!.customerExerciseDeviceId!); + await CustomerExerciseDeviceApi().removeDevice(found.customerExerciseDeviceId!); //} Cache().setCustomerDevices(_devices); } @@ -63,11 +63,11 @@ class CustomerExerciseDeviceRepository { bool hasDevice(int exerciseDeviceId) { bool found = false; - this._devices.forEach((element) { + for (var element in _devices) { if (element.exerciseDeviceId == exerciseDeviceId) { found = true; } - }); + } return found; } diff --git a/lib/repository/customer_repository.dart b/lib/repository/customer_repository.dart index cf8a0be..e419093 100644 --- a/lib/repository/customer_repository.dart +++ b/lib/repository/customer_repository.dart @@ -50,54 +50,54 @@ class CustomerRepository with Logging { String? getGenderByName(String name) { String? dbValue; - genders.forEach((element) { + for (var element in genders) { if (element.name == name) { dbValue = element.dbValue; } - }); + } return dbValue; } String? getGenderByDBValue(String dbValue) { String? name; - genders.forEach((element) { + for (var element in genders) { if (element.dbValue == dbValue) { name = element.name; } - }); + } return name; } String? get name { - return this.customer != null && this.customer!.name != null ? this.customer!.name : ""; + return customer != null && customer!.name != null ? customer!.name : ""; } String? get firstName { - return this.customer != null && this.customer!.firstname != null ? this.customer!.firstname : ""; + return customer != null && customer!.firstname != null ? customer!.firstname : ""; } String get sex { - if (this.customer == null) throw Exception("Initialize the customer object"); - return this.customer!.sex == "m" ? "Man" : "Woman"; + if (customer == null) throw Exception("Initialize the customer object"); + return customer!.sex == "m" ? "Man" : "Woman"; } int? get birthYear { - if (this.customer == null) throw Exception("Initialize the customer object"); - return this.customer!.birthYear; + if (customer == null) throw Exception("Initialize the customer object"); + return customer!.birthYear; } String? get goal { - if (this.customer == null) throw Exception("Initialize the customer object"); - return this.customer!.goal; + if (customer == null) throw Exception("Initialize the customer object"); + return customer!.goal; } String? getSportString() { - if (this.customer == null) throw Exception("Initialize the customer object"); + if (customer == null) throw Exception("Initialize the customer object"); String? sport; List? sports = Cache().getSports(); if (sports != null) { for (Sport sportObject in sports) { - if (sportObject.sportId == this.customer!.sportId) { + if (sportObject.sportId == customer!.sportId) { sport = sportObject.name; break; } @@ -107,12 +107,12 @@ class CustomerRepository with Logging { } Sport? getSport() { - if (this.customer == null) throw Exception("Initialize the customer object"); + if (customer == null) throw Exception("Initialize the customer object"); Sport? sport; List? sports = Cache().getSports(); if (sports != null) { for (Sport sportObject in sports) { - if (sportObject.sportId == this.customer!.sportId) { + if (sportObject.sportId == customer!.sportId) { sport = sportObject; break; } @@ -122,69 +122,69 @@ class CustomerRepository with Logging { } String? get fitnessLevel { - if (this.customer == null) throw Exception("Initialize the customer object"); - return this.customer!.fitnessLevel; + if (customer == null) throw Exception("Initialize the customer object"); + return customer!.fitnessLevel; } String? get bodyType { - if (this.customer == null) throw Exception("Initialize the customer object"); - return this.customer!.bodyType; + if (customer == null) throw Exception("Initialize the customer object"); + return customer!.bodyType; } setName(String name) { - if (this.customer == null) throw Exception("Initialize the customer object"); - this.customer!.name = name; + if (customer == null) throw Exception("Initialize the customer object"); + customer!.name = name; } setFirstName(String firstName) { - if (this.customer == null) throw Exception("Initialize the customer object"); - this.customer!.firstname = firstName; + if (customer == null) throw Exception("Initialize the customer object"); + customer!.firstname = firstName; } setPassword(String password) { - if (this.customer == null) throw Exception("Initialize the customer object"); - this.customer!.password = password; + if (customer == null) throw Exception("Initialize the customer object"); + customer!.password = password; } setEmail(String email) { - if (this.customer == null) throw Exception("Initialize the customer object"); - this.customer!.email = email; + if (customer == null) throw Exception("Initialize the customer object"); + customer!.email = email; } setSex(String sex) { - if (this.customer == null) throw Exception("Initialize the customer object"); - this.customer!.sex = sex; + if (customer == null) throw Exception("Initialize the customer object"); + customer!.sex = sex; } setWeight(double weight) { - final propertyName = "Weight"; - this.setCustomerProperty(propertyName, weight); + const propertyName = "Weight"; + setCustomerProperty(propertyName, weight); } setHeight(int height) { - final propertyName = "Height"; - this.setCustomerProperty(propertyName, height.toDouble()); + const propertyName = "Height"; + setCustomerProperty(propertyName, height.toDouble()); } setCustomerProperty(String propertyName, double value, {id = 0}) { - if (this.customer == null) { + if (customer == null) { throw Exception("Initialize the customer object"); } - if (this.customer!.properties[propertyName] == null) { - this.customer!.properties[propertyName] = CustomerProperty( + if (customer!.properties[propertyName] == null) { + customer!.properties[propertyName] = CustomerProperty( propertyId: propertyRepository.getPropertyByName("Height")!.propertyId, - customerId: this.customer!.customerId == null ? 0 : this.customer!.customerId!, + customerId: customer!.customerId == null ? 0 : customer!.customerId!, propertyValue: value, dateAdd: DateTime.now()); } else { - this.customer!.properties[propertyName]!.propertyValue = value; + customer!.properties[propertyName]!.propertyValue = value; } - this.customer!.properties[propertyName]!.dateAdd = DateTime.now(); - this.customer!.properties[propertyName]!.newData = true; + customer!.properties[propertyName]!.dateAdd = DateTime.now(); + customer!.properties[propertyName]!.newData = true; if (id > 0) { - this.customer!.properties[propertyName]!.customerPropertyId = id; + customer!.properties[propertyName]!.customerPropertyId = id; } - Cache().addCustomerProperty(this.customer!.properties[propertyName]!); + Cache().addCustomerProperty(customer!.properties[propertyName]!); } double getWeight() { @@ -196,40 +196,40 @@ class CustomerRepository with Logging { } double getCustomerPropertyValue(String propertyName) { - if (this.customer == null || this.customer!.properties[propertyName] == null) { + if (customer == null || customer!.properties[propertyName] == null) { return 0.0; } else { - return this.customer!.properties[propertyName]!.propertyValue; + return customer!.properties[propertyName]!.propertyValue; } } CustomerProperty? getCustomerProperty(String propertyName) { - if (this.customer == null) throw Exception("Initialize the customer object"); - return this.customer!.properties[propertyName]; + if (customer == null) throw Exception("Initialize the customer object"); + return customer!.properties[propertyName]; } setBirthYear(int birthYear) { - if (this.customer == null) throw Exception("Initialize the customer object"); - this.customer!.birthYear = birthYear; + if (customer == null) throw Exception("Initialize the customer object"); + customer!.birthYear = birthYear; } setFitnessLevel(String level) { - if (this.customer == null) throw Exception("Initialize the customer object"); - this.customer!.fitnessLevel = level; + if (customer == null) throw Exception("Initialize the customer object"); + customer!.fitnessLevel = level; } setGoal(String goal) { - if (this.customer == null) throw Exception("Initialize the customer object"); - this.customer!.goal = goal; + if (customer == null) throw Exception("Initialize the customer object"); + customer!.goal = goal; } setSportString(String selectedSport) { - if (this.customer == null) throw Exception("Initialize the customer object"); + if (customer == null) throw Exception("Initialize the customer object"); List? sports = Cache().getSports(); if (sports != null) { for (Sport sportObject in sports) { if (sportObject.name == selectedSport) { - this.customer!.sportId = sportObject.sportId; + customer!.sportId = sportObject.sportId; break; } } @@ -237,40 +237,36 @@ class CustomerRepository with Logging { } setBodyType(String bodyType) { - if (this.customer == null) throw Exception("Initialize the customer object"); - this.customer!.bodyType = bodyType; + if (customer == null) throw Exception("Initialize the customer object"); + customer!.bodyType = bodyType; } createNew() { - this.customer = Customer(); + customer = Customer(); } Customer getCustomer() { - if (this.customer == null) throw Exception("Initialize the customer object"); - return this.customer!; + if (customer == null) throw Exception("Initialize the customer object"); + return customer!; } void setCustomer(Customer customer) { - this.customer = customer; + customer = customer; } Future addCustomer() async { - if (this.customer == null) throw Exception("Initialize the customer object"); + if (customer == null) throw Exception("Initialize the customer object"); final Customer modelCustomer = customer!; await CustomerApi().addCustomer(modelCustomer); } Future saveCustomer() async { - if (this.customer == null) throw Exception("Initialize the customer object"); + if (customer == null) throw Exception("Initialize the customer object"); final Customer modelCustomer = customer!; - if (modelCustomer.sex == null) { - modelCustomer.sex = "m"; - } - if (modelCustomer.fitnessLevel == null) { - modelCustomer.fitnessLevel = "beginner"; - } + modelCustomer.sex ??= "m"; + modelCustomer.fitnessLevel ??= "beginner"; await CustomerApi().saveCustomer(modelCustomer); - await this.saveProperties(modelCustomer.properties); + await saveProperties(modelCustomer.properties); } Future saveProperties(LinkedHashMap properties) async { @@ -283,8 +279,8 @@ class CustomerRepository with Logging { } Future savePropertyByName(String name) async { - await Future.forEach(this._properties!, (element) async { - final CustomerProperty customerProperty = element as CustomerProperty; + await Future.forEach(_properties!, (element) async { + final CustomerProperty customerProperty = element; final Property? property = propertyRepository.getPropertyByName(name); if (property != null) { if (property.propertyId == customerProperty.propertyId) { @@ -295,26 +291,26 @@ class CustomerRepository with Logging { } Future getTraineeAsCustomer() async { - this._trainee = await CustomerApi().getTrainee(Cache().userLoggedIn!.customerId!); + _trainee = await CustomerApi().getTrainee(Cache().userLoggedIn!.customerId!); return _trainee; } Future?> getTrainees() async { int trainerId = Cache().userLoggedIn!.customerId!; final results = await CustomerApi().getTrainees(trainerId); - this._trainees = results; + _trainees = results; return results; } Future> getAllCustomerProperties() async { int customerId = Cache().userLoggedIn!.customerId!; final results = await CustomerApi().getAllProperties(customerId); - this._properties = results; + _properties = results; return results; } List? getAllProperties() { - return this._properties; + return _properties; } List? getTraineesList() { @@ -325,11 +321,11 @@ class CustomerRepository with Logging { if (_trainees == null) { return; } - _trainees!.forEach((element) { + for (var element in _trainees!) { if (traineeId == element.customerId) { - this._trainee = element; + _trainee = element; } - }); + } } void emptyTrainees() { @@ -338,18 +334,18 @@ class CustomerRepository with Logging { } Customer? getTrainee() { - return this._trainee; + return _trainee; } Customer? getTraineeById(int customerId) { if (_trainees == null) { return null; } - _trainees!.forEach((element) { + for (var element in _trainees!) { if (customerId == element.customerId) { - this._trainee = element; + _trainee = element; } - }); + } return _trainee; } @@ -364,13 +360,13 @@ class CustomerRepository with Logging { } void setMediaDimensions(double width, double height) { - this.mediaHeight = height; - this.mediaWidth = width; - this.addSizes(this.sex); + mediaHeight = height; + mediaWidth = width; + addSizes(sex); } void addSizes(String sex) { - if (this.customer == null) throw Exception("Initialize the customer object"); + if (customer == null) throw Exception("Initialize the customer object"); List? properties = Cache().getProperties(); if (properties == null) { return; @@ -378,139 +374,139 @@ class CustomerRepository with Logging { final double distortionWidth = mediaWidth / baseWidth; final double distortionHeight = mediaHeight / baseHeight; if (isMan) { - properties.forEach((element) { + for (var element in properties) { if (element.propertyName == "Shoulder") { element.top = (122 * distortionHeight).toInt(); element.left = (130 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Shoulder"); + element.value = customer!.getProperty("Shoulder"); manSizes.add(element); } else if (element.propertyName == "Neck") { element.top = (68 * distortionHeight).toInt(); element.left = (130 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Neck"); + element.value = customer!.getProperty("Neck"); manSizes.add(element); } else if (element.propertyName == "Biceps") { element.top = (178 * distortionHeight).toInt(); element.left = (208 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Biceps"); + element.value = customer!.getProperty("Biceps"); manSizes.add(element); } else if (element.propertyName == "Chest") { element.top = (154 * distortionHeight).toInt(); element.left = (130 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Chest"); + element.value = customer!.getProperty("Chest"); manSizes.add(element); } else if (element.propertyName == "Belly") { element.top = (244 * distortionHeight).toInt(); element.left = (130 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Belly"); + element.value = customer!.getProperty("Belly"); manSizes.add(element); } else if (element.propertyName == "Hip") { element.top = (308 * distortionHeight).toInt(); element.left = (130 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Hip"); + element.value = customer!.getProperty("Hip"); manSizes.add(element); } else if (element.propertyName == "Thigh Top") { element.top = (332 * distortionHeight).toInt(); element.left = (165 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Thigh Top"); + element.value = customer!.getProperty("Thigh Top"); manSizes.add(element); } else if (element.propertyName == "Thigh Middle") { element.top = (382 * distortionHeight).toInt(); element.left = (100 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Thigh Middle"); + element.value = customer!.getProperty("Thigh Middle"); manSizes.add(element); } else if (element.propertyName == "Knee") { element.top = (464 * distortionHeight).toInt(); element.left = (97 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Knee"); + element.value = customer!.getProperty("Knee"); manSizes.add(element); } else if (element.propertyName == "Calf") { element.top = (520 * distortionHeight).toInt(); element.left = (97 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Calf"); + element.value = customer!.getProperty("Calf"); manSizes.add(element); } else if (element.propertyName == "Ankle") { element.top = (620 * distortionHeight).toInt(); element.left = (150 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Ankle"); + element.value = customer!.getProperty("Ankle"); manSizes.add(element); } else if (element.propertyName == "Weight") { element.top = (402 * distortionHeight).toInt(); element.left = (240 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Weight"); + element.value = customer!.getProperty("Weight"); manSizes.add(element); } - }); + } } else { - properties.forEach((element) { + for (var element in properties) { if (element.propertyName == "Shoulder") { element.top = (122 * distortionHeight).toInt(); element.left = (151 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Shoulder"); + element.value = customer!.getProperty("Shoulder"); manSizes.add(element); } else if (element.propertyName == "Neck") { element.top = (78 * distortionHeight).toInt(); element.left = (151 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Neck"); + element.value = customer!.getProperty("Neck"); manSizes.add(element); } else if (element.propertyName == "Biceps") { element.top = (178 * distortionHeight).toInt(); element.left = (212 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Biceps"); + element.value = customer!.getProperty("Biceps"); manSizes.add(element); } else if (element.propertyName == "Chest") { element.top = (154 * distortionHeight).toInt(); element.left = (151 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Chest"); + element.value = customer!.getProperty("Chest"); manSizes.add(element); } else if (element.propertyName == "Belly") { element.top = (230 * distortionHeight).toInt(); element.left = (151 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Belly"); + element.value = customer!.getProperty("Belly"); manSizes.add(element); } else if (element.propertyName == "Hip") { element.top = (294 * distortionHeight).toInt(); element.left = (151 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Hip"); + element.value = customer!.getProperty("Hip"); manSizes.add(element); } else if (element.propertyName == "Thigh Top") { element.top = (335 * distortionHeight).toInt(); element.left = (185 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Thigh Top"); + element.value = customer!.getProperty("Thigh Top"); manSizes.add(element); } else if (element.propertyName == "Thigh Middle") { element.top = (377 * distortionHeight).toInt(); element.left = (125 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Thigh Middle"); + element.value = customer!.getProperty("Thigh Middle"); manSizes.add(element); } else if (element.propertyName == "Knee") { element.top = (468 * distortionHeight).toInt(); element.left = (129 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Knee"); + element.value = customer!.getProperty("Knee"); manSizes.add(element); } else if (element.propertyName == "Calf") { element.top = (525 * distortionHeight).toInt(); element.left = (129 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Calf"); + element.value = customer!.getProperty("Calf"); manSizes.add(element); } else if (element.propertyName == "Ankle") { element.top = (620 * distortionHeight).toInt(); element.left = (162 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Ankle"); + element.value = customer!.getProperty("Ankle"); manSizes.add(element); } else if (element.propertyName == "Weight") { element.top = (402 * distortionHeight).toInt(); element.left = (240 * distortionWidth).toInt(); - element.value = this.customer!.getProperty("Weight"); + element.value = customer!.getProperty("Weight"); manSizes.add(element); } - }); + } } } int? getWeightCoordinate(isMan, {isTop = false, isLeft = false}) { int? value = 0; - this.manSizes.forEach((element) { + for (var element in manSizes) { if (element.propertyName == SizesEnum.Weight.toStr()) { if (isTop == true) { value = element.top; @@ -518,40 +514,40 @@ class CustomerRepository with Logging { value = element.left; } } - }); + } return value; } Property? getPropertyByName(String propertyName) { Property? property; List sizes; - if (this.sex == "m") { - sizes = this.manSizes; + if (sex == "m") { + sizes = manSizes; } else { - sizes = this.womanSizes; + sizes = womanSizes; } - sizes.forEach((element) { + for (var element in sizes) { if (element.propertyName == propertyName) { property = element; } - }); + } return property; } void updateSizes(String propertyName, double value) { List sizes; - if (this.sex == "m") { - sizes = this.manSizes; + if (sex == "m") { + sizes = manSizes; } else { - sizes = this.womanSizes; + sizes = womanSizes; } - sizes.forEach((element) { + for (var element in sizes) { if (element.propertyName == propertyName) { element.value = value; } - }); + } } List getAllCustomerPropertyByName(String propertyName) { @@ -563,11 +559,11 @@ class CustomerRepository with Logging { return allProperties; } - Cache().getCustomerPropertyAll()!.forEach((element) { + for (var element in Cache().getCustomerPropertyAll()!) { if (element.propertyId == property.propertyId) { allProperties.add(element); } - }); + } return allProperties; } } diff --git a/lib/repository/exercise_repository.dart b/lib/repository/exercise_repository.dart index b195ebf..9872d67 100644 --- a/lib/repository/exercise_repository.dart +++ b/lib/repository/exercise_repository.dart @@ -7,10 +7,10 @@ import 'package:workouttest_util/model/exercise.dart'; import 'package:workouttest_util/model/exercise_type.dart'; import 'package:workouttest_util/model/workout_menu_tree.dart'; import 'package:workouttest_util/service/exercise_service.dart'; -// ignore: depend_on_referenced_packages import 'package:intl/intl.dart'; +import 'package:workouttest_util/util/logging.dart'; -class ExerciseRepository { +class ExerciseRepository with Logging { Exercise? exercise; Customer? customer; ExerciseType? exerciseType; @@ -30,69 +30,69 @@ class ExerciseRepository { DateTime? end; ExerciseRepository() { - this.createNew(); + createNew(); } createNew() { - this.exercise = Exercise(); + exercise = Exercise(); exercise!.dateAdd = DateTime.now(); } setQuantity(double quantity) { - if (this.exercise == null) { - this.createNew(); + if (exercise == null) { + createNew(); } - this.exercise!.quantity = quantity; + exercise!.quantity = quantity; } setUnitQuantity(double unitQuantity) { - if (this.exercise == null) { - this.createNew(); + if (exercise == null) { + createNew(); } - this.exercise!.unitQuantity = unitQuantity; + exercise!.unitQuantity = unitQuantity; } setUnit(String unit) { - if (this.exercise == null) { - this.createNew(); + if (exercise == null) { + createNew(); } - this.exercise!.unit = unit; + exercise!.unit = unit; } setDatetimeExercise(DateTime datetimeExercise) { - if (this.exercise == null) { - this.createNew(); + if (exercise == null) { + createNew(); } - this.exercise!.dateAdd = datetimeExercise; + exercise!.dateAdd = datetimeExercise; } - double? get unitQuantity => this.exercise!.unitQuantity; + double? get unitQuantity => exercise!.unitQuantity; - double? get quantity => this.exercise!.quantity; + double? get quantity => exercise!.quantity; - Exercise? getExercise() => this.exercise; + Exercise? getExercise() => exercise; Future addExercise() async { - if (this.customer == null) { + if (customer == null) { throw Exception("Please log in"); } - final Exercise modelExercise = this.exercise!; - modelExercise.customerId = this.customer!.customerId; - modelExercise.exerciseTypeId = this.exerciseType!.exerciseTypeId; + final Exercise modelExercise = exercise!; + modelExercise.customerId = customer!.customerId; + modelExercise.exerciseTypeId = exerciseType!.exerciseTypeId; if (exerciseType!.unitQuantity != "1") { modelExercise.unitQuantity = null; } Exercise copy = modelExercise.copy(); - this.actualExerciseList!.add(copy); - //final int index = this.actualExerciseList.length - 1; - //print("$index. actual exercise " + this.actualExerciseList[index].toJson().toString()); + actualExerciseList!.add(copy); + //final int index = actualExerciseList.length - 1; + //print("$index. actual exercise " + actualExerciseList[index].toJson().toString()); Exercise savedExercise = await ExerciseApi().addExercise(modelExercise); - //this.actualExerciseList[index].exerciseId = savedExercise.exerciseId; + //actualExerciseList[index].exerciseId = savedExercise.exerciseId; if (customer!.customerId == Cache().userLoggedIn!.customerId) { Cache().addExercise(savedExercise); } else if (Cache().getTrainee() != null && customer!.customerId == Cache().getTrainee()!.customerId) { @@ -103,41 +103,41 @@ class ExerciseRepository { } void addExerciseNoRegistration() { - final Exercise modelExercise = this.exercise!; - modelExercise.exerciseTypeId = this.exerciseType!.exerciseTypeId; + final Exercise modelExercise = exercise!; + modelExercise.exerciseTypeId = exerciseType!.exerciseTypeId; if (exerciseType!.unitQuantity != "1") { modelExercise.unitQuantity = null; } Exercise copy = modelExercise.copy(); - this.actualExerciseList!.add(copy); - this.exerciseList = []; - this.exerciseList!.add(copy); - this.noRegistration = true; + actualExerciseList!.add(copy); + exerciseList = []; + exerciseList!.add(copy); + noRegistration = true; } void initExercise() { - this.createNew(); - this.exerciseType = exerciseType; - this.setUnit(exerciseType!.unit); - exercise!.exerciseTypeId = this.exerciseType!.exerciseTypeId; - this.setQuantity(12); - this.setUnitQuantity(30); - this.exercise!.exercisePlanDetailId = 0; + createNew(); + exerciseType = exerciseType; + setUnit(exerciseType!.unit); + exercise!.exerciseTypeId = exerciseType!.exerciseTypeId; + setQuantity(12); + setUnitQuantity(30); + exercise!.exercisePlanDetailId = 0; exercise!.exerciseId = 0; - this.start = DateTime.now(); + start = DateTime.now(); } Future deleteExercise(Exercise exercise) async { await ExerciseApi().deleteExercise(exercise); } - setCustomer(Customer customer) => this.customer = customer; + setCustomer(Customer customer) => customer = customer; - setExerciseType(ExerciseType exerciseType) => this.exerciseType = exerciseType; + setExerciseType(ExerciseType exerciseType) => exerciseType = exerciseType; Future> getExercisesByCustomer(int customerId) async { final results = await ExerciseApi().getExercisesByCustomer(customerId); - this.exerciseList = results; + exerciseList = results; if (Cache().userLoggedIn != null) { if (customerId == Cache().userLoggedIn!.customerId) { Cache().setExercises(exerciseList!); @@ -145,23 +145,21 @@ class ExerciseRepository { Cache().setExercisesTrainee(exerciseList!); } } - return this.exerciseList!; + return exerciseList!; } List? getExerciseList() { - this.exerciseList = Cache().getExercises(); - return this.exerciseList; + exerciseList = Cache().getExercises(); + return exerciseList; } List? getExerciseListTrainee() { - this.exerciseList = Cache().getExercisesTrainee(); - return this.exerciseList; + exerciseList = Cache().getExercisesTrainee(); + return exerciseList; } String? nextMissingBaseExercise(SplayTreeMap sortedTree) { - if (exerciseList == null) { - exerciseList = Cache().getExercises(); - } + exerciseList ??= Cache().getExercises(); if (exerciseList == null) { return null; @@ -175,22 +173,20 @@ class ExerciseRepository { String treeName = key as String; treeName = treeName.substring(3); foundTreeName = null; - listByMuscle.forEach((exercise) { - if (missingTreeName == null) { - missingTreeName = treeName; - } + for (var exercise in listByMuscle) { + missingTreeName ??= treeName; if (exercise.base) { if (exerciseList != null) { - exerciseList!.forEach((element) { + for (var element in exerciseList!) { if (element.exerciseTypeId == exercise.exerciseTypeId) { foundTreeName = treeName; //print("Found " + foundTreeName + " Missing actual: " + missingTreeName); isBreak = true; } - }); + } } } - }); + } if (foundTreeName == null && !isBreak) { missingTreeName = treeName; isBreak = true; @@ -218,15 +214,13 @@ class ExerciseRepository { } }); - if (exerciseList == null) { - exerciseList = Cache().getExercises(); - } + exerciseList ??= Cache().getExercises(); if (exerciseList == null) { return; } - exerciseList!.forEach((element) { + for (var element in exerciseList!) { Exercise exercise = element; if (!checkedExerciseTypeId.contains(exercise.exerciseTypeId)) { checkedExerciseTypeId.add(exercise.exerciseTypeId!); @@ -242,7 +236,7 @@ class ExerciseRepository { } }); } - }); + } //print ("checkedExerciseTypeid: " + checkedExerciseTypeId.toString()); //print ("baseTreeItem: " + baseTreeItem.toString()); @@ -252,19 +246,19 @@ class ExerciseRepository { } void getLastExercise() { - List? exercises = this.getExerciseList(); + List? exercises = getExerciseList(); Exercise? lastExercise = exercises == null ? null : exercises[0]; if (exercises != null) { - exercises.forEach((element) { + for (var element in exercises) { Exercise actualExercise = element; if (actualExercise.dateAdd!.compareTo(lastExercise!.dateAdd!) > 0) { lastExercise = actualExercise; } - }); + } } - this.exercise = lastExercise; - this.customer = Cache().userLoggedIn!; - this.exerciseType = getExerciseTypeById(exercise!.exerciseTypeId!); + exercise = lastExercise; + customer = Cache().userLoggedIn!; + exerciseType = getExerciseTypeById(exercise!.exerciseTypeId!); return; } @@ -272,12 +266,12 @@ class ExerciseRepository { ExerciseType? actualExerciseType; List? exercises = Cache().getExerciseTypes(); if (exercises != null) { - exercises.forEach((element) { + for (var element in exercises) { ExerciseType exerciseType = element; if (exerciseType.exerciseTypeId == exerciseTypeId) { actualExerciseType = exerciseType; } - }); + } } if (actualExerciseType == null) { throw Exception("Data error, no ExerciseType for exerciseTypeId $exerciseTypeId"); @@ -286,16 +280,16 @@ class ExerciseRepository { } void getSameExercise(int exerciseTypeId, String day) { - if (!this.noRegistration) { - this.actualExerciseList = []; + if (!noRegistration) { + actualExerciseList = []; } if (exerciseList != null) { int index = 0; - for (int i = 0; i < this.exerciseList!.length; i++) { + for (int i = 0; i < exerciseList!.length; i++) { Exercise exercise = exerciseList![i]; final String exerciseDate = DateFormat("yyyy-MM-dd", AppLanguage().appLocal.toString()).format(exercise.dateAdd!); if (exerciseTypeId == exercise.exerciseTypeId && exerciseDate == day && index < 4) { - this.actualExerciseList!.add(exercise); + actualExerciseList!.add(exercise); index++; } } @@ -318,12 +312,12 @@ class ExerciseRepository { double getBest1RM(Exercise exercise) { double result = 0; - if (this.exerciseList == null || this.exerciseList!.isEmpty) { - this.exerciseList = Cache().getExercises(); + if (exerciseList == null || exerciseList!.isEmpty) { + exerciseList = Cache().getExercises(); } final int exerciseTypeId = exercise.exerciseTypeId!; - double toCompare = this.calculate1RM(exercise); + double toCompare = calculate1RM(exercise); result = toCompare; final String today = DateFormat("yyyy-MM-dd", AppLanguage().appLocal.toString()).format(DateTime.now()); @@ -331,12 +325,12 @@ class ExerciseRepository { if (exerciseList == null) { return toCompare; } - this.exerciseList!.forEach((exercise) { + for (var exercise in exerciseList!) { final String exerciseDate = DateFormat("yyyy-MM-dd", AppLanguage().appLocal.toString()).format(exercise.dateAdd!); if (exercise.exerciseTypeId == exerciseTypeId && exerciseDate.compareTo(today) < 0) { oldExercises.add(exercise); } - }); + } if (oldExercises.isNotEmpty) { oldExercises.sort((a, b) { @@ -352,7 +346,7 @@ class ExerciseRepository { return sumA >= sumB ? 1 : -1; }); - double withCompare = this.calculate1RM(oldExercises.last); + double withCompare = calculate1RM(oldExercises.last); //result = toCompare >= withCompare ? (1 - toCompare / withCompare) * 100 : (1 - toCompare / withCompare) * -100; result = toCompare >= withCompare ? toCompare : withCompare; @@ -362,12 +356,12 @@ class ExerciseRepository { double getLast1RMPercent(Exercise exercise) { double result = 0; - if (this.exerciseList == null || this.exerciseList!.isEmpty) { - this.exerciseList = Cache().getExercises(); + if (exerciseList == null || exerciseList!.isEmpty) { + exerciseList = Cache().getExercises(); } final int exerciseTypeId = exercise.exerciseTypeId!; - double toCompare = this.calculate1RM(exercise); + double toCompare = calculate1RM(exercise); final String today = DateFormat("yyyy-MM-dd", AppLanguage().appLocal.toString()).format(exercise.dateAdd!); List oldExercises = []; @@ -375,15 +369,15 @@ class ExerciseRepository { if (exerciseList == null) { return result; } - this.exerciseList!.forEach((exercise) { + for (var exercise in exerciseList!) { final String exerciseDate = DateFormat("yyyy-MM-dd", AppLanguage().appLocal.toString()).format(exercise.dateAdd!); if (exercise.exerciseTypeId == exerciseTypeId && exerciseDate.compareTo(today) < 0) { oldExercises.add(exercise); } - }); + } if (oldExercises.isNotEmpty) { - double withCompare = this.calculate1RM(oldExercises.first); + double withCompare = calculate1RM(oldExercises.first); result = toCompare >= withCompare ? (toCompare / withCompare) * 100 : (1 - toCompare / withCompare) * -100; } return result; @@ -391,8 +385,8 @@ class ExerciseRepository { double getBestVolume(Exercise exercise) { double result = 0; - if (this.exerciseList == null || this.exerciseList!.isEmpty) { - this.exerciseList = Cache().getExercises(); + if (exerciseList == null || exerciseList!.isEmpty) { + exerciseList = Cache().getExercises(); } final int exerciseTypeId = exercise.exerciseTypeId!; @@ -404,12 +398,12 @@ class ExerciseRepository { if (exerciseList == null) { return toCompare; } - this.exerciseList!.forEach((exercise) { + for (var exercise in exerciseList!) { final String exerciseDate = DateFormat("yyyy-MM-dd", AppLanguage().appLocal.toString()).format(exercise.dateAdd!); if (exercise.exerciseTypeId == exerciseTypeId && exerciseDate.compareTo(today) < 0) { oldExercises.add(exercise); } - }); + } if (oldExercises.isNotEmpty) { oldExercises.sort((a, b) { @@ -437,8 +431,8 @@ class ExerciseRepository { double getLastExercisePercent(Exercise exercise) { double result = 0; - if (this.exerciseList == null || this.exerciseList!.isEmpty) { - this.exerciseList = Cache().getExercises(); + if (exerciseList == null || exerciseList!.isEmpty) { + exerciseList = Cache().getExercises(); } final int exerciseTypeId = exercise.exerciseTypeId!; @@ -449,19 +443,19 @@ class ExerciseRepository { if (exerciseList == null) { return result; } - this.exerciseList!.forEach((exercise) { + for (var exercise in exerciseList!) { final String exerciseDate = DateFormat("yyyy-MM-dd", AppLanguage().appLocal.toString()).format(exercise.dateAdd!); if (exercise.exerciseTypeId == exerciseTypeId && exerciseDate.compareTo(today) < 0) { oldExercises.add(exercise); } - }); + } if (oldExercises.isNotEmpty) { double withCompare = oldExercises.first.unitQuantity != null ? oldExercises.first.quantity! * oldExercises.first.unitQuantity! : oldExercises.first.quantity!; result = toCompare >= withCompare ? (toCompare / withCompare) * 100 : (1 - toCompare / withCompare) * -100; - print("Last Last: ${oldExercises.first} vs. $exercise - - result: $result"); + log("Last Last: ${oldExercises.first} vs. $exercise - - result: $result"); } return result; } @@ -473,20 +467,20 @@ class ExerciseRepository { exerciseList!.sort((a, b) { final String datePartA = DateFormat('yyyyMMdd', AppLanguage().appLocal.toString()).format(a.dateAdd!); - String aId = datePartA + "_" + a.exerciseTypeId.toString(); + String aId = "${datePartA}_${a.exerciseTypeId}"; final String datePartB = DateFormat('yyyyMMdd', AppLanguage().appLocal.toString()).format(b.dateAdd!); - String bId = datePartB + "_" + b.exerciseTypeId.toString(); + String bId = "${datePartB}_${b.exerciseTypeId}"; return bId.compareTo(aId); }); - this.exerciseLogList = []; + exerciseLogList = []; String summary = ""; String prevDate = DateFormat("yyyy-MM-dd", AppLanguage().appLocal.toString()).format(exerciseList![0].dateAdd!); int prevExerciseTypeId = exerciseList![0].exerciseTypeId!; Exercise prevExercise = exerciseList![0]; int prevCount = 0; - for (int i = 0; i < this.exerciseList!.length; i++) { + for (int i = 0; i < exerciseList!.length; i++) { Exercise exercise = exerciseList![i]; int exerciseTypeId = exercise.exerciseTypeId!; String exerciseDate = DateFormat("yyyy-MM-dd", AppLanguage().appLocal.toString()).format(exercise.dateAdd!); @@ -494,7 +488,7 @@ class ExerciseRepository { if (exerciseTypeId != prevExerciseTypeId || prevDate != exerciseDate) { ExerciseType? exerciseType = Cache().getExerciseTypeById(prevExercise.exerciseTypeId!); String unit = exerciseType != null && exerciseType.unitQuantityUnit != null ? exerciseType.unitQuantityUnit! : prevExercise.unit!; - prevExercise.summary = summary + " " + unit; + prevExercise.summary = "$summary $unit"; exerciseLogList!.add(prevExercise); //print("Log add " + exercise.toJson().toString()); summary = ""; @@ -508,7 +502,7 @@ class ExerciseRepository { //print("exerciseType " + (exerciseType == null ? "NULL" : exerciseType.name) + " ID " + exercise.exerciseTypeId.toString()); if (exerciseType != null) { if (exerciseType.unitQuantity == "1") { - summary += "x" + exercise.unitQuantity!.toStringAsFixed(0); + summary += "x${exercise.unitQuantity!.toStringAsFixed(0)}"; } //print(" --- sum " + exerciseType.name + " $summary"); } @@ -528,11 +522,11 @@ class ExerciseRepository { if (allExercise == null) { return list; } - allExercise.forEach((element) { + for (var element in allExercise) { if (element.exerciseTypeId == exerciseTypeId) { list.add(element); } - }); + } return list; } } diff --git a/lib/repository/exercise_type_repository.dart b/lib/repository/exercise_type_repository.dart index 750af76..d810a22 100644 --- a/lib/repository/exercise_type_repository.dart +++ b/lib/repository/exercise_type_repository.dart @@ -11,15 +11,15 @@ class ExerciseTypeRepository with Logging { List list = []; List? exerciseTypes = Cache().getExerciseTypes(); if (exerciseTypes != null) { - exerciseTypes.forEach((exerciseType) { + for (var exerciseType in exerciseTypes) { if (exerciseType.alternatives.isNotEmpty) { - exerciseType.alternatives.forEach((childId) { + for (var childId in exerciseType.alternatives) { if (childId == exerciseTypeId) { list.add(exerciseType); } - }); + } } - }); + } } return list; } diff --git a/lib/repository/property_repository.dart b/lib/repository/property_repository.dart index 18cf343..a623dce 100644 --- a/lib/repository/property_repository.dart +++ b/lib/repository/property_repository.dart @@ -6,25 +6,23 @@ class PropertyRepository { List? _properties; Future?> getDBProperties() async { - this._properties = await PropertyApi().getProperties(); - return this._properties; + _properties = await PropertyApi().getProperties(); + return _properties; } List? getProperties() { - return this._properties; + return _properties; } Property? getPropertyByName(String name) { Property? property; - if (_properties == null) { - _properties = Cache().getProperties(); - } + _properties ??= Cache().getProperties(); if (_properties != null) { - this._properties!.forEach((element) { + for (var element in _properties!) { if (name == element.propertyName) { property = element; } - }); + } } return property; } diff --git a/lib/repository/training_plan_day_repository.dart b/lib/repository/training_plan_day_repository.dart index 6767681..addc08c 100644 --- a/lib/repository/training_plan_day_repository.dart +++ b/lib/repository/training_plan_day_repository.dart @@ -10,13 +10,13 @@ class TrainingPlanDayRepository { if (plans == null) { return; } - plans.forEach((plan) { + for (var plan in plans) { if (plan.details != null) { - plan.details!.forEach((element) { - element.day = this.getNameById(element.dayId); - }); + for (var element in plan.details!) { + element.day = getNameById(element.dayId); + } } - }); + } } String? getNameById(int? dayId) { diff --git a/lib/repository/training_plan_repository.dart b/lib/repository/training_plan_repository.dart index c080079..f566969 100644 --- a/lib/repository/training_plan_repository.dart +++ b/lib/repository/training_plan_repository.dart @@ -11,8 +11,9 @@ import 'package:workouttest_util/repository/exercise_type_repository.dart'; import 'package:workouttest_util/repository/training_plan_day_repository.dart'; import 'package:workouttest_util/util/app_language.dart'; import 'package:workouttest_util/util/common.dart'; +import 'package:workouttest_util/util/logging.dart'; -class TrainingPlanRepository with Common { +class TrainingPlanRepository with Common, Logging { ExerciseTree? parentTree; List getPlansByParent(String parent) { final List resultList = []; @@ -44,7 +45,7 @@ class TrainingPlanRepository with Common { /// 3. create new customer_training_plan CustomerTrainingPlan? activateTrainingPlan(int trainingPlanId) { - print(" **** Activate Plan: $trainingPlanId"); + log(" **** Activate Plan: $trainingPlanId"); // 1. deactivate if (Cache().getCustomerTrainingPlans() != null) { Cache().getCustomerTrainingPlans()!.forEach((plan) { @@ -61,9 +62,9 @@ class TrainingPlanRepository with Common { plan.active = true; plan.status = "open"; plan.dateAdd = DateTime.now(); - TrainingPlan? trainingPlan = this.getTrainingPlanById(trainingPlanId); + TrainingPlan? trainingPlan = getTrainingPlanById(trainingPlanId); if (trainingPlan == null || trainingPlan.details == null) { - print("trainingPlan null"); + log("trainingPlan null"); return null; } plan.name = trainingPlan.nameTranslations[AppLanguage().appLocal.toString()]; @@ -88,7 +89,7 @@ class TrainingPlanRepository with Common { CustomerTrainingPlanDetails? getDetailById(CustomerTrainingPlan? plan, int customerTrainingPlanDetailsId) { CustomerTrainingPlanDetails? foundDetail; - if (plan == null || plan.details.length == 0 || customerTrainingPlanDetailsId == 0) { + if (plan == null || plan.details.isEmpty || customerTrainingPlanDetailsId == 0) { return foundDetail; } @@ -116,7 +117,7 @@ class TrainingPlanRepository with Common { alternativeDetail.weight = 0; } } else if (elem.weight == -2) { - final CustomerTrainingPlanDetails calculated = this.isWeightCalculatedByExerciseType(elem.exerciseTypeId, alternativeDetail, plan); + final CustomerTrainingPlanDetails calculated = isWeightCalculatedByExerciseType(elem.exerciseTypeId, alternativeDetail, plan); if (calculated.weight != -1) { alternativeDetail.weight = calculated.weight; } else { @@ -140,7 +141,7 @@ class TrainingPlanRepository with Common { detail.repeats = elem.repeats; detail.set = elem.set; detail.dayId = elem.dayId; - TrainingPlanDayRepository trainingPlanDayRepository = TrainingPlanDayRepository(); + TrainingPlanDayRepository trainingPlanDayRepository = const TrainingPlanDayRepository(); detail.day = trainingPlanDayRepository.getNameById(elem.dayId); detail.parallel = elem.parallel; detail.restingTime = elem.restingTime; @@ -153,7 +154,7 @@ class TrainingPlanRepository with Common { detail.weight = 0; } } else if (elem.weight == -2) { - final CustomerTrainingPlanDetails calculated = this.isWeightCalculatedByExerciseType(elem.exerciseTypeId, detail, plan); + final CustomerTrainingPlanDetails calculated = isWeightCalculatedByExerciseType(elem.exerciseTypeId, detail, plan); if (calculated.weight != -1) { detail.weight = calculated.weight; } else { @@ -244,7 +245,7 @@ class TrainingPlanRepository with Common { } Exercise? lastExercise1RM; - DateTime dt = DateTime.now().subtract(Duration(days: 30)); + DateTime dt = DateTime.now().subtract(const Duration(days: 30)); List exercises = Cache().getExercises()!; exercises.sort((a, b) { // reverse @@ -352,7 +353,7 @@ class TrainingPlanRepository with Common { detail.weight = Common.calculateWeigthByChangedQuantity(detailWithData.weight!, detailWithData.repeats!.toDouble(), originalRepeats.toDouble()); detail.weight = Common.roundWeight(detail.weight!); - print("Recalculated weight: ${detail.weight}"); + log("Recalculated weight: ${detail.weight}"); detail.repeats = originalRepeats; return detail; } @@ -379,7 +380,7 @@ class TrainingPlanRepository with Common { // 2 get recalculated repeats recalculatedDetail.weight = Common.calculateWeigthByChangedQuantity(detail.weight!, detail.repeats!.toDouble(), originalRepeats.toDouble()); recalculatedDetail.weight = Common.roundWeight(recalculatedDetail.weight!); - print("recalculated repeats for $originalRepeats: ${recalculatedDetail.weight}"); + log("recalculated repeats for $originalRepeats: ${recalculatedDetail.weight}"); //recalculatedDetail.repeats = originalRepeats; return recalculatedDetail; @@ -435,7 +436,7 @@ class TrainingPlanRepository with Common { } } - print("Generated plan $trainingPlanId fitness ${Cache().userLoggedIn!.fitnessLevel} - ${FitnessState.beginner}"); + log("Generated plan $trainingPlanId fitness ${Cache().userLoggedIn!.fitnessLevel} - ${FitnessState.beginner}"); if (trainingPlanId != null) { CustomerTrainingPlan? customerTrainingPlan = activateTrainingPlan(trainingPlanId); diff --git a/lib/repository/user_repository.dart b/lib/repository/user_repository.dart index 51732fc..8aa20d1 100644 --- a/lib/repository/user_repository.dart +++ b/lib/repository/user_repository.dart @@ -10,23 +10,23 @@ class UserRepository with Logging { late User user; UserRepository() { - this.createNewUser(); + createNewUser(); } setEmail(String email) { - this.user.email = email; + user.email = email; } setPassword(String password) { - this.user.password = password; + user.password = password; } createNewUser() { - this.user = User(); + user = User(); } Future addUser() async { - final User modelUser = this.user; + final User modelUser = user; try { String rc = await FirebaseApi().registerEmail(modelUser.email!, modelUser.password!); if (rc == FirebaseApi.SIGN_IN_OK) { @@ -38,19 +38,19 @@ class UserRepository with Logging { log(message); if (message.contains("CERT_ALREADY_IN_HASH_TABLE")) { } else { - throw new Exception(e); + throw Exception(e); } } } Future addUserFB() async { - final User modelUser = this.user; + final User modelUser = user; try { Map userData = await FirebaseApi().registerWithFacebook(); modelUser.email = userData['email']; if (modelUser.email == null) { - throw new Exception("Facebook signup was not successful. Please try another method"); + throw Exception("Facebook signup was not successful. Please try another method"); } modelUser.password = Cache().firebaseUid; modelUser.firebaseUid = Cache().firebaseUid; @@ -66,7 +66,7 @@ class UserRepository with Logging { log(e.code); throw Exception("The account exists with different credential"); } else { - print(e.code); + log(e.code); throw Exception(e); } } on WorkoutTestException catch (ex) { @@ -75,19 +75,19 @@ class UserRepository with Logging { throw Exception("The email address has been registered already"); } } on Exception catch (ex) { - log("FB exception: " + ex.toString()); + log("FB exception: $ex"); throw Exception("Facebook Sign In failed"); } } Future addUserGoogle() async { - final User modelUser = this.user; + final User modelUser = user; try { Map userData = await FirebaseApi().registerWithGoogle(); modelUser.email = userData['email']; if (modelUser.email == null) { - throw new Exception("Google signup was not successful. Please try another method"); + throw Exception("Google signup was not successful. Please try another method"); } modelUser.password = Cache().firebaseUid; modelUser.firebaseUid = Cache().firebaseUid; @@ -105,19 +105,19 @@ class UserRepository with Logging { throw Exception("The email address has been registered already"); } } on Exception catch (ex) { - log("Google exception: " + ex.toString()); + log("Google exception: $ex"); throw Exception("Google Sign In failed"); } } Future addUserApple() async { - final User modelUser = this.user; + final User modelUser = user; try { Map userData = await FirebaseApi().registerWithApple(); modelUser.email = userData['email']; if (modelUser.email == null) { - throw new Exception("Apple signup was not successful. Please try another method"); + throw Exception("Apple signup was not successful. Please try another method"); } modelUser.password = Cache().firebaseUid; modelUser.firebaseUid = Cache().firebaseUid; @@ -133,13 +133,13 @@ class UserRepository with Logging { throw Exception("The email address has been registered already"); } } on Exception catch (ex) { - log("Apple exception: " + ex.toString()); + log("Apple exception: $ex"); throw Exception(ex); } } Future getUserByFB() async { - final User modelUser = this.user; + final User modelUser = user; try { Map userData = await FirebaseApi().signInWithFacebook(); modelUser.email = userData['email']; @@ -160,49 +160,49 @@ class UserRepository with Logging { } } */ on NotFoundException catch (ex) { - log("FB exception: " + ex.toString()); + log("FB exception: $ex"); throw Exception("Customer does not exist or the password is wrong"); } on Exception catch (e) { log(e.toString()); - throw new Exception(e); + throw Exception(e); } } Future getUserByGoogle() async { - final User modelUser = this.user; + final User modelUser = user; try { Map userData = await FirebaseApi().signInWithGoogle(); if (userData['email'] == null) { - throw new Exception("Google login was not successful"); + throw Exception("Google login was not successful"); } modelUser.email = userData['email']; await CustomerApi().getUserByEmail(modelUser.email!); await Cache().afterFirebaseLogin(); } on Exception catch (ex) { - log("Google exception: " + ex.toString()); + log("Google exception: $ex"); throw Exception(ex); } } Future getUserByApple() async { - final User modelUser = this.user; + final User modelUser = user; Map userData = await FirebaseApi().signInWithApple(); if (userData['email'] == null) { - throw new Exception("Apple login was not successful"); + throw Exception("Apple login was not successful"); } modelUser.email = userData['email']; try { await CustomerApi().getUserByEmail(modelUser.email!); await Cache().afterFirebaseLogin(); } on Exception catch (ex) { - log("Apple exception: " + ex.toString()); + log("Apple exception: $ex"); throw Exception("Customer does not exist or the password is wrong"); } } Future getUser() async { - final User modelUser = this.user; + final User modelUser = user; String rc = await FirebaseApi().signInEmail(modelUser.email, modelUser.password); try { if (rc == FirebaseApi.SIGN_IN_OK) { @@ -218,7 +218,7 @@ class UserRepository with Logging { } Future resetPassword() async { - final User modelUser = this.user; + final User modelUser = user; await FirebaseApi().resetPassword(modelUser.email!); } } diff --git a/lib/service/api.dart b/lib/service/api.dart index d1030a0..8c0fa4c 100644 --- a/lib/service/api.dart +++ b/lib/service/api.dart @@ -1,6 +1,8 @@ import 'dart:convert'; import 'dart:io'; +import 'package:flutter/foundation.dart'; import 'package:sentry_flutter/sentry_flutter.dart'; +import 'package:workouttest_util/service/webapi.dart'; import 'package:workouttest_util/util/logging.dart'; import 'package:workouttest_util/util/common.dart'; import 'package:workouttest_util/util/not_found_exception.dart'; @@ -19,6 +21,10 @@ class APIClient with Common, Logging { } dynamic authenticateUser(String email, String password) async { + if ( kIsWeb ) { + APIWebClient webClient = APIWebClient(); + return webClient.authenticateUser(email, password); + } var baseUrl = Cache().getBaseUrl(); log("Base URL: $baseUrl"); var url = "${baseUrl}authenticate"; @@ -60,6 +66,10 @@ class APIClient with Common, Logging { } Future post(String endPoint, String body) async { + if ( kIsWeb ) { + APIWebClient webClient = APIWebClient(); + return webClient.post(endPoint, body); + } final url = Cache().getBaseUrl() + endPoint; trace(" ------------ http/post body $body - url: $url "); try { @@ -99,6 +109,10 @@ class APIClient with Common, Logging { } Future get(String endPoint, String param) async { + if ( kIsWeb ) { + APIWebClient webClient = APIWebClient(); + return webClient.get(endPoint, param); + } final url = Cache().getBaseUrl() + endPoint + param; try { trace("-------- API get $url"); diff --git a/lib/service/customer_exercise_device_service.dart b/lib/service/customer_exercise_device_service.dart index 58f390a..0c03c33 100644 --- a/lib/service/customer_exercise_device_service.dart +++ b/lib/service/customer_exercise_device_service.dart @@ -12,7 +12,7 @@ class CustomerExerciseDeviceApi with Logging { List devices = []; try { log(" --- get customer_exercise_devices: "); - final body = await _client.get("customer_exercise_device/customer/" + customerId.toString(), ""); + final body = await _client.get("customer_exercise_device/customer/$customerId", ""); final Iterable json = jsonDecode(body); devices = json.map((device) => CustomerExerciseDevice.fromJson(device)).toList(); } on NotFoundException catch (_) { @@ -25,22 +25,22 @@ class CustomerExerciseDeviceApi with Logging { Future addDevice(CustomerExerciseDevice device) async { CustomerExerciseDevice savedDevice; try { - final String body = JsonEncoder().convert(device.toJson()); - log(" --- add customer_exercise_device: " + body); + final String body = const JsonEncoder().convert(device.toJson()); + log(" --- add customer_exercise_device: $body"); final String responseBody = await _client.post("customer_exercise_device", body); savedDevice = CustomerExerciseDevice.fromJson(jsonDecode(responseBody)); } on Exception catch (e) { - throw new Exception(e.toString()); + throw Exception(e.toString()); } return savedDevice; } Future removeDevice(int id) async { try { - log(" --- delete customer_exercise_device: " + id.toString()); - await _client.post("customer_exercise_device/delete/" + id.toString(), ""); + log(" --- delete customer_exercise_device: $id"); + await _client.post("customer_exercise_device/delete/$id", ""); } on Exception catch (e) { - throw new Exception(e.toString()); + throw Exception(e.toString()); } return; } diff --git a/lib/service/exercise_service.dart b/lib/service/exercise_service.dart index 2e8c8f3..9b0e1e4 100644 --- a/lib/service/exercise_service.dart +++ b/lib/service/exercise_service.dart @@ -7,9 +7,9 @@ class ExerciseApi with Logging { final APIClient _client = APIClient(); Future saveExercise(Exercise exercise) async { - String body = JsonEncoder().convert(exercise.toJson()); - log(" ===== saving exercise id: " + exercise.exerciseId.toString() + ":" + body); - await _client.post("exercises/" + exercise.exerciseId.toString(), body); + String body = const JsonEncoder().convert(exercise.toJson()); + log(" ===== saving exercise id: ${exercise.exerciseId}:$body"); + await _client.post("exercises/${exercise.exerciseId}", body); } Future> getExercisesByCustomer(int customerId) async { @@ -25,8 +25,8 @@ class ExerciseApi with Logging { } Future addExercise(Exercise exercise) async { - String body = JsonEncoder().convert(exercise.toJson()); - log(" ===== add new exercise: " + body); + String body = const JsonEncoder().convert(exercise.toJson()); + log(" ===== add new exercise: $body"); final String response = await _client.post("exercises", body); final Exercise savedExercise = Exercise.fromJson(jsonDecode(response)); return savedExercise; @@ -37,8 +37,8 @@ class ExerciseApi with Logging { return; } int exerciseId = exercise.exerciseId!; - log(" ===== delete exercise: " + exerciseId.toString()); - await _client.post("exercises/" + exerciseId.toString(), ""); + log(" ===== delete exercise: $exerciseId"); + await _client.post("exercises/$exerciseId", ""); return; } } diff --git a/lib/service/exercise_tree_service.dart b/lib/service/exercise_tree_service.dart index d554eac..a1df753 100644 --- a/lib/service/exercise_tree_service.dart +++ b/lib/service/exercise_tree_service.dart @@ -18,7 +18,7 @@ class ExerciseTreeApi with Logging { exerciseTrees = await getExerciseTreeParents(exerciseTrees); await Future.forEach(exerciseTrees, (element) async { - ExerciseTree exerciseTree = element as ExerciseTree; + ExerciseTree exerciseTree = element; exerciseTree.imageUrl = await buildImage(exerciseTree.imageUrl, exerciseTree.treeId); }); exerciseTrees = await getExerciseTreeParents(exerciseTrees); @@ -29,13 +29,13 @@ class ExerciseTreeApi with Logging { } Future buildImage(String imageUrl, int treeId) async { - String assetImage = 'asset/menu/' + imageUrl.substring(7); - print("asset image $assetImage"); + String assetImage = 'asset/menu/${imageUrl.substring(7)}'; + log("asset image $assetImage"); return await rootBundle.load(assetImage).then((value) { return assetImage; }).catchError((_) { String imagePath = assetImage.substring(10); - String url = Cache.mediaUrl + 'images' + imagePath; + String url = '${Cache.mediaUrl}images$imagePath'; return url; }); } @@ -72,10 +72,10 @@ class ExerciseTreeApi with Logging { List copyList(List tree) { final List copyList = []; - tree.forEach((element) { + for (var element in tree) { final ExerciseTree copy = element.copy(-1); copyList.add(copy); - }); + } return copyList; } diff --git a/lib/service/firebase_api.dart b/lib/service/firebase_api.dart index 92ecb4d..8b0602e 100644 --- a/lib/service/firebase_api.dart +++ b/lib/service/firebase_api.dart @@ -1,13 +1,11 @@ import 'dart:math' as math; import 'dart:convert'; -// ignore: depend_on_referenced_packages import 'package:crypto/crypto.dart'; import 'package:workouttest_util/model/cache.dart'; import 'package:workouttest_util/util/logging.dart' as logger; import 'package:sentry_flutter/sentry_flutter.dart'; import 'package:sign_in_with_apple/sign_in_with_apple.dart'; import 'package:firebase_auth/firebase_auth.dart'; -// ignore: depend_on_referenced_packages import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:firebase_remote_config/firebase_remote_config.dart'; @@ -38,7 +36,7 @@ class FirebaseApi with logger.Logging { // Wait for Firebase to initialize and set `_initialized` state to true await Firebase.initializeApp(); - this.appleSignInAvailable = await SignInWithApple.isAvailable(); + appleSignInAvailable = await SignInWithApple.isAvailable(); await FirebaseMessaging.instance.setForegroundNotificationPresentationOptions( @@ -46,17 +44,17 @@ class FirebaseApi with logger.Logging { badge: true, sound: true, ); - this.firebaseRegToken = await FirebaseMessaging.instance.getToken(); + firebaseRegToken = await FirebaseMessaging.instance.getToken(); Cache().firebaseMessageToken = firebaseRegToken; log("FirebaseMessaging token $firebaseRegToken"); FirebaseMessaging.onBackgroundMessage(_firebaseMessagingBackgroundHandler); FirebaseMessaging.onMessage.listen((RemoteMessage message) { - print('Got a message whilst in the foreground!'); - print('Message data: ${message.data}'); + log('Got a message whilst in the foreground!'); + log('Message data: ${message.data}'); if (message.notification != null) { - print('Message also contained a notification: ${message.notification}'); + log('Message also contained a notification: ${message.notification}'); } }); } catch (e) { @@ -172,7 +170,7 @@ class FirebaseApi with logger.Logging { } Future> registerWithApple() async { - Map userData = Map(); + Map userData = {}; final rawNonce = generateNonce(); final nonce = sha256ofString(rawNonce); @@ -209,7 +207,7 @@ class FirebaseApi with logger.Logging { } Future> signInWithGoogle() async { - Map userData = Map(); + Map userData = {}; // Trigger the authentication flow GoogleSignIn googleSignIn = GoogleSignIn( @@ -246,7 +244,7 @@ class FirebaseApi with logger.Logging { } Future> registerWithGoogle() async { - Map userData = Map(); + Map userData = {}; // Trigger the authentication flow GoogleSignIn googleSignIn = GoogleSignIn( @@ -319,7 +317,7 @@ class FirebaseApi with logger.Logging { // Once signed in, return the UserCredential final userCredential = await FirebaseAuth.instance.signInWithCredential(facebookAuthCredential); - log("Email by FB: " + userData['email'] + " FB credential: " + userCredential.toString()); + log("Email by FB: ${userData['email']} FB credential: $userCredential"); Cache().firebaseUid = userCredential.user!.uid; } else { diff --git a/lib/service/purchase_service.dart b/lib/service/purchase_service.dart index 425f614..8c30d7a 100644 --- a/lib/service/purchase_service.dart +++ b/lib/service/purchase_service.dart @@ -22,7 +22,7 @@ class PurchaseApi with Logging { } Future savePurchase(Purchase purchase) async { - String body = JsonEncoder().convert(purchase.toJson()); + String body = const JsonEncoder().convert(purchase.toJson()); log(" ===== saving purchase:$body"); await _client.post("purchase", body); } diff --git a/lib/service/webapi.dart b/lib/service/webapi.dart new file mode 100644 index 0000000..781f6c4 --- /dev/null +++ b/lib/service/webapi.dart @@ -0,0 +1,123 @@ +import 'package:sentry_flutter/sentry_flutter.dart'; +import 'package:workouttest_util/model/cache.dart'; +import 'package:workouttest_util/util/common.dart'; +import 'package:workouttest_util/util/logging.dart'; +import 'dart:convert'; +import 'package:http/http.dart' as http; +import 'package:workouttest_util/util/not_found_exception.dart'; + +class APIWebClient with Common, Logging { + static final APIWebClient _singleton = APIWebClient._internal(); + late bool cert; + + factory APIWebClient() { + return _singleton; + } + + APIWebClient._internal() { + cert = false; + } + + dynamic authenticateUser(String email, String password) async { + var baseUrl = Cache().getBaseUrl(); + log("Base URL: $baseUrl"); + var url = "${baseUrl}authenticate"; + + try { + final body = jsonEncode({ + 'username': email, + 'password': password + }); + var uri = Uri.parse(url); + var result = await http.post(uri, body: body, headers: { + "Content-Type": "application/json", + "Authorization": "1", + }); + + if (result.statusCode != 200) { + log("authentication response: ${result.statusCode} with URL: $url"); + throw Exception("Authentication error: ${result.statusCode}"); + } + + String response = result.body; + log("Authentication status: ${result.statusCode}, response: $response"); + final data = jsonDecode(response); + return data; + } catch (exception) { + log(exception.toString()); + try { + await Sentry.captureException(exception); + } on Exception catch (e) { + log(e.toString()); + } + + throw Exception("Network error, try again later!"); + } + } + + Future post(String endPoint, String body) async { + final url = Cache().getBaseUrl() + endPoint; + trace(" ------------ http/post body $body - url: $url "); + try { + String authToken = Cache().getAuthToken(); + if (authToken.isEmpty) { + var responseJson = await authenticateUser(Cache.username, Cache.password); + authToken = responseJson['token']; + Cache().authToken = authToken; + } + var uri = Uri.parse(url); + var result = await http.post(uri, body: body, headers: { + "Content-Type": "application/json", + "Authorization": 'Bearer $authToken', + }); + trace(" ------------post response code: ${result.statusCode}"); + if (result.statusCode == 200) { + return result.body; + } else if (result.statusCode == 404) { + throw const NotFoundException(message: "Not Found"); + } else { + throw Exception("Network Error, please try again later"); + } + } on NotFoundException catch(e) { + throw NotFoundException(message: "Not Found ${e.message}"); + } on Exception catch (e) { + log("Post Exception: $e"); + await Sentry.captureException(e); + throw Exception("Network Error, please try again later"); + } + } + + Future get(String endPoint, String param) async { + final url = Cache().getBaseUrl() + endPoint + param; + try { + trace("-------- API get $url"); + String authToken = Cache().getAuthToken(); + if (authToken.isEmpty) { + var responseJson = await authenticateUser(Cache.username, Cache.password); + authToken = responseJson['token']; + Cache().authToken = authToken; + } + var uri = Uri.parse(url); + var result = await http.get(uri, headers: { + "Content-Type": "application/json", + "Authorization": 'Bearer $authToken', + }); + + trace(" ------------get response code: ${result.statusCode}"); + if (result.statusCode == 200) { + return result.body; + } else if (result.statusCode == 404) { + throw const NotFoundException(message: "Not Found"); + } else { + throw Exception("Network Error, please try again later"); + } + } on NotFoundException catch(e) { + throw NotFoundException(message: "Not Found ${e.message}"); + } on Exception catch (e) { + log("Post Exception: $e"); + await Sentry.captureException(e); + throw Exception("Network Error, please try again later"); + } + } + +} \ No newline at end of file diff --git a/lib/util/app_language.dart b/lib/util/app_language.dart index 3ad0242..74afc25 100644 --- a/lib/util/app_language.dart +++ b/lib/util/app_language.dart @@ -7,7 +7,7 @@ import 'package:shared_preferences/shared_preferences.dart'; class AppLanguage with Logging { static final AppLanguage _singleton = AppLanguage._internal(); - Locale? _appLocale = Locale('en'); + Locale? _appLocale = const Locale('en'); factory AppLanguage() { return _singleton; @@ -19,18 +19,18 @@ class AppLanguage with Logging { return _singleton; } - Locale get appLocal => _appLocale ?? Locale("en"); + Locale get appLocal => _appLocale ?? const Locale("en"); Future fetchLocale() async { var prefs = await SharedPreferences.getInstance(); String? langCode = prefs.getString('language_code'); log(" ---- lang code $langCode"); if (langCode == null) { - _appLocale = Locale('en'); + _appLocale = const Locale('en'); } else { _appLocale = Locale(langCode); } - log(" ---- Fetched lang: " + _appLocale.toString()); + log(" ---- Fetched lang: $_appLocale"); } getLocale(SharedPreferences prefs) { @@ -38,15 +38,15 @@ class AppLanguage with Logging { if (langCode == null) { final String localName = Platform.localeName; if (localName.endsWith("HU")) { - _appLocale = Locale('hu'); + _appLocale = const Locale('hu'); langCode = "hu"; } else { - _appLocale = Locale('en'); + _appLocale = const Locale('en'); langCode = "en"; } } _appLocale = Locale(langCode); - log(" ---- Get lang: " + _appLocale.toString() + " lang code $langCode"); + log(" ---- Get lang: $_appLocale lang code $langCode"); } void changeLanguage(Locale type) async { @@ -54,15 +54,15 @@ class AppLanguage with Logging { if (_appLocale == type) { return; } - if (type == Locale("hu")) { - _appLocale = Locale("hu"); + if (type == const Locale("hu")) { + _appLocale = const Locale("hu"); await prefs.setString('language_code', 'hu'); await prefs.setString('countryCode', 'HU'); } else { - _appLocale = Locale("en"); + _appLocale = const Locale("en"); await prefs.setString('language_code', 'en'); await prefs.setString('countryCode', 'US'); } - log(" ---- Stored lang: " + _appLocale.toString()); + log(" ---- Stored lang: $_appLocale"); } } diff --git a/lib/util/app_localization.dart b/lib/util/app_localization.dart index c699e15..6b0b35e 100644 --- a/lib/util/app_localization.dart +++ b/lib/util/app_localization.dart @@ -26,7 +26,7 @@ class AppLocalizations with Logging { Future load() async { // Load the language JSON file from the "lang" folder - log(" -- load language pieces " + locale.languageCode); + log(" -- load language pieces ${locale.languageCode}"); String jsonString = await rootBundle.loadString('i18n/${locale.languageCode}.json'); Map jsonMap = json.decode(jsonString); @@ -45,7 +45,7 @@ class AppLocalizations with Logging { String translate(String key) { if (isTest) return key; String? translated = _localizedStrings[key]; - return translated != null ? translated : key; + return translated ?? key; } } @@ -64,7 +64,7 @@ class AppLocalizationsDelegate extends LocalizationsDelegate { @override Future load(Locale locale) async { // AppLocalizations class is where the JSON loading actually runs - AppLocalizations localizations = new AppLocalizations(locale, isTest: this.isTest); + AppLocalizations localizations = AppLocalizations(locale, isTest: isTest); if (isTest) { await localizations.loadTest(locale); } else { diff --git a/lib/util/common.dart b/lib/util/common.dart index 5fd0722..7500b0a 100644 --- a/lib/util/common.dart +++ b/lib/util/common.dart @@ -2,7 +2,6 @@ import 'dart:convert'; import 'package:workouttest_util/util/app_language.dart'; import 'package:flutter/material.dart'; -// ignore: depend_on_referenced_packages import 'package:intl/intl.dart'; class DateRate { diff --git a/lib/util/enums.dart b/lib/util/enums.dart index 8f64fc8..341ba95 100644 --- a/lib/util/enums.dart +++ b/lib/util/enums.dart @@ -3,8 +3,8 @@ import 'package:workouttest_util/util/string_extension.dart'; enum LoginType { email, fb, google, apple } extension LoginTypeExt on LoginType { - bool equalsTo(LoginType type) => this.toString() == type.toString(); - bool equalsStringTo(String type) => this.toString() == type; + bool equalsTo(LoginType type) => toString() == type.toString(); + bool equalsStringTo(String type) => toString() == type; } enum TrackingEvent { @@ -69,60 +69,60 @@ T enumFromString(Iterable values, String value) { } extension TrackingEventExt on TrackingEvent { - String enumToString() => this.toString().split(".").last; + String enumToString() => toString().split(".").last; - bool equalsTo(TrackingEvent event) => this.toString() == event.toString(); - bool equalsStringTo(String event) => this.toString() == event; + bool equalsTo(TrackingEvent event) => toString() == event.toString(); + bool equalsStringTo(String event) => toString() == event; } enum PropertyEnum { Ectomorph, Mesomorph, Endomorph } extension PropertyExt on PropertyEnum { - String toStr() => this.toString().split(".").last; + String toStr() => toString().split(".").last; - bool equalsTo(PropertyEnum event) => this.toString() == event.toString(); - bool equalsStringTo(String event) => this.toString() == event; + bool equalsTo(PropertyEnum event) => toString() == event.toString(); + bool equalsStringTo(String event) => toString() == event; } enum SizesEnum { Weight, Height, Shoulder, Neck, Biceps, Chest, Belly, Hip, ThighTop, ThighMiddle, Knee, Calf, Ankle, Underarm, Lowerarm } extension SizesExt on SizesEnum { - String toStr() => this.toString().split(".").last; - bool equalsTo(SizesEnum event) => this.toString() == event.toString(); - bool equalsStringTo(String event) => this.toString() == event; + String toStr() => toString().split(".").last; + bool equalsTo(SizesEnum event) => toString() == event.toString(); + bool equalsStringTo(String event) => toString() == event; } enum EvaluationText { very_poor, poor, fair, below_average, average, above_average, good, excellent, elite } extension EvaluationTextExt on EvaluationText { - String toStr() => this.toString().split(".").last; - bool equalsTo(EvaluationText eval) => this.toString() == eval.toString(); - bool equalsStringTo(String eval) => this.toStr() == eval; + String toStr() => toString().split(".").last; + bool equalsTo(EvaluationText eval) => toString() == eval.toString(); + bool equalsStringTo(String eval) => toStr() == eval; } enum ExerciseTypeTrainingPlanState { none, added, executed } extension ExerciseTypeTrainingPlanStateExt on ExerciseTypeTrainingPlanState { - String toStr() => this.toString().split(".").last; - bool equalsTo(ExerciseTypeTrainingPlanState state) => this.toString() == state.toString(); - bool equalsStringTo(String state) => this.toStr() == state; + String toStr() => toString().split(".").last; + bool equalsTo(ExerciseTypeTrainingPlanState state) => toString() == state.toString(); + bool equalsStringTo(String state) => toStr() == state; } enum ExerciseSaveType { test, training, test_set } extension ExerciseSaveTypeExt on ExerciseSaveType { - String toStr() => this.toString().split(".").last; - bool equalsTo(ExerciseSaveType type) => this.toString() == type.toString(); - bool equalsStringTo(String type) => this.toStr() == type; + String toStr() => toString().split(".").last; + bool equalsTo(ExerciseSaveType type) => toString() == type.toString(); + bool equalsStringTo(String type) => toStr() == type; } enum MuscleGroup { chest, biceps, triceps, back, shoulders, core, thigh, calf } extension MuscleGroupExt on MuscleGroup { - String toStr() => this.toString().split(".").last; - String toText() => this.toString().split(".").last.capitalize(); - bool equalsTo(MuscleGroup type) => this.toString() == type.toString(); - bool equalsStringTo(String type) => this.toStr() == type; + String toStr() => toString().split(".").last; + String toText() => toString().split(".").last.capitalize(); + bool equalsTo(MuscleGroup type) => toString() == type.toString(); + bool equalsStringTo(String type) => toStr() == type; String getStrByIndex(int index) => MuscleGroup.values.elementAt(index).toStr(); MuscleGroup getByIndex(int index) => MuscleGroup.values.elementAt(index); String getTextByIndex(int index) => MuscleGroup.values.elementAt(index).toText(); diff --git a/lib/util/string_extension.dart b/lib/util/string_extension.dart index d48c06a..5d92948 100644 --- a/lib/util/string_extension.dart +++ b/lib/util/string_extension.dart @@ -1,5 +1,5 @@ extension StringExtension on String { String capitalize() { - return "${this[0].toUpperCase()}${this.substring(1).toLowerCase()}"; + return "${this[0].toUpperCase()}${substring(1).toLowerCase()}"; } } diff --git a/test/api_test.dart b/test/api_test.dart new file mode 100644 index 0000000..780bb20 --- /dev/null +++ b/test/api_test.dart @@ -0,0 +1,33 @@ +import 'dart:convert'; +import 'dart:io'; +import 'package:flutter_test/flutter_test.dart'; +import 'package:workouttest_util/model/cache.dart'; +import 'package:workouttest_util/service/api.dart'; +import 'package:workouttest_util/service/webapi.dart'; + +main() { + setUp(() { + Cache().setLocalBaseUrl(); + }); + + group('api', () { + + test('connect api auth successfully', () async { + var api = APIClient(); + var responseJson = await api.authenticateUser("bosi", "andio2009"); + print(responseJson); + Cache().authToken = responseJson['token']; + final body = await api.get("app_package", ""); + print(body); + }); + + test('connect webapi auth successfully', () async { + var api = APIWebClient(); + var responseJson = await api.authenticateUser("bosi", "andio2009"); + print(responseJson); + Cache().authToken = responseJson['token']; + final body = await api.get("app_package", ""); + print(body); + }); + }); +} \ No newline at end of file diff --git a/test/workouttest_util_test.dart b/test/workouttest_util_test.dart deleted file mode 100644 index 55500ed..0000000 --- a/test/workouttest_util_test.dart +++ /dev/null @@ -1,9 +0,0 @@ -import 'package:flutter_test/flutter_test.dart'; - -import 'package:workouttest_util/workouttest_util.dart'; - -void main() { - test('adds one to input values', () { - - }); -}