Skip to content

Commit ae204e6

Browse files
committed
Merge branch 'master' into remove-legacy-arch
2 parents f1268a4 + 5080fe9 commit ae204e6

45 files changed

Lines changed: 3660 additions & 139 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
## 3.0.0
2+
3+
### Updates
4+
- Added embedded messaging functionality. This includes the ability to:
5+
- Manually sync messages with `Iterable.embeddedManager.syncMessages()`
6+
- Get messages with `Iterable.embeddedManager.getMessages([PLACEMENT_IDS])`
7+
- Start an embedded session with `Iterable.embeddedManager.startSession()`
8+
- End an embedded session with `Iterable.embeddedManager.endSession()`
9+
- Start an embedded impression with
10+
`Iterable.embeddedManager.startImpression(MESSAGE_ID, PLACEMENT_ID)`
11+
- Pause an embedded impression with
12+
`Iterable.embeddedManager.pauseImpression(MESSAGE_ID)`
13+
- Handle embedded clicks with
14+
`Iterable.embeddedManager.handleClick(message, buttonId, action)`
15+
- Added out-of-the-box (OOTB) embedded views (embedded components) for rendering
16+
embedded messages in your app:
17+
- `IterableEmbeddedView` — renders a message by `IterableEmbeddedViewType`
18+
(Banner, Card, or Notification)
19+
- `IterableEmbeddedBanner`, `IterableEmbeddedCard`, and
20+
`IterableEmbeddedNotification` — individual OOTB view components
21+
- `IterableEmbeddedViewConfig` — optional styling configuration for OOTB views
22+
123
## 2.2.2
224
### Updates
325
- Added `baseline-browser-mapping`

example/ios/ReactNativeSdkExample.xcodeproj/project.pbxproj

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,8 @@
203203
83CBB9F71A601CBA00E9B192 /* Project object */ = {
204204
isa = PBXProject;
205205
attributes = {
206-
LastUpgradeCheck = 1210;
206+
BuildIndependentTargetsInParallel = YES;
207+
LastUpgradeCheck = 2640;
207208
TargetAttributes = {
208209
00E356ED1AD99517003FC87E = {
209210
CreatedOnToolsVersion = 6.2;
@@ -260,12 +261,12 @@
260261
buildActionMask = 2147483647;
261262
files = (
262263
);
263-
inputPaths = (
264-
"$(SRCROOT)/.xcode.env.local",
265-
"$(SRCROOT)/.xcode.env",
264+
inputFileListPaths = (
265+
"${PODS_ROOT}/Target Support Files/Pods-ReactNativeSdkExample/Pods-ReactNativeSdkExample-resources-${CONFIGURATION}-input-files.xcfilelist",
266266
);
267-
name = "Bundle React Native code and images";
268-
outputPaths = (
267+
name = "[CP] Copy Pods Resources";
268+
outputFileListPaths = (
269+
"${PODS_ROOT}/Target Support Files/Pods-ReactNativeSdkExample/Pods-ReactNativeSdkExample-resources-${CONFIGURATION}-output-files.xcfilelist",
269270
);
270271
runOnlyForDeploymentPostprocessing = 0;
271272
shellPath = /bin/sh;
@@ -365,7 +366,6 @@
365366
buildSettings = {
366367
BUNDLE_LOADER = "$(TEST_HOST)";
367368
CLANG_ENABLE_MODULES = YES;
368-
DEVELOPMENT_TEAM = BP98Z28R86;
369369
GCC_PREPROCESSOR_DEFINITIONS = (
370370
"DEBUG=1",
371371
"$(inherited)",
@@ -397,7 +397,6 @@
397397
BUNDLE_LOADER = "$(TEST_HOST)";
398398
CLANG_ENABLE_MODULES = YES;
399399
COPY_PHASE_STRIP = NO;
400-
DEVELOPMENT_TEAM = BP98Z28R86;
401400
INFOPLIST_FILE = ReactNativeSdkExampleTests/Info.plist;
402401
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
403402
LD_RUNPATH_SEARCH_PATHS = (
@@ -426,7 +425,6 @@
426425
CLANG_ENABLE_MODULES = YES;
427426
CODE_SIGN_ENTITLEMENTS = ReactNativeSdkExample/ReactNativeSdkExample.entitlements;
428427
CURRENT_PROJECT_VERSION = 1;
429-
DEVELOPMENT_TEAM = BP98Z28R86;
430428
ENABLE_BITCODE = NO;
431429
INFOPLIST_FILE = ReactNativeSdkExample/Info.plist;
432430
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
@@ -459,7 +457,6 @@
459457
CLANG_ENABLE_MODULES = YES;
460458
CODE_SIGN_ENTITLEMENTS = ReactNativeSdkExample/ReactNativeSdkExample.entitlements;
461459
CURRENT_PROJECT_VERSION = 1;
462-
DEVELOPMENT_TEAM = BP98Z28R86;
463460
INFOPLIST_FILE = ReactNativeSdkExample/Info.plist;
464461
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
465462
LD_RUNPATH_SEARCH_PATHS = (
@@ -515,8 +512,10 @@
515512
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
516513
COPY_PHASE_STRIP = NO;
517514
CXX = "";
515+
DEVELOPMENT_TEAM = BP98Z28R86;
518516
ENABLE_STRICT_OBJC_MSGSEND = YES;
519517
ENABLE_TESTABILITY = YES;
518+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
520519
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
521520
GCC_C_LANGUAGE_STANDARD = gnu99;
522521
GCC_DYNAMIC_NO_PIC = NO;
@@ -577,6 +576,7 @@
577576
);
578577
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
579578
SDKROOT = iphoneos;
579+
STRING_CATALOG_GENERATE_SYMBOLS = YES;
580580
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
581581
SWIFT_ENABLE_EXPLICIT_MODULES = NO;
582582
USE_HERMES = true;
@@ -616,8 +616,10 @@
616616
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
617617
COPY_PHASE_STRIP = YES;
618618
CXX = "";
619+
DEVELOPMENT_TEAM = BP98Z28R86;
619620
ENABLE_NS_ASSERTIONS = NO;
620621
ENABLE_STRICT_OBJC_MSGSEND = YES;
622+
ENABLE_USER_SCRIPT_SANDBOXING = NO;
621623
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
622624
GCC_C_LANGUAGE_STANDARD = gnu99;
623625
GCC_NO_COMMON_BLOCKS = YES;

example/ios/ReactNativeSdkExample.xcodeproj/xcshareddata/xcschemes/ReactNativeSdkExample.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1210"
3+
LastUpgradeVersion = "2640"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

example/src/components/Embedded/Embedded.styles.ts

Lines changed: 106 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,131 @@
11
import { StyleSheet } from 'react-native';
2-
import { button, buttonText, container, hr, link, input, title, subtitle } from '../../constants';
3-
import { utilityColors, backgroundColors } from '../../constants/styles/colors';
2+
import {
3+
backgroundColors,
4+
button,
5+
buttonText,
6+
colors,
7+
container,
8+
hr,
9+
input,
10+
modalButton,
11+
modalButtons,
12+
modalContent,
13+
modalOverlay,
14+
subtitle,
15+
title,
16+
utilityColors,
17+
} from '../../constants';
418

519
const styles = StyleSheet.create({
620
button,
721
buttonText,
8-
container,
22+
compactUtilityButton: {
23+
...button,
24+
paddingVertical: 8,
25+
},
26+
compactUtilityButtonText: {
27+
...buttonText,
28+
fontSize: 12,
29+
lineHeight: 17,
30+
},
31+
container: {
32+
...container,
33+
marginHorizontal: 0,
34+
marginTop: 0,
35+
paddingHorizontal: 0,
36+
},
37+
embeddedHr: {
38+
...hr,
39+
marginVertical: 12,
40+
},
941
embeddedSection: {
1042
display: 'flex',
1143
flexDirection: 'column',
1244
gap: 16,
1345
paddingHorizontal: 16,
1446
},
15-
embeddedTitle: {
16-
fontSize: 16,
17-
fontWeight: 'bold',
18-
lineHeight: 20,
47+
inputContainer: {
48+
marginVertical: 10,
1949
},
20-
embeddedTitleContainer: {
21-
display: 'flex',
50+
jsonEditor: {
51+
...input,
52+
fontSize: 12,
53+
height: 220,
54+
},
55+
modalButton,
56+
modalButtons,
57+
modalContent,
58+
modalOverlay,
59+
placementIdsInput: {
60+
...input,
61+
flex: 1,
62+
marginBottom: 0,
63+
minWidth: 72,
64+
},
65+
placementIdsLabel: {
66+
flexShrink: 1,
67+
fontSize: 14,
68+
},
69+
placementIdsRow: {
70+
alignItems: 'center',
2271
flexDirection: 'row',
72+
gap: 8,
73+
marginBottom: 8,
2374
},
24-
hr,
25-
inputContainer: {
26-
marginVertical: 10,
75+
sessionButtonHalf: {
76+
flex: 1,
77+
},
78+
sessionButtonsRow: {
79+
flexDirection: 'row',
80+
gap: 8,
81+
marginBottom: 8,
2782
},
28-
link,
2983
subtitle: { ...subtitle, textAlign: 'center' },
3084
text: { textAlign: 'center' },
3185
textInput: input,
3286
title: { ...title, textAlign: 'center' },
3387
utilitySection: {
3488
paddingHorizontal: 16,
3589
},
90+
viewTypeButton: {
91+
alignItems: 'center',
92+
borderColor: colors.brandCyan,
93+
borderRadius: 8,
94+
borderWidth: 2,
95+
flex: 1,
96+
paddingHorizontal: 8,
97+
paddingVertical: 7,
98+
},
99+
viewTypeButtonSelected: {
100+
backgroundColor: colors.brandCyan,
101+
},
102+
viewTypeButtonText: {
103+
color: colors.brandCyan,
104+
fontSize: 12,
105+
fontWeight: '600',
106+
},
107+
viewTypeButtonTextSelected: {
108+
color: colors.backgroundPrimary,
109+
},
110+
viewTypeButtons: {
111+
flex: 1,
112+
flexDirection: 'row',
113+
gap: 8,
114+
justifyContent: 'space-around',
115+
minWidth: 0,
116+
},
117+
viewTypeLabel: {
118+
flexShrink: 0,
119+
fontSize: 13,
120+
fontWeight: '600',
121+
},
122+
viewTypeSelector: {
123+
alignItems: 'center',
124+
flexDirection: 'row',
125+
flexWrap: 'wrap',
126+
gap: 8,
127+
marginVertical: 12,
128+
},
36129
warningContainer: {
37130
backgroundColor: backgroundColors.backgroundWarningSubtle,
38131
borderLeftColor: utilityColors.warning100,

0 commit comments

Comments
 (0)