Merge pull request #16 from Mobile-Telematics/update

Flutter plugin v0.2.0

Author: telematicsgig

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.2.0
+
+* Migrate to dart 3+
+* Updated Android sdk version to 2.2.260
+* Updated iOS sdk version to 6.6.0
+
 ## 0.1.1
 
 * Updated Android sdk version to 2.2.253

README.md

@@ -80,7 +80,7 @@ add network permissions
     ```groovy
     dependencies {
         //...
-        implementation "com.telematicssdk:tracking: 2.2.253"
+        implementation "com.telematicssdk:tracking:2.2.260"
     }
     ```
 

android/build.gradle

@@ -1,17 +1,17 @@
 group 'com.telematicssdk'
-version '1.0-SNAPSHOT'
+version '2.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.4.31'
-    ext.raxel_tracking = '2.2.253'
+    ext.kotlin_version = '1.9.0'
+    ext.raxel_tracking = '2.2.260'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
         //noinspection GradleDependency
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:8.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -30,18 +30,23 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 30
-
+    compileSdkVersion 34
+    namespace "com.telematicssdk"
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
     defaultConfig {
-        minSdkVersion 18
+        minSdkVersion 24
 //        javaCompileOptions.annotationProcessorOptions.includeCompileClasspath = true
     }
     lintOptions {
         disable 'InvalidPackage'
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
 }
 
 dependencies {

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip

android/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.telematicssdk">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

android/src/main/kotlin/com/telematicssdk/TelematicsSDKPlugin.kt

@@ -82,8 +82,10 @@ class TelematicsSDKPlugin : ActivityAware, ActivityResultListener, FlutterPlugin
             "isTracking" -> isTracking(result)
             "setDeviceID" -> setDeviceID(call, result)
             "setEnableSdk" -> setEnableSdk(call, result)
-            "startTracking" -> startTracking(result)
-            "stopTracking" -> stopTracking(result)
+            "setDisableWithUpload" -> setDisableWithUpload(result)
+            "startManualTracking" -> startManualTracking(result)
+            "stopManualTracking" -> stopManualTracking(result)
+            "enableHF" -> enableHF(call, result)
             "showPermissionWizard" -> showPermissionWizard(call, result)
             "getTrackTags" -> getTrackTags(call, result)
             "addTrackTags" -> addTrackTags(call, result)
@@ -156,23 +158,27 @@ class TelematicsSDKPlugin : ActivityAware, ActivityResultListener, FlutterPlugin
 
     private fun setEnableSdk(call: MethodCall, result: Result) {
         val enable = call.argument<Boolean?>("enable") as Boolean
-        val uploadBeforeDisabling = call.argument<Boolean?>("uploadBeforeDisabling") as Boolean
+        api.setEnableSdk(enable)
+        result.success(null)
+    }
+    private fun enableHF(call: MethodCall, result: Result) {
+        val enable = call.argument<Boolean?>("enableHF") as Boolean
+        api.setHfRecordingEnabled(enable)
+        result.success(null)
+    }
 
-        if (!enable && uploadBeforeDisabling) {
-            api.setDisableWithUpload()
-        } else {
-            api.setEnableSdk(enable)
-        }
+    private fun setDisableWithUpload(result: Result) {
+        api.setDisableWithUpload()
         result.success(null)
     }
 
-    private fun startTracking(result: Result) {
+    private fun startManualTracking(result: Result) {
         val startResult = api.startTracking()
 
         result.success(startResult)
     }
 
-    private fun stopTracking(result: Result) {
+    private fun stopManualTracking(result: Result) {
         val stopResult = api.stopTracking()
 
         result.success(stopResult)

example/android/app/build.gradle

@@ -26,8 +26,8 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
-
+    compileSdkVersion 34
+    namespace "com.telematicssdk.example"
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
@@ -39,12 +39,17 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.telematicssdk.example"
-        minSdkVersion 18
-        targetSdkVersion 30
+        minSdkVersion 24
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
     buildTypes {
         release {
             // TODO: Add your own signing config for the release build.
@@ -63,5 +68,5 @@ flutter {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "com.telematicssdk:tracking:2.2.231"
+    implementation "com.telematicssdk:tracking:2.2.260"
 }

example/android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.telematicssdk.example">
+    xmlns:tools="http://schemas.android.com/tools">
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide
@@ -21,7 +20,8 @@
             android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues

example/android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.4.31'
+    ext.kotlin_version = '1.9.0'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:8.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Jan 14 12:59:58 MSK 2021
+#Thu Oct 26 11:15:05 MSK 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

example/ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>10.3</string>
+  <string>12.0</string>
 </dict>
 </plist>

example/ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '10.0'
+platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -37,5 +37,8 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
+    target.build_configurations.each do |config|
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
+    end
   end
 end