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
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ repositories {
def kotlin_version = getExtOrDefault("kotlinVersion")

dependencies {
implementation (group: "me.bridgefy", name: "android-sdk", version: "1.2.2", ext: "aar") {
implementation (group: "me.bridgefy", name: "android-sdk", version: "1.2.3", ext: "aar") {
transitive = true
}
// For < 0.71, this will be from the local maven repo
Expand Down
7 changes: 4 additions & 3 deletions example/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
import {PaperProvider} from 'react-native-paper';
import {NavigationContainer} from '@react-navigation/native';
import {HomeScreen} from './src/presentation/screens';
const IonIcon = require('react-native-vector-icons/IonIcons')
.default as React.ElementType;
import {IonIcon} from './src/presentation/components/IonIcon';

const IconComponent = (props: any) => <IonIcon {...props} />;

export const App = () => {
return (
<PaperProvider
settings={{
icon: props => <IonIcon {...props} />,
icon: IconComponent,
}}>
<NavigationContainer>
<HomeScreen />
Expand Down
5 changes: 4 additions & 1 deletion example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
"lint": "eslint .",
"start": "react-native start",
"pods": "pod-install --quiet",
"test": "jest"
"test": "jest",
"clean": "rm -Rf node_modules yarn.lock",
"clean:android": "rm -Rf android/build android/.gradle android/build",
"clean:ios": "rm -Rf ios/build ios/*.xcworkspace ios/Podfile.lock ios/Pods"
},
"dependencies": {
"@react-navigation/material-top-tabs": "^6.6.13",
Expand Down
4 changes: 2 additions & 2 deletions example/src/presentation/components/IonIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {globalColors} from '../theme/global.styles';
const Icon = require('react-native-vector-icons/IonIcons')
.default as React.ElementType;
import Icon from 'react-native-vector-icons/Ionicons';

interface Props {
name: string;
Expand All @@ -12,5 +11,6 @@ export const IonIcon = ({
color = globalColors.primaryColor,
size = 25,
}: Props) => {
// @ts-ignore
return <Icon name={name} size={size} color={color} />;
};
10 changes: 5 additions & 5 deletions ios/Frameworks/BridgefySDK.xcframework/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,34 @@
<key>DebugSymbolsPath</key>
<string>dSYMs</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>BridgefySDK.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>BinaryPath</key>
<string>BridgefySDK.framework/BridgefySDK</string>
<key>DebugSymbolsPath</key>
<string>dSYMs</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-simulator</string>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>BridgefySDK.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
</array>
<key>CFBundlePackageType</key>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#if 0
#elif defined(__arm64__) && __arm64__
// Generated by Apple Swift version 5.10 (swiftlang-5.10.0.13 clang-1500.3.9.4)
// Generated by Apple Swift version 6.0.2 effective-5.10 (swiftlang-6.0.2.1.2 clang-1600.0.26.4)
#ifndef BRIDGEFYSDK_SWIFT_H
#define BRIDGEFYSDK_SWIFT_H
#pragma clang diagnostic push
Expand Down Expand Up @@ -42,6 +42,8 @@
#include <string.h>
#endif
#if defined(__cplusplus)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wnon-modular-include-in-framework-module"
#if defined(__arm64e__) && __has_include(<ptrauth.h>)
# include <ptrauth.h>
#else
Expand All @@ -55,6 +57,7 @@
# endif
#pragma clang diagnostic pop
#endif
#pragma clang diagnostic pop
#endif

#if !defined(SWIFT_TYPEDEFS)
Expand Down Expand Up @@ -288,6 +291,7 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wnullability"
#pragma clang diagnostic ignored "-Wdollar-in-identifier-extension"
#pragma clang diagnostic ignored "-Wunsafe-buffer-usage"

#if __has_attribute(external_source_symbol)
# pragma push_macro("any")
Expand Down
Binary file not shown.
Loading