Skip to content

Commit 1e9f1d7

Browse files
bump native versions
1 parent ed9e92f commit 1e9f1d7

9 files changed

Lines changed: 65 additions & 9 deletions

File tree

FronteggRN.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ Pod::Spec.new do |s|
2020
# See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
2121
if respond_to?(:install_modules_dependencies, true)
2222
install_modules_dependencies(s)
23-
s.dependency "FronteggSwift", "1.2.34"
23+
s.dependency "FronteggSwift", "1.2.75"
2424
else
2525
s.dependency "React-Core"
26-
s.dependency "FronteggSwift", "1.2.34"
26+
s.dependency "FronteggSwift", "1.2.75"
2727

2828
# Don't install the dependencies when we run `pod install` in the old architecture.
2929
if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then

android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ dependencies {
7777
implementation "androidx.browser:browser:1.8.0"
7878
implementation 'io.reactivex.rxjava3:rxkotlin:3.0.1'
7979
implementation 'com.google.code.gson:gson:2.10.1'
80-
implementation 'com.frontegg.sdk:android:1.2.33'
80+
implementation 'com.frontegg.sdk:android:1.3.16'
8181
}
8282

8383
if (isNewArchitectureEnabled()) {

example/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ android {
123123
dependencies {
124124
// The version of react-native is set by the React Native Gradle Plugin
125125
implementation("com.facebook.react:react-android")
126-
126+
implementation 'com.frontegg.sdk:android:1.3.16'
127127
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
128128
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
129129
exclude group:'com.squareup.okhttp3', module:'okhttp'

example/android/app/src/main/java/com/demo/MainApplication.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@
22

33
import android.app.Application;
44
import com.facebook.react.PackageList;
5+
import android.content.res.ColorStateList;
6+
import android.graphics.Color;
7+
import android.widget.ProgressBar;
58
import com.facebook.react.ReactApplication;
69
import com.facebook.react.ReactNativeHost;
710
import com.facebook.react.ReactPackage;
811
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
912
import com.facebook.react.defaults.DefaultReactNativeHost;
1013
import com.facebook.soloader.SoLoader;
14+
import com.frontegg.android.ui.DefaultLoader;
1115
import java.util.List;
1216

1317
public class MainApplication extends Application implements ReactApplication {
@@ -57,6 +61,15 @@ public void onCreate() {
5761
// If you opted-in for the New Architecture, we load the native entry point for this app.
5862
DefaultNewArchitectureEntryPoint.load();
5963
}
64+
6065
ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
66+
67+
DefaultLoader.INSTANCE.setLoaderProvider(context -> {
68+
ProgressBar progressBar = new ProgressBar(context);
69+
ColorStateList colorStateList = ColorStateList.valueOf(Color.RED);
70+
progressBar.setIndeterminateTintList(colorStateList);
71+
return progressBar;
72+
});
73+
6174
}
6275
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import Foundation
2+
import SwiftUI
3+
import FronteggSwift
4+
5+
@objc public class FronteggLoaderInitializer: NSObject {
6+
@objc public static func initializeLoader() {
7+
DefaultLoader.customLoaderView = AnyView(
8+
VStack {
9+
ProgressView("Loading...")
10+
.progressViewStyle(CircularProgressViewStyle(tint: .blue))
11+
.padding()
12+
}
13+
)
14+
}
15+
}

example/ios/Podfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ PODS:
1010
- React-jsi (= 0.72.1)
1111
- ReactCommon/turbomodule/core (= 0.72.1)
1212
- fmt (6.2.1)
13-
- FronteggRN (1.2.13):
14-
- FronteggSwift (= 1.2.34)
13+
- FronteggRN (1.2.14):
14+
- FronteggSwift (= 1.2.35)
1515
- RCT-Folly (= 2021.07.22.00)
1616
- React-Core
17-
- FronteggSwift (1.2.34)
17+
- FronteggSwift (1.2.35)
1818
- glog (0.3.5)
1919
- hermes-engine (0.72.1):
2020
- hermes-engine/Pre-built (= 0.72.1)
@@ -584,8 +584,8 @@ SPEC CHECKSUMS:
584584
FBLazyVector: 55cd4593d570bd9e5e227488d637ce6a9581ce51
585585
FBReactNativeSpec: 799b0e1a1561699cd0e424e24fe5624da38402f0
586586
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
587-
FronteggRN: 5b77d04cc146acee4f7ca025c83db91db0277719
588-
FronteggSwift: 6c5483852a91adecbfed1bd54f26436a6dfd5d26
587+
FronteggRN: 4ba206176f861ade22489eb9d2015e563aff4453
588+
FronteggSwift: c90a92236fe137483c090a5066b310d9f534723e
589589
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
590590
hermes-engine: 9df83855a0fd15ef8eb61694652bae636b0c466e
591591
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913

example/ios/ReactNativeExample.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
1717
9FAF02B86F1794E4CE2B25FC /* libPods-ReactNativeExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 48D7E04979345AE7E4960E7D /* libPods-ReactNativeExample.a */; };
1818
B24DB32AEF180101559169F0 /* libPods-ReactNativeExample-ReactNativeExampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A2FEEAB4BC4E6A87D996DBDB /* libPods-ReactNativeExample-ReactNativeExampleTests.a */; };
19+
D847CC182D99D1DA00CAB625 /* FronteggLoaderInitializer.swift in Sources */ = {isa = PBXBuildFile; fileRef = D847CC172D99D1D900CAB625 /* FronteggLoaderInitializer.swift */; };
1920
/* End PBXBuildFile section */
2021

2122
/* Begin PBXContainerItemProxy section */
@@ -48,6 +49,7 @@
4849
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = ReactNativeExample/LaunchScreen.storyboard; sourceTree = "<group>"; };
4950
A2FEEAB4BC4E6A87D996DBDB /* libPods-ReactNativeExample-ReactNativeExampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ReactNativeExample-ReactNativeExampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
5051
CD982C31CEF36640C39F4113 /* Pods-ReactNativeExample-ReactNativeExampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReactNativeExample-ReactNativeExampleTests.debug.xcconfig"; path = "Target Support Files/Pods-ReactNativeExample-ReactNativeExampleTests/Pods-ReactNativeExample-ReactNativeExampleTests.debug.xcconfig"; sourceTree = "<group>"; };
52+
D847CC172D99D1D900CAB625 /* FronteggLoaderInitializer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FronteggLoaderInitializer.swift; sourceTree = "<group>"; };
5153
DBD4E57CAF9F6DF06DB159C4 /* Pods-ReactNativeExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReactNativeExample.debug.xcconfig"; path = "Target Support Files/Pods-ReactNativeExample/Pods-ReactNativeExample.debug.xcconfig"; sourceTree = "<group>"; };
5254
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
5355
/* End PBXFileReference section */
@@ -92,6 +94,7 @@
9294
13B07FAE1A68108700A75B9A /* ReactNativeExample */ = {
9395
isa = PBXGroup;
9496
children = (
97+
D847CC172D99D1D900CAB625 /* FronteggLoaderInitializer.swift */,
9598
41E63BA72A5430AB00BF6DE4 /* ReactNativeExample.entitlements */,
9699
13B07FAF1A68108700A75B9A /* AppDelegate.h */,
97100
13B07FB01A68108700A75B9A /* AppDelegate.mm */,
@@ -425,6 +428,7 @@
425428
buildActionMask = 2147483647;
426429
files = (
427430
41872B5B2AFBC5CF0014FB13 /* FronteggSwiftAdapter.swift in Sources */,
431+
D847CC182D99D1DA00CAB625 /* FronteggLoaderInitializer.swift in Sources */,
428432
13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */,
429433
13B07FC11A68108700A75B9A /* main.m in Sources */,
430434
);

example/ios/ReactNativeExample/AppDelegate.mm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ @implementation AppDelegate
88

99
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
1010
{
11+
[FronteggLoaderInitializer initializeLoader];
12+
1113
self.moduleName = @"ReactNativeExample";
1214
// You can add your custom initial props in the dictionary below.
1315
// They will be passed down to the ViewController used by React Native.

example/src/CustomLoader.tsx

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import React from 'react';
2+
import { View, Text, StyleSheet } from 'react-native';
3+
4+
const CustomLoader = () => (
5+
<View style={styles.loaderContainer}>
6+
<Text style={styles.loaderText}>Custom Loading...</Text>
7+
</View>
8+
);
9+
10+
const styles = StyleSheet.create({
11+
loaderContainer: {
12+
flex: 1,
13+
justifyContent: 'center',
14+
alignItems: 'center',
15+
},
16+
loaderText: {
17+
fontSize: 18,
18+
color: '#000',
19+
},
20+
});
21+
22+
export default CustomLoader;

0 commit comments

Comments
 (0)