Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed iOS build breaking #24

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+4 −10
Open

Fixed iOS build breaking #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d94b82
RN 0.47 Breaking Change: No longer need to override this method.
Alberto-BaseNet Sep 15, 2017
a0985aa
Fixed header imports
Oct 24, 2017
864f3f5
Fixed CGRectMake return type which broke iOS build
Oct 24, 2017
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
6 changes: 0 additions & 6 deletions android/src/main/java/com/fileopener/FileOpenerPackage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.fileopener;

import com.facebook.react.ReactPackage;
import com.facebook.react.bridge.JavaScriptModule;
import com.facebook.react.bridge.NativeModule;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.uimanager.ViewManager;
Expand All @@ -18,11 +17,6 @@ public List<NativeModule> createNativeModules(ReactApplicationContext reactConte
return Arrays.<NativeModule>asList(new FileOpener(reactContext));
}

@Override
public List<Class<? extends JavaScriptModule>> createJSModules() {
return Collections.emptyList();
}

@Override
public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
return Collections.emptyList();
Expand Down
4 changes: 2 additions & 2 deletions ios/RNFileOpener/RNFileOpener.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#import "RCTBridgeModule.h"
#import "RCTBridge.h"
#import <React/RCTBridgeModule.h>
#import <React/RCTBridge.h>

@import UIKit;

Expand Down
4 changes: 2 additions & 2 deletions ios/RNFileOpener/RNFileOpener.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ - (dispatch_queue_t)methodQueue

RCT_EXPORT_MODULE();

RCT_REMAP_METHOD(open, filePath:(NSString *)filePath fileMine:(NSString *)fileMine fromRect:(CGRectMake)rect
RCT_REMAP_METHOD(open, filePath:(NSString *)filePath fileMine:(NSString *)fileMine
resolver:(RCTPromiseResolveBlock)resolve
rejecter:(RCTPromiseRejectBlock)reject)
{
Expand All @@ -34,7 +34,7 @@ - (dispatch_queue_t)methodQueue

if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
{
wasOpened = [self.FileOpener presentOptionsMenuFromRect:rect inView:ctrl.view animated:YES];
wasOpened = [self.FileOpener presentOptionsMenuFromRect:CGRectMake(CGRectGetMidX(ctrl.view.frame), CGRectGetMidY(ctrl.view.frame), 0, 20) inView:ctrl.view animated:YES];
}

if (wasOpened) {
Expand Down