fix bug

Author: o-bagge

open_earable/ios/Flutter/AppFrameworkInfo.plist

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

open_earable/ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+# platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

open_earable/ios/Podfile.lock

@@ -5,10 +5,18 @@ PODS:
   - flutter_gl (0.0.3):
     - Flutter
     - three3d_egl (~> 0.1.3)
+  - flutter_inappwebview (0.0.1):
+    - Flutter
+    - flutter_inappwebview/Core (= 0.0.1)
+    - OrderedSet (~> 5.0)
+  - flutter_inappwebview/Core (0.0.1):
+    - Flutter
+    - OrderedSet (~> 5.0)
   - flutter_native_splash (0.0.1):
     - Flutter
   - open_file (0.0.1):
     - Flutter
+  - OrderedSet (5.0.0)
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -26,6 +34,7 @@ DEPENDENCIES:
   - app_settings (from `.symlinks/plugins/app_settings/ios`)
   - Flutter (from `Flutter`)
   - flutter_gl (from `.symlinks/plugins/flutter_gl/ios`)
+  - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
   - open_file (from `.symlinks/plugins/open_file/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
@@ -34,6 +43,7 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
+    - OrderedSet
     - Protobuf
     - SwiftProtobuf
     - three3d_egl
@@ -45,6 +55,8 @@ EXTERNAL SOURCES:
     :path: Flutter
   flutter_gl:
     :path: ".symlinks/plugins/flutter_gl/ios"
+  flutter_inappwebview:
+    :path: ".symlinks/plugins/flutter_inappwebview/ios"
   flutter_native_splash:
     :path: ".symlinks/plugins/flutter_native_splash/ios"
   open_file:
@@ -58,17 +70,19 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   app_settings: 017320c6a680cdc94c799949d95b84cb69389ebc
-  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_gl: 5a5603f35db897697f064027864a32b15d0c421d
+  flutter_inappwebview: 3d32228f1304635e7c028b0d4252937730bbc6cf
   flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
   open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d
+  OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
   Protobuf: 970f7ee93a3a08e3cf64859b8efd95ee32b4f87f
   reactive_ble_mobile: 9ce6723d37ccf701dbffd202d487f23f5de03b4c
   SwiftProtobuf: b70d65f419fbfe61a2d58003456ca5da58e337d6
   three3d_egl: de2cd4950ad2d5f2122166c36583bde4c812e7b5
 
-PODFILE CHECKSUM: 70d9d25280d0dd177a5f637cdb0f0b0b12c6a189
+PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
 
 COCOAPODS: 1.12.1

open_earable/ios/Runner.xcodeproj/project.pbxproj

@@ -463,7 +463,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
@@ -601,7 +601,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -650,7 +650,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";

open_earable/lib/apps/neck_stretch/model/stretch_state.dart

@@ -80,7 +80,6 @@ class StretchStats {
   double leftStretchDuration;
   double rightStretchDuration;
 
-
   StretchStats(
       {this.maxMainAngle = 0,
       this.maxLeftAngle = 0,
@@ -150,13 +149,13 @@ class NeckStretch {
   late bool _resting;
 
   /// Holds the Timer that increments the current Duration
-  var _restDurationTimer;
+  Timer? _restDurationTimer;
 
   /// Stores the rest duration of the current timer
   late Duration _restDuration;
 
   /// Stores the current active timer for state transition
-  var _currentTimer;
+  Timer? _currentTimer;
 
   StretchSettings get settings => _settings;
 
@@ -183,8 +182,8 @@ class NeckStretch {
   void stopStretching() {
     _resting = false;
     _settings.state = NeckStretchState.noStretch;
-    _currentTimer.cancel();
-    _restDurationTimer.cancel();
+    _currentTimer?.cancel();
+    _restDurationTimer?.cancel();
     _restDuration = Duration(seconds: 0);
     _viewModel.stopTracking();
   }
@@ -204,7 +203,7 @@ class NeckStretch {
       /// If we don't restart the timer it results in a weird UI inconsistency
       /// for displaying the _restDuration as then the restDuration is already
       /// counted down when the next Timer hasn't started yet.
-      _restDurationTimer.cancel();
+      _restDurationTimer?.cancel();
       _startCountdown();
       _restDuration = _settings.restingTime;
       _currentTimer = Timer(_settings.restingTime, () {
@@ -241,8 +240,8 @@ class NeckStretch {
         return;
       case NeckStretchState.leftNeckStretch:
         _settings.state = NeckStretchState.doneStretching;
-        _currentTimer.cancel();
-        _restDurationTimer.cancel();
+        _currentTimer?.cancel();
+        _restDurationTimer?.cancel();
         _restDuration = Duration(seconds: 0);
         _viewModel.stopTracking();
         _openEarable.audioPlayer.jingle(2);