Skip to content

Commit

Permalink
Merge branch 'master' of github.com:shahen94/react-native-video-editor
Browse files Browse the repository at this point in the history
  • Loading branch information
shahen94 committed Nov 13, 2016
2 parents 9878be8 + 009bae7 commit 5118b41
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 38 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Library is under constructing

# react-native-video-editor [![Build Status](https://travis-ci.org/shahen94/react-native-video-editor.svg?branch=master)](https://travis-ci.org/shahen94/react-native-video-editor)
# react-native-video-processing [![Build Status](https://travis-ci.org/shahen94/react-native-video-processing.svg?branch=master)](https://travis-ci.org/shahen94/react-native-video-processing)

[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=plastic)](https://github.com/semantic-release/semantic-release)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
import com.facebook.react.bridge.ReactMethod;
import com.facebook.react.bridge.Callback;

public class RNVideoEditorModule extends ReactContextBaseJavaModule {
public class RNVideoProcessingModule extends ReactContextBaseJavaModule {

private final ReactApplicationContext reactContext;

public RNVideoEditorModule(ReactApplicationContext reactContext) {
public RNVideoProcessingModule(ReactApplicationContext reactContext) {
super(reactContext);
this.reactContext = reactContext;
}

@Override
public String getName() {
return "RNVideoEditor";
return "RNVideoProcessing";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.uimanager.ViewManager;
import com.facebook.react.bridge.JavaScriptModule;
public class RNVideoEditorPackage implements ReactPackage {
public class RNVideoProcessingPackage implements ReactPackage {
@Override
public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
return Arrays.<NativeModule>asList(new RNVideoEditorModule(reactContext));
return Arrays.<NativeModule>asList(new RNVideoProcessingModule(reactContext));
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

import { NativeModules } from 'react-native';

const { RNVideoEditor } = NativeModules;
const { RNVideoProcessing } = NativeModules;

export default RNVideoEditor;
export default RNVideoProcessing;
7 changes: 7 additions & 0 deletions init/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
const createLibrary = require('react-native-create-library');

createLibrary({
name: 'VideoProcessing',
platforms: ['ios', 'android'],
packageIdentifier: 'com.shahenlibrary'
});
7 changes: 0 additions & 7 deletions ios/RNVideoEditor.h

This file was deleted.

7 changes: 7 additions & 0 deletions ios/RNVideoProcessing.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

#import "RCTBridgeModule.h"

@interface RNVideoProcessing : NSObject <RCTBridgeModule>

@end

4 changes: 2 additions & 2 deletions ios/RNVideoEditor.m → ios/RNVideoProcessing.m
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

#import "RNVideoEditor.h"
#import "RNVideoProcessing.h"

@implementation RNVideoEditor
@implementation RNVideoProcessing

- (dispatch_queue_t)methodQueue
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
B3E7B58A1CC2AC0600A0062D /* RNVideoEditor.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* RNVideoEditor.m */; };
B3E7B58A1CC2AC0600A0062D /* RNVideoProcessing.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* RNVideoProcessing.m */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
Expand All @@ -23,9 +23,9 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
134814201AA4EA6300B7C361 /* libRNVideoEditor.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNVideoEditor.a; sourceTree = BUILT_PRODUCTS_DIR; };
B3E7B5881CC2AC0600A0062D /* RNVideoEditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNVideoEditor.h; sourceTree = "<group>"; };
B3E7B5891CC2AC0600A0062D /* RNVideoEditor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNVideoEditor.m; sourceTree = "<group>"; };
134814201AA4EA6300B7C361 /* libRNVideoProcessing.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNVideoProcessing.a; sourceTree = BUILT_PRODUCTS_DIR; };
B3E7B5881CC2AC0600A0062D /* RNVideoProcessing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNVideoProcessing.h; sourceTree = "<group>"; };
B3E7B5891CC2AC0600A0062D /* RNVideoProcessing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNVideoProcessing.m; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -42,26 +42,26 @@
134814211AA4EA7D00B7C361 /* Products */ = {
isa = PBXGroup;
children = (
134814201AA4EA6300B7C361 /* libRNVideoEditor.a */,
134814201AA4EA6300B7C361 /* libRNVideoProcessing.a */,
);
name = Products;
sourceTree = "<group>";
};
58B511D21A9E6C8500147676 = {
isa = PBXGroup;
children = (
B3E7B5881CC2AC0600A0062D /* RNVideoEditor.h */,
B3E7B5891CC2AC0600A0062D /* RNVideoEditor.m */,
B3E7B5881CC2AC0600A0062D /* RNVideoProcessing.h */,
B3E7B5891CC2AC0600A0062D /* RNVideoProcessing.m */,
134814211AA4EA7D00B7C361 /* Products */,
);
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
58B511DA1A9E6C8500147676 /* RNVideoEditor */ = {
58B511DA1A9E6C8500147676 /* RNVideoProcessing */ = {
isa = PBXNativeTarget;
buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RNVideoEditor" */;
buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RNVideoProcessing" */;
buildPhases = (
58B511D71A9E6C8500147676 /* Sources */,
58B511D81A9E6C8500147676 /* Frameworks */,
Expand All @@ -71,9 +71,9 @@
);
dependencies = (
);
name = RNVideoEditor;
name = RNVideoProcessing;
productName = RCTDataManager;
productReference = 134814201AA4EA6300B7C361 /* libRNVideoEditor.a */;
productReference = 134814201AA4EA6300B7C361 /* libRNVideoProcessing.a */;
productType = "com.apple.product-type.library.static";
};
/* End PBXNativeTarget section */
Expand All @@ -90,7 +90,7 @@
};
};
};
buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RNVideoEditor" */;
buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RNVideoProcessing" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
Expand All @@ -102,7 +102,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
58B511DA1A9E6C8500147676 /* RNVideoEditor */,
58B511DA1A9E6C8500147676 /* RNVideoProcessing */,
);
};
/* End PBXProject section */
Expand All @@ -112,7 +112,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
B3E7B58A1CC2AC0600A0062D /* RNVideoEditor.m in Sources */,
B3E7B58A1CC2AC0600A0062D /* RNVideoProcessing.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -204,7 +204,7 @@
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = RNVideoEditor;
PRODUCT_NAME = RNVideoProcessing;
SKIP_INSTALL = YES;
};
name = Debug;
Expand All @@ -220,15 +220,15 @@
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = RNVideoEditor;
PRODUCT_NAME = RNVideoProcessing;
SKIP_INSTALL = YES;
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RNVideoEditor" */ = {
58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RNVideoProcessing" */ = {
isa = XCConfigurationList;
buildConfigurations = (
58B511ED1A9E6C8500147676 /* Debug */,
Expand All @@ -237,7 +237,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RNVideoEditor" */ = {
58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RNVideoProcessing" */ = {
isa = XCConfigurationList;
buildConfigurations = (
58B511F01A9E6C8500147676 /* Debug */,
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/shahen94/react-native-video-editor.git"
"url": "https://github.com/shahen94/react-native-video-processing.git"
},
"keywords": [
"react",
Expand All @@ -28,12 +28,12 @@
"author": "Shahen Hovhannisyan <[email protected]>",
"license": "MIT",
"bugs": {
"url": "https://github.com/shahen94/react-native-video-editor/issues"
"url": "https://github.com/shahen94/react-native-video-processing/issues"
},
"jest": {
"preset": "jest-react-native"
},
"homepage": "https://github.com/shahen94/react-native-video-editor#readme",
"homepage": "https://github.com/shahen94/react-native-video-processing#readme",
"dependencies": {
"babel-preset-es2015": "6.18.0",
"babel-preset-react": "6.16.0",
Expand Down

0 comments on commit 5118b41

Please sign in to comment.