@selligent-marketing-cloud/selligent-react-native 2.10.0 → 3.0.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [3.0.0] - 7 December 2022
+
+### Changed
+- Add version 4.0.1 of the Android SDK to `android/libs`
+- Remove everything to do with `googleApplicationId` from Android, as this setting was completely removed from Selligent's SDK
+- On Android, use an SMNotificationButton's button action's `getValue()` method to get the action value, in accordance with Selligent's new API
+- Change development dependency version of `react-native` to `^0.70.6`
+
 ## [2.10.0] - 12 September 2022
 
 ### Added

package/README.md

@@ -15,7 +15,7 @@ This module uses the native Selligent SDKs:
 
 | SDK                                                                     | Version |
 | ----------------------------------------------------------------------- | ------- |
-| [Android](https://github.com/SelligentMarketingCloud/MobileSDK-Android) | 3.10.1  |
+| [Android](https://github.com/SelligentMarketingCloud/MobileSDK-Android) | 4.0.1  |
 | [iOS](https://github.com/SelligentMarketingCloud/MobileSDK-iOS)         | 2.7.7   |
 
 ## ToC

package/android/build/intermediates/compile_symbol_list/debug/R.txt

@@ -973,6 +973,7 @@ int attr suffixText 0x0
 int attr suffixTextAppearance 0x0
 int attr suffixTextColor 0x0
 int attr suggestionRowLayout 0x0
+int attr swipeRefreshLayoutProgressSpinnerBackgroundColor 0x0
 int attr switchMinWidth 0x0
 int attr switchPadding 0x0
 int attr switchStyle 0x0
@@ -1703,6 +1704,10 @@ int color material_timepicker_button_stroke 0x0
 int color material_timepicker_clock_text_color 0x0
 int color material_timepicker_clockface 0x0
 int color material_timepicker_modebutton_tint 0x0
+int color mtrl_bottom_nav_colored_item_tint 0x0
+int color mtrl_bottom_nav_colored_ripple_color 0x0
+int color mtrl_bottom_nav_item_tint 0x0
+int color mtrl_bottom_nav_ripple_color 0x0
 int color mtrl_btn_bg_color_selector 0x0
 int color mtrl_btn_ripple_color 0x0
 int color mtrl_btn_stroke_color_selector 0x0
@@ -1792,9 +1797,6 @@ int color tooltip_background_dark 0x0
 int color tooltip_background_light 0x0
 int color upsdk_blue_text_007dff 0x0
 int color upsdk_category_button_select_pressed 0x0
-int color upsdk_color_gray_1 0x0
-int color upsdk_color_gray_10 0x0
-int color upsdk_color_gray_7 0x0
 int color upsdk_white 0x0
 int dimen abc_action_bar_content_inset_material 0x0
 int dimen abc_action_bar_content_inset_with_nav 0x0
@@ -2255,6 +2257,7 @@ int dimen mtrl_card_elevation 0x0
 int dimen mtrl_card_spacing 0x0
 int dimen mtrl_chip_pressed_translation_z 0x0
 int dimen mtrl_chip_text_size 0x0
+int dimen mtrl_edittext_rectangle_top_offset 0x0
 int dimen mtrl_exposed_dropdown_menu_popup_elevation 0x0
 int dimen mtrl_exposed_dropdown_menu_popup_vertical_offset 0x0
 int dimen mtrl_exposed_dropdown_menu_popup_vertical_padding 0x0
@@ -2406,11 +2409,6 @@ int dimen tooltip_precise_anchor_threshold 0x0
 int dimen tooltip_vertical_padding 0x0
 int dimen tooltip_y_offset_non_touch 0x0
 int dimen tooltip_y_offset_touch 0x0
-int dimen upsdk_margin_l 0x0
-int dimen upsdk_margin_m 0x0
-int dimen upsdk_margin_xs 0x0
-int dimen upsdk_master_body_2 0x0
-int dimen upsdk_master_subtitle 0x0
 int drawable abc_ab_share_pack_mtrl_alpha 0x0
 int drawable abc_action_bar_item_background_material 0x0
 int drawable abc_btn_borderless_material 0x0
@@ -2532,6 +2530,7 @@ int drawable common_google_signin_btn_text_light 0x0
 int drawable common_google_signin_btn_text_light_focused 0x0
 int drawable common_google_signin_btn_text_light_normal 0x0
 int drawable common_google_signin_btn_text_light_normal_background 0x0
+int drawable design_bottom_navigation_item_background 0x0
 int drawable design_fab_background 0x0
 int drawable design_ic_visibility 0x0
 int drawable design_ic_visibility_off 0x0
@@ -2575,6 +2574,7 @@ int drawable mtrl_ic_cancel 0x0
 int drawable mtrl_ic_error 0x0
 int drawable mtrl_navigation_bar_item_background 0x0
 int drawable mtrl_popupmenu_background 0x0
+int drawable mtrl_popupmenu_background_dark 0x0
 int drawable mtrl_popupmenu_background_overlay 0x0
 int drawable mtrl_tabs_default_indicator 0x0
 int drawable navigation_empty_icon 0x0
@@ -2830,8 +2830,10 @@ int id item4 0x0
 int id item_touch_helper_previous_elevation 0x0
 int id jumpToEnd 0x0
 int id jumpToStart 0x0
+int id labelGroup 0x0
 int id labeled 0x0
 int id labelled_by 0x0
+int id largeLabel 0x0
 int id latestProductCardView 0x0
 int id layout 0x0
 int id left 0x0
@@ -3018,6 +3020,7 @@ int id sm_mapView_container 0x0
 int id sm_no_permission 0x0
 int id sm_responseView_container 0x0
 int id sm_view_container 0x0
+int id smallLabel 0x0
 int id snackbar_action 0x0
 int id snackbar_text 0x0
 int id spacer 0x0
@@ -3349,6 +3352,8 @@ int menu menu_notification 0x0
 int menu menu_sell_base 0x0
 int menu menu_view 0x0
 int plurals mtrl_badge_content_description 0x0
+int raw firebase_common_keep 0x0
+int raw keep 0x0
 int string abc_action_bar_home_description 0x0
 int string abc_action_bar_up_description 0x0
 int string abc_action_menu_overflow_description 0x0
@@ -3378,7 +3383,6 @@ int string abc_shareactionprovider_share_with_application 0x0
 int string abc_toolbar_collapse_description 0x0
 int string action_back_label 0x0
 int string action_forward_label 0x0
-int string ag_sdk_cbg_root 0x0
 int string alert_description 0x0
 int string androidx_startup 0x0
 int string app_icon_sticky_notification_description 0x0
@@ -3451,13 +3455,12 @@ int string header_description 0x0
 int string hide_bottom_view_on_scroll_behavior 0x0
 int string hms_abort 0x0
 int string hms_abort_message 0x0
+int string hms_apk_not_installed_hints 0x0
 int string hms_base_google 0x0
 int string hms_base_vmall 0x0
 int string hms_bindfaildlg_message 0x0
 int string hms_bindfaildlg_title 0x0
 int string hms_cancel 0x0
-int string hms_cancel_after_cancel 0x0
-int string hms_cancel_install_message 0x0
 int string hms_check_failure 0x0
 int string hms_check_no_update 0x0
 int string hms_checking 0x0
@@ -3470,7 +3473,6 @@ int string hms_downloading_loading 0x0
 int string hms_downloading_new 0x0
 int string hms_gamebox_name 0x0
 int string hms_install 0x0
-int string hms_install_after_cancel 0x0
 int string hms_install_message 0x0
 int string hms_is_spoof 0x0
 int string hms_push_channel 0x0
@@ -3602,10 +3604,8 @@ int string title_activity_view 0x0
 int string toolbar_description 0x0
 int string upsdk_app_dl_installing 0x0
 int string upsdk_app_download_info_new 0x0
-int string upsdk_app_download_installing 0x0
 int string upsdk_app_size 0x0
 int string upsdk_app_version 0x0
-int string upsdk_appstore_install 0x0
 int string upsdk_cancel 0x0
 int string upsdk_checking_update_prompt 0x0
 int string upsdk_choice_update 0x0
@@ -3613,7 +3613,6 @@ int string upsdk_connect_server_fail_prompt_toast 0x0
 int string upsdk_detail 0x0
 int string upsdk_getting_message_fail_prompt_toast 0x0
 int string upsdk_install 0x0
-int string upsdk_mobile_dld_warn 0x0
 int string upsdk_no_available_network_prompt_toast 0x0
 int string upsdk_ota_app_name 0x0
 int string upsdk_ota_cancel 0x0
@@ -4252,6 +4251,7 @@ int style ThemeOverlay_MaterialComponents_Dialog 0x0
 int style ThemeOverlay_MaterialComponents_Dialog_Alert 0x0
 int style ThemeOverlay_MaterialComponents_Dialog_Alert_Framework 0x0
 int style ThemeOverlay_MaterialComponents_Light 0x0
+int style ThemeOverlay_MaterialComponents_Light_BottomSheetDialog 0x0
 int style ThemeOverlay_MaterialComponents_Light_Dialog_Alert_Framework 0x0
 int style ThemeOverlay_MaterialComponents_MaterialAlertDialog 0x0
 int style ThemeOverlay_MaterialComponents_MaterialAlertDialog_Centered 0x0
@@ -5040,9 +5040,20 @@ int styleable BottomAppBar_navigationIconTint 8
 int styleable BottomAppBar_paddingBottomSystemWindowInsets 9
 int styleable BottomAppBar_paddingLeftSystemWindowInsets 10
 int styleable BottomAppBar_paddingRightSystemWindowInsets 11
-int[] styleable BottomNavigationView { 0x1010140, 0x0 }
+int[] styleable BottomNavigationView { 0x1010140, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }
 int styleable BottomNavigationView_android_minHeight 0
-int styleable BottomNavigationView_itemHorizontalTranslationEnabled 1
+int styleable BottomNavigationView_backgroundTint 1
+int styleable BottomNavigationView_elevation 2
+int styleable BottomNavigationView_itemBackground 3
+int styleable BottomNavigationView_itemHorizontalTranslationEnabled 4
+int styleable BottomNavigationView_itemIconSize 5
+int styleable BottomNavigationView_itemIconTint 6
+int styleable BottomNavigationView_itemRippleColor 7
+int styleable BottomNavigationView_itemTextAppearanceActive 8
+int styleable BottomNavigationView_itemTextAppearanceInactive 9
+int styleable BottomNavigationView_itemTextColor 10
+int styleable BottomNavigationView_labelVisibilityMode 11
+int styleable BottomNavigationView_menu 12
 int[] styleable BottomSheetBehavior_Layout { 0x1010440, 0x1010120, 0x101011f, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }
 int styleable BottomSheetBehavior_Layout_android_elevation 0
 int styleable BottomSheetBehavior_Layout_android_maxHeight 1
@@ -6302,6 +6313,8 @@ int[] styleable StateListDrawableItem { 0x1010199 }
 int styleable StateListDrawableItem_android_drawable 0
 int[] styleable StateSet { 0x0 }
 int styleable StateSet_defaultState 0
+int[] styleable SwipeRefreshLayout { 0x0 }
+int styleable SwipeRefreshLayout_swipeRefreshLayoutProgressSpinnerBackgroundColor 0
 int[] styleable SwitchCompat { 0x1010125, 0x1010124, 0x1010142, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }
 int styleable SwitchCompat_android_textOff 0
 int styleable SwitchCompat_android_textOn 1

package/android/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties

@@ -1 +1 @@
-#Fri Sep 09 11:49:59 CEST 2022
+#Wed Dec 07 00:41:42 CET 2022

package/android/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt

@@ -974,6 +974,7 @@ attr suffixText
 attr suffixTextAppearance
 attr suffixTextColor
 attr suggestionRowLayout
+attr swipeRefreshLayoutProgressSpinnerBackgroundColor
 attr switchMinWidth
 attr switchPadding
 attr switchStyle
@@ -1704,6 +1705,10 @@ color material_timepicker_button_stroke
 color material_timepicker_clock_text_color
 color material_timepicker_clockface
 color material_timepicker_modebutton_tint
+color mtrl_bottom_nav_colored_item_tint
+color mtrl_bottom_nav_colored_ripple_color
+color mtrl_bottom_nav_item_tint
+color mtrl_bottom_nav_ripple_color
 color mtrl_btn_bg_color_selector
 color mtrl_btn_ripple_color
 color mtrl_btn_stroke_color_selector
@@ -1793,9 +1798,6 @@ color tooltip_background_dark
 color tooltip_background_light
 color upsdk_blue_text_007dff
 color upsdk_category_button_select_pressed
-color upsdk_color_gray_1
-color upsdk_color_gray_10
-color upsdk_color_gray_7
 color upsdk_white
 dimen abc_action_bar_content_inset_material
 dimen abc_action_bar_content_inset_with_nav
@@ -2256,6 +2258,7 @@ dimen mtrl_card_elevation
 dimen mtrl_card_spacing
 dimen mtrl_chip_pressed_translation_z
 dimen mtrl_chip_text_size
+dimen mtrl_edittext_rectangle_top_offset
 dimen mtrl_exposed_dropdown_menu_popup_elevation
 dimen mtrl_exposed_dropdown_menu_popup_vertical_offset
 dimen mtrl_exposed_dropdown_menu_popup_vertical_padding
@@ -2407,11 +2410,6 @@ dimen tooltip_precise_anchor_threshold
 dimen tooltip_vertical_padding
 dimen tooltip_y_offset_non_touch
 dimen tooltip_y_offset_touch
-dimen upsdk_margin_l
-dimen upsdk_margin_m
-dimen upsdk_margin_xs
-dimen upsdk_master_body_2
-dimen upsdk_master_subtitle
 drawable abc_ab_share_pack_mtrl_alpha
 drawable abc_action_bar_item_background_material
 drawable abc_btn_borderless_material
@@ -2533,6 +2531,7 @@ drawable common_google_signin_btn_text_light
 drawable common_google_signin_btn_text_light_focused
 drawable common_google_signin_btn_text_light_normal
 drawable common_google_signin_btn_text_light_normal_background
+drawable design_bottom_navigation_item_background
 drawable design_fab_background
 drawable design_ic_visibility
 drawable design_ic_visibility_off
@@ -2576,6 +2575,7 @@ drawable mtrl_ic_cancel
 drawable mtrl_ic_error
 drawable mtrl_navigation_bar_item_background
 drawable mtrl_popupmenu_background
+drawable mtrl_popupmenu_background_dark
 drawable mtrl_popupmenu_background_overlay
 drawable mtrl_tabs_default_indicator
 drawable navigation_empty_icon
@@ -2831,8 +2831,10 @@ id item4
 id item_touch_helper_previous_elevation
 id jumpToEnd
 id jumpToStart
+id labelGroup
 id labeled
 id labelled_by
+id largeLabel
 id latestProductCardView
 id layout
 id left
@@ -3019,6 +3021,7 @@ id sm_mapView_container
 id sm_no_permission
 id sm_responseView_container
 id sm_view_container
+id smallLabel
 id snackbar_action
 id snackbar_text
 id spacer
@@ -3350,6 +3353,8 @@ menu menu_notification
 menu menu_sell_base
 menu menu_view
 plurals mtrl_badge_content_description
+raw firebase_common_keep
+raw keep
 string abc_action_bar_home_description
 string abc_action_bar_up_description
 string abc_action_menu_overflow_description
@@ -3379,7 +3384,6 @@ string abc_shareactionprovider_share_with_application
 string abc_toolbar_collapse_description
 string action_back_label
 string action_forward_label
-string ag_sdk_cbg_root
 string alert_description
 string androidx_startup
 string app_icon_sticky_notification_description
@@ -3452,13 +3456,12 @@ string header_description
 string hide_bottom_view_on_scroll_behavior
 string hms_abort
 string hms_abort_message
+string hms_apk_not_installed_hints
 string hms_base_google
 string hms_base_vmall
 string hms_bindfaildlg_message
 string hms_bindfaildlg_title
 string hms_cancel
-string hms_cancel_after_cancel
-string hms_cancel_install_message
 string hms_check_failure
 string hms_check_no_update
 string hms_checking
@@ -3471,7 +3474,6 @@ string hms_downloading_loading
 string hms_downloading_new
 string hms_gamebox_name
 string hms_install
-string hms_install_after_cancel
 string hms_install_message
 string hms_is_spoof
 string hms_push_channel
@@ -3603,10 +3605,8 @@ string title_activity_view
 string toolbar_description
 string upsdk_app_dl_installing
 string upsdk_app_download_info_new
-string upsdk_app_download_installing
 string upsdk_app_size
 string upsdk_app_version
-string upsdk_appstore_install
 string upsdk_cancel
 string upsdk_checking_update_prompt
 string upsdk_choice_update
@@ -3614,7 +3614,6 @@ string upsdk_connect_server_fail_prompt_toast
 string upsdk_detail
 string upsdk_getting_message_fail_prompt_toast
 string upsdk_install
-string upsdk_mobile_dld_warn
 string upsdk_no_available_network_prompt_toast
 string upsdk_ota_app_name
 string upsdk_ota_cancel
@@ -4253,6 +4252,7 @@ style ThemeOverlay_MaterialComponents_Dialog
 style ThemeOverlay_MaterialComponents_Dialog_Alert
 style ThemeOverlay_MaterialComponents_Dialog_Alert_Framework
 style ThemeOverlay_MaterialComponents_Light
+style ThemeOverlay_MaterialComponents_Light_BottomSheetDialog
 style ThemeOverlay_MaterialComponents_Light_Dialog_Alert_Framework
 style ThemeOverlay_MaterialComponents_MaterialAlertDialog
 style ThemeOverlay_MaterialComponents_MaterialAlertDialog_Centered
@@ -4764,7 +4764,7 @@ styleable Autofill_InlineSuggestion autofillInlineSuggestionChip autofillInlineS
 styleable Badge backgroundColor badgeGravity badgeRadius badgeTextColor badgeWidePadding badgeWithTextRadius horizontalOffset horizontalOffsetWithText maxCharacterCount number verticalOffset verticalOffsetWithText
 styleable BaseProgressIndicator android_indeterminate hideAnimationBehavior indicatorColor minHideDelay showAnimationBehavior showDelay trackColor trackCornerRadius trackThickness
 styleable BottomAppBar backgroundTint elevation fabAlignmentMode fabAnimationMode fabCradleMargin fabCradleRoundedCornerRadius fabCradleVerticalOffset hideOnScroll navigationIconTint paddingBottomSystemWindowInsets paddingLeftSystemWindowInsets paddingRightSystemWindowInsets
-styleable BottomNavigationView android_minHeight itemHorizontalTranslationEnabled
+styleable BottomNavigationView android_minHeight backgroundTint elevation itemBackground itemHorizontalTranslationEnabled itemIconSize itemIconTint itemRippleColor itemTextAppearanceActive itemTextAppearanceInactive itemTextColor labelVisibilityMode menu
 styleable BottomSheetBehavior_Layout android_elevation android_maxHeight android_maxWidth backgroundTint behavior_draggable behavior_expandedOffset behavior_fitToContents behavior_halfExpandedRatio behavior_hideable behavior_peekHeight behavior_saveFlags behavior_skipCollapsed gestureInsetBottomIgnored marginLeftSystemWindowInsets marginRightSystemWindowInsets marginTopSystemWindowInsets paddingBottomSystemWindowInsets paddingLeftSystemWindowInsets paddingRightSystemWindowInsets paddingTopSystemWindowInsets shapeAppearance shapeAppearanceOverlay
 styleable ButtonBarLayout allowStacking
 styleable Capability queryPatterns shortcutMatchRequired
@@ -4868,6 +4868,7 @@ styleable State android_id constraints
 styleable StateListDrawable android_constantSize android_dither android_enterFadeDuration android_exitFadeDuration android_variablePadding android_visible
 styleable StateListDrawableItem android_drawable
 styleable StateSet defaultState
+styleable SwipeRefreshLayout swipeRefreshLayoutProgressSpinnerBackgroundColor
 styleable SwitchCompat android_textOff android_textOn android_thumb showText splitTrack switchMinWidth switchPadding switchTextAppearance thumbTextPadding thumbTint thumbTintMode track trackTint trackTintMode
 styleable SwitchMaterial useMaterialThemeColors
 styleable TabItem android_icon android_layout android_text

package/android/src/main/java/com/selligent/ButtonBroadcastEventDataParser.java

@@ -17,7 +17,7 @@ class ButtonBroadcastEventDataParser implements BroadcastEventDataParser {
         resultingMap.putInt("type", button.type);
         resultingMap.putString("value", button.value);
         resultingMap.putString("label", button.label);
-        resultingMap.putInt("action", button.action);
+        resultingMap.putInt("action", button.action.getValue());
         if (button.data != null) {
             final WritableMap buttonData = new WritableNativeMap();
             for(String dataKey : button.data.keySet()) {

package/android/src/main/java/com/selligent/RNSelligent.java

@@ -187,7 +187,7 @@ public class RNSelligent extends ReactContextBaseJavaModule implements Lifecycle
                             buttonMap.putString("id", button.id);
                             buttonMap.putString("value", button.value);
                             buttonMap.putString("label", button.label);
-                            buttonMap.putInt("action", button.action);
+                            buttonMap.putInt("action", button.action.getValue());
                             buttonMap.putInt("type", button.type);
 
                             buttonsArray.pushMap(buttonMap);

package/android/src/main/java/com/selligent/SMSettingsFactory.java

@@ -9,7 +9,6 @@ class SMSettingsFactory {
         smSettings.WebServiceUrl = settings.getUrl();
         smSettings.ClientId = settings.getClientId();
         smSettings.PrivateKey = settings.getPrivateKey();
-        smSettings.GoogleApplicationId = settings.getGoogleApplicationId();
         smSettings.ConfigureGeolocation = settings.getConfigureLocationServices();
         smSettings.AddInAppMessageFromPushToInAppMessageList = settings.getAddInAppMessageFromPushToInAppMessageList();
         smSettings.DoNotFetchTheToken = settings.getDoNotFetchTheToken();

package/android/src/main/java/com/selligent/Settings.java

@@ -8,7 +8,6 @@ class Settings {
     private String url;
     private String clientId;
     private String privateKey;
-    private String googleApplicationId;
     private String activityName;
     private String notificationSmallIcon;
     private String notificationLargeIcon;
@@ -39,10 +38,6 @@ class Settings {
         return privateKey;
     }
 
-    public String getGoogleApplicationId() {
-        return googleApplicationId;
-    }
-
     public String getActivityName() {
         return activityName;
     }
@@ -101,9 +96,6 @@ class Settings {
         settings.url = (String) settingsHashMap.get("url");
         settings.clientId = (String) settingsHashMap.get("clientId");
         settings.privateKey = (String) settingsHashMap.get("privateKey");
-        if (settingsHashMap.containsKey("googleApplicationId")) {
-            settings.googleApplicationId = (String) settingsHashMap.get("googleApplicationId");
-        }
         if (settingsHashMap.containsKey("configureLocationServices")) {
             settings.configureLocationServices = (Boolean) settingsHashMap.get("configureLocationServices");
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@selligent-marketing-cloud/selligent-react-native",
   "title": "Selligent React Native",
-  "version": "2.10.0",
+  "version": "3.0.0",
   "description": "React Native bridge for Selligent SDK",
   "main": "index.js",
   "scripts": {
@@ -27,6 +27,6 @@
   },
   "devDependencies": {
     "react": "18.1.0",
-    "react-native": "^0.70.0"
+    "react-native": "^0.70.6"
   }
 }