Update gradle, kotlin and Add tests

Author: iarata

packages/app_usage/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 4.1.0
+
+* Upgrade gradle version 8.12.3
+* Upgrade APG
+* Upgrade Kotlin to 2.2.0
+* Add tests
+* Update Flutter SDK version
+
 ## 4.0.1
 
 * Upgrading gradle version

packages/app_usage/analysis_options.yaml

@@ -0,0 +1,18 @@
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options
+
+include: package:lints/recommended.yaml
+
+analyzer:
+  exclude: [build/**]
+  language:
+    strict-casts: true
+    strict-inference: true
+    strict-raw-types: true
+
+linter:
+  rules:
+    cancel_subscriptions: true
+    constant_identifier_names: false
+    depend_on_referenced_packages: false
+    use_string_in_part_of_directives: false

packages/app_usage/android/build.gradle

@@ -2,14 +2,14 @@ group = "dk.cachet.app_usage"
 version = "1.0-SNAPSHOT"
 
 buildscript {
-    ext.kotlin_version = "1.8.22"
+    ext.kotlin_version = "2.2.0"
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:8.1.0")
+        classpath("com.android.tools.build:gradle:8.12.3")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
     }
 }
@@ -35,7 +35,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11
+        jvmTarget = "11"
     }
 
     sourceSets {
@@ -64,5 +64,3 @@ android {
         }
     }
 }
-
-

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

@@ -11,12 +11,12 @@ android {
     ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = "11"
     }
 
     defaultConfig {

packages/app_usage/example/android/gradle.properties

@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
-android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true

packages/app_usage/example/android/settings.gradle

@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.2"
-    id "com.android.application" version "8.1.0" apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.20' apply false
+    id "com.android.application" version "8.12.3" apply false
+    id 'org.jetbrains.kotlin.android' version '2.2.0' apply false
 }
 
 include ":app"

packages/app_usage/example/integration_test/app_usage_e2e_test.dart

@@ -0,0 +1,73 @@
+import 'package:app_usage_example/main.dart' as app;
+import 'package:app_usage/app_usage.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:integration_test/integration_test.dart';
+
+void main() {
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+
+  const MethodChannel channel = MethodChannel('app_usage.methodChannel');
+
+  tearDown(() async {
+    AppUsage.debugIsAndroidOverride = null;
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(channel, null);
+  });
+
+  testWidgets('loads usage information into the example app', (tester) async {
+    AppUsage.debugIsAndroidOverride = true;
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(channel, (call) async {
+      expect(call.method, 'getUsage');
+
+      final arguments = Map<String, dynamic>.from(call.arguments as Map);
+      final start = arguments['start'] as int;
+      final end = arguments['end'] as int;
+
+      expect(start, lessThan(end));
+
+      return <String, List<double>>{
+        'com.example.mail': <double>[
+          120,
+          start / 1000,
+          end / 1000,
+          (end - const Duration(minutes: 5).inMilliseconds) / 1000,
+        ],
+      };
+    });
+
+    app.main();
+    await tester.pumpAndSettle();
+
+    expect(find.text('No usage data loaded yet.'), findsOneWidget);
+
+    await tester.tap(find.byKey(const Key('load_usage_button')));
+    await tester.pumpAndSettle();
+
+    expect(find.text('mail'), findsOneWidget);
+    expect(find.text('com.example.mail'), findsOneWidget);
+    expect(find.text('0:02:00.000000'), findsOneWidget);
+  });
+
+  testWidgets('shows channel errors in the example app', (tester) async {
+    AppUsage.debugIsAndroidOverride = true;
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(channel, (call) async {
+      throw PlatformException(
+        code: 'permission_denied',
+        message: 'Usage access is not granted.',
+      );
+    });
+
+    app.main();
+    await tester.pumpAndSettle();
+
+    await tester.tap(find.byKey(const Key('load_usage_button')));
+    await tester.pumpAndSettle();
+
+    expect(find.byKey(const Key('usage_error_message')), findsOneWidget);
+    expect(find.textContaining('permission_denied'), findsOneWidget);
+  });
+}

packages/app_usage/example/lib/main.dart

@@ -1,15 +1,18 @@
 import 'package:flutter/material.dart';
 import 'package:app_usage/app_usage.dart';
 
-void main() => runApp(AppUsageApp());
+void main() => runApp(const AppUsageApp());
 
 class AppUsageApp extends StatefulWidget {
+  const AppUsageApp({super.key});
+
   @override
   AppUsageAppState createState() => AppUsageAppState();
 }
 
 class AppUsageAppState extends State<AppUsageApp> {
   List<AppUsageInfo> _infos = [];
+  String? _errorMessage;
 
   @override
   void initState() {
@@ -18,13 +21,19 @@ class AppUsageAppState extends State<AppUsageApp> {
 
   void getUsageStats() async {
     try {
-      DateTime endDate = DateTime.now();
-      DateTime startDate = endDate.subtract(Duration(hours: 1));
-      List<AppUsageInfo> infoList =
+      final DateTime endDate = DateTime.now();
+      final DateTime startDate = endDate.subtract(const Duration(hours: 1));
+      final List<AppUsageInfo> infoList =
           await AppUsage().getAppUsage(startDate, endDate);
-      setState(() => _infos = infoList);
+      setState(() {
+        _infos = infoList;
+        _errorMessage = null;
+      });
     } catch (exception) {
-      print(exception);
+      setState(() {
+        _infos = [];
+        _errorMessage = exception.toString();
+      });
     }
   }
 
@@ -36,16 +45,45 @@ class AppUsageAppState extends State<AppUsageApp> {
           title: const Text('App Usage Example'),
           backgroundColor: Colors.green,
         ),
-        body: ListView.builder(
-            itemCount: _infos.length,
-            itemBuilder: (context, index) {
-              return ListTile(
-                  title: Text(_infos[index].appName),
-                  trailing: Text(_infos[index].usage.toString()));
-            }),
+        body: _buildBody(),
         floatingActionButton: FloatingActionButton(
-            onPressed: getUsageStats, child: Icon(Icons.file_download)),
+          key: const Key('load_usage_button'),
+          onPressed: getUsageStats,
+          child: const Icon(Icons.file_download),
+        ),
       ),
     );
   }
+
+  Widget _buildBody() {
+    if (_errorMessage != null) {
+      return Center(
+        child: Text(
+          _errorMessage!,
+          key: const Key('usage_error_message'),
+          textAlign: TextAlign.center,
+        ),
+      );
+    }
+
+    if (_infos.isEmpty) {
+      return const Center(
+        child: Text(
+          'No usage data loaded yet.',
+          key: Key('usage_empty_state'),
+        ),
+      );
+    }
+
+    return ListView.builder(
+      itemCount: _infos.length,
+      itemBuilder: (context, index) {
+        return ListTile(
+          title: Text(_infos[index].appName),
+          subtitle: Text(_infos[index].packageName),
+          trailing: Text(_infos[index].usage.toString()),
+        );
+      },
+    );
+  }
 }

packages/app_usage/example/pubspec.yaml

@@ -6,7 +6,7 @@ description: Demonstrates how to use the app_usage plugin.
 publish_to: "none" # Remove this line if you wish to publish to pub.dev
 
 environment:
-  sdk: ">=3.2.0 <4.0.0"
+  sdk: ">=3.8.0 <4.0.0"
 
 dependencies:
   flutter:
@@ -25,6 +25,8 @@ dependencies:
   cupertino_icons: ^1.0.2
 
 dev_dependencies:
+  integration_test:
+    sdk: flutter
   flutter_test:
     sdk: flutter
 

packages/app_usage/lib/app_usage.dart

@@ -1,13 +1,14 @@
 import 'dart:async';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'dart:io' show Platform;
 
 /// Information on app usage.
 class AppUsageInfo {
   late String _packageName, _appName;
   late Duration _usage;
-  DateTime _startDate, _endDate, _lastForeground;
+  final DateTime _startDate, _endDate, _lastForeground;
 
   AppUsageInfo(
     String name,
@@ -48,20 +49,28 @@ class AppUsageInfo {
 
 /// Singleton class to get app usage statistics.
 class AppUsage {
-  static const MethodChannel _methodChannel =
-      const MethodChannel("app_usage.methodChannel");
+  static const MethodChannel _methodChannel = MethodChannel(
+    "app_usage.methodChannel",
+  );
+  static bool? _debugIsAndroidOverride;
 
   static final AppUsage _instance = AppUsage._();
   AppUsage._();
   factory AppUsage() => _instance;
 
+  @visibleForTesting
+  static set debugIsAndroidOverride(bool? value) {
+    _debugIsAndroidOverride = value;
+  }
+
   /// Get app usage statistics for the specified interval. Only works on Android.
   /// Returns an empty list if called on iOS.
   Future<List<AppUsageInfo>> getAppUsage(
     DateTime startDate,
     DateTime endDate,
   ) async {
-    if (!Platform.isAndroid) return [];
+    final bool isAndroid = _debugIsAndroidOverride ?? Platform.isAndroid;
+    if (!isAndroid) return [];
 
     if (endDate.isBefore(startDate)) {
       throw ArgumentError('End date must be after start date');
@@ -72,22 +81,33 @@ class AppUsage {
     int start = startDate.millisecondsSinceEpoch;
 
     // Set parameters
-    Map<String, int> interval = {'start': start, 'end': end};
+    final Map<String, int> interval = <String, int>{'start': start, 'end': end};
 
     // Get result and parse it as a Map of <String, List<double>>
-    Map usage = await _methodChannel.invokeMethod('getUsage', interval);
+    final Map<Object?, Object?> usage =
+        await _methodChannel.invokeMethod<Map<Object?, Object?>>(
+          'getUsage',
+          interval,
+        ) ??
+        <Object?, Object?>{};
 
     // Convert to list of AppUsageInfo
-    List<AppUsageInfo> result = [];
-    for (String key in usage.keys) {
-      List<double> temp = List<double>.from(usage[key]);
+    final List<AppUsageInfo> result = <AppUsageInfo>[];
+    for (final MapEntry<Object?, Object?> entry in usage.entries) {
+      final String key = entry.key as String;
+      final List<double> temp = List<double>.from(
+        entry.value as Iterable<Object?>,
+      );
       if (temp[0] > 0) {
-        result.add(AppUsageInfo(
+        result.add(
+          AppUsageInfo(
             key,
             temp[0],
             DateTime.fromMillisecondsSinceEpoch(temp[1].round() * 1000),
             DateTime.fromMillisecondsSinceEpoch(temp[2].round() * 1000),
-            DateTime.fromMillisecondsSinceEpoch(temp[3].round() * 1000)));
+            DateTime.fromMillisecondsSinceEpoch(temp[3].round() * 1000),
+          ),
+        );
       }
     }