Cameronmorrow1/fence 2577 bump flutter ios to 3240

CHANGELOG.md

@@ -1,3 +1,12 @@
+# 3.24.0-beta.1
+- Updates iOS sdk to 3.24.0
+- Adds `silentPush` initialization option to iOS
+
+# 3.23.4-beta.2
+- Changed iOS platform target to 12.0
+
+# 3.23.4-beta.1
+- Updates iOS and Android sdk to 3.23.4 and 3.23.5, respectively
 
 # 3.12.4
 - Fixes breaking change on Flutter 3.29.0 by removing v1 embedding

README.md

@@ -16,6 +16,10 @@ Then, see the Flutter package documentation [here](https://radar.com/documentati
 
 See an example app in `example/`.
 
+## iOS Installation
+
+For iOS projects using this plugin, if your iOS deployment target is below 15.0, you must add `use_frameworks!` to your `Podfile`:
+
 ## Support
 
 Have questions? We're here to help! Email us at [support@radar.com](mailto:support@radar.com).

android/build.gradle

@@ -9,6 +9,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
     }
 }
 
@@ -20,6 +21,7 @@ rootProject.allprojects {
 }
 
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
 
 android {
     namespace 'io.radar.flutter'
@@ -29,15 +31,24 @@ android {
         minSdkVersion 16
         targetSdkVersion 31
         versionCode 1
-        versionName '3.12.4'
+        versionName '3.23.5'
     }
     lintOptions {
         disable 'InvalidPackage'
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 }
 
 dependencies {
-    implementation 'io.radar:sdk:3.18.10'
+    implementation 'io.radar:sdk:3.23.5'
     implementation 'com.google.android.gms:play-services-location:21.0.1'
     implementation 'com.google.code.gson:gson:2.8.6'
 }

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-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip

android/src/main/java/io/radar/flutter/RadarFlutterPlugin.java

@@ -57,6 +57,7 @@
 import io.radar.sdk.model.RadarRouteMatrix;
 import io.radar.sdk.RadarTrackingOptions.RadarTrackingOptionsForegroundService;
 import io.radar.sdk.model.RadarVerifiedLocationToken;
+import io.radar.sdk.model.RadarInAppMessage;
 
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.embedding.engine.dart.DartExecutor.DartCallback;
@@ -268,6 +269,30 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull final Result result)
                     case "validateAddress":
                         validateAddress(call, result);
                         break;
+                    case "setProduct":
+                        setProduct(call, result);
+                        break;
+                    case "getProduct":
+                        getProduct(result);
+                        break;
+                    case "getTags":
+                        getTags(result);
+                        break;
+                    case "addTags":
+                        addTags(call, result);
+                        break;
+                    case "removeTags":
+                        removeTags(call, result);
+                        break;
+                    case "isTrackingVerified":
+                        isTrackingVerified(result);
+                        break;
+                    case "clearVerifiedLocationToken":
+                        clearVerifiedLocationToken(result);
+                        break;
+                    case "showInAppMessage":
+                        showInAppMessage(call, result);
+                        break;
                     default:
                         result.notImplemented();
                         break;
@@ -282,9 +307,9 @@ private static void initialize(MethodCall call, Result result) {
         String publishableKey = call.argument("publishableKey");
         SharedPreferences.Editor editor = mContext.getSharedPreferences("RadarSDK", Context.MODE_PRIVATE).edit();
         editor.putString("x_platform_sdk_type", "Flutter");
-        editor.putString("x_platform_sdk_version", "3.12.4");
+        editor.putString("x_platform_sdk_version", "3.24.0-beta.1");
         editor.apply();
-        Radar.initialize(mContext, publishableKey);
+        Radar.initialize(mContext, publishableKey, null, Radar.RadarLocationServicesProvider.GOOGLE, false, null, null, mActivity);
         Radar.setReceiver(new RadarFlutterReceiver(channel));
         Radar.setVerifiedReceiver(new RadarFlutterVerifiedReceiver(channel));
         result.success(true);
@@ -861,12 +886,14 @@ public void run() {
         String[] categories = categoriesList != null ? (String[])categoriesList.toArray(new String[0]) : new String[0];
         ArrayList groupsList = (ArrayList)call.argument("groups");
         String[] groups = groupsList != null ? (String[])groupsList.toArray(new String[0]) : new String[0];
+        ArrayList countryCodesList = (ArrayList)call.argument("countryCodes");
+        String[] countryCodes = countryCodesList != null ? (String[])countryCodesList.toArray(new String[0]) : null;
         int limit = call.hasArgument("limit") ? (int)call.argument("limit") : 10;
 
         if (near != null) {
-            Radar.searchPlaces(near, radius, chains, chainMetadata, categories, groups, limit, callback);
+            Radar.searchPlaces(near, radius, chains, chainMetadata, categories, groups, countryCodes, limit, callback);
         } else {
-            Radar.searchPlaces(radius, chains, chainMetadata, categories, groups, limit, callback);
+            Radar.searchPlaces(radius, chains, chainMetadata, categories, groups, countryCodes, limit, callback);
         }
     }
 
@@ -1148,6 +1175,21 @@ public void run() {
 
     public static void trackVerified(MethodCall call, final Result result) {
         Boolean beacons = call.hasArgument("beacons") ? call.argument("beacons") : false;
+        String desiredAccuracyStr = call.hasArgument("desiredAccuracy") ? call.argument("desiredAccuracy") : "medium";
+        String reason = call.hasArgument("reason") ? call.argument("reason") : null;
+        String transactionId = call.hasArgument("transactionId") ? call.argument("transactionId") : null;
+
+        RadarTrackingOptions.RadarTrackingOptionsDesiredAccuracy desiredAccuracy = RadarTrackingOptions.RadarTrackingOptionsDesiredAccuracy.MEDIUM;
+        if (desiredAccuracyStr != null) {
+            desiredAccuracyStr = desiredAccuracyStr.toLowerCase();
+            if (desiredAccuracyStr.equals("high")) {
+                desiredAccuracy = RadarTrackingOptions.RadarTrackingOptionsDesiredAccuracy.HIGH;
+            } else if (desiredAccuracyStr.equals("medium")) {
+                desiredAccuracy = RadarTrackingOptions.RadarTrackingOptionsDesiredAccuracy.MEDIUM;
+            } else if (desiredAccuracyStr.equals("low")) {
+                desiredAccuracy = RadarTrackingOptions.RadarTrackingOptionsDesiredAccuracy.LOW;
+            }
+        }
 
         Radar.RadarTrackVerifiedCallback callback = new Radar.RadarTrackVerifiedCallback() {
             @Override
@@ -1170,7 +1212,7 @@ public void run() {
             }
         };
 
-        Radar.trackVerified(beacons, callback);
+        Radar.trackVerified(beacons, desiredAccuracy, reason, transactionId, callback);
     }
 
     public static void getVerifiedLocationToken(Result result) {
@@ -1236,6 +1278,74 @@ public void run() {
         Radar.validateAddress(address, callback);
     }
 
+    private static void setProduct(MethodCall call, Result result) {
+        String product = call.argument("product");
+        Radar.setProduct(product);
+        result.success(true);
+    }
+
+    private static void getProduct(Result result) {
+        String product = Radar.getProduct();
+        result.success(product);
+    }
+
+    private static void getTags(Result result) {
+        String[] tags = Radar.getTags();
+        List<String> tagsList = null;
+        if (tags != null) {
+            tagsList = new ArrayList<>(java.util.Arrays.asList(tags));
+        }
+        result.success(tagsList);
+    }
+
+    private static void addTags(MethodCall call, Result result) {
+        ArrayList<String> tagsList = (ArrayList<String>)call.argument("tags");
+        String[] tags = (tagsList != null) ? tagsList.toArray(new String[0]) : new String[0];
+        Radar.addTags(tags);
+        result.success(true);
+    }
+
+    private static void removeTags(MethodCall call, Result result) {
+        ArrayList<String> tagsList = (ArrayList<String>)call.argument("tags");
+        String[] tags = (tagsList != null) ? tagsList.toArray(new String[0]) : new String[0];
+        Radar.removeTags(tags);
+        result.success(true);
+    }
+
+    private static void isTrackingVerified(Result result) {
+        Boolean isTrackingVerified = Radar.isTrackingVerified();
+        result.success(isTrackingVerified);
+    }
+
+    private static void clearVerifiedLocationToken(Result result) {
+        Radar.clearVerifiedLocationToken();
+        result.success(true);
+    }
+
+    private static void showInAppMessage(MethodCall call, Result result) {
+        try {
+            HashMap inAppMessageMap = call.argument("inAppMessage");
+            String inAppMessageJson = null;
+            try {
+                if (inAppMessageMap != null) {
+                    JSONObject jsonObj = new JSONObject(new Gson().toJsonTree(inAppMessageMap).getAsJsonObject().toString());
+                    inAppMessageJson = jsonObj.toString();
+                }
+                RadarInAppMessage inAppMessage = RadarInAppMessage.fromJson(inAppMessageJson);
+                if (inAppMessage != null) {
+                    Radar.showInAppMessage(inAppMessage);
+                    result.success(true);
+                } else {
+                    result.error("INVALID_INAPP_MESSAGE", "Invalid in-app message data", inAppMessageJson);
+                }
+            } catch (Exception e) {
+                result.error("INVALID_INAPP_MESSAGE", "Failed to convert inAppMessage to JSON", e.getMessage());
+            }
+        } catch (Exception e) {
+            result.error(e.toString(), e.getMessage(), e.getMessage());
+        }
+    }
+
     private static Location locationForMap(HashMap locationMap) {
         double latitude = (Double)locationMap.get("latitude");
         double longitude = (Double)locationMap.get("longitude");

example/android/app/build.gradle

@@ -22,7 +22,8 @@ if (flutterVersionName == null) {
 }
 
 android {
-    compileSdkVersion 34
+    namespace "io.radar.example"
+    compileSdkVersion 35
 
     lintOptions {
         disable 'InvalidPackage'
@@ -46,7 +47,7 @@ android {
     }
 
     dependencies {
-        implementation 'io.radar:sdk:3.18.9'
+        implementation 'io.radar:sdk:3.23.5'
         implementation "com.google.android.play:integrity:1.2.0"
     }
 }

example/android/app/src/main/java/io/radar/example/MainApplication.java

@@ -1,7 +1,6 @@
 package io.radar.example;
 
 import io.flutter.app.FlutterApplication;
-import io.flutter.view.FlutterMain;
 import io.radar.sdk.Radar;
 
 public class MainApplication extends FlutterApplication {
@@ -10,7 +9,6 @@ public class MainApplication extends FlutterApplication {
     public void onCreate() {
         super.onCreate();
         Radar.initialize(this, "prj_test_pk_0000000000000000000000000000000000000000");
-        FlutterMain.startInitialization(this);
     }
 
 }

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

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

example/android/settings.gradle

@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.4.2" apply false
+    id "com.android.application" version "8.6.0" apply false
     // id "org.jetbrains.kotlin.android" version "1.8.21" apply false
 }
 

example/ios/Flutter/AppFrameworkInfo.plist

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

example/ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '12.0'
+platform :ios, '13.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -28,8 +28,9 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe
 flutter_ios_podfile_setup
 
 target 'Runner' do
+  use_frameworks!
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
-  pod 'RadarSDKMotion', '3.18.3'
+  pod 'RadarSDKMotion', '3.24.0'
 end
 
 post_install do |installer|