Merge branch 'main' into dev

README.md

@@ -409,6 +409,13 @@ await MatomoTracker.instance.initialize(
             <sub><b>Null</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/jainhitesh9998">
+            <img src="https://avatars.githubusercontent.com/u/16622965?v=4" width="100;" alt="jainhitesh9998"/>
+            <br />
+            <sub><b>Hitesh C</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/lukaslihotzki">
             <img src="https://avatars.githubusercontent.com/u/10326063?v=4" width="100;" alt="lukaslihotzki"/>

example/lib/main.dart

@@ -7,7 +7,7 @@ import 'package:url_launcher/url_launcher.dart';
 // See the docker folder for instructions on how to get a
 // test Matomo instance running
 const _matomoEndpoint = 'http://localhost:8765/matomo.php';
-const _sideId = 1;
+const _sideId = "1";
 const _testUserId = 'Nelson Pandela';
 
 // Use this as dispatchSettings in MatomoTracker.instance.initialize()

lib/src/local_storage/local_storage.dart

@@ -1,4 +1,4 @@
-abstract class LocalStorage {
+abstract interface class LocalStorage {
   Future<String?> getVisitorId();
   Future<void> setVisitorId(String visitorId);
   Future<DateTime?> getFirstVisit();

lib/src/matomo.dart

@@ -55,7 +55,7 @@ class MatomoTracker {
   /// The ID of the website we're tracking a visit/action for.
   ///
   /// Corresponds with `idsite`.
-  late final int siteId;
+  late final String siteId;
 
   /// The url of the Matomo endpoint.
   ///
@@ -205,7 +205,7 @@ class MatomoTracker {
   /// It is recommended to leave [userAgent] to `null` so it will be detected
   /// automatically.
   Future<void> initialize({
-    required int siteId,
+    required String siteId,
     required String url,
     bool newVisit = true,
     String? visitorId,

lib/src/matomo_action.dart

@@ -206,7 +206,7 @@ class MatomoAction {
 
     return {
       // Required parameters
-      'idsite': tracker.siteId.toString(),
+      'idsite': tracker.siteId,
       'rec': '1',
 
       if (nV != null && nV) 'new_visit': '1',

pubspec.yaml

@@ -16,16 +16,16 @@ environment:
 dependencies:
   clock: ^1.1.1
   collection: ^1.17.2
-  device_info_plus: ">=9.0.3 <11.0.0"
+  device_info_plus: ^9.1.0
   flutter:
     sdk: flutter
   http: ^1.1.0
-  package_info_plus: ">=4.1.0 <6.0.0"
+  package_info_plus: ">=4.2.0 <6.0.0"
   shared_preferences: ^2.2.2
-  uuid: ^3.0.7
+  uuid: ^4.1.0
 
 dev_dependencies:
-  custom_lint: ^0.5.3
+  custom_lint: ^0.5.4
   fd_lints: ^2.2.0
   flutter_test:
     sdk: flutter

test/ressources/mock/data.dart

@@ -119,7 +119,7 @@ const matomoDispatcherToken = 'token';
 
 // MatomoTracker
 const matomoTrackerContentBase = 'contentBase';
-const matomoTrackerSiteId = 1;
+const matomoTrackerSiteId = "1";
 const matomoTrackerScreenResolution = Size(200, 200);
 const matomoTrackerUrl = 'https://example.com';
 const matomoTrackerContentBaseUrl = 'https://example.com';