Pul rq

.gitignore

@@ -122,3 +122,9 @@ packages/audio_streamer/example/.flutter-plugins-dependencies
 *.sh
 packages/health/example/.flutter-plugins-dependencies
 *.sh
+packages/health/example/.flutter-plugins-dependencies
+packages/health/example/.flutter-plugins-dependencies
+packages/activity_recognition_flutter/example/.flutter-plugins-dependencies
+packages/mobility_features/example/.flutter-plugins-dependencies
+packages/mobility_features/example/.flutter-plugins-dependencies
+packages/health/example/.flutter-plugins-dependencies

README.md

@@ -10,7 +10,7 @@ For more information about plugins, and how to use them, see
 ## Plugins
 These are the available plugins in this repository.
 
-| Plugin | Description | Android | iOS |    Pub    | 
+| Plugin | Description | Android | iOS |    http://pub.dev/    | 
 |--------|-------------|:-------:|:---:|:---------:|
 | [screen_state](./packages/screen_state) | Track screen state changes | ✔️ | ❌ | [![pub package](https://img.shields.io/pub/v/screen_state.svg)](https://pub.dartlang.org/packages/screen_state) |
 | [light](./packages/light) | Track light sensor readings | ✔️ | ❌ |  [![pub package](https://img.shields.io/pub/v/light.svg)](https://pub.dartlang.org/packages/light) |
@@ -35,15 +35,19 @@ Please check existing issues and file any new issues, bugs, or feature requests
 
 ## Contributing
 
-If you wish to contribute a new plugin to the Flutter ecosystem, please
+As part of the open-source Flutter ecosystem, we would welcome any help in maintaining and enhancing these plugins. 
+We (i.e., CACHET) have limited resources for maintaining these plugins and we rely on **your** help in this.
+We welcome any contribution -- from small error corrections in the documentation, to bug fixes, to large features enhacements, or even new features in a plugin.
+If you wish to contribute to any of the plugins in this repo,
+please review our [contribution guide](https://github.com/cph-cachet/flutter-plugins/CONTRIBUTING.md),
+and send a [pull request](https://github.com/cph-cachet/flutter-plugins/pulls).
+
+
+In general, if you wish to contribute a new plugin to the Flutter ecosystem, please
 see the documentation for [developing packages](https://flutter.io/developing-packages/) and
 [platform channels](https://flutter.io/platform-channels/). You can store
 your plugin source code in any GitHub repository (the present repo is only
 intended for plugins developed by the core CARP team). Once your plugin
 is ready you can [publish](https://flutter.io/developing-packages/#publish)
 to the [pub repository](https://pub.dartlang.org/).
 
-If you wish to contribute a change to any of the existing plugins in this repo,
-please review our [contribution guide](https://github.com/cph-cachet/flutter-plugins/CONTRIBUTING.md),
-and send a [pull request](https://github.com/cph-cachet/flutter-plugins/pulls).
-

packages/activity_recognition_flutter/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 4.2.0
+* small refactor and improvement of docs
+* using `ActivityRecognition()` when creating a singleton -- standard practice in Dart.
+
+## 4.1.0
+* [PR #474](https://github.com/cph-cachet/flutter-plugins/pull/474) - Android 12 intent-flag
+* the name of the stream has been changed from `startStream` to `activityStream`
+* cleanup in example app
+
 ## 4.0.5+1
 * [PR #408](https://github.com/cph-cachet/flutter-plugins/pull/408)
 
@@ -17,7 +26,6 @@
 * [PR #314](https://github.com/cph-cachet/flutter-plugins/pull/314)
 
 ## 4.0.0
-
 - Null safety migration
 - Updated swift code
 

packages/activity_recognition_flutter/android/build.gradle

@@ -22,16 +22,16 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 21
     }
     lintOptions {
         disable 'InvalidPackage'
     }
 }
 
 dependencies {
-    implementation 'com.google.android.gms:play-services-location:16.0.0'
+    implementation 'com.google.android.gms:play-services-location:19.0.1'
 }

packages/activity_recognition_flutter/android/src/main/java/dk/cachet/activity_recognition_flutter/ActivityRecognitionFlutterPlugin.java

@@ -45,7 +45,13 @@ public class ActivityRecognitionFlutterPlugin implements FlutterPlugin, EventCha
     private void startActivityTracking() {
         // Start the service
         Intent intent = new Intent(androidActivity, ActivityRecognizedBroadcastReceiver.class);
-        PendingIntent pendingIntent = PendingIntent.getBroadcast(androidActivity, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        Log.d(TAG, "SDK = " + Build.VERSION.SDK_INT);
+        int flags = PendingIntent.FLAG_UPDATE_CURRENT;
+        if (Build.VERSION.SDK_INT >= 31) {
+            flags |= PendingIntent.FLAG_IMMUTABLE;
+        }
+        PendingIntent pendingIntent = PendingIntent.getBroadcast(androidActivity, 0, intent, flags);
 
         // Frequency in milliseconds
         long frequency = 5 * 1000;
@@ -55,13 +61,13 @@ private void startActivityTracking() {
         task.addOnSuccessListener(new OnSuccessListener<Void>() {
             @Override
             public void onSuccess(Void e) {
-                Log.d(TAG, "ActivityRecognition: onSuccess");
+                Log.d(TAG, "Successfully registered ActivityRecognition listener.");
             }
         });
         task.addOnFailureListener(new OnFailureListener() {
             @Override
             public void onFailure(@NonNull Exception e) {
-                Log.d(TAG, "ActivityRecognition: onFailure");
+                Log.d(TAG, "Failed to registered ActivityRecognition listener.");
             }
         });
     }
@@ -82,13 +88,11 @@ public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBindin
     @Override
     public void onListen(Object arguments, EventChannel.EventSink events) {
         HashMap<String, Object> args = (HashMap<String, Object>) arguments;
-        Log.d(TAG, "args: " + args);
         boolean fg = (boolean) args.get("foreground");
         if(fg) {
             startForegroundService();
         }
-        Log.d(TAG, "foreground: " + fg);
-
+        Log.d(TAG, "Foreground mode: " + fg);
 
         eventSink = events;
         startActivityTracking();
@@ -132,7 +136,7 @@ public void onAttachedToActivity(@NonNull ActivityPluginBinding binding) {
 
         SharedPreferences prefs = androidContext.getSharedPreferences(ACTIVITY_RECOGNITION, Context.MODE_PRIVATE);
         prefs.registerOnSharedPreferenceChangeListener(this);
-        Log.d(TAG, "onAttachedToActivity");
+        // Log.d(TAG, "onAttachedToActivity");
     }
 
     @Override
@@ -161,9 +165,9 @@ public void onDetachedFromActivity() {
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         String result = sharedPreferences
                 .getString(DETECTED_ACTIVITY, "error");
-        Log.d("onSharedPreferenceChange", result);
+        // Log.d("onSharedPreferenceChange", result);
         if (key!= null && key.equals(DETECTED_ACTIVITY)) {
-            Log.d(TAG, "Detected activity: " + result);
+            // Log.d(TAG, "Detected activity: " + result);
             eventSink.success(result);
         }
     }

packages/activity_recognition_flutter/example/android/app/build.gradle

@@ -34,7 +34,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "dk.cachet.activity_recognition_flutter_example"
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

packages/activity_recognition_flutter/example/ios/Runner.xcodeproj/project.pbxproj

@@ -155,7 +155,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1320;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -321,6 +321,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -339,7 +340,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -400,6 +401,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -424,7 +426,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -455,6 +457,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -473,7 +476,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -491,7 +494,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = H33599VJ27;
+				DEVELOPMENT_TEAM = 8TB3T6MAZG;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

packages/activity_recognition_flutter/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildSystemType</key>
-	<string>Original</string>
+	<string>Latest</string>
 	<key>PreviewsEnabled</key>
 	<false/>
 </dict>

packages/activity_recognition_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1320"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Profile"

packages/activity_recognition_flutter/example/ios/Runner/Info.plist

@@ -31,8 +31,6 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>