MET-5021: Update Unity Plugin to support Android SDK 2.0

Editor/Metica.UnityEd.asmdef

@@ -2,7 +2,7 @@
     "name": "Metica.UnityEd",
     "rootNamespace": "",
     "references": [
-        "GUID:c2fa3a29e8c2d344eb32bb07693f48f2"
+        "GUID:201bb3ee2b9a58648b8158bc0b3694a5"
     ],
     "includePlatforms": [
         "Editor"

Editor/MeticaAdsDependencies.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <dependencies>
     <androidPackages>
-        <androidPackage spec="com.metica:metica-sdk:1.13.5" />
+        <androidPackage spec="com.metica:metica-sdk:2.0.0-beta1" />
     </androidPackages>
 </dependencies>

Editor/MeticaEditorUtilities.cs

@@ -2,7 +2,7 @@
 using UnityEngine;
 using UnityEditor;
 using System.IO;
-using Metica.Unity;
+using Metica.SDK.Unity;
 
 namespace Metica.UnityEd
 {

Editor/MeticaUnitySdkEditor.cs

@@ -1,16 +1,15 @@
 using UnityEngine;
 using UnityEditor;
 using System.IO;
-
-using Metica.Unity;
+using Metica.SDK.Unity;
 
 namespace Metica.UnityEd
 {
     [CustomEditor(typeof(MeticaUnitySdk))]
     public class MeticaUnitySdkEditor : Editor
     {
         MeticaUnitySdk m_sdk = null;
-        SdkConfigProvider m_configProvider = null;
+        MeticaConfigProvider m_configProvider = null;
 
         private const string MeticaDataFolder = "Assets/Metica/Data";
 
@@ -40,7 +39,7 @@ public override void OnInspectorGUI()
 
                     if (!string.IsNullOrEmpty(assetPath))
                     {
-                        m_configProvider = ScriptableObject.CreateInstance<SdkConfigProvider>();
+                        m_configProvider = ScriptableObject.CreateInstance<MeticaConfigProvider>();
 
                         AssetDatabase.CreateAsset(m_configProvider, assetPath);
                         AssetDatabase.Refresh();

Runtime/ADS/Metica.ADS.asmdef

@@ -2,7 +2,6 @@
     "name": "Metica.ADS",
     "rootNamespace": "",
     "references": [
-        "Metica.SDK",
         "MaxSdk.Scripts",
         "Metica.Core"
     ],
@@ -15,4 +14,4 @@
     "defineConstraints": [],
     "versionDefines": [],
     "noEngineReferences": false
-}
+}

Runtime/ADS/MeticaAds.cs

@@ -2,12 +2,12 @@
 
 using System.Threading.Tasks;
 using Metica.Core;
-using Metica.SDK;
 using UnityEngine.Assertions;
 
 // ReSharper disable once CheckNamespace
 namespace Metica.ADS
 {
+    // TODO: make the whole class internal
     public static class MeticaAds
     {   
         public const string TAG = "MeticaUnityPlugin";
@@ -23,7 +23,7 @@ static MeticaAds()
             // Check for Unity Editor first since the editor also responds to the currently selected platform.
             PlatformDelegate = GetUnityPlayerDelegate();
 #elif UNITY_ANDROID
-            PlatformDelegate = new Android.AndroidDelegate(AndroidUnityBridge.UnityBridgeClass, AndroidUnityBridge.MeticaAdsExternalTrackerClass);
+            PlatformDelegate = new Android.AndroidDelegate(AndroidUnityBridge.UnityBridgeClass);
 #elif UNITY_IPHONE || UNITY_IOS
             PlatformDelegate = new IOS.IOSDelegate();
 #else
@@ -55,20 +55,14 @@ static MeticaAds()
             PlatformDelegate.RewardedAdRevenuePaid += MeticaAdsCallbacks.Rewarded.OnAdRevenuePaidInternal;
         }
 
-        public static async Task<bool> InitializeAsync(MeticaConfiguration configuration)
-        {
-            var result = await InitializeWithResultAsync(configuration);
-            return result.IsMeticaAdsEnabled;
-        }
-
-        public static async Task<MeticaAdsInitializationResult> InitializeWithResultAsync(MeticaConfiguration configuration)
+        public static async Task<MeticaInitializationResult> InitializeAsync(MeticaConfiguration configuration)
         {
             return await PlatformDelegate.InitializeAsync(
-                MeticaSdk.ApiKey,
-                MeticaSdk.AppId,
-                MeticaSdk.CurrentUserId,
-                MeticaSdk.Version,
-                MeticaSdk.BaseEndpoint,
+                configuration.ApiKey,
+                configuration.AppId,
+                configuration.UserId,
+                configuration.Version,
+                configuration.BaseEndpoint,
                 configuration
             );
         }
@@ -86,7 +80,6 @@ public static void CreateBanner(string bannerAdUnitId, MeticaBannerPosition posi
         // Banner ad methods
         public static void ShowBanner(string adUnitId)
         {
-
             PlatformDelegate.ShowBanner(adUnitId);
         }
         public static void HideBanner(string adUnitId)
@@ -100,53 +93,31 @@ public static void DestroyBanner(string adUnitId)
         }
 
         // Interstitial ad methods
-        public static void LoadInterstitial()
+        public static void LoadInterstitial(string interstitialAdUnitId)
         {
-            PlatformDelegate.LoadInterstitial();
+            PlatformDelegate.LoadInterstitial(interstitialAdUnitId);
         }
-        public static void ShowInterstitial()
+        public static void ShowInterstitial(string interstitialAdUnitId)
         {
-            PlatformDelegate.ShowInterstitial();
+            PlatformDelegate.ShowInterstitial(interstitialAdUnitId);
         }
-        public static bool IsInterstitialReady()
+        public static bool IsInterstitialReady(string interstitialAdUnitId)
         {
-            return PlatformDelegate.IsInterstitialReady();
+            return PlatformDelegate.IsInterstitialReady(interstitialAdUnitId);
         }
 
         // Rewarded ad methods
-        public static void LoadRewarded()
-        {
-            PlatformDelegate.LoadRewarded();
-        }
-        public static void ShowRewarded()
-        {
-            PlatformDelegate.ShowRewarded();
-        }
-        public static bool IsRewardedReady()
+        public static void LoadRewarded(string rewardedAdUnitId)
         {
-            return PlatformDelegate.IsRewardedReady();
+            PlatformDelegate.LoadRewarded(rewardedAdUnitId);
         }
-
-        public static void NotifyAdLoadAttempt(string interstitialAdUnitId)
-        {
-            PlatformDelegate.NotifyAdLoadAttempt(interstitialAdUnitId);
-        }
-
-        public static void NotifyAdLoadSuccess(MeticaAd meticaAd)
+        public static void ShowRewarded(string rewardedAdUnitId)
         {
-            PlatformDelegate.NotifyAdLoadSuccess(meticaAd);
+            PlatformDelegate.ShowRewarded(rewardedAdUnitId);
         }
-
-        public static void NotifyAdLoadFailed(string adUnitId, string error)
-        {
-            PlatformDelegate.NotifyAdLoadFailed(adUnitId, error);
-        }
-
-        public static void NotifyAdShowSuccess(MeticaAd meticaAd)
+        public static bool IsRewardedReady(string rewardedAdUnitId)
         {
-            // Internally we use the NotifyAdRevenue call, but externally as to not
-            // break API we use NotifyAdShowSuccess. Which is similar as both will tel you ad was shown.
-            PlatformDelegate.NotifyAdRevenue(meticaAd);
+            return PlatformDelegate.IsRewardedReady(rewardedAdUnitId);
         }
 
         private static UnityPlayer.UnityPlayerDelegate GetUnityPlayerDelegate()

Runtime/ADS/MeticaAdsAssignmentStatus.cs

@@ -1,9 +1,11 @@
 namespace Metica.ADS
 {
-    public enum MeticaAdsAssignmentStatus
-    {
-        Normal,
-        Holdout,
-        HoldoutDueToError,
-    }
+[System.Obsolete(
+    "Use MeticaUserGroup instead. This enum has been superseded by MeticaUserGroup which provides clearer trial/holdout assignment status.")]
+public enum MeticaAdsAssignmentStatus
+{
+    Normal,
+    Holdout,
+    HoldoutDueToError,
+}
 }

Runtime/ADS/MeticaConfiguration.cs

@@ -1,6 +1,33 @@
-namespace Metica.ADS 
+using System.Collections.Generic;
+
+namespace Metica.ADS
 {
-public class MeticaConfiguration
-{
-}
+    [System.Serializable]
+    public struct MeticaConfiguration
+    {
+        /// <summary>
+        /// Metica API Key
+        /// </summary>
+        public string ApiKey;
+        /// <summary>
+        /// Metica App ID
+        /// </summary>
+        public string AppId;
+        [System.Obsolete]
+        public string UserId;
+        [System.Obsolete]
+        public string Version;
+        public string BaseEndpoint;
+        /// <summary>
+        /// Allows adding custom API keys or other values.
+        /// TODO: https://linear.app/metica/issue/MET-4645/custom-additional-api-keys
+        /// </summary>
+        public List<KeyMap> CustomKeys;
+
+        public struct KeyMap
+        {
+            public string Key;
+            public string Value;
+        }
+    }
 }

Runtime/ADS/MeticaAdsInitializationResult.cs → Runtime/ADS/MeticaInitializationResult.cs

@@ -1,8 +1,10 @@
 namespace Metica.ADS
 {
-    public class MeticaAdsInitializationResult
+    public class MeticaInitializationResult
     {
-        public MeticaAdsInitializationResult(MeticaAdsAssignmentStatus status)
+        public MeticaAdsAssignmentStatus Status { get; }
+
+        public MeticaInitializationResult(MeticaAdsAssignmentStatus status)
         {
             Status = status;
         }
@@ -21,7 +23,5 @@ public bool IsMeticaAdsEnabled
                 return false;
             }
         }
-
-        public MeticaAdsAssignmentStatus Status { get; }
     }
 }

Runtime/ADS/MeticaSmartFloors.cs

@@ -0,0 +1,16 @@
+using UnityEngine;
+
+namespace Metica.ADS
+{
+public class MeticaSmartFloors
+{
+    public MeticaUserGroup userGroup { get; private set; }
+    public bool isSuccess { get; private set; }
+
+    public MeticaSmartFloors(MeticaUserGroup userGroup, bool isSuccess)
+    {
+        this.userGroup = userGroup;
+        this.isSuccess = isSuccess;
+    }
+}
+}

Runtime/ADS/MeticaUserGroup.cs

@@ -0,0 +1,8 @@
+namespace Metica.ADS
+{
+public enum MeticaUserGroup
+{
+    TRIAL,
+    HOLDOUT,
+}
+}