Merge branch 'main' into dependabot/pub/packages/android_alarm_manager_plus/example/permission_handler-12.0.01

Author: miquelbeltran

packages/device_info_plus/device_info_plus/android/src/main/kotlin/dev/fluttercommunity/plus/device_info/MethodCallHandlerImpl.kt

@@ -9,6 +9,9 @@ import android.provider.Settings
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler
+import kotlin.collections.HashMap
+import android.os.StatFs
+import android.os.Environment
 
 /**
  * The implementation of [MethodChannel.MethodCallHandler] for the plugin. Responsible for
@@ -56,6 +59,10 @@ internal class MethodCallHandlerImpl(
             build["isPhysicalDevice"] = !isEmulator
             build["systemFeatures"] = getSystemFeatures()
 
+            val statFs = StatFs(Environment.getDataDirectory().getPath())
+            build["freeDiskSize"] = statFs.getFreeBytes()
+            build["totalDiskSize"] = statFs.getTotalBytes()
+
             val version: MutableMap<String, Any> = HashMap()
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 version["baseOS"] = Build.VERSION.BASE_OS

packages/device_info_plus/device_info_plus/example/lib/main.dart

@@ -101,6 +101,8 @@ class _MyAppState extends State<MyApp> {
       'tags': build.tags,
       'type': build.type,
       'isPhysicalDevice': build.isPhysicalDevice,
+      'freeDiskSize': build.freeDiskSize,
+      'totalDiskSize': build.totalDiskSize,
       'systemFeatures': build.systemFeatures,
       'serialNumber': build.serialNumber,
       'isLowRamDevice': build.isLowRamDevice,
@@ -120,6 +122,8 @@ class _MyAppState extends State<MyApp> {
       'identifierForVendor': data.identifierForVendor,
       'isPhysicalDevice': data.isPhysicalDevice,
       'isiOSAppOnMac': data.isiOSAppOnMac,
+      'freeDiskSize': data.freeDiskSize,
+      'totalDiskSize': data.totalDiskSize,
       'physicalRamSize': data.physicalRamSize,
       'availableRamSize': data.availableRamSize,
       'utsname.sysname:': data.utsname.sysname,

packages/device_info_plus/device_info_plus/ios/device_info_plus/Sources/device_info_plus/FPPDeviceInfoPlusPlugin.m

@@ -30,6 +30,15 @@ - (void)handleMethodCall:(FlutterMethodCall *)call
     if (@available(iOS 14.0, *)) {
       isiOSAppOnMac = [NSNumber numberWithBool:[info isiOSAppOnMac]];
     }
+    NSError *error = nil;
+    NSDictionary *fsAttributes = [[NSFileManager defaultManager] attributesOfFileSystemForPath:NSHomeDirectory() error:&error];
+    NSNumber *freeSize = [NSNumber numberWithInt:-1];
+    NSNumber *totalSize = [NSNumber numberWithInt:-1];
+    if(fsAttributes) {
+        freeSize = fsAttributes[NSFileSystemFreeSize];
+        totalSize = fsAttributes[NSFileSystemSize];
+    }
+
     NSString *machine;
     NSString *deviceName;
     if ([self isDevicePhysical]) {
@@ -51,10 +60,12 @@ - (void)handleMethodCall:(FlutterMethodCall *)call
       @"modelName" : deviceName,
       @"identifierForVendor" : [[device identifierForVendor] UUIDString]
           ?: [NSNull null],
+      @"freeDiskSize" : freeSize,
+      @"totalDiskSize" : totalSize,
       @"isPhysicalDevice" : isPhysicalNumber,
       @"isiOSAppOnMac" : isiOSAppOnMac,
-      @"physicalRamSize": physicalRamSize,
-      @"availableRamSize": availableRamSize,
+      @"physicalRamSize" : physicalRamSize,
+      @"availableRamSize" : availableRamSize,
       @"utsname" : @{
         @"sysname" : @(un.sysname),
         @"nodename" : @(un.nodename),

packages/device_info_plus/device_info_plus/lib/src/model/android_device_info.dart

@@ -31,6 +31,8 @@ class AndroidDeviceInfo extends BaseDeviceInfo {
     required this.tags,
     required this.type,
     required this.isPhysicalDevice,
+    required this.freeDiskSize,
+    required this.totalDiskSize,
     required List<String> systemFeatures,
     required this.serialNumber,
     required this.isLowRamDevice,
@@ -123,6 +125,16 @@ class AndroidDeviceInfo extends BaseDeviceInfo {
   /// `false` if the application is running in an emulator, `true` otherwise.
   final bool isPhysicalDevice;
 
+  /// Available disk size in bytes
+  ///
+  /// https://developer.android.com/reference/android/os/StatFs#getFreeBytes()
+  final int freeDiskSize;
+
+  /// Total disk size in bytes
+  ///
+  /// https://developer.android.com/reference/android/os/StatFs#getTotalBytes()
+  final int totalDiskSize;
+
   /// Describes what features are available on the current device.
   ///
   /// This can be used to check if the device has, for example, a front-facing
@@ -183,6 +195,8 @@ class AndroidDeviceInfo extends BaseDeviceInfo {
       tags: map['tags'],
       type: map['type'],
       isPhysicalDevice: map['isPhysicalDevice'],
+      freeDiskSize: map['freeDiskSize'],
+      totalDiskSize: map['totalDiskSize'],
       systemFeatures: _fromList(map['systemFeatures'] ?? []),
       serialNumber: map['serialNumber'],
       isLowRamDevice: map['isLowRamDevice'],
@@ -214,6 +228,8 @@ class AndroidDeviceInfo extends BaseDeviceInfo {
     required String tags,
     required String type,
     required bool isPhysicalDevice,
+    required int freeDiskSize,
+    required int totalDiskSize,
     required List<String> systemFeatures,
     required String serialNumber,
     required bool isLowRamDevice,
@@ -249,6 +265,8 @@ class AndroidDeviceInfo extends BaseDeviceInfo {
       'tags': tags,
       'type': type,
       'isPhysicalDevice': isPhysicalDevice,
+      'freeDiskSize': freeDiskSize,
+      'totalDiskSize': totalDiskSize,
       'systemFeatures': systemFeatures,
       'serialNumber': serialNumber,
       'isLowRamDevice': isLowRamDevice,
@@ -278,6 +296,8 @@ class AndroidDeviceInfo extends BaseDeviceInfo {
       tags: tags,
       type: type,
       isPhysicalDevice: isPhysicalDevice,
+      freeDiskSize: freeDiskSize,
+      totalDiskSize: totalDiskSize,
       systemFeatures: _fromList(systemFeatures),
       serialNumber: serialNumber,
       isLowRamDevice: isLowRamDevice,

packages/device_info_plus/device_info_plus/lib/src/model/ios_device_info.dart

@@ -18,6 +18,8 @@ class IosDeviceInfo extends BaseDeviceInfo {
     required this.model,
     required this.modelName,
     required this.localizedModel,
+    required this.freeDiskSize,
+    required this.totalDiskSize,
     this.identifierForVendor,
     required this.isPhysicalDevice,
     required this.physicalRamSize,
@@ -74,6 +76,12 @@ class IosDeviceInfo extends BaseDeviceInfo {
   /// Operating system information derived from `sys/utsname.h`.
   final IosUtsname utsname;
 
+  /// Free disk size in bytes
+  final int freeDiskSize;
+
+  /// Total disk size in bytes
+  final int totalDiskSize;
+
   /// Deserializes from the map message received from [_kChannel].
   static IosDeviceInfo fromMap(Map<String, dynamic> map) {
     return IosDeviceInfo._(
@@ -85,6 +93,8 @@ class IosDeviceInfo extends BaseDeviceInfo {
       modelName: map['modelName'],
       localizedModel: map['localizedModel'],
       identifierForVendor: map['identifierForVendor'],
+      freeDiskSize: map['freeDiskSize'],
+      totalDiskSize: map['totalDiskSize'],
       isPhysicalDevice: map['isPhysicalDevice'],
       physicalRamSize: map['physicalRamSize'],
       availableRamSize: map['availableRamSize'],
@@ -103,6 +113,8 @@ class IosDeviceInfo extends BaseDeviceInfo {
     required String model,
     required String modelName,
     required String localizedModel,
+    required int freeDiskSize,
+    required int totalDiskSize,
     String? identifierForVendor,
     required bool isPhysicalDevice,
     required bool isiOSAppOnMac,
@@ -118,6 +130,8 @@ class IosDeviceInfo extends BaseDeviceInfo {
       'modelName': modelName,
       'localizedModel': localizedModel,
       'identifierForVendor': identifierForVendor,
+      'freeDiskSize': freeDiskSize,
+      'totalDiskSize': totalDiskSize,
       'isPhysicalDevice': isPhysicalDevice,
       'isiOSAppOnMac': isiOSAppOnMac,
       'physicalRamSize': physicalRamSize,
@@ -139,6 +153,8 @@ class IosDeviceInfo extends BaseDeviceInfo {
       modelName: modelName,
       localizedModel: localizedModel,
       identifierForVendor: identifierForVendor,
+      freeDiskSize: freeDiskSize,
+      totalDiskSize: totalDiskSize,
       isPhysicalDevice: isPhysicalDevice,
       isiOSAppOnMac: isiOSAppOnMac,
       physicalRamSize: physicalRamSize,

packages/device_info_plus/device_info_plus/test/model/android_device_info_fake.dart

@@ -29,6 +29,8 @@ const _fakeAndroidDeviceInfo = <String, dynamic>{
   'display': 'display',
   'hardware': 'hardware',
   'isPhysicalDevice': true,
+  'freeDiskSize': 70729949184,
+  'totalDiskSize': 113281839104,
   'bootloader': 'bootloader',
   'fingerprint': 'fingerprint',
   'manufacturer': 'manufacturer',

packages/device_info_plus/device_info_plus/test/model/android_device_info_test.dart

@@ -25,6 +25,8 @@ void main() {
       expect(androidDeviceInfo.hardware, 'hardware');
       expect(androidDeviceInfo.bootloader, 'bootloader');
       expect(androidDeviceInfo.isPhysicalDevice, isTrue);
+      expect(androidDeviceInfo.freeDiskSize, 70729949184);
+      expect(androidDeviceInfo.totalDiskSize, 113281839104);
       expect(androidDeviceInfo.fingerprint, 'fingerprint');
       expect(androidDeviceInfo.manufacturer, 'manufacturer');
       expect(androidDeviceInfo.supportedAbis, _fakeSupportedAbis);

packages/device_info_plus/device_info_plus/test/model/ios_device_info_test.dart

@@ -27,6 +27,8 @@ void main() {
         'systemVersion': 'systemVersion',
         'localizedModel': 'localizedModel',
         'identifierForVendor': 'identifierForVendor',
+        'freeDiskSize': 4096,
+        'totalDiskSize': 8192,
       };
 
       iosDeviceInfo = IosDeviceInfo.fromMap(iosDeviceInfoMap);
@@ -43,6 +45,8 @@ void main() {
       expect(iosDeviceInfo.systemName, 'systemName');
       expect(iosDeviceInfo.systemVersion, 'systemVersion');
       expect(iosDeviceInfo.localizedModel, 'localizedModel');
+      expect(iosDeviceInfo.freeDiskSize, 4096);
+      expect(iosDeviceInfo.totalDiskSize, 8192);
       expect(iosDeviceInfo.utsname.release, 'release');
       expect(iosDeviceInfo.utsname.version, 'version');
       expect(iosDeviceInfo.utsname.machine, 'machine');

packages/network_info_plus/network_info_plus/example/pubspec.yaml

@@ -8,7 +8,7 @@ dependencies:
   flutter:
     sdk: flutter
   network_info_plus: ^6.1.4
-  permission_handler: ^11.3.0
+  permission_handler: ^12.0.0+1
 
 dev_dependencies:
   flutter_test: