Skip to content

Commit

Permalink
Updating Unity plugins for version 4.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@radixdev
radixdev committed Apr 28, 2023
1 parent 09644df commit d7f265b
Show file tree
Hide file tree
Showing 902 changed files with 3,200 additions and 17,897 deletions.
Binary file modified Assets/Plugins/Android/appboy-ui.aar
View file
Binary file not shown.
Binary file modified Assets/Plugins/Android/appboy-unity.aar
View file
Binary file not shown.
Binary file modified Assets/Plugins/Android/appboy.aar
View file
Binary file not shown.
35 changes: 0 additions & 35 deletions Assets/Plugins/Appboy/AppboyBinding.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,37 +338,6 @@ public class AppboyBinding : MonoBehaviour {
#endif
}

public static void setUserFacebookData(
string facebookId,
string firstName,
string lastName,
string email,
string bio,
string cityName,
Gender? gender,
int? numberOfFriends,
string birthday
) {
#if HAS_BRAZE_SDK
mBinding.setUserFacebookData(facebookId, firstName, lastName, email, bio, cityName, gender, numberOfFriends, birthday);
#endif
}

public static void setUserTwitterData(
int? twitterUserId,
string twitterHandle,
string name,
string description,
int? followerCount,
int? followingCount,
int? tweetCount,
string profileImageUrl
) {
#if HAS_BRAZE_SDK
mBinding.setUserTwitterData(twitterUserId, twitterHandle, name, description, followerCount, followingCount, tweetCount, profileImageUrl);
#endif
}

public static void SetUserLastKnownLocation(
double latitude,
double longitude,
Expand Down Expand Up @@ -691,10 +660,6 @@ string profileImageUrl
/// <summary>
/// Set this value to a valid BrazeInAppMessageListener instance to
/// register for in-app messages related UI events.
///
/// Using this listener alongside ABKInAppMessageUIDelegate and
/// ABKInAppMessageControllerDelegate from the Braze iOS SDK is not
/// supported.
/// </summary>
/// <seealso cref="BrazeInAppMessageListener">
/// <value>Listener for in-app messages UI events.</value>
Expand Down
67 changes: 8 additions & 59 deletions Assets/Plugins/Appboy/BrazeAndroidPlatform.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class BrazeAndroidPlatform : BrazePlatform {
public AndroidJavaObject InAppMessageUtils {
get {
if (inAppMessageUtils == null) {
inAppMessageUtils = new AndroidJavaClass("com.appboy.unity.utils.InAppMessageUtils");
inAppMessageUtils = new AndroidJavaClass("com.braze.unity.utils.InAppMessageUtils");
}
return inAppMessageUtils;
}
Expand All @@ -54,7 +54,7 @@ public class BrazeAndroidPlatform : BrazePlatform {
public AndroidJavaObject UnityConfigurationProvider {
get {
if (unityConfigurationProvider == null) {
unityConfigurationProvider = new AndroidJavaObject("com.appboy.unity.configuration.UnityConfigurationProvider", BrazeUnityActivity);
unityConfigurationProvider = new AndroidJavaObject("com.braze.unity.configuration.UnityConfigurationProvider", BrazeUnityActivity);
}
return unityConfigurationProvider;
}
Expand Down Expand Up @@ -112,7 +112,7 @@ public class BrazeAndroidPlatform : BrazePlatform {
}

public void SetUserGender(Gender gender) {
using (var genderClass = new AndroidJavaClass("com.appboy.enums.Gender")) {
using (var genderClass = new AndroidJavaClass("com.braze.enums.Gender")) {
switch (gender) {
case Gender.Male:
GetCurrentUser().Call<bool>("setGender", genderClass.GetStatic<AndroidJavaObject>("MALE"));
Expand Down Expand Up @@ -140,7 +140,7 @@ public class BrazeAndroidPlatform : BrazePlatform {
}

public void SetUserDateOfBirth(int year, int month, int day) {
using (var monthClass = new AndroidJavaClass("com.appboy.enums.Month")) {
using (var monthClass = new AndroidJavaClass("com.braze.enums.Month")) {
AndroidJavaObject monthObject;
switch (month) {
case 1:
Expand Down Expand Up @@ -196,7 +196,7 @@ public class BrazeAndroidPlatform : BrazePlatform {
}

public void SetUserEmailNotificationSubscriptionType(AppboyNotificationSubscriptionType emailNotificationSubscriptionType) {
using (var notificationTypeClass = new AndroidJavaClass("com.appboy.enums.NotificationSubscriptionType")) {
using (var notificationTypeClass = new AndroidJavaClass("com.braze.enums.NotificationSubscriptionType")) {
switch (emailNotificationSubscriptionType) {
case AppboyNotificationSubscriptionType.OPTED_IN:
GetCurrentUser().Call<bool>("setEmailNotificationSubscriptionType", notificationTypeClass.GetStatic<AndroidJavaObject>("OPTED_IN"));
Expand All @@ -215,7 +215,7 @@ public class BrazeAndroidPlatform : BrazePlatform {
}

public void SetUserPushNotificationSubscriptionType(AppboyNotificationSubscriptionType pushNotificationSubscriptionType) {
using (var notificationTypeClass = new AndroidJavaClass("com.appboy.enums.NotificationSubscriptionType")) {
using (var notificationTypeClass = new AndroidJavaClass("com.braze.enums.NotificationSubscriptionType")) {
switch (pushNotificationSubscriptionType) {
case AppboyNotificationSubscriptionType.OPTED_IN:
GetCurrentUser().Call<bool>("setPushNotificationSubscriptionType", notificationTypeClass.GetStatic<AndroidJavaObject>("OPTED_IN"));
Expand Down Expand Up @@ -281,57 +281,6 @@ public class BrazeAndroidPlatform : BrazePlatform {
GetCurrentUser().Call<bool>("addToCustomAttributeArray", key, value);
}

public void setUserFacebookData(string facebookId, string firstName, string lastName, string email, string bio, string cityName, Gender? gender, int? numberOfFriends, string birthday) {
var genderClass = new AndroidJavaClass("com.appboy.enums.Gender");
AndroidJavaObject genderEnum = null;
if (gender != null) {
switch (gender) {
case Gender.Male:
genderEnum = genderClass.GetStatic<AndroidJavaObject>("MALE");
break;
case Gender.Female:
genderEnum = genderClass.GetStatic<AndroidJavaObject>("FEMALE");
break;
default:
Debug.Log("Unknown gender received: " + gender);
break;
}
}

var facebookUser = new AndroidJavaObject("com.appboy.models.outgoing.FacebookUser", new object[]
{
facebookId,
firstName,
lastName,
email,
bio,
cityName,
genderEnum,
numberOfFriends == null ? null : new AndroidJavaObject("java.lang.Integer", numberOfFriends),
null,
birthday
}
);

GetCurrentUser().Call<bool>("setFacebookData", facebookUser);
}

public void setUserTwitterData(int? twitterUserId, string twitterHandle, string name, string description, int? followerCount, int? followingCount, int? tweetCount, string profileImageUrl) {
var twitterUser = new AndroidJavaObject("com.appboy.models.outgoing.TwitterUser", new object[]
{
twitterUserId == null ? null : new AndroidJavaObject("java.lang.Integer", twitterUserId),
twitterHandle,
name,
description,
twitterUserId == null ? null : new AndroidJavaObject("java.lang.Integer", followerCount),
twitterUserId == null ? null : new AndroidJavaObject("java.lang.Integer", followingCount),
twitterUserId == null ? null : new AndroidJavaObject("java.lang.Integer", tweetCount),
profileImageUrl
}
);
GetCurrentUser().Call<bool>("setTwitterData", twitterUser);
}

public void SetUserLastKnownLocation(
double latitude,
double longitude,
Expand Down Expand Up @@ -448,11 +397,11 @@ public class BrazeAndroidPlatform : BrazePlatform {
}

public string GetInstallTrackingId() {
return Braze.Call<string>("getInstallTrackingId");
return Braze.Call<string>("getDeviceId");
}

public void SetAttributionData(string network, string campaign, string adgroup, string creative) {
var attributionData = new AndroidJavaObject("com.appboy.models.outgoing.AttributionData", network, campaign, adgroup, creative);
var attributionData = new AndroidJavaObject("com.braze.models.outgoing.AttributionData", network, campaign, adgroup, creative);
GetCurrentUser().Call<bool>("setAttributionData", attributionData);
}

Expand Down
23 changes: 0 additions & 23 deletions Assets/Plugins/Appboy/BrazePlatform.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,29 +50,6 @@ int quantity
void AddToCustomUserAttributeArray(string key, string value);
void RemoveFromCustomUserAttributeArray(string key, string value);

void setUserFacebookData(
string facebookId,
string firstName,
string lastName,
string email,
string bio,
string cityName,
Gender? gender,
int? numberOfFriends,
string birthday
);

void setUserTwitterData(
int? twitterUserId,
string twitterHandle,
string name,
string description,
int? followerCount,
int? followingCount,
int? tweetCount,
string profileImageUrl
);

void SetUserLastKnownLocation(
double latitude,
double longitude,
Expand Down
18 changes: 0 additions & 18 deletions Assets/Plugins/Appboy/BrazeiOSPlatform.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,6 @@ public class BrazeiOSPlatform : BrazePlatform {
[System.Runtime.InteropServices.DllImport("__Internal")]
private static extern void _removeFromCustomUserAttributeArray(string key, string value);

[System.Runtime.InteropServices.DllImport("__Internal")]
private static extern void _setUserFacebookData(string facebookId, string firstName, string lastName, string email, string bio, string cityName, int gender, int numberOfFriends, string birthday);

[System.Runtime.InteropServices.DllImport("__Internal")]
private static extern void _setUserTwitterData(int twitterUserId, string twitterHandle, string name, string description, int followerCount, int followingCount, int tweetCount, string profileImageUrl);

[System.Runtime.InteropServices.DllImport("__Internal")]
private static extern void _setUserLastKnownLocation(double latitude, double longitude, double altitude, double accuracy, double verticalAccuracy);

Expand Down Expand Up @@ -188,9 +182,6 @@ public class BrazeiOSPlatform : BrazePlatform {
[System.Runtime.InteropServices.DllImport("__Internal")]
private static extern void _removeFromSubscriptionGroup(string id);

[System.Runtime.InteropServices.DllImport("__Internal")]
private static extern void _setInAppMessageDelegatesEnabled(bool enabled);

public void LogCustomEvent(string eventName) {
_logCustomEvent(eventName, null);
}
Expand Down Expand Up @@ -305,14 +296,6 @@ public class BrazeiOSPlatform : BrazePlatform {
_removeFromCustomUserAttributeArray(key, value);
}

public void setUserFacebookData(string facebookId, string firstName, string lastName, string email, string bio, string cityName, Gender? gender, int? numberOfFriends, string birthday) {
_setUserFacebookData(facebookId, firstName, lastName, email, bio, cityName, gender == null ? -1 : (int)gender, numberOfFriends == null ? -1 : (int)numberOfFriends, birthday);
}

public void setUserTwitterData(int? twitterUserId, string twitterHandle, string name, string description, int? followerCount, int? followingCount, int? tweetCount, string profileImageUrl) {
_setUserTwitterData(twitterUserId == null ? -1 : (int)twitterUserId, twitterHandle, name, description, followerCount == null ? -1 : (int)followerCount, followingCount == null ? -1 : (int)followingCount, tweetCount == null ? -1 : (int)tweetCount, profileImageUrl);
}

public void SetUserLastKnownLocation(
double latitude,
double longitude,
Expand All @@ -339,7 +322,6 @@ public class BrazeiOSPlatform : BrazePlatform {

private void SetInAppMessageListener(BrazeInAppMessageListener listener) {
_inAppMessageListener = listener;
_setInAppMessageDelegatesEnabled(listener != null);
BrazeInternalGameObject.setInAppMessageListener(listener);
}

Expand Down
9 changes: 9 additions & 0 deletions Assets/Plugins/Appboy/Editor/AppboyConfig.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ public class AppboyConfig : ScriptableObject {

// Automate Unity integrations
[SerializeField]
/// When disabled, it allows integrations that don't want to use the iOS macro
/// `IMPL_APP_CONTROLLER_SUBCLASS`, which is used in our sample's AppDelegate
private bool iOSAutomatesIntegration = false;
[SerializeField]
private bool androidAutomatesIntegration = false;
Expand All @@ -34,6 +36,8 @@ public class AppboyConfig : ScriptableObject {
private string iOSSdkAuthenticationFailedCallbackMethodName = string.Empty;
[SerializeField]
private string iOSLogLevel = string.Empty;
[SerializeField]
private bool iOSImportDependencies = false;
// Android
[SerializeField]
private string androidApiKey = string.Empty;
Expand Down Expand Up @@ -199,6 +203,11 @@ public class AppboyConfig : ScriptableObject {
set { SetProperty(ref Instance.iOSLogLevel, value); }
}

public static bool IOSImportDependencies {
get { return Instance.iOSImportDependencies; }
set { SetProperty(ref Instance.iOSImportDependencies, value); }
}

// Push
public static bool IOSIntegratesPush {
get { return Instance.iOSIntegratesPush; }
Expand Down
7 changes: 7 additions & 0 deletions Assets/Plugins/Appboy/Editor/AppboyConfigEditor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,13 @@ public class AppboyConfigEditor : EditorWindow {
EditorGUI.indentLevel--;
EditorGUILayout.Separator();

// Dependencies
EditorGUILayout.LabelField("Dependencies", EditorStyles.boldLabel);
EditorGUI.indentLevel++;
AppboyConfig.IOSImportDependencies = EditorGUILayout.ToggleLeft("Import SDWebImage dependency (GIF support)", AppboyConfig.IOSImportDependencies, EditorStyles.boldLabel);
EditorGUI.indentLevel--;
EditorGUILayout.Separator();

// Push Notifications
EditorGUILayout.BeginVertical();
EditorGUILayout.LabelField("Push Notifications", EditorStyles.boldLabel);
Expand Down
Loading

0 comments on commit d7f265b

Please sign in to comment.