Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,12 +189,22 @@ jobs:
timeout-minutes: 45
env:
TURBO_CACHE_DIR: .turbo/ios
# Fix github runner issues with xcode 26 toolchains
# https://github.com/actions/runner-images/issues/13135#issuecomment-3722044150
steps:
- name: Set Xcode Toolchain
shell: bash
run: |
echo "TOOLCHAINS=com.apple.dt.toolchain.XcodeDefault" >> $GITHUB_ENV

- name: Checkout
uses: actions/checkout@v4

- name: Setup
uses: ./.github/actions/setup

- name: Select XCode 26.3
run: sudo xcode-select -s '/Applications/Xcode_26.3.0.app/Contents/Developer'

- name: Cache turborepo for iOS
uses: actions/cache@v3
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@ dependencies {
implementation "androidx.car.app:app:1.4.0"
implementation "androidx.car.app:app-projected:1.4.0"
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation "com.google.android.libraries.navigation:navigation:7.3.0"
implementation "com.google.android.libraries.navigation:navigation:7.4.0"
api 'com.google.guava:guava:31.0.1-android'
}
2 changes: 1 addition & 1 deletion example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ dependencies {
implementation "androidx.car.app:app-projected:1.4.0"

// Include the Google Navigation SDK.
implementation 'com.google.android.libraries.navigation:navigation:7.3.0'
implementation 'com.google.android.libraries.navigation:navigation:7.4.0'
}

secrets {
Expand Down
2 changes: 1 addition & 1 deletion example/e2e/shared.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,6 @@ export const selectTestByName = async name => {
await waitFor(targetElement).toBeVisible().withTimeout(5000);
}

await iOSDelay(600);
await iOSDelay(3000);
await targetElement.tap();
};
10 changes: 4 additions & 6 deletions example/src/helpers/overlayModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,15 @@ interface OverlayModalProps {
closeOverlay: () => void;
children: ReactNode;
height?: number;
contentPaddingBottom?: number;
}

const OverlayModal: React.FC<OverlayModalProps> = ({
visible,
closeOverlay,
children,
height: height,
contentPaddingBottom = 20,
}) => {
const modalContentStyle = [
styles.modalContent,
Expand All @@ -51,9 +53,9 @@ const OverlayModal: React.FC<OverlayModalProps> = ({
showsVerticalScrollIndicator={true}
persistentScrollbar={true}
style={styles.scrollContainer}
contentContainerStyle={styles.scrollContentContainer}
contentContainerStyle={{ paddingBottom: contentPaddingBottom }}
>
<View style={styles.scrollContent}>{children}</View>
{children}
</ScrollView>
<View style={styles.closeButtonContainer}>
<ExampleAppButton
Expand Down Expand Up @@ -94,10 +96,6 @@ const styles = StyleSheet.create({
scrollContainer: {
flex: 1,
},
scrollContentContainer: {
paddingBottom: 20,
},
scrollContent: {},
closeButtonContainer: {
marginTop: 8,
shadowColor: '#000',
Expand Down
1 change: 1 addition & 0 deletions example/src/screens/IntegrationTestsScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,7 @@ const IntegrationTestsScreen = () => {
setIsOverlayOpen(false);
}}
height={overlayMinHeight}
contentPaddingBottom={500}
>
<ExampleAppButton
title="testNavigationSessionInitialization"
Expand Down
2 changes: 1 addition & 1 deletion react-native-navigation-sdk.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Pod::Spec.new do |s|
s.public_header_files = "ios/**/*.h"

s.dependency "React-Core"
s.dependency "GoogleNavigation", "10.7.0"
s.dependency "GoogleNavigation", "10.10.0"

install_modules_dependencies(s)
end
Loading