Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
e6a6ca1
Content card init (#504)
yangyansong-adbe Aug 5, 2025
640a4fe
Add Image only template
cacheung Aug 5, 2025
c5aa7cf
remove changes in Contentview
cacheung Aug 7, 2025
8d6096f
remove extra line
cacheung Aug 7, 2025
1915342
Merge pull request #506 from cacheung/ImageOnlyTemplate
cacheung Aug 7, 2025
6ab2b43
Fix bugs in Themes (#509)
yangyansong-adbe Aug 14, 2025
72aa27f
Update image only test (#511)
cacheung Aug 15, 2025
695747b
feat: :lipstick: adds better typing, react components for cc
dsoffiantini Aug 25, 2025
9b71f62
feat: respect themeing, image responsiveness
dsoffiantini Aug 25, 2025
d7130e0
feat: :lipstick: improve styling overrides of content card
dsoffiantini Aug 26, 2025
214136c
feat: :lipstick: a bit more styling for new containers
dsoffiantini Aug 27, 2025
2e1bc14
Fix Content Card View outdated ContentTemplates
cacheung Aug 28, 2025
f06642f
Update the failing unit test and move the Messaging.updateProposition…
cacheung Aug 28, 2025
c36f095
Merge pull request #524 from cacheung/content-card
cacheung Aug 29, 2025
b471c22
Merge branch 'staging' of github.com:adobe/aepsdk-react-native into c…
cacheung Sep 3, 2025
e1176e3
Merge branch 'staging' of github.com:adobe/aepsdk-react-native into c…
cacheung Sep 3, 2025
d2a570f
update integration with track PR
cacheung Sep 3, 2025
cdccab3
feat: :sparkles: change updatePropositions to async, allow prop overr…
dsoffiantini Sep 3, 2025
4f01fb1
Merge branch 'content-card-ui' of github.com:adobe/aepsdk-react-nativ…
cacheung Sep 4, 2025
d675cb8
Upate RCTAEPMessaging
cacheung Sep 4, 2025
e13b8c0
fix unit test
cacheung Sep 4, 2025
d464d36
merge update
cacheung Sep 5, 2025
f93b263
Merge pull request #530 from cacheung/content-card1
cacheung Sep 5, 2025
a02b8c9
feat: :sparkles: tracking working
dsoffiantini Sep 5, 2025
7ed71b9
feat: :recycle: combine components into one
dsoffiantini Sep 10, 2025
3b3dca5
feat: :bug: fix style overrides
dsoffiantini Sep 11, 2025
9f9e53d
refactoring sample app for content cards
Sep 11, 2025
0dd9717
Update tutorial doc for content card
cacheung Sep 12, 2025
0027596
update Content card customization guide
cacheung Sep 12, 2025
cea983e
addressing PR feedback
Sep 12, 2025
f0a48bd
Merge pull request #533 from jkartoshka/content-card-ui
jkartoshka Sep 12, 2025
85993d9
Merge branch 'content-card-ui' of github.com:adobe/aepsdk-react-nativ…
cacheung Sep 12, 2025
cdcbdc1
Fix failing test
cacheung Sep 15, 2025
5005861
Update doc with Templates layout diagrams
cacheung Sep 15, 2025
3b7c382
Add useContentCardUI hook
cacheung Sep 16, 2025
3942016
build: :pushpin: update dependencies for messaging
dsoffiantini Sep 16, 2025
340a62c
refactor: :fire: remove declare keyword
dsoffiantini Sep 16, 2025
525f33b
fix: :bug: fix promise for android updatePropositions
dsoffiantini Sep 16, 2025
890f248
fix: :bug: fixes sample header, package exports
dsoffiantini Sep 16, 2025
741e19d
fix: :bug: couple type fixes
dsoffiantini Sep 17, 2025
a3bed13
update some format and wording
cacheung Sep 17, 2025
474de99
update doc
cacheung Sep 17, 2025
10b1ca0
refactor: :arrow_up: upgrade yarn, change build
dsoffiantini Sep 17, 2025
7af2ee2
feat: :adhesive_bandage: allow compiled messaging for now
dsoffiantini Sep 17, 2025
c1231d7
fix: :bug: fix new architecture issue
dsoffiantini Sep 17, 2025
2142062
update doc
cacheung Sep 17, 2025
c88ac6a
Update image file
cacheung Sep 18, 2025
d9b1dad
update doc format
cacheung Sep 18, 2025
5229fa4
Merge pull request #532 from cacheung/doc
cacheung Sep 18, 2025
523f2c6
update contentCardCustomizationGuide file name
cacheung Sep 19, 2025
b9607f7
feat: :sparkles: adds support for content card containers
dsoffiantini Sep 22, 2025
53e036e
fix: :adhesive_bandage: fix sample app
dsoffiantini Sep 25, 2025
63509e7
fix: :bug: compiler fixes
dsoffiantini Sep 25, 2025
ce48979
Update tutorial doc for content card
cacheung Sep 12, 2025
b7c655f
update Content card customization guide
cacheung Sep 12, 2025
95e9a10
Fix failing test
cacheung Sep 15, 2025
3aab4f2
Update doc with Templates layout diagrams
cacheung Sep 15, 2025
4cfbf7f
Add useContentCardUI hook
cacheung Sep 16, 2025
e49fce5
update some format and wording
cacheung Sep 17, 2025
b2aa106
update doc
cacheung Sep 17, 2025
8d27a7e
update doc
cacheung Sep 17, 2025
15c717b
Update image file
cacheung Sep 18, 2025
e73653e
update doc format
cacheung Sep 18, 2025
5923674
update contentCardCustomizationGuide file name
cacheung Sep 19, 2025
6da8a2d
fix: :adhesive_bandage: fix sample app
dsoffiantini Sep 25, 2025
6530dbf
fix: :bug: compiler fixes
dsoffiantini Sep 25, 2025
07c9593
basic container components
dsoffiantini Sep 25, 2025
53b7332
Fix the Rendered fewer hooks than expected error when clicking dismiss
cacheung Sep 25, 2025
1d0e5c5
[Messaging] typecast Messaging Proposition for getPropositionsForSurf…
ishita-gambhir-adobe Sep 25, 2025
1db16a1
remove conversion
cacheung Sep 28, 2025
f4c83f4
remove old mapping for tracking
cacheung Sep 28, 2025
be76b66
Fix the different views from content card.
cacheung Sep 28, 2025
6f27668
Enable Corepack for ci to fix the test and indention issue
cacheung Sep 29, 2025
2d0fd9a
fix react-native import error for "test"
cacheung Sep 29, 2025
9848a41
update sample package dependency
cacheung Sep 29, 2025
895b911
update yarn.lock file
cacheung Sep 29, 2025
f97033b
fix CI test
cacheung Sep 29, 2025
06bd3b4
add timeout for ci steps
cacheung Sep 29, 2025
a89c153
fix ci tests
cacheung Sep 29, 2025
5146482
remove -network-concurrency
cacheung Sep 29, 2025
723718c
fix config indentation
cacheung Sep 29, 2025
1ec3f07
Increasing the memory limit from 4GB,
cacheung Sep 29, 2025
d5bf3f5
update for Rendered fewer hooks than expected error" when clicking di…
cacheung Sep 29, 2025
189fe94
Merge pull request #536 from cacheung/newTracking
cacheung Sep 29, 2025
6c2ae81
Merge branch 'content-card-containers' into content-card-ui
cacheung Sep 29, 2025
02461a4
Revert "Merge branch 'content-card-containers' into content-card-ui"
cacheung Sep 29, 2025
3e66208
Reapply "Merge branch 'content-card-containers' into content-card-ui"
cacheung Oct 1, 2025
00e7269
fix: :white_check_mark: fixes test setup
dsoffiantini Oct 4, 2025
cf7b3da
docs: :memo: adds some extra docs for components
dsoffiantini Oct 6, 2025
0c77f94
test: :white_check_mark: test updates
dsoffiantini Oct 6, 2025
041318a
Add unread UI implementation (#539)
cacheung Oct 9, 2025
e16cbac
Content Card Container UI Component (#538)
jkartoshka Oct 10, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
202 changes: 113 additions & 89 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,36 +8,45 @@ orbs:
jobs:
unit-test:
docker:
- image: cimg/node:18.20
- image: cimg/node:18.20
resource_class: large

steps:
- checkout
- checkout

- restore_cache:
keys:
- restore_cache:
keys:
- yarn-cache-{{ checksum "yarn.lock" }}
- yarn-cache-

- run:
name: Install Node.js and Yarn Dependencies
command: yarn install
- run:
name: Enable Corepack
command: corepack enable

- run:
name: Build the Project
command: yarn run build
- run:
name: Install Node.js and Yarn Dependencies
command: yarn install --immutable --network-timeout 300000
no_output_timeout: 20m
environment:
NODE_OPTIONS: "--max-old-space-size=4096"

- run:
name: Expo Prebuild
command: cd apps/AEPSampleAppNewArchEnabled && npx expo prebuild
- run:
name: Build the Project
command: yarn run build

- save_cache:
key: yarn-cache-{{ checksum "yarn.lock" }}
paths:
- ./node_modules
- ./apps/AEPSampleAppNewArchEnabled/node_modules
- run:
name: Expo Prebuild
command: cd apps/AEPSampleAppNewArchEnabled && npx expo prebuild

- run:
name: Unit Tests
command: yarn test --watchAll=false --runInBand
- save_cache:
paths:
- .yarn/cache
- .yarn/unplugged
key: yarn-cache-{{ checksum "yarn.lock" }}

- run:
name: Unit Tests
command: yarn test --watchAll=false --runInBand

build-sample-app-android:
executor:
Expand All @@ -46,86 +55,101 @@ jobs:
resource_class: large

steps:
- checkout
- checkout

- run:
name: Enable Corepack
command: corepack enable

- run:
name: Install Node.js and Yarn Dependencies
command: yarn install
- run:
name: Install Node.js and Yarn Dependencies
command: yarn install --network-timeout 300000
no_output_timeout: 20m
environment:
NODE_OPTIONS: "--max-old-space-size=4096"

- run:
name: Build the Project
command: yarn run build
- run:
name: Build the Project
command: yarn run build

- run:
name: Expo Prebuild
command: cd apps/AEPSampleAppNewArchEnabled && npx expo prebuild
- run:
name: Expo Prebuild
command: cd apps/AEPSampleAppNewArchEnabled && npx expo prebuild

- run:
name: Building Android Sample App
command: yarn sampleappnewarchenabled:android:build
environment:
_JAVA_OPTIONS: "-Xmx4096M -XX:MaxMetaspaceSize=512m"
- run:
name: Building Android Sample App
command: yarn sampleappnewarchenabled:android:build
environment:
_JAVA_OPTIONS: "-Xmx4096M -XX:MaxMetaspaceSize=512m"

build-sample-app-ios:
macos:
xcode: 15.2

steps:
- checkout

- restore_cache:
keys:
- ios-yarn-cache-{{ checksum "yarn.lock" }}

- run:
name: Set Xcode Path
command: sudo xcode-select -s /Applications/Xcode.app

- run:
name: Install Node.js and Yarn Dependencies
command: yarn install

- run:
name: Build the Project
command: yarn run build

- run:
name: Expo Prebuild
command: cd apps/AEPSampleAppNewArchEnabled && npx expo prebuild

- save_cache:
key: ios-yarn-cache-{{ checksum "yarn.lock" }}
paths:
- ./node_modules
- ./apps/AEPSampleAppNewArchEnabled/node_modules

- run:
name: Install Cocoapods
command: sudo gem install cocoapods

- run:
name: Install Pods
command: yarn sampleappnewarchenabled:ios:pod:install

- run:
name: Building iOS Sample App
command: |
cd apps/AEPSampleAppNewArchEnabled/ios
xcodebuild \
-workspace AEPSampleAppNewArchEnabled.xcworkspace \
-scheme AEPSampleAppNewArchEnabled \
-sdk iphonesimulator \
-destination "generic/platform=iOS Simulator" \
clean build
- checkout

- restore_cache:
keys:
- yarn-cache-{{ checksum "yarn.lock" }}
- yarn-cache-

- run:
name: Set Xcode Path
command: sudo xcode-select -s /Applications/Xcode.app

- run:
name: Enable Corepack
command: corepack enable

- run:
name: Install Node.js and Yarn Dependencies
command: yarn install --immutable --network-timeout 300000
no_output_timeout: 20m
environment:
NODE_OPTIONS: "--max-old-space-size=4096"

- run:
name: Build the Project
command: yarn run build

- run:
name: Expo Prebuild
command: cd apps/AEPSampleAppNewArchEnabled && npx expo prebuild

- save_cache:
paths:
- .yarn/cache
- .yarn/unplugged
key: yarn-cache-{{ checksum "yarn.lock" }}

- run:
name: Install Cocoapods
command: sudo gem install cocoapods

- run:
name: Install Pods
command: yarn sampleappnewarchenabled:ios:pod:install

- run:
name: Building iOS Sample App
command: |
cd apps/AEPSampleAppNewArchEnabled/ios
xcodebuild \
-workspace AEPSampleAppNewArchEnabled.xcworkspace \
-scheme AEPSampleAppNewArchEnabled \
-sdk iphonesimulator \
-destination "generic/platform=iOS Simulator" \
clean build

workflows:
version: 2.1
ci-workflow:
jobs:
- unit-test
- build-sample-app-ios
# - build-sample-app-android
# Disable the Android build job because of the error below:
# Execution failed for task ':react-native-reanimated:configureCMakeDebug[arm64-v8a]'.
# > [CXX1210] /root/project/apps/AEPSampleApp/node_modules/react-native-reanimated/android/CMakeLists.txt debug|arm64-v8a : No compatible library found
# The Android build job will be enabled once the issue is resolved.
- unit-test
- build-sample-app-ios
# - build-sample-app-android
# Disable the Android build job because of the error below:
# Execution failed for task ':react-native-reanimated:configureCMakeDebug[arm64-v8a]'.
# > [CXX1210] /root/project/apps/AEPSampleApp/node_modules/react-native-reanimated/android/CMakeLists.txt debug|arm64-v8a : No compatible library found
# The Android build job will be enabled once the issue is resolved.
1 change: 1 addition & 0 deletions .cursorignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
apps/AEPSampleApp
8 changes: 8 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
insert_final_newline = true
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/.yarn/** linguist-vendored
/.yarn/releases/* binary
/.yarn/plugins/**/* binary
/.pnp.* binary linguist-generated
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -152,3 +152,6 @@ out/

# ignore ds store
.DS_Store

# temporary allow messaging compiled code
!packages/messaging/dist/
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
nodeLinker: node-modules
nmHoistingLimits: workspaces
8 changes: 2 additions & 6 deletions apps/AEPSampleApp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
"name": "aepsampleapp",
"version": "2.0.0",
"private": true,
"workspaces": {
"nohoist": [
"**/*"
]
},
"scripts": {
"android": "react-native run-android",
"ios": "react-native run-ios",
Expand Down Expand Up @@ -66,6 +61,7 @@
"node": ">=16"
},
"installConfig": {
"hoistingLimits": "dependencies"
"hoistingLimits": "workspaces",
"selfReferences": false
}
}
9 changes: 5 additions & 4 deletions apps/AEPSampleAppNewArchEnabled/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
},
"ios": {
"supportsTablet": true,
"bundleIdentifier": "com.AEPSampleAppNewArchEnabled"
"bundleIdentifier": "com.adobe.MessagingDemoAppSwiftUI"
},
"android": {
"adaptiveIcon": {
"foregroundImage": "./assets/images/adaptive-icon.png",
"backgroundColor": "#ffffff"
},
"package": "com.AEPSampleAppNewArchEnabled"
"package": "com.adobe.marketing.mobile.messagingsample"
},
"web": {
"bundler": "metro",
Expand All @@ -34,11 +34,12 @@
"expo-build-properties",
{
"ios": {
"newArchEnabled": true,
"newArchEnabled": true,
"useFrameworks": "static"
},
"android": {
"newArchEnabled": true
"newArchEnabled": true,
"kotlinVersion": "1.9.25"
}
}
],
Expand Down
30 changes: 15 additions & 15 deletions apps/AEPSampleAppNewArchEnabled/app/AssuranceView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,38 +10,38 @@ OF ANY KIND, either express or implied. See the License for the specific languag
governing permissions and limitations under the License.
*/

import React, {useState} from 'react';
import React, { useState } from "react";
import {
Button,
StyleSheet,
Text,
View,
TextInput,
ScrollView,
} from 'react-native';
import {Assurance} from '@adobe/react-native-aepassurance';
import { useRouter } from 'expo-router';
} from "react-native";
import { Assurance } from "@adobe/react-native-aepassurance";
import { useRouter } from "expo-router";

const AssuranceView = () => {
const [version, setVersion] = useState('');
const [sessionURL, setsessionURL] = useState('your-assurance-url');
const [version, setVersion] = useState("");
const [sessionURL, setsessionURL] = useState("your-assurance-url");

const router = useRouter();

Assurance.extensionVersion().then(version => {
Assurance.extensionVersion().then((version) => {
setVersion(version);
});

return (
<View style={styles.container}>
<ScrollView contentContainerStyle={{marginTop: 75}}>
<Button onPress={router.back} title="Go to main page" />
<ScrollView contentContainerStyle={{ marginTop: 75 }}>
<Button onPress={router.back} title="Go to main page" />
<Text style={styles.welcome}>Assurance v{version}</Text>
<Button title="Start Session" onPress={startSessionClicked} />
<TextInput
style={{height: 40, margin: 10}}
style={{ height: 40, margin: 10 }}
placeholder="assurance://"
onChangeText={val => setsessionURL(val)}
onChangeText={(val) => setsessionURL(val)}
/>
</ScrollView>
</View>
Expand All @@ -55,13 +55,13 @@ const AssuranceView = () => {
const styles = StyleSheet.create({
container: {
flex: 1,
justifyContent: 'center',
alignItems: 'center',
backgroundColor: '#F5FCFF',
justifyContent: "center",
alignItems: "center",
backgroundColor: "#F5FCFF",
},
welcome: {
fontSize: 25,
textAlign: 'center',
textAlign: "center",
margin: 10,
marginTop: 80,
},
Expand Down
Loading