diff --git a/ApptentiveKit.Android/ApptentiveCore/ApptentiveCore/ApptentiveCore.csproj b/ApptentiveKit.Android/ApptentiveCore/ApptentiveCore/ApptentiveCore.csproj index c25b492..a8fe10f 100644 --- a/ApptentiveKit.Android/ApptentiveCore/ApptentiveCore/ApptentiveCore.csproj +++ b/ApptentiveKit.Android/ApptentiveCore/ApptentiveCore/ApptentiveCore.csproj @@ -1,14 +1,16 @@ - net8.0-android - 21 + net10.0-android + 7.0.0 + 24 enable enable - + true true + \ No newline at end of file diff --git a/ApptentiveKit.Android/ApptentiveCore/ApptentiveCore/ApptentiveCore.nuspec b/ApptentiveKit.Android/ApptentiveCore/ApptentiveCore/ApptentiveCore.nuspec index 62b6568..faa6215 100644 --- a/ApptentiveKit.Android/ApptentiveCore/ApptentiveCore/ApptentiveCore.nuspec +++ b/ApptentiveKit.Android/ApptentiveCore/ApptentiveCore/ApptentiveCore.nuspec @@ -2,7 +2,7 @@ ApptentiveCore ApptentiveCore for Maui Android - 6.9.0 + 7.0.0 Apptentive Apptentive false @@ -12,12 +12,12 @@ BSD-3-Clause https://raw.githubusercontent.com/apptentive/apptentive-maui/main/icon.png - + - - - + + + \ No newline at end of file diff --git a/ApptentiveKit.Android/ApptentiveCore/ApptentiveCore/apptentive-core-6.9.0.aar b/ApptentiveKit.Android/ApptentiveCore/ApptentiveCore/apptentive-core-6.9.0.aar deleted file mode 100644 index 978de08..0000000 Binary files a/ApptentiveKit.Android/ApptentiveCore/ApptentiveCore/apptentive-core-6.9.0.aar and /dev/null differ diff --git a/ApptentiveKit.Android/ApptentiveCore/ApptentiveCore/apptentive-core-7.0.0.aar b/ApptentiveKit.Android/ApptentiveCore/ApptentiveCore/apptentive-core-7.0.0.aar new file mode 100644 index 0000000..c0b2370 Binary files /dev/null and b/ApptentiveKit.Android/ApptentiveCore/ApptentiveCore/apptentive-core-7.0.0.aar differ diff --git a/ApptentiveKit.Android/ApptentiveCoreUI/ApptentiveCoreUI/ApptentiveCoreUI.csproj b/ApptentiveKit.Android/ApptentiveCoreUI/ApptentiveCoreUI/ApptentiveCoreUI.csproj index b4bb427..b287ee0 100644 --- a/ApptentiveKit.Android/ApptentiveCoreUI/ApptentiveCoreUI/ApptentiveCoreUI.csproj +++ b/ApptentiveKit.Android/ApptentiveCoreUI/ApptentiveCoreUI/ApptentiveCoreUI.csproj @@ -1,7 +1,8 @@ - net8.0-android - 21 + net10.0-android + 7.0.0 + 24 enable enable @@ -9,7 +10,7 @@ - + true true diff --git a/ApptentiveKit.Android/ApptentiveCoreUI/ApptentiveCoreUI/ApptentiveCoreUI.nuspec b/ApptentiveKit.Android/ApptentiveCoreUI/ApptentiveCoreUI/ApptentiveCoreUI.nuspec index da007e0..419ee83 100644 --- a/ApptentiveKit.Android/ApptentiveCoreUI/ApptentiveCoreUI/ApptentiveCoreUI.nuspec +++ b/ApptentiveKit.Android/ApptentiveCoreUI/ApptentiveCoreUI/ApptentiveCoreUI.nuspec @@ -2,7 +2,7 @@ ApptentiveCoreUI ApptentiveCoreUI for Maui Android - 6.9.0 + 7.0.0 Apptentive Apptentive false @@ -12,14 +12,14 @@ BSD-3-Clause https://raw.githubusercontent.com/apptentive/apptentive-maui/main/icon.png - + - - - + + + \ No newline at end of file diff --git a/ApptentiveKit.Android/ApptentiveCoreUI/ApptentiveCoreUI/apptentive-core-ui-6.9.0.aar b/ApptentiveKit.Android/ApptentiveCoreUI/ApptentiveCoreUI/apptentive-core-ui-6.9.0.aar deleted file mode 100644 index a1f16ee..0000000 Binary files a/ApptentiveKit.Android/ApptentiveCoreUI/ApptentiveCoreUI/apptentive-core-ui-6.9.0.aar and /dev/null differ diff --git a/ApptentiveKit.Android/ApptentiveCoreUI/ApptentiveCoreUI/apptentive-core-ui-7.0.0.aar b/ApptentiveKit.Android/ApptentiveCoreUI/ApptentiveCoreUI/apptentive-core-ui-7.0.0.aar new file mode 100644 index 0000000..21e8323 Binary files /dev/null and b/ApptentiveKit.Android/ApptentiveCoreUI/ApptentiveCoreUI/apptentive-core-ui-7.0.0.aar differ diff --git a/ApptentiveKit.Android/ApptentiveEnjoymentDialog/ApptentiveEnjoymentDialog/ApptentiveEnjoymentDialog.csproj b/ApptentiveKit.Android/ApptentiveEnjoymentDialog/ApptentiveEnjoymentDialog/ApptentiveEnjoymentDialog.csproj index fec4825..9f3611b 100644 --- a/ApptentiveKit.Android/ApptentiveEnjoymentDialog/ApptentiveEnjoymentDialog/ApptentiveEnjoymentDialog.csproj +++ b/ApptentiveKit.Android/ApptentiveEnjoymentDialog/ApptentiveEnjoymentDialog/ApptentiveEnjoymentDialog.csproj @@ -1,7 +1,8 @@ - net8.0-android - 21 + net10.0-android + 7.0.0 + 24 enable enable @@ -9,7 +10,7 @@ - + true true diff --git a/ApptentiveKit.Android/ApptentiveEnjoymentDialog/ApptentiveEnjoymentDialog/ApptentiveEnjoymentDialog.nuspec b/ApptentiveKit.Android/ApptentiveEnjoymentDialog/ApptentiveEnjoymentDialog/ApptentiveEnjoymentDialog.nuspec index 942febd..7edfaa1 100644 --- a/ApptentiveKit.Android/ApptentiveEnjoymentDialog/ApptentiveEnjoymentDialog/ApptentiveEnjoymentDialog.nuspec +++ b/ApptentiveKit.Android/ApptentiveEnjoymentDialog/ApptentiveEnjoymentDialog/ApptentiveEnjoymentDialog.nuspec @@ -2,7 +2,7 @@ ApptentiveEnjoymentDialog ApptentiveEnjoymentDialog for Maui Android - 6.9.0 + 7.0.0 Apptentive Apptentive false @@ -12,14 +12,14 @@ BSD-3-Clause https://raw.githubusercontent.com/apptentive/apptentive-maui/main/icon.png - + - - - + + + \ No newline at end of file diff --git a/ApptentiveKit.Android/ApptentiveEnjoymentDialog/ApptentiveEnjoymentDialog/apptentive-enjoyment-dialog-6.9.0.aar b/ApptentiveKit.Android/ApptentiveEnjoymentDialog/ApptentiveEnjoymentDialog/apptentive-enjoyment-dialog-6.9.0.aar deleted file mode 100644 index 7c6286f..0000000 Binary files a/ApptentiveKit.Android/ApptentiveEnjoymentDialog/ApptentiveEnjoymentDialog/apptentive-enjoyment-dialog-6.9.0.aar and /dev/null differ diff --git a/ApptentiveKit.Android/ApptentiveEnjoymentDialog/ApptentiveEnjoymentDialog/apptentive-enjoyment-dialog-7.0.0.aar b/ApptentiveKit.Android/ApptentiveEnjoymentDialog/ApptentiveEnjoymentDialog/apptentive-enjoyment-dialog-7.0.0.aar new file mode 100644 index 0000000..a8a2b70 Binary files /dev/null and b/ApptentiveKit.Android/ApptentiveEnjoymentDialog/ApptentiveEnjoymentDialog/apptentive-enjoyment-dialog-7.0.0.aar differ diff --git a/ApptentiveKit.Android/ApptentiveFeedback/ApptentiveFeedback/Additions/ApptentiveCallbacks.cs b/ApptentiveKit.Android/ApptentiveFeedback/ApptentiveFeedback/Additions/ApptentiveCallbacks.cs index 04587c6..6200a6c 100644 --- a/ApptentiveKit.Android/ApptentiveFeedback/ApptentiveFeedback/Additions/ApptentiveCallbacks.cs +++ b/ApptentiveKit.Android/ApptentiveFeedback/ApptentiveFeedback/Additions/ApptentiveCallbacks.cs @@ -25,7 +25,7 @@ public partial class Apptentive /// The ApptentiveConfiguration object. /// Called after successful or failed registration is conducted. - public static void Register(Application application, ApptentiveConfiguration configuration, Action onCompletion = null) + public static void Register(Application application, ApptentiveConfiguration configuration, Action? onCompletion = null) { ApptentiveSDK.Apptentive.Register(application, configuration, new RegisterCallback(onCompletion)); } @@ -37,7 +37,7 @@ public static void Register(Application application, ApptentiveConfiguration con /// Called after we check if a interaction can be presented or not. /// A Map of String keys to Object values. Objects may be Strings, Numbers, or Booleans.If any message is sent by the Person, this data is sent with it, and then cleared. If no message is sent, this data is discarded. /// The event's string value - public static void Engage(String eventName, IDictionary customData = null, Action onCompletion = null) + public static void Engage(String eventName, IDictionary? customData = null, Action? onCompletion = null) { ApptentiveSDK.Apptentive.Engage(eventName, customData, new EngagementCallback(onCompletion)); } @@ -50,7 +50,7 @@ public static void Engage(String eventName, IDictionary /// Called after we check to see if Message Center can be displayed, but before it is displayed. /// A Map of String keys to Object values. Objects may be Strings, Numbers, or Booleans.If any message is sent by the Person, this data is sent with it, and then cleared. If no message is sent, this data is discarded. - public static void ShowMessageCenter(Action onCompletion, IDictionary customData = null) + public static void ShowMessageCenter(Action onCompletion, IDictionary? customData = null) { ApptentiveSDK.Apptentive.ShowMessageCenter(customData, new EngagementCallback(onCompletion)); } @@ -90,7 +90,7 @@ public static bool QueryCanShowInteraction(String eventName) /// `null`. /// An Intent containing the Apptentive Push data. Pass in what you receive /// in the Service or BroadcastReceiver that is used by your chosen push provider. - public static void BuildPendingIntentFromPushNotification(Context context, Action onCompletion, Intent intent) + public static void BuildPendingIntentFromPushNotification(Context context, Action onCompletion, Intent intent) { ApptentiveSDK.Apptentive.BuildPendingIntentFromPushNotification(context, new PendingIntentCallback(onCompletion), intent); } @@ -111,7 +111,7 @@ public static void BuildPendingIntentFromPushNotification(Context context, Actio /// Contains the Apptentive /// Push data. Pass in what you receive in the the Service or BroadcastReceiver /// that is used by your chosen push provider. - public static void BuildPendingIntentFromPushNotification(Context context, Action onCompletion, IDictionary data) + public static void BuildPendingIntentFromPushNotification(Context context, Action onCompletion, IDictionary data) { ApptentiveSDK.Apptentive.BuildPendingIntentFromPushNotification(context, new PendingIntentCallback(onCompletion), data); } @@ -143,7 +143,7 @@ public PendingIntentCallback(Action onCompletion) this.onCompletion = onCompletion; } - public void OnPendingIntent(PendingIntent pendingIntent) + public void OnPendingIntent(PendingIntent? pendingIntent) { if (pendingIntent != null) { @@ -165,9 +165,9 @@ public BooleanCallback(Action onCompletion) this.onCompletion = onCompletion; } - public void OnFinish(Java.Lang.Boolean result) + public void OnFinish(Java.Lang.Boolean? result) { - if (result.BooleanValue()) + if (result?.BooleanValue() == true) { onCompletion?.Invoke(true); } @@ -181,15 +181,15 @@ public void OnFinish(Java.Lang.Boolean result) public class RegisterCallback : Java.Lang.Object, IRegisterCallback { - private readonly Action onCompletion; + private readonly Action? onCompletion; - public RegisterCallback(Action onCompletion) + public RegisterCallback(Action? onCompletion) { this.onCompletion = onCompletion; } - public void OnComplete(RegisterResult result) + public void OnComplete(RegisterResult? result) { if (result is RegisterResult.Success) { @@ -206,15 +206,15 @@ public void OnComplete(RegisterResult result) public class EngagementCallback : Java.Lang.Object, IEngagementCallback { - private readonly Action onCompletion; + private readonly Action? onCompletion; - public EngagementCallback(Action onCompletion) + public EngagementCallback(Action? onCompletion) { this.onCompletion = onCompletion; } - public void OnComplete(EngagementResult result) + public void OnComplete(EngagementResult? result) { if (result is EngagementResult.InteractionShown) { diff --git a/ApptentiveKit.Android/ApptentiveFeedback/ApptentiveFeedback/ApptentiveFeedback.csproj b/ApptentiveKit.Android/ApptentiveFeedback/ApptentiveFeedback/ApptentiveFeedback.csproj index d2cf5f4..24e9107 100644 --- a/ApptentiveKit.Android/ApptentiveFeedback/ApptentiveFeedback/ApptentiveFeedback.csproj +++ b/ApptentiveKit.Android/ApptentiveFeedback/ApptentiveFeedback/ApptentiveFeedback.csproj @@ -1,10 +1,10 @@ - net8.0-android - 21 + net10.0-android + 24 enable enable - 6.9.0 + 7.0.0 @@ -26,20 +26,31 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + true true diff --git a/ApptentiveKit.Android/ApptentiveFeedback/ApptentiveFeedback/ApptentiveFeedback.nuspec b/ApptentiveKit.Android/ApptentiveFeedback/ApptentiveFeedback/ApptentiveFeedback.nuspec index effc9ff..2669f53 100644 --- a/ApptentiveKit.Android/ApptentiveFeedback/ApptentiveFeedback/ApptentiveFeedback.nuspec +++ b/ApptentiveKit.Android/ApptentiveFeedback/ApptentiveFeedback/ApptentiveFeedback.nuspec @@ -2,7 +2,7 @@ ApptentiveFeedback ApptentiveFeedback for Maui Android - 6.9.0 + 7.0.0 Apptentive Apptentive false @@ -12,7 +12,7 @@ BSD-3-Clause https://raw.githubusercontent.com/apptentive/apptentive-maui/main/icon.png - + @@ -26,23 +26,23 @@ - - - + + + - - - - - - + + + + + + - - - + + + diff --git a/ApptentiveKit.Android/ApptentiveFeedback/ApptentiveFeedback/Transforms/Metadata.xml b/ApptentiveKit.Android/ApptentiveFeedback/ApptentiveFeedback/Transforms/Metadata.xml index d1071ba..9c7c728 100644 --- a/ApptentiveKit.Android/ApptentiveFeedback/ApptentiveFeedback/Transforms/Metadata.xml +++ b/ApptentiveKit.Android/ApptentiveFeedback/ApptentiveFeedback/Transforms/Metadata.xml @@ -41,5 +41,6 @@ internal ApptentiveSDK + Java.Lang.Object diff --git a/ApptentiveKit.Android/ApptentiveFeedback/ApptentiveFeedback/apptentive-feedback-6.9.0.aar b/ApptentiveKit.Android/ApptentiveFeedback/ApptentiveFeedback/apptentive-feedback-6.9.0.aar deleted file mode 100644 index 510cebf..0000000 Binary files a/ApptentiveKit.Android/ApptentiveFeedback/ApptentiveFeedback/apptentive-feedback-6.9.0.aar and /dev/null differ diff --git a/ApptentiveKit.Android/ApptentiveFeedback/ApptentiveFeedback/apptentive-feedback-7.0.0.aar b/ApptentiveKit.Android/ApptentiveFeedback/ApptentiveFeedback/apptentive-feedback-7.0.0.aar new file mode 100644 index 0000000..f388e96 Binary files /dev/null and b/ApptentiveKit.Android/ApptentiveFeedback/ApptentiveFeedback/apptentive-feedback-7.0.0.aar differ diff --git a/ApptentiveKit.Android/ApptentiveInAppReview/ApptentiveInAppReview/ApptentiveInAppReview.csproj b/ApptentiveKit.Android/ApptentiveInAppReview/ApptentiveInAppReview/ApptentiveInAppReview.csproj index c5c0909..7f228f7 100644 --- a/ApptentiveKit.Android/ApptentiveInAppReview/ApptentiveInAppReview/ApptentiveInAppReview.csproj +++ b/ApptentiveKit.Android/ApptentiveInAppReview/ApptentiveInAppReview/ApptentiveInAppReview.csproj @@ -1,12 +1,13 @@ - net8.0-android - 21 + net10.0-android + 7.0.0 + 24 enable enable - + true true diff --git a/ApptentiveKit.Android/ApptentiveInAppReview/ApptentiveInAppReview/ApptentiveInAppReview.nuspec b/ApptentiveKit.Android/ApptentiveInAppReview/ApptentiveInAppReview/ApptentiveInAppReview.nuspec index d274355..82fbcc3 100644 --- a/ApptentiveKit.Android/ApptentiveInAppReview/ApptentiveInAppReview/ApptentiveInAppReview.nuspec +++ b/ApptentiveKit.Android/ApptentiveInAppReview/ApptentiveInAppReview/ApptentiveInAppReview.nuspec @@ -2,7 +2,7 @@ ApptentiveInAppReview ApptentiveInAppReview for Maui Android - 6.9.0 + 7.0.0 Apptentive Apptentive false @@ -12,14 +12,14 @@ BSD-3-Clause https://raw.githubusercontent.com/apptentive/apptentive-maui/main/icon.png - + - - - + + + \ No newline at end of file diff --git a/ApptentiveKit.Android/ApptentiveInAppReview/ApptentiveInAppReview/apptentive-in-app-review-6.9.0.aar b/ApptentiveKit.Android/ApptentiveInAppReview/ApptentiveInAppReview/apptentive-in-app-review-6.9.0.aar deleted file mode 100644 index 825c067..0000000 Binary files a/ApptentiveKit.Android/ApptentiveInAppReview/ApptentiveInAppReview/apptentive-in-app-review-6.9.0.aar and /dev/null differ diff --git a/ApptentiveKit.Android/ApptentiveInAppReview/ApptentiveInAppReview/apptentive-in-app-review-7.0.0.aar b/ApptentiveKit.Android/ApptentiveInAppReview/ApptentiveInAppReview/apptentive-in-app-review-7.0.0.aar new file mode 100644 index 0000000..586c668 Binary files /dev/null and b/ApptentiveKit.Android/ApptentiveInAppReview/ApptentiveInAppReview/apptentive-in-app-review-7.0.0.aar differ diff --git a/ApptentiveKit.Android/ApptentiveInitiator/ApptentiveInitiator/ApptentiveInitiator.csproj b/ApptentiveKit.Android/ApptentiveInitiator/ApptentiveInitiator/ApptentiveInitiator.csproj index 458acec..c18e1de 100644 --- a/ApptentiveKit.Android/ApptentiveInitiator/ApptentiveInitiator/ApptentiveInitiator.csproj +++ b/ApptentiveKit.Android/ApptentiveInitiator/ApptentiveInitiator/ApptentiveInitiator.csproj @@ -1,12 +1,13 @@ - net8.0-android - 21 + net10.0-android + 7.0.0 + 24 enable enable - + true true diff --git a/ApptentiveKit.Android/ApptentiveInitiator/ApptentiveInitiator/ApptentiveInitiator.nuspec b/ApptentiveKit.Android/ApptentiveInitiator/ApptentiveInitiator/ApptentiveInitiator.nuspec index 894a2f9..858b8de 100644 --- a/ApptentiveKit.Android/ApptentiveInitiator/ApptentiveInitiator/ApptentiveInitiator.nuspec +++ b/ApptentiveKit.Android/ApptentiveInitiator/ApptentiveInitiator/ApptentiveInitiator.nuspec @@ -2,7 +2,7 @@ ApptentiveInitiator ApptentiveInitiator for Maui Android - 6.9.0 + 7.0.0 Apptentive Apptentive false @@ -12,12 +12,12 @@ BSD-3-Clause https://raw.githubusercontent.com/apptentive/apptentive-maui/main/icon.png - + - - - + + + \ No newline at end of file diff --git a/ApptentiveKit.Android/ApptentiveInitiator/ApptentiveInitiator/apptentive-initiator-6.9.0.aar b/ApptentiveKit.Android/ApptentiveInitiator/ApptentiveInitiator/apptentive-initiator-6.9.0.aar deleted file mode 100644 index ffad6dc..0000000 Binary files a/ApptentiveKit.Android/ApptentiveInitiator/ApptentiveInitiator/apptentive-initiator-6.9.0.aar and /dev/null differ diff --git a/ApptentiveKit.Android/ApptentiveInitiator/ApptentiveInitiator/apptentive-initiator-7.0.0.aar b/ApptentiveKit.Android/ApptentiveInitiator/ApptentiveInitiator/apptentive-initiator-7.0.0.aar new file mode 100644 index 0000000..2fa6b17 Binary files /dev/null and b/ApptentiveKit.Android/ApptentiveInitiator/ApptentiveInitiator/apptentive-initiator-7.0.0.aar differ diff --git a/ApptentiveKit.Android/ApptentiveMessageCenter/ApptentiveMessageCenter/ApptentiveMessageCenter.csproj b/ApptentiveKit.Android/ApptentiveMessageCenter/ApptentiveMessageCenter/ApptentiveMessageCenter.csproj index 873423b..82cd0ba 100644 --- a/ApptentiveKit.Android/ApptentiveMessageCenter/ApptentiveMessageCenter/ApptentiveMessageCenter.csproj +++ b/ApptentiveKit.Android/ApptentiveMessageCenter/ApptentiveMessageCenter/ApptentiveMessageCenter.csproj @@ -1,7 +1,8 @@ - net8.0-android - 21 + net10.0-android + 7.0.0 + 24 enable enable @@ -9,7 +10,7 @@ - + true true diff --git a/ApptentiveKit.Android/ApptentiveMessageCenter/ApptentiveMessageCenter/ApptentiveMessageCenter.nuspec b/ApptentiveKit.Android/ApptentiveMessageCenter/ApptentiveMessageCenter/ApptentiveMessageCenter.nuspec index d04f3bf..67714ca 100644 --- a/ApptentiveKit.Android/ApptentiveMessageCenter/ApptentiveMessageCenter/ApptentiveMessageCenter.nuspec +++ b/ApptentiveKit.Android/ApptentiveMessageCenter/ApptentiveMessageCenter/ApptentiveMessageCenter.nuspec @@ -2,7 +2,7 @@ ApptentiveMessageCenter ApptentiveMessageCenter for Maui Android - 6.9.0 + 7.0.0 Apptentive Apptentive false @@ -12,14 +12,14 @@ BSD-3-Clause https://raw.githubusercontent.com/apptentive/apptentive-maui/main/icon.png - + - - - + + + \ No newline at end of file diff --git a/ApptentiveKit.Android/ApptentiveMessageCenter/ApptentiveMessageCenter/apptentive-message-center-6.9.0.aar b/ApptentiveKit.Android/ApptentiveMessageCenter/ApptentiveMessageCenter/apptentive-message-center-6.9.0.aar deleted file mode 100644 index 656c48c..0000000 Binary files a/ApptentiveKit.Android/ApptentiveMessageCenter/ApptentiveMessageCenter/apptentive-message-center-6.9.0.aar and /dev/null differ diff --git a/ApptentiveKit.Android/ApptentiveMessageCenter/ApptentiveMessageCenter/apptentive-message-center-7.0.0.aar b/ApptentiveKit.Android/ApptentiveMessageCenter/ApptentiveMessageCenter/apptentive-message-center-7.0.0.aar new file mode 100644 index 0000000..c16bd68 Binary files /dev/null and b/ApptentiveKit.Android/ApptentiveMessageCenter/ApptentiveMessageCenter/apptentive-message-center-7.0.0.aar differ diff --git a/ApptentiveKit.Android/ApptentiveNavigateToLink/ApptentiveNavigateToLink/ApptentiveNavigateToLink.csproj b/ApptentiveKit.Android/ApptentiveNavigateToLink/ApptentiveNavigateToLink/ApptentiveNavigateToLink.csproj index e6ed7a5..df3358f 100644 --- a/ApptentiveKit.Android/ApptentiveNavigateToLink/ApptentiveNavigateToLink/ApptentiveNavigateToLink.csproj +++ b/ApptentiveKit.Android/ApptentiveNavigateToLink/ApptentiveNavigateToLink/ApptentiveNavigateToLink.csproj @@ -1,12 +1,13 @@ - net8.0-android - 21 + net10.0-android + 7.0.0 + 24 enable enable - + true true diff --git a/ApptentiveKit.Android/ApptentiveNavigateToLink/ApptentiveNavigateToLink/ApptentiveNavigateToLink.nuspec b/ApptentiveKit.Android/ApptentiveNavigateToLink/ApptentiveNavigateToLink/ApptentiveNavigateToLink.nuspec index c6672e8..a020fdc 100644 --- a/ApptentiveKit.Android/ApptentiveNavigateToLink/ApptentiveNavigateToLink/ApptentiveNavigateToLink.nuspec +++ b/ApptentiveKit.Android/ApptentiveNavigateToLink/ApptentiveNavigateToLink/ApptentiveNavigateToLink.nuspec @@ -2,7 +2,7 @@ ApptentiveNavigateToLink ApptentiveNavigateToLink for Maui Android - 6.9.0 + 7.0.0 Apptentive Apptentive false @@ -12,12 +12,12 @@ BSD-3-Clause https://raw.githubusercontent.com/apptentive/apptentive-maui/main/icon.png - + - - - + + + \ No newline at end of file diff --git a/ApptentiveKit.Android/ApptentiveNavigateToLink/ApptentiveNavigateToLink/apptentive-navigate-to-link-6.9.0.aar b/ApptentiveKit.Android/ApptentiveNavigateToLink/ApptentiveNavigateToLink/apptentive-navigate-to-link-6.9.0.aar deleted file mode 100644 index 79aab65..0000000 Binary files a/ApptentiveKit.Android/ApptentiveNavigateToLink/ApptentiveNavigateToLink/apptentive-navigate-to-link-6.9.0.aar and /dev/null differ diff --git a/ApptentiveKit.Android/ApptentiveNavigateToLink/ApptentiveNavigateToLink/apptentive-navigate-to-link-7.0.0.aar b/ApptentiveKit.Android/ApptentiveNavigateToLink/ApptentiveNavigateToLink/apptentive-navigate-to-link-7.0.0.aar new file mode 100644 index 0000000..653228a Binary files /dev/null and b/ApptentiveKit.Android/ApptentiveNavigateToLink/ApptentiveNavigateToLink/apptentive-navigate-to-link-7.0.0.aar differ diff --git a/ApptentiveKit.Android/ApptentiveNotes/ApptentiveNotes/ApptentiveNotes.csproj b/ApptentiveKit.Android/ApptentiveNotes/ApptentiveNotes/ApptentiveNotes.csproj index 73fd8bc..2a556ba 100644 --- a/ApptentiveKit.Android/ApptentiveNotes/ApptentiveNotes/ApptentiveNotes.csproj +++ b/ApptentiveKit.Android/ApptentiveNotes/ApptentiveNotes/ApptentiveNotes.csproj @@ -1,7 +1,8 @@ - net8.0-android - 21 + net10.0-android + 7.0.0 + 24 enable enable @@ -9,7 +10,7 @@ - + true true diff --git a/ApptentiveKit.Android/ApptentiveNotes/ApptentiveNotes/ApptentiveNotes.nuspec b/ApptentiveKit.Android/ApptentiveNotes/ApptentiveNotes/ApptentiveNotes.nuspec index 503bceb..e7ee689 100644 --- a/ApptentiveKit.Android/ApptentiveNotes/ApptentiveNotes/ApptentiveNotes.nuspec +++ b/ApptentiveKit.Android/ApptentiveNotes/ApptentiveNotes/ApptentiveNotes.nuspec @@ -2,7 +2,7 @@ ApptentiveNotes ApptentiveNotes for Maui Android - 6.9.0 + 7.0.0 Apptentive Apptentive false @@ -12,14 +12,14 @@ BSD-3-Clause https://raw.githubusercontent.com/apptentive/apptentive-maui/main/icon.png - + - - - + + + \ No newline at end of file diff --git a/ApptentiveKit.Android/ApptentiveNotes/ApptentiveNotes/apptentive-notes-6.9.0.aar b/ApptentiveKit.Android/ApptentiveNotes/ApptentiveNotes/apptentive-notes-6.9.0.aar deleted file mode 100644 index 98d7902..0000000 Binary files a/ApptentiveKit.Android/ApptentiveNotes/ApptentiveNotes/apptentive-notes-6.9.0.aar and /dev/null differ diff --git a/ApptentiveKit.Android/ApptentiveNotes/ApptentiveNotes/apptentive-notes-7.0.0.aar b/ApptentiveKit.Android/ApptentiveNotes/ApptentiveNotes/apptentive-notes-7.0.0.aar new file mode 100644 index 0000000..4619437 Binary files /dev/null and b/ApptentiveKit.Android/ApptentiveNotes/ApptentiveNotes/apptentive-notes-7.0.0.aar differ diff --git a/ApptentiveKit.Android/ApptentiveRatings/ApptentiveRatings/ApptentiveRatings.csproj b/ApptentiveKit.Android/ApptentiveRatings/ApptentiveRatings/ApptentiveRatings.csproj index 36513c9..06fd4dd 100644 --- a/ApptentiveKit.Android/ApptentiveRatings/ApptentiveRatings/ApptentiveRatings.csproj +++ b/ApptentiveKit.Android/ApptentiveRatings/ApptentiveRatings/ApptentiveRatings.csproj @@ -1,7 +1,8 @@ - net8.0-android - 21 + net10.0-android + 7.0.0 + 24 enable enable @@ -9,7 +10,7 @@ - + true true diff --git a/ApptentiveKit.Android/ApptentiveRatings/ApptentiveRatings/ApptentiveRatings.nuspec b/ApptentiveKit.Android/ApptentiveRatings/ApptentiveRatings/ApptentiveRatings.nuspec index bf1f04b..2d1b3f0 100644 --- a/ApptentiveKit.Android/ApptentiveRatings/ApptentiveRatings/ApptentiveRatings.nuspec +++ b/ApptentiveKit.Android/ApptentiveRatings/ApptentiveRatings/ApptentiveRatings.nuspec @@ -2,7 +2,7 @@ ApptentiveRatings ApptentiveRatings for Maui Android - 6.9.0 + 7.0.0 Apptentive Apptentive false @@ -12,14 +12,14 @@ BSD-3-Clause https://raw.githubusercontent.com/apptentive/apptentive-maui/main/icon.png - + - - - + + + \ No newline at end of file diff --git a/ApptentiveKit.Android/ApptentiveRatings/ApptentiveRatings/apptentive-ratings-6.9.0.aar b/ApptentiveKit.Android/ApptentiveRatings/ApptentiveRatings/apptentive-ratings-6.9.0.aar deleted file mode 100644 index 1c1a8a8..0000000 Binary files a/ApptentiveKit.Android/ApptentiveRatings/ApptentiveRatings/apptentive-ratings-6.9.0.aar and /dev/null differ diff --git a/ApptentiveKit.Android/ApptentiveRatings/ApptentiveRatings/apptentive-ratings-7.0.0.aar b/ApptentiveKit.Android/ApptentiveRatings/ApptentiveRatings/apptentive-ratings-7.0.0.aar new file mode 100644 index 0000000..5fc6e46 Binary files /dev/null and b/ApptentiveKit.Android/ApptentiveRatings/ApptentiveRatings/apptentive-ratings-7.0.0.aar differ diff --git a/ApptentiveKit.Android/ApptentiveSurvey/ApptentiveSurvey/ApptentiveSurvey.csproj b/ApptentiveKit.Android/ApptentiveSurvey/ApptentiveSurvey/ApptentiveSurvey.csproj index c4bf2c7..098787a 100644 --- a/ApptentiveKit.Android/ApptentiveSurvey/ApptentiveSurvey/ApptentiveSurvey.csproj +++ b/ApptentiveKit.Android/ApptentiveSurvey/ApptentiveSurvey/ApptentiveSurvey.csproj @@ -1,7 +1,8 @@ - net8.0-android - 21 + net10.0-android + 7.0.0 + 24 enable enable @@ -9,7 +10,7 @@ - + true true diff --git a/ApptentiveKit.Android/ApptentiveSurvey/ApptentiveSurvey/ApptentiveSurvey.nuspec b/ApptentiveKit.Android/ApptentiveSurvey/ApptentiveSurvey/ApptentiveSurvey.nuspec index 73b18eb..f9f9be4 100644 --- a/ApptentiveKit.Android/ApptentiveSurvey/ApptentiveSurvey/ApptentiveSurvey.nuspec +++ b/ApptentiveKit.Android/ApptentiveSurvey/ApptentiveSurvey/ApptentiveSurvey.nuspec @@ -2,7 +2,7 @@ ApptentiveSurvey ApptentiveSurvey for Maui Android - 6.9.0 + 7.0.0 Apptentive Apptentive false @@ -12,14 +12,14 @@ BSD-3-Clause https://raw.githubusercontent.com/apptentive/apptentive-maui/main/icon.png - + - - - + + + \ No newline at end of file diff --git a/ApptentiveKit.Android/ApptentiveSurvey/ApptentiveSurvey/apptentive-survey-6.9.0.aar b/ApptentiveKit.Android/ApptentiveSurvey/ApptentiveSurvey/apptentive-survey-6.9.0.aar deleted file mode 100644 index 10fdcc4..0000000 Binary files a/ApptentiveKit.Android/ApptentiveSurvey/ApptentiveSurvey/apptentive-survey-6.9.0.aar and /dev/null differ diff --git a/ApptentiveKit.Android/ApptentiveSurvey/ApptentiveSurvey/apptentive-survey-7.0.0.aar b/ApptentiveKit.Android/ApptentiveSurvey/ApptentiveSurvey/apptentive-survey-7.0.0.aar new file mode 100644 index 0000000..a7b9076 Binary files /dev/null and b/ApptentiveKit.Android/ApptentiveSurvey/ApptentiveSurvey/apptentive-survey-7.0.0.aar differ diff --git a/Plugin.Maui.Apptentive.Sample/Platforms/Android/AndroidManifest.xml b/Plugin.Maui.Apptentive.Sample/Platforms/Android/AndroidManifest.xml index e79e41c..3ff3df8 100644 --- a/Plugin.Maui.Apptentive.Sample/Platforms/Android/AndroidManifest.xml +++ b/Plugin.Maui.Apptentive.Sample/Platforms/Android/AndroidManifest.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/Plugin.Maui.Apptentive.Sample/Plugin.Maui.Apptentive.Sample.csproj b/Plugin.Maui.Apptentive.Sample/Plugin.Maui.Apptentive.Sample.csproj index 53a2551..09d09fd 100644 --- a/Plugin.Maui.Apptentive.Sample/Plugin.Maui.Apptentive.Sample.csproj +++ b/Plugin.Maui.Apptentive.Sample/Plugin.Maui.Apptentive.Sample.csproj @@ -27,7 +27,7 @@ false 13.0 - 21.0 + 24.0 6.7 diff --git a/Plugin.Maui.Apptentive/Platforms/Android/Apptentive.android.cs b/Plugin.Maui.Apptentive/Platforms/Android/Apptentive.android.cs index c12c037..ec8948b 100644 --- a/Plugin.Maui.Apptentive/Platforms/Android/Apptentive.android.cs +++ b/Plugin.Maui.Apptentive/Platforms/Android/Apptentive.android.cs @@ -3,136 +3,177 @@ namespace Plugin.Maui.Apptentive; -public partial interface IApptentive { +public partial interface IApptentive +{ void Register(Configuration Configuration, Action completion, MauiApplication Application); } partial class ApptentiveImplementation : IApptentive { - public event EventNotificationHandler? EventEngaged; - - public event AuthenticationFailureHandler? AuthenticationFailed; - - public void Register(Configuration Configuration, Action Completion, MauiApplication Application) - { - var androidConfiguration = new ApptentiveSDK.ApptentiveConfiguration(Configuration.ApptentiveKey, Configuration.ApptentiveSignature); - androidConfiguration.DistributionVersion = Configuration.DistributionVersion; - androidConfiguration.DistributionName = Configuration.DistributionName; - androidConfiguration.ShouldSanitizeLogMessages = Configuration.ShouldSanitizeLogMessages; - androidConfiguration.ShouldInheritAppTheme = Configuration.ShouldInheritAppTheme; - androidConfiguration.CustomAppStoreURL = Configuration.CustomAppStoreURL; - //TODO: Log Level is not reliably accessible. - ApptentiveSDK.Apptentive.Register(Application, androidConfiguration, Completion); - } - - public void Engage(string Event, Action onCompletion = null) - { - ApptentiveSDK.Apptentive.Engage(Event, null, new EngagementCallback(onCompletion)); - } - - public void CanShowInteraction(string Event, Action completion) - { - bool canShowInteraction = ApptentiveSDK.Apptentive.QueryCanShowInteraction(Event); - completion(canShowInteraction); - } - - public void PresentMessageCenter() - { - ApptentiveSDK.Apptentive.ShowMessageCenter(); - } - - public void CanShowMessageCenter(Action completion) - { - ApptentiveSDK.Apptentive.CanShowMessageCenter(completion); - } - - public void SetPersonName(string PersonName) - { - ApptentiveSDK.Apptentive.PersonName = PersonName; - } - - public void setPersonEmailAddress(string PersonEmailAddress) - { - ApptentiveSDK.Apptentive.PersonEmail = PersonEmailAddress; - } - - public void addCustomPersonData(string Key, string Value) - { - ApptentiveSDK.Apptentive.AddCustomPersonData(Key, Value); - } - - public void addCustomPersonData(string Key, double Value) - { - int intValue = (int)Value; - ApptentiveSDK.Apptentive.AddCustomPersonData(Key, (Java.Lang.Number)intValue); - } - - public void addCustomPersonData(string Key, bool Value) - { - ApptentiveSDK.Apptentive.AddCustomPersonData(Key, (Java.Lang.Boolean)Value); - } - - public void removeCustomPersonData(string Key) - { - ApptentiveSDK.Apptentive.RemoveCustomPersonData(Key); - } - - public void addCustomDeviceData(string Key, string Value) - { - ApptentiveSDK.Apptentive.AddCustomDeviceData(Key, Value); - } - - public void addCustomDeviceData(string Key, double Value) - { - int intValue = (int)Value; - ApptentiveSDK.Apptentive.AddCustomDeviceData(Key, (Java.Lang.Number)intValue); - } - - public void addCustomDeviceData(string Key, bool Value) - { - ApptentiveSDK.Apptentive.AddCustomDeviceData(Key, (Java.Lang.Boolean)Value); - } - - public void removeCustomDeviceData(string Key) - { - ApptentiveSDK.Apptentive.RemoveCustomDeviceData(Key); - } - - public int UnreadMessageCount - { - get - { - return ApptentiveSDK.Apptentive.UnreadMessageCount; - } - } - - public void sentAttachmentText(string Text) - { - ApptentiveSDK.Apptentive.SendAttachmentText(Text); - } - - // public void sendAttachmentImage(Image image) - // { - // Bitmap? bitmap = null; - // using (MemoryStream memoryStream = new MemoryStream()) - // { - // image.Save(memoryStream, Microsoft.Maui.Graphics.ImageFormat.Png); - // byte[] byteArray = memoryStream.ToArray(); - // string mimeType = "image/png"; - // ApptentiveSDK.Apptentive.SendAttachmentFile(byteArray, mimeType); - // } - // } - - - public void sendAttachmentFile(System.IO.Stream File, string MimeType) - { - ApptentiveSDK.Apptentive.SendAttachmentFile(File, MimeType); - } - - public void LogIn(string Token, Action Completion) { } - - public void LogOut() { } - - public void UpdateToken(string Token, Action? Completion) { } +#pragma warning disable CS0067 // Events required by IApptentive interface but not yet raised on Android + public event EventNotificationHandler? EventEngaged; + public event AuthenticationFailureHandler? AuthenticationFailed; +#pragma warning restore CS0067 + + public void Register(Configuration Configuration, Action Completion, MauiApplication Application) + { + var androidConfiguration = new ApptentiveSDK.ApptentiveConfiguration(Configuration.ApptentiveKey, Configuration.ApptentiveSignature); + androidConfiguration.DistributionVersion = Configuration.DistributionVersion; + androidConfiguration.LogLevel = ParseLogLevel(Configuration.LogLevel); + androidConfiguration.DistributionName = Configuration.DistributionName; + androidConfiguration.ShouldSanitizeLogMessages = Configuration.ShouldSanitizeLogMessages; + androidConfiguration.ShouldInheritAppTheme = Configuration.ShouldInheritAppTheme; + androidConfiguration.CustomAppStoreURL = Configuration.CustomAppStoreURL; + + if (string.IsNullOrEmpty(Configuration.OverrideBaseUrl)) + { + androidConfiguration.Region = ParseRegion(Configuration.Region); + } + else + { + androidConfiguration.Region = new ApptentiveSDK.ApptentiveRegion.Custom(Configuration.OverrideBaseUrl); + } + + //TODO: Log Level is not reliably accessible. + ApptentiveSDK.Apptentive.Register(Application, androidConfiguration, Completion); + } + + private static ApptentiveSDK.ApptentiveRegion ParseRegion(string? input = null) + { + return input?.ToLowerInvariant() switch + { + "us" => ApptentiveSDK.ApptentiveRegion.US.Instance, + "eu" => ApptentiveSDK.ApptentiveRegion.EU.Instance, + "cn" => ApptentiveSDK.ApptentiveRegion.CN.Instance, + "au" => ApptentiveSDK.ApptentiveRegion.AU.Instance, + null => ApptentiveSDK.ApptentiveRegion.US.Instance, + _ => ApptentiveSDK.ApptentiveRegion.US.Instance + }; + } + + private static AndroidLogLevel ParseLogLevel(ApptentiveLogLevel LogLevel) + { + return LogLevel switch + { + ApptentiveLogLevel.Undefined => AndroidLogLevel.Info!, + ApptentiveLogLevel.Crit => AndroidLogLevel.Error!, + ApptentiveLogLevel.Error => AndroidLogLevel.Error!, + ApptentiveLogLevel.Warn => AndroidLogLevel.Warning!, + ApptentiveLogLevel.Info => AndroidLogLevel.Info!, + ApptentiveLogLevel.Debug => AndroidLogLevel.Debug!, + ApptentiveLogLevel.Verbose => AndroidLogLevel.Verbose!, + _ => AndroidLogLevel.Info! + }; + } + + public void Engage(string Event, Action? onCompletion = null) + { + ApptentiveSDK.Apptentive.Engage(Event, null, new EngagementCallback(onCompletion)); + } + + public void CanShowInteraction(string Event, Action completion) + { + bool canShowInteraction = ApptentiveSDK.Apptentive.QueryCanShowInteraction(Event); + completion(canShowInteraction); + } + + public void PresentMessageCenter() + { + ApptentiveSDK.Apptentive.ShowMessageCenter(); + } + + public void CanShowMessageCenter(Action completion) + { + ApptentiveSDK.Apptentive.CanShowMessageCenter(completion); + } + + public void SetPersonName(string PersonName) + { + ApptentiveSDK.Apptentive.PersonName = PersonName; + } + + public void setPersonEmailAddress(string PersonEmailAddress) + { + ApptentiveSDK.Apptentive.PersonEmail = PersonEmailAddress; + } + + public void addCustomPersonData(string Key, string Value) + { + ApptentiveSDK.Apptentive.AddCustomPersonData(Key, Value); + } + + public void addCustomPersonData(string Key, double Value) + { + int intValue = (int)Value; + ApptentiveSDK.Apptentive.AddCustomPersonData(Key, (Java.Lang.Number)intValue); + } + + public void addCustomPersonData(string Key, bool Value) + { + ApptentiveSDK.Apptentive.AddCustomPersonData(Key, (Java.Lang.Boolean)Value); + } + + public void removeCustomPersonData(string Key) + { + ApptentiveSDK.Apptentive.RemoveCustomPersonData(Key); + } + + public void addCustomDeviceData(string Key, string Value) + { + ApptentiveSDK.Apptentive.AddCustomDeviceData(Key, Value); + } + + public void addCustomDeviceData(string Key, double Value) + { + int intValue = (int)Value; + ApptentiveSDK.Apptentive.AddCustomDeviceData(Key, (Java.Lang.Number)intValue); + } + + public void addCustomDeviceData(string Key, bool Value) + { + ApptentiveSDK.Apptentive.AddCustomDeviceData(Key, (Java.Lang.Boolean)Value); + } + + public void removeCustomDeviceData(string Key) + { + ApptentiveSDK.Apptentive.RemoveCustomDeviceData(Key); + } + + public int UnreadMessageCount + { + get + { + return ApptentiveSDK.Apptentive.UnreadMessageCount; + } + } + + public void sentAttachmentText(string Text) + { + ApptentiveSDK.Apptentive.SendAttachmentText(Text); + } + + // public void sendAttachmentImage(Image image) + // { + // Bitmap? bitmap = null; + // using (MemoryStream memoryStream = new MemoryStream()) + // { + // image.Save(memoryStream, Microsoft.Maui.Graphics.ImageFormat.Png); + // byte[] byteArray = memoryStream.ToArray(); + // string mimeType = "image/png"; + // ApptentiveSDK.Apptentive.SendAttachmentFile(byteArray, mimeType); + // } + // } + + + public void sendAttachmentFile(System.IO.Stream File, string MimeType) + { + ApptentiveSDK.Apptentive.SendAttachmentFile(File, MimeType); + } + + public void LogIn(string Token, Action? Completion) { } + + public void LogOut() { } + + public void UpdateToken(string Token, Action? Completion) { } } \ No newline at end of file diff --git a/Plugin.Maui.Apptentive/Plugin.Maui.Apptentive.csproj b/Plugin.Maui.Apptentive/Plugin.Maui.Apptentive.csproj index 75a8456..78a88e5 100644 --- a/Plugin.Maui.Apptentive/Plugin.Maui.Apptentive.csproj +++ b/Plugin.Maui.Apptentive/Plugin.Maui.Apptentive.csproj @@ -22,7 +22,7 @@ Supports using the ApptentiveKit Android and iOS SDKs from Alchemer in a .NET Maui App. 13.0 - 21.0 + 24.0 @@ -50,9 +50,9 @@ - - - + + --> diff --git a/Plugin.Maui.Apptentive/Plugin.Maui.Apptentive.nuspec b/Plugin.Maui.Apptentive/Plugin.Maui.Apptentive.nuspec index 9d013f9..4863228 100644 --- a/Plugin.Maui.Apptentive/Plugin.Maui.Apptentive.nuspec +++ b/Plugin.Maui.Apptentive/Plugin.Maui.Apptentive.nuspec @@ -14,8 +14,8 @@ images\icon.png Apptentive Alchemer - - + + @@ -24,8 +24,8 @@ - - + + \ No newline at end of file