+
+ 
Null
+
+
+
+
+ 
@@ -422,6 +429,14 @@ await MatomoTracker.instance.initialize(
+ 
diff --git a/lib/src/matomo.dart b/lib/src/matomo.dart
index 091d5ec..505b7a1 100644
--- a/lib/src/matomo.dart
+++ b/lib/src/matomo.dart
@@ -385,8 +385,9 @@ class MatomoTracker {
final systemName = iosInfo.systemName;
final version = iosInfo.systemVersion;
final model = iosInfo.model;
+ final machine = iosInfo.utsname.machine;
- return '$systemName $version, $model';
+ return '$systemName $version, $model $machine';
} else if (_platformInfo.isWindows) {
final windowsInfo = await effectiveDeviceInfo.windowsInfo;
final releaseId = windowsInfo.releaseId;
diff --git a/lib/src/matomo_action.dart b/lib/src/matomo_action.dart
index 5a23b67..c38a0f2 100644
--- a/lib/src/matomo_action.dart
+++ b/lib/src/matomo_action.dart
@@ -200,7 +200,7 @@ class MatomoAction {
final ua = tracker.userAgent;
final dims = dimensions;
final locale = PlatformDispatcher.instance.locale;
- final country = locale.countryCode;
+ final country = locale.countryCode?.toLowerCase();
final nV = newVisit;
final p = ping;
final cont = content;
diff --git a/pubspec.yaml b/pubspec.yaml
index 5b862f4..ebf9972 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
name: matomo_tracker
description: A fully cross-platform wrap of the Matomo tracking client for
Flutter, using the Matomo API.
-version: 5.0.0-dev.2
+version: 5.0.0-dev.3
homepage: https://github.com/Floating-Dartists/matomo-tracker
repository: https://github.com/Floating-Dartists/matomo-tracker
issue_tracker: https://github.com/Floating-Dartists/matomo-tracker/issues
@@ -10,26 +10,26 @@ topics:
- analytics
environment:
- sdk: ">=3.0.0 <4.0.0"
+ sdk: ">=3.4.1 <4.0.0"
flutter: ">=3.3.0"
dependencies:
clock: ^1.1.1
- collection: ^1.17.2
+ collection: ^1.18.0
device_info_plus: ">=9.1.0 <11.0.0"
flutter:
sdk: flutter
- http: ^1.1.0
- package_info_plus: ">=4.2.0 <8.0.0"
- shared_preferences: ^2.2.2
+ http: ^1.2.1
+ package_info_plus: ">=4.2.0 <9.0.0"
+ shared_preferences: ^2.2.3
uuid: ">=4.1.0 <6.0.0"
dev_dependencies:
- custom_lint: ^0.5.4
- fd_lints: ^2.2.0
+ custom_lint: ">=0.5.4 <0.7.0"
+ fd_lints: ^2.2.1
flutter_test:
sdk: flutter
- meta: ^1.9.1
- mocktail: ^1.0.2
+ meta: ^1.12.0
+ mocktail: ^1.0.3
flutter: null
diff --git a/test/ressources/mock/data.dart b/test/ressources/mock/data.dart
index 4760d6d..1350067 100644
--- a/test/ressources/mock/data.dart
+++ b/test/ressources/mock/data.dart
@@ -150,6 +150,7 @@ const androidModel = 'androidModel';
const iosSystemName = 'iosSystemName';
const iosSystemVersion = 'iosSystemVersion';
const iosModel = 'iosModel';
+const iosMachine = 'iosMachine';
const windowsReleaseId = 'windowsReleaseId';
const windowsBuildNumber = 1;
const macOsModel = 'macOsModel';
diff --git a/test/ressources/mock/mock.dart b/test/ressources/mock/mock.dart
index 0853f2c..b708442 100644
--- a/test/ressources/mock/mock.dart
+++ b/test/ressources/mock/mock.dart
@@ -42,6 +42,8 @@ class MockAndroidBuildVersion extends Mock implements AndroidBuildVersion {}
class MockIosDeviceInfo extends Mock implements IosDeviceInfo {}
+class MockIosDeviceUtsname extends Mock implements IosUtsname {}
+
class MockWindowsDeviceInfo extends Mock implements WindowsDeviceInfo {}
class MockMacOsDeviceInfo extends Mock implements MacOsDeviceInfo {}
@@ -76,6 +78,7 @@ final mockWebBrowserInfo = MockWebBrowserInfo();
final mockAndroidDeviceInfo = MockAndroidDeviceInfo();
final mockAndroidBuildVersion = MockAndroidBuildVersion();
final mockIosDeviceInfo = MockIosDeviceInfo();
+final mockIosUtsname = MockIosDeviceUtsname();
final mockWindowsDeviceInfo = MockWindowsDeviceInfo();
final mockMacOsDeviceInfo = MockMacOsDeviceInfo();
final mockLinuxDeviceInfo = MockLinuxDeviceInfo();
diff --git a/test/src/matomo_test.dart b/test/src/matomo_test.dart
index 395ecb5..d8ffbfc 100644
--- a/test/src/matomo_test.dart
+++ b/test/src/matomo_test.dart
@@ -303,6 +303,8 @@ void main() {
when(() => mockIosDeviceInfo.systemName).thenReturn(iosSystemName);
when(() => mockIosDeviceInfo.systemVersion).thenReturn(iosSystemVersion);
when(() => mockIosDeviceInfo.model).thenReturn(iosModel);
+ when(() => mockIosDeviceInfo.utsname).thenReturn(mockIosUtsname);
+ when(() => mockIosUtsname.machine).thenReturn(iosMachine);
// Windows
when(() => mockDeviceInfoPlugin.windowsInfo)
@@ -373,7 +375,7 @@ void main() {
expect(
userAgent,
- '$iosSystemName $iosSystemVersion, $iosModel',
+ '$iosSystemName $iosSystemVersion, $iosModel $iosMachine',
);
});