Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor of BLoC & Sensing | Fix authentication flow | Polar disconnection exception handling #219

Merged
merged 32 commits into from
Jan 29, 2024
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
5ff3de1
Lars refsgaard/health as a service (#206)
bardram Jan 6, 2024
458f4dd
Fix of DataViz & Service connectivity
bardram Jan 6, 2024
7d5524e
Added support for health in manifest + plist files
bardram Jan 9, 2024
39228cc
fix of bug in data viz #204
bardram Jan 11, 2024
00ecbcf
cleanup in hr dataviz
bardram Jan 12, 2024
4c0ef06
Fix of #207
bardram Jan 15, 2024
b20aba2
adding linter and fixing all linter problems (quite a few) - except f…
bardram Jan 18, 2024
40768ed
fix of imports
bardram Jan 18, 2024
6af9ea6
fix of data viz initialization (again)
bardram Jan 18, 2024
2244333
colors added to devices and services icons
bardram Jan 18, 2024
ba86818
general clean up of dead code and state enums
bardram Jan 18, 2024
2ef4527
Update project.pbxproj
bardram Jan 19, 2024
2841127
adding route names to each page (to avoid typos in route naming)
bardram Jan 19, 2024
618dce1
Using ChangeNofifier in ViewModel
bardram Jan 19, 2024
129d272
refactor of devices page
bardram Jan 19, 2024
14ba5f7
small fixes to LoginPage
bardram Jan 20, 2024
519d346
fix of ACTIVITY_RECOGNITION permission on Android API level <28
bardram Jan 20, 2024
72c32e7
refactor and documentation of CarpBackend
bardram Jan 21, 2024
e234cc4
More refactor of CarpBackend and StudyAppBLoC
bardram Jan 22, 2024
732973d
fix of invitation view models and view to follow MVVM
bardram Jan 22, 2024
ddd932f
fix of StudyPage and its model to follow MVVM
bardram Jan 22, 2024
9953e31
refactor of device page + login
bardram Jan 23, 2024
41e3df4
fix of #215
bardram Jan 26, 2024
1ce05c5
more refactor of the bloc
bardram Jan 26, 2024
0e576e9
improvement to root route + documentation
bardram Jan 26, 2024
5afe12b
update of flutter plugins in pubspec
bardram Jan 26, 2024
b2b4b96
Merge branch 'master' into bardram/responsive-refactor-#212
bardram Jan 26, 2024
77d271f
merging master + deleting old files
bardram Jan 26, 2024
761bdd6
Fix code formatting and remove unused files
LarsRefsgaard Jan 29, 2024
471861a
Update signing profile in project.pbxproj
LarsRefsgaard Jan 29, 2024
87126da
Update MARKETING_VERSION to 1.4 for iOS
LarsRefsgaard Jan 29, 2024
2985d46
update of CHANGELOG + README
bardram Jan 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 14 additions & 25 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -1,29 +1,18 @@
# This file configures the analyzer, which statically analyzes Dart code to
# check for errors, warnings, and lints.
#
# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
# invoked from the command line by running `flutter analyze`.
# Additional information about this file can be found at
# https://dart.dev/guides/language/analysis-options

include: package:lints/recommended.yaml

# The following line activates a set of recommended lints for Flutter apps,
# packages, and plugins designed to encourage good coding practices.
include: package:flutter_lints/flutter.yaml
analyzer:
exclude: [build/**]
language:
strict-casts: true
strict-inference: true
strict-raw-types: true

linter:
# The lint rules applied to this project can be customized in the
# section below to disable rules from the `package:flutter_lints/flutter.yaml`
# included above or to enable additional rules. A list of all available lints
# and their documentation is published at
# https://dart-lang.github.io/linter/lints/index.html.
#
# Instead of disabling a lint rule for the entire project in the
# section below, it can also be suppressed for a single line of code
# or a specific dart file by using the `// ignore: name_of_lint` and
# `// ignore_for_file: name_of_lint` syntax on the line or in the file
# producing the lint.
rules:
# avoid_print: false # Uncomment to disable the `avoid_print` rule
# prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule

# Additional information about this file can be found at
# https://dart.dev/guides/language/analysis-options
cancel_subscriptions: true
constant_identifier_names: false
depend_on_referenced_packages: false
use_string_in_part_of_directives: false
49 changes: 7 additions & 42 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,14 @@
android:maxSdkVersion="28" />

<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />

<!-- for Android 9 (API 28 and below), use: -->
<uses-permission
android:name="com.google.android.gms.permission.ACTIVITY_RECOGNITION"
android:maxSdkVersion="28" />
<!-- for Android 10 (API 29 and later), use: -->
<uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />

<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
Expand All @@ -57,48 +64,6 @@
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.CAMERA" />

<!-- Permissions for Health Connect API -->
LarsRefsgaard marked this conversation as resolved.
Show resolved Hide resolved
<uses-permission android:name="android.permission.health.READ_STEPS"/>
<uses-permission android:name="android.permission.health.WRITE_STEPS"/>
<uses-permission android:name="android.permission.health.READ_WEIGHT"/>
<uses-permission android:name="android.permission.health.WRITE_WEIGHT"/>
<uses-permission android:name="android.permission.health.READ_HEIGHT"/>
<uses-permission android:name="android.permission.health.WRITE_HEIGHT"/>
<uses-permission android:name="android.permission.health.READ_HEART_RATE"/>
<uses-permission android:name="android.permission.health.WRITE_HEART_RATE"/>
<uses-permission android:name="android.permission.health.READ_EXERCISE"/>
<uses-permission android:name="android.permission.health.WRITE_EXERCISE"/>
<uses-permission android:name="android.permission.health.READ_SLEEP"/>
<uses-permission android:name="android.permission.health.WRITE_SLEEP"/>
<uses-permission android:name="android.permission.health.READ_SPEED"/>
<uses-permission android:name="android.permission.health.WRITE_SPEED"/>
<uses-permission android:name="android.permission.health.READ_DISTANCE"/>
<uses-permission android:name="android.permission.health.WRITE_DISTANCE"/>
<uses-permission android:name="android.permission.health.READ_TOTAL_CALORIES_BURNED"/>
<uses-permission android:name="android.permission.health.WRITE_TOTAL_CALORIES_BURNED"/>
<uses-permission android:name="android.permission.health.READ_ACTIVE_CALORIES_BURNED"/>
<uses-permission android:name="android.permission.health.WRITE_ACTIVE_CALORIES_BURNED"/>
<uses-permission android:name="android.permission.health.READ_BLOOD_GLUCOSE"/>
<uses-permission android:name="android.permission.health.WRITE_BLOOD_GLUCOSE"/>
<uses-permission android:name="android.permission.health.READ_BLOOD_PRESSURE"/>
<uses-permission android:name="android.permission.health.WRITE_BLOOD_PRESSURE"/>
<uses-permission android:name="android.permission.health.READ_BODY_FAT"/>
<uses-permission android:name="android.permission.health.WRITE_BODY_FAT"/>
<uses-permission android:name="android.permission.health.READ_BODY_TEMPERATURE"/>
<uses-permission android:name="android.permission.health.WRITE_BODY_TEMPERATURE"/>
<uses-permission android:name="android.permission.health.READ_OXYGEN_SATURATION"/>
<uses-permission android:name="android.permission.health.WRITE_OXYGEN_SATURATION"/>
<uses-permission android:name="android.permission.health.READ_HYDRATION"/>
<uses-permission android:name="android.permission.health.WRITE_HYDRATION"/>
<uses-permission android:name="android.permission.health.READ_RESTING_HEART_RATE"/>
<uses-permission android:name="android.permission.health.WRITE_RESTING_HEART_RATE"/>
<uses-permission android:name="android.permission.health.WRITE_FLOORS_CLIMBED"/>
<uses-permission android:name="android.permission.health.READ_FLOORS_CLIMBED"/>
<uses-permission android:name="android.permission.health.WRITE_BASAL_METABOLIC_RATE"/>
<uses-permission android:name="android.permission.health.READ_BASAL_METABOLIC_RATE"/>
<uses-permission android:name="android.permission.health.READ_RESPIRATORY_RATE"/>
<uses-permission android:name="android.permission.health.WRITE_RESPIRATORY_RATE"/>

<!-- io.flutter.app.FlutterApplication is an android.app.Application that
calls FlutterMain.startInitialization(this); in its onCreate method.
In most cases you can leave this as-is, but you if you want to provide
Expand Down
2 changes: 1 addition & 1 deletion assets/lang/da.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,5 +141,5 @@
"widgets.logoutmessage.cancel": "Annuller",
"widgets.logoutmessage.okay": "Okay",
"pages.login.login": "Log ind",
"pages.login.endsession": "Afslut log ind session"
"pages.login.logout": "Log ud"
}
2 changes: 1 addition & 1 deletion assets/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,5 +142,5 @@
"widgets.logoutmessage.cancel": "Cancel",
"widgets.logoutmessage.okay": "Okay",
"pages.login.login": "Log in",
"pages.login.endsession": "End login session"
"pages.login.logout": "Logout"
}
6 changes: 3 additions & 3 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "Runner/base.lproj/Main.storyboard Runner/Assets.xcassets Runner/base.lproj/LaunchScreen.storyboard";
DEVELOPMENT_TEAM = 59TCTNUBMQ;
DEVELOPMENT_TEAM = 8TB3T6MAZG;
LarsRefsgaard marked this conversation as resolved.
Show resolved Hide resolved
ENABLE_BITCODE = "$(inherited)";
FLUTTER_ROOT = "$(HOME)/flutter";
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -535,7 +535,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "Runner/base.lproj/Main.storyboard Runner/Assets.xcassets Runner/base.lproj/LaunchScreen.storyboard";
DEVELOPMENT_TEAM = 59TCTNUBMQ;
DEVELOPMENT_TEAM = 8TB3T6MAZG;
ENABLE_BITCODE = "$(inherited)";
FLUTTER_ROOT = "$(HOME)/flutter";
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -578,7 +578,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "Runner/base.lproj/Main.storyboard Runner/Assets.xcassets Runner/base.lproj/LaunchScreen.storyboard";
DEVELOPMENT_TEAM = 59TCTNUBMQ;
DEVELOPMENT_TEAM = 8TB3T6MAZG;
ENABLE_BITCODE = "$(inherited)";
FLUTTER_ROOT = "$(HOME)/flutter";
FRAMEWORK_SEARCH_PATHS = (
Expand Down
Loading
Loading