[exp/pedometer] Upgrade jnigen to 0.13.1 (#2566)

flutter · Jan 23, 2025 · ce50aaf · ce50aaf
1 parent c33edaf
commit ce50aaf
Show file tree

Hide file tree

Showing 7 changed files with 13,162 additions and 11,138 deletions.
diff --git a/experimental/pedometer/android/build.gradle b/experimental/pedometer/android/build.gradle
@@ -27,7 +27,7 @@ apply plugin: 'com.android.library'
 android {
     // Bumping the plugin compileSdkVersion requires all clients of this plugin
     // to bump the version in their app.
-    compileSdkVersion 31
+    compileSdkVersion 34
 
     // Bumping the plugin ndkVersion requires all clients of this plugin to bump
     // the version in their app and to download a newer version of the NDK.

diff --git a/experimental/pedometer/example/android/app/build.gradle b/experimental/pedometer/example/android/app/build.gradle
@@ -53,7 +53,7 @@ android {
         applicationId "com.example.jni_demo"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
-        compileSdkVersion 33
+        compileSdkVersion 34
         minSdkVersion 30
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()

diff --git a/experimental/pedometer/example/lib/main.dart b/experimental/pedometer/example/lib/main.dart
@@ -1,6 +1,6 @@
+import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
-import 'package:fl_chart/fl_chart.dart';
 
 import 'steps_repo.dart';
 
@@ -198,8 +198,8 @@ Widget getBottomTitles(double value, TitleMeta meta) {
     _ => ''
   };
   return SideTitleWidget(
-    axisSide: meta.axisSide,
     space: 4,
+    meta: meta,
     child: Text(
       timeText,
       style: TextStyle(fontSize: 14, color: Colors.blue[900]),

diff --git a/experimental/pedometer/example/lib/steps_repo.dart b/experimental/pedometer/example/lib/steps_repo.dart
@@ -146,8 +146,8 @@ class _AndroidStepsRepo implements StepsRepo {
         {hc.StepsRecord.COUNT_TOTAL}
             .toJSet(hc.AggregateMetric.type(jni.JLong.type)),
         hc.TimeRangeFilter.between(
-          hc.Instant.ofEpochMilli(start),
-          hc.Instant.ofEpochMilli(end),
+          hc.Instant.ofEpochMilli(start)!,
+          hc.Instant.ofEpochMilli(end)!,
         ),
         jni.JSet.hash(jni.JObject.type),
       );
@@ -156,7 +156,7 @@ class _AndroidStepsRepo implements StepsRepo {
     final data = await Future.wait(futures);
     return data.asMap().entries.map((entry) {
       final stepsLong = entry.value.get(hc.StepsRecord.COUNT_TOTAL);
-      final steps = stepsLong.isNull ? 0 : stepsLong.intValue();
+      final steps = stepsLong?.intValue() ?? 0;
       return Steps(entry.key.toString().padLeft(2, '0'), steps);
     }).toList();
   }

diff --git a/experimental/pedometer/example/pubspec.yaml b/experimental/pedometer/example/pubspec.yaml
@@ -41,7 +41,7 @@ dependencies:
 
   ffi: ^2.1.2
   intl: ^0.20.0
-  jni: ^0.12.0
+  jni: ^0.13.0
   fl_chart: ^0.70.0
 
 dev_dependencies: