diff --git a/android/src/main/java/com/expensify/wallet/WalletPackage.kt b/android/src/main/java/com/expensify/wallet/WalletPackage.kt index f302f8e..848c6c5 100644 --- a/android/src/main/java/com/expensify/wallet/WalletPackage.kt +++ b/android/src/main/java/com/expensify/wallet/WalletPackage.kt @@ -1,6 +1,6 @@ package com.expensify.wallet -import com.expensify.wallet.components.AddToWalletButtonViewManager +import com.expensify.wallet.components.RNAddToWalletButtonManager import com.facebook.react.BaseReactPackage import com.facebook.react.bridge.ReactApplicationContext import com.facebook.react.bridge.NativeModule @@ -44,5 +44,5 @@ class WalletPackage : BaseReactPackage() { } override fun createViewManagers(reactContext: com.facebook.react.bridge.ReactApplicationContext) - : List> = listOf(AddToWalletButtonViewManager()) + : List> = listOf(RNAddToWalletButtonManager()) } diff --git a/android/src/main/java/com/expensify/wallet/components/RNAddToWalletButtonViewManager.kt b/android/src/main/java/com/expensify/wallet/components/RNAddToWalletButtonManager.kt similarity index 66% rename from android/src/main/java/com/expensify/wallet/components/RNAddToWalletButtonViewManager.kt rename to android/src/main/java/com/expensify/wallet/components/RNAddToWalletButtonManager.kt index 6bc40eb..d4ae817 100644 --- a/android/src/main/java/com/expensify/wallet/components/RNAddToWalletButtonViewManager.kt +++ b/android/src/main/java/com/expensify/wallet/components/RNAddToWalletButtonManager.kt @@ -4,16 +4,16 @@ import com.facebook.react.uimanager.SimpleViewManager import com.facebook.react.uimanager.ThemedReactContext import com.facebook.react.uimanager.annotations.ReactProp -class AddToWalletButtonViewManager : SimpleViewManager() { +class RNAddToWalletButtonManager : SimpleViewManager() { override fun getName(): String = "RNAddToWalletButton" - override fun createViewInstance(reactContext: ThemedReactContext): AddToWalletButtonView { - return AddToWalletButtonView(reactContext) + override fun createViewInstance(reactContext: ThemedReactContext): RNAddToWalletButtonView { + return RNAddToWalletButtonView(reactContext) } @ReactProp(name = "buttonType") - fun setButtonType(view: AddToWalletButtonView, type: String) { + fun setButtonType(view: RNAddToWalletButtonView, type: String) { view.setButtonType(type) } } diff --git a/android/src/main/java/com/expensify/wallet/components/RNAddToWalletButtonView.kt b/android/src/main/java/com/expensify/wallet/components/RNAddToWalletButtonView.kt index dea7e04..b23beca 100644 --- a/android/src/main/java/com/expensify/wallet/components/RNAddToWalletButtonView.kt +++ b/android/src/main/java/com/expensify/wallet/components/RNAddToWalletButtonView.kt @@ -6,7 +6,7 @@ import com.expensify.wallet.R import android.view.LayoutInflater import android.view.View -class AddToWalletButtonView(context: Context) : FrameLayout(context) { +class RNAddToWalletButtonView(context: Context) : FrameLayout(context) { private var buttonView: View? = null private var buttonType: String = "basic" diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 0a6732d..07c67a2 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1806,7 +1806,7 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - react-native-wallet (0.1.8): + - react-native-wallet (0.1.9): - boost - DoubleConversion - fast_float @@ -2613,7 +2613,7 @@ SPEC CHECKSUMS: React-Mapbuffer: e402e7a0535b2213c50727553621480fe8cd8ade React-microtasksnativemodule: a63ce5595016996a9bac1f10c70a7a7fe6506649 react-native-safe-area-context: c6e2edd1c1da07bdce287fa9d9e60c5f7b514616 - react-native-wallet: 48e8d0417dbe38917c585c1d3665cb09cebd6871 + react-native-wallet: e929bf18d6f4ac35ee263ff4319e9ef107ae2cd9 React-NativeModulesApple: b3766e1f87b08064ebc459b9e1538da2447ca874 React-oscompat: 34f3d3c06cadcbc470bc4509c717fb9b919eaa8b React-perflogger: a1edb025fd5d44f61bf09307e248f7608d7b2dcf diff --git a/ios/components/RNAddToWalletButtonManager.swift b/ios/components/RNAddToWalletButtonManager.swift index 3b05352..2d7a49a 100644 --- a/ios/components/RNAddToWalletButtonManager.swift +++ b/ios/components/RNAddToWalletButtonManager.swift @@ -4,7 +4,7 @@ import React @objc(RNAddToWalletButtonManager) class RNAddToWalletButtonManager: RCTViewManager { override func view() -> UIView! { - return AddToWalletButtonView() + return RNAddToWalletButtonView() } override static func requiresMainQueueSetup() -> Bool { diff --git a/ios/components/RNAddToWalletButtonView.swift b/ios/components/RNAddToWalletButtonView.swift index 52405a8..09e8ccf 100644 --- a/ios/components/RNAddToWalletButtonView.swift +++ b/ios/components/RNAddToWalletButtonView.swift @@ -2,8 +2,8 @@ import Foundation import PassKit import UIKit -@objc(AddToWalletButtonView) -class AddToWalletButtonView: UIView { +@objc(RNAddToWalletButtonView) +class RNAddToWalletButtonView: UIView { private var addPassButton = PKAddPassButton(addPassButtonStyle: .blackOutline) private let defaultWidth: CGFloat = 120 private let defaultHeight: CGFloat = 40