Merge pull request #26 from OpenRowingCommunity/de-future

De future

Author: MoralCode

.github/workflows/dart.yml

@@ -16,17 +16,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # Note: This workflow uses the latest stable version of the Dart SDK.
       # You can specify other versions if desired, see documentation here:
       # https://github.com/dart-lang/setup-dart/blob/main/README.md
-      # - uses: dart-lang/setup-dart@v1
-      - uses: dart-lang/setup-dart@9a04e6d73cca37bd455e0608d7e5092f881fd603
+      - uses: dart-lang/setup-dart@v1
+        with:
+          sdk: 3.1.3
 
       - uses: subosito/flutter-action@v1
         with:
           channel: 'stable'
+          flutter-version: 3.13.0
 
       - name: Install dependencies
         run: flutter pub get
@@ -37,7 +39,7 @@ jobs:
 
       # Consider passing '--fatal-infos' for slightly stricter analysis.
       - name: Analyze project source
-        run: flutter analyze
+        run: flutter analyze --no-fatal-infos --no-fatal-warnings
 
       # Your project will need to have tests in test/ and a dependency on
       # package:test for this step to succeed. Note that Flutter projects will

.idea/libraries/Dart_SDK.xml

@@ -109,32 +109,28 @@ myErg.monitorForWorkoutSummary().listen((workoutSummary) {
 ```
 
 Each workout summary is a flutter object that contains the following fields:
-- `Future<DateTime> timestamp`
-- `Future<double> workTime`
-- `Future<double> workDistance`
-- `Future<int> avgSPM`
-- `Future<int> endHeartRate`
-- `Future<int> avgHeartRate`
-- `Future<int> minHeartRate`
-- `Future<int> maxHeartRate`
-- `Future<int> avgDragFactor`
-- `Future<int> recoveryHeartRate`
-- `Future<WorkoutType> workoutType`
-- `Future<double> avgPace`
-- `Future<IntervalType> intervalType`
-- `Future<int> intervalSize`
-- `Future<int> intervalCount`
-- `Future<int> totalCalories`
-- `Future<int> watts`
-- `Future<int> totalRestDistance`
-- `Future<int> intervalRestTime`
-- `Future<int> avgCalories`
-
-Futures are handy here since the erg can send back different data at different times. The primary reason for this is the `recoveryHeartRate` field which the erg sends after the user has been resting for 1 minute. If the workout is cancelled or the erg is turned off before the end of this minute, the data may never arrive. See #10.
-
-Overall this method of accessing workout summary data is not the most ideal, and is likely to change later if a better solution is found. See #11.
-
-
+- `timestamp`
+- `workTime`
+- `workDistance`
+- `avgSPM`
+- `endHeartRate`
+- `avgHeartRate`
+- `minHeartRate`
+- `maxHeartRate`
+- `avgDragFactor`
+- `recoveryHeartRate`
+- `workoutType`
+- `avgPace`
+- `intervalType`
+- `intervalSize`
+- `intervalCount`
+- `totalCalories`
+- `watts`
+- `totalRestDistance`
+- `intervalRestTime`
+- `avgCalories`
+
+The `recoveryHeartRate` field is one that the erg sends after the rower has been resting for 1 minute. If the workout is cancelled or the erg is turned off before the end of this minute, the data may never arrive. See #10. This is likely to change later if a better solution is found. See #11.
 
 
 

.idea/workspace.xml

@@ -9,6 +9,15 @@
       <excludeFolder url="file://$MODULE_DIR$/.idea" />
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/flutter_ble_lib_ios_15/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/flutter_ble_lib_ios_15/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/flutter_ble_lib_ios_15/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/flutter_ble_lib_ios_15/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/flutter_ble_lib_ios_15/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/flutter_ble_lib_ios_15/build" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />

README.md

@@ -26,7 +26,9 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    // Any value starting with "flutter." get its value from
+    // the Flutter Gradle plugin.
+    compileSdk flutter.compileSdkVersion
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -35,8 +37,10 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.fresh_example"
-        minSdkVersion 18
-        targetSdkVersion 30
+        // You can update the following value to match your application needs.
+        minSdk flutter.minSdkVersion
+        targetSdk flutter.targetSdkVersion
+        // You can set these values in the property declaration or use a variable
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

c2bluetooth.iml

@@ -1,5 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.fresh_example">
+    <!-- https://developer.android.com/guide/topics/connectivity/bluetooth/permissions -->
+     <uses-permission android:name="android.permission.BLUETOOTH_SCAN" android:usesPermissionFlags="neverForLocation" />
+     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" android:maxSdkVersion="30" />
+     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" android:maxSdkVersion="30" />
+
    <application
         android:label="fresh_example"
         android:icon="@mipmap/ic_launcher">
@@ -9,7 +15,8 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
@@ -18,15 +25,6 @@
               android:name="io.flutter.embedding.android.NormalTheme"
               android:resource="@style/NormalTheme"
               />
-            <!-- Displays an Android View that continues showing the launch screen
-                 Drawable until Flutter paints its first frame, then this splash
-                 screen fades out. A splash screen is useful to avoid any visual
-                 gap between the end of Android's launch screen and the painting of
-                 Flutter's first frame. -->
-            <meta-data
-              android:name="io.flutter.embedding.android.SplashScreenDrawable"
-              android:resource="@drawable/launch_background"
-              />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>

example/android/app/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.5.20'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -24,6 +24,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+tasks.register("clean", Delete) {
+    delete rootProject.layout.buildDirectory
 }

example/android/app/src/main/AndroidManifest.xml

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip

example/android/build.gradle

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>11.0</string>
 </dict>
 </plist>