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
1 change: 1 addition & 0 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ android {
}

dependencies {
compile project(':react-native-cookies')
compile project(':react-native-i18n')
compile project(':react-native-photo-view')
compile project(':react-native-config')
Expand Down
2 changes: 2 additions & 0 deletions android/app/src/main/java/com/gitpoint/MainApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import android.app.Application;

import com.facebook.react.ReactApplication;
import com.psykar.cookiemanager.CookieManagerPackage;
import com.AlexanderZaytsev.RNI18n.RNI18nPackage;
import com.reactnative.photoview.PhotoViewPackage;
import com.lugg.ReactNativeConfig.ReactNativeConfigPackage;
Expand Down Expand Up @@ -35,6 +36,7 @@ public boolean getUseDeveloperSupport() {
protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList(
new MainReactPackage(),
new CookieManagerPackage(),
new RNI18nPackage(),
new PhotoViewPackage(),
new ReactNativeConfigPackage(),
Expand Down
2 changes: 2 additions & 0 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
rootProject.name = 'GitPoint'
include ':react-native-cookies'
project(':react-native-cookies').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-cookies/android')
include ':react-native-i18n'
project(':react-native-i18n').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-i18n/android')
include ':react-native-photo-view'
Expand Down
83 changes: 77 additions & 6 deletions ios/GitPoint.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
};
objectVersion = 46;
objects = {

/* Begin PBXBuildFile section */
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
Expand Down Expand Up @@ -52,6 +53,7 @@
9FDCBF42F42C4D3A90C4FF77 /* OpenSans-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 50CF1CCB91B749748E0C08C7 /* OpenSans-Light.ttf */; };
A62FF9CF326443FB885D7FBD /* libSafariViewManager.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 54211983D32D4316AE302999 /* libSafariViewManager.a */; };
A77965889D0C4ABAA76C7D1E /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E0083FB0C16F4D6C8C5A1128 /* EvilIcons.ttf */; };
AAB4EADBDA2046AE9DDC0C6A /* libRNCookieManagerIOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ED00F0F2B2624699A679DFB6 /* libRNCookieManagerIOS.a */; };
B551A74F653048B38D9D2677 /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8257ED6670C241A48D707255 /* Entypo.ttf */; };
B83B9C1B275C4114A4A156F6 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F01012DEC16A4179879AD390 /* SimpleLineIcons.ttf */; };
B8D599F61D2A4797A2F71CAA /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AFDBB5669CAB4C5C8215B571 /* libRNVectorIcons.a */; };
Expand Down Expand Up @@ -252,6 +254,20 @@
remoteGlobalIDString = 134814201AA4EA6300B7C361;
remoteInfo = RNSearchBar;
};
48F9DE9A1F6DB8C60064194C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 78A0EE19E449476883F58020 /* CodePush.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 6463C8241EBA0CB60095B8CD;
remoteInfo = "CodePush-tvOS";
};
48F9DEBB1F6DB8C60064194C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = E14CC94AAEF7467B9AFD7CDB /* RNCookieManagerIOS.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1BD725DA1CF77A8B005DBD79;
remoteInfo = RNCookieManagerIOS;
};
5E9157321DD0AC6500FF2AA8 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */;
Expand Down Expand Up @@ -412,7 +428,9 @@
DC5C35E41E37AD1800F3F526 /* Zocial.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = Zocial.ttf; sourceTree = "<group>"; };
E0083FB0C16F4D6C8C5A1128 /* EvilIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = "<group>"; };
E118784082B847BCB75CCABA /* OpenSans-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-Regular.ttf"; path = "../src/assets/fonts/OpenSans-Regular.ttf"; sourceTree = "<group>"; };
E14CC94AAEF7467B9AFD7CDB /* RNCookieManagerIOS.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNCookieManagerIOS.xcodeproj; path = "../node_modules/react-native-cookies/ios/RNCookieManagerIOS.xcodeproj"; sourceTree = "<group>"; };
ECD55646AE8E4000BD08BC2D /* Lato-Black.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Lato-Black.ttf"; path = "../src/assets/fonts/Lato-Black.ttf"; sourceTree = "<group>"; };
ED00F0F2B2624699A679DFB6 /* libRNCookieManagerIOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNCookieManagerIOS.a; sourceTree = "<group>"; };
EE0605281E45441288EA9435 /* RNDeviceInfo.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNDeviceInfo.xcodeproj; path = "../node_modules/react-native-device-info/RNDeviceInfo.xcodeproj"; sourceTree = "<group>"; };
F01012DEC16A4179879AD390 /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = SimpleLineIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = "<group>"; };
F471BB4CEC5E4F1FBC1EC566 /* opensans_semibold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = opensans_semibold.ttf; path = ../src/assets/fonts/opensans_semibold.ttf; sourceTree = "<group>"; };
Expand Down Expand Up @@ -451,6 +469,7 @@
21B7C06027854E159BE31EE1 /* libCodePush.a in Frameworks */,
562B8AA6D1DA4F4C8294AD19 /* libz.tbd in Frameworks */,
03B3A46935444CCDA0302579 /* libRNI18n.a in Frameworks */,
AAB4EADBDA2046AE9DDC0C6A /* libRNCookieManagerIOS.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -623,6 +642,7 @@
isa = PBXGroup;
children = (
273F19201F1E1AD5004B4410 /* libCodePush.a */,
48F9DE9B1F6DB8C60064194C /* libCodePush.a */,
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@housseindjirdeh not sure why Xcode added this line, you may want to have a closer look

);
name = Products;
sourceTree = "<group>";
Expand All @@ -643,6 +663,14 @@
name = Products;
sourceTree = "<group>";
};
48F9DE961F6DB8C60064194C /* Products */ = {
isa = PBXGroup;
children = (
48F9DEBC1F6DB8C60064194C /* libRNCookieManagerIOS.a */,
);
name = Products;
sourceTree = "<group>";
};
5E91572E1DD0AC6500FF2AA8 /* Products */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -690,6 +718,7 @@
84EAF1F8EA7E4DA69245C813 /* ReactNativeConfig.xcodeproj */,
78A0EE19E449476883F58020 /* CodePush.xcodeproj */,
B88D3A8C883A40A8A56A5FA1 /* RNI18n.xcodeproj */,
E14CC94AAEF7467B9AFD7CDB /* RNCookieManagerIOS.xcodeproj */,
);
name = Libraries;
sourceTree = "<group>";
Expand Down Expand Up @@ -948,6 +977,10 @@
ProductGroup = 27A36D231F1DDCCE0033CA49 /* Products */;
ProjectRef = 84EAF1F8EA7E4DA69245C813 /* ReactNativeConfig.xcodeproj */;
},
{
ProductGroup = 48F9DE961F6DB8C60064194C /* Products */;
ProjectRef = E14CC94AAEF7467B9AFD7CDB /* RNCookieManagerIOS.xcodeproj */;
},
{
ProductGroup = DCD1C1341EEF193300E3B03D /* Products */;
ProjectRef = EE0605281E45441288EA9435 /* RNDeviceInfo.xcodeproj */;
Expand Down Expand Up @@ -1148,6 +1181,20 @@
remoteRef = 48F49F661F19026D0012FAD6 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
48F9DE9B1F6DB8C60064194C /* libCodePush.a */ = {
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here @housseindjirdeh

isa = PBXReferenceProxy;
fileType = archive.ar;
path = libCodePush.a;
remoteRef = 48F9DE9A1F6DB8C60064194C /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
48F9DEBC1F6DB8C60064194C /* libRNCookieManagerIOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libRNCookieManagerIOS.a;
remoteRef = 48F9DEBB1F6DB8C60064194C /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
Expand Down Expand Up @@ -1399,11 +1446,15 @@
"$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig",
"$(SRCROOT)/../node_modules/react-native-code-push/ios/CodePush/**",
"$(SRCROOT)/../node_modules/react-native-i18n/ios",
"$(SRCROOT)/../node_modules/react-native-cookies/ios/RNCookieManagerIOS",
);
INFOPLIST_FILE = GitPointTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(inherited)";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
OTHER_LDFLAGS = (
"-ObjC",
"-lc++",
Expand All @@ -1428,11 +1479,15 @@
"$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig",
"$(SRCROOT)/../node_modules/react-native-code-push/ios/CodePush/**",
"$(SRCROOT)/../node_modules/react-native-i18n/ios",
"$(SRCROOT)/../node_modules/react-native-cookies/ios/RNCookieManagerIOS",
);
INFOPLIST_FILE = GitPointTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(inherited)";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
OTHER_LDFLAGS = (
"-ObjC",
"-lc++",
Expand Down Expand Up @@ -1462,6 +1517,7 @@
"$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig",
"$(SRCROOT)/../node_modules/react-native-code-push/ios/CodePush/**",
"$(SRCROOT)/../node_modules/react-native-i18n/ios",
"$(SRCROOT)/../node_modules/react-native-cookies/ios/RNCookieManagerIOS",
);
INFOPLIST_FILE = GitPoint/Info.plist;
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
Expand Down Expand Up @@ -1501,6 +1557,7 @@
"$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig",
"$(SRCROOT)/../node_modules/react-native-code-push/ios/CodePush/**",
"$(SRCROOT)/../node_modules/react-native-i18n/ios",
"$(SRCROOT)/../node_modules/react-native-cookies/ios/RNCookieManagerIOS",
);
INFOPLIST_FILE = GitPoint/Info.plist;
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional";
Expand Down Expand Up @@ -1541,10 +1598,14 @@
"$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig",
"$(SRCROOT)/../node_modules/react-native-code-push/ios/CodePush/**",
"$(SRCROOT)/../node_modules/react-native-i18n/ios",
"$(SRCROOT)/../node_modules/react-native-cookies/ios/RNCookieManagerIOS",
);
INFOPLIST_FILE = "GitPoint-tvOS/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(inherited)";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
OTHER_LDFLAGS = (
"-ObjC",
"-lc++",
Expand Down Expand Up @@ -1578,10 +1639,14 @@
"$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig",
"$(SRCROOT)/../node_modules/react-native-code-push/ios/CodePush/**",
"$(SRCROOT)/../node_modules/react-native-i18n/ios",
"$(SRCROOT)/../node_modules/react-native-cookies/ios/RNCookieManagerIOS",
);
INFOPLIST_FILE = "GitPoint-tvOS/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(inherited)";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
OTHER_LDFLAGS = (
"-ObjC",
"-lc++",
Expand All @@ -1607,7 +1672,10 @@
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = "GitPoint-tvOSTests/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(inherited)";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.GitPoint-tvOSTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
Expand All @@ -1629,7 +1697,10 @@
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = "GitPoint-tvOSTests/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(inherited)";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.GitPoint-tvOSTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos;
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
"react-native-code-push": "^5.0.0-beta",
"react-native-communications": "^2.2.1",
"react-native-config": "^0.6.0",
"react-native-cookies": "^3.2.0",
"react-native-device-info": "^0.11.0",
"react-native-elements": "^0.9.3",
"react-native-htmlview": "^0.12.0",
Expand Down
5 changes: 4 additions & 1 deletion root.store.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ if (__DEV__ && process.env.TRON_ENABLED) {
compose(getMiddleware(), ...getEnhancers())
);
} else {
store = createStore(rootReducer, composeWithDevTools(getMiddleware(), ...getEnhancers()));
store = createStore(
rootReducer,
composeWithDevTools(getMiddleware(), ...getEnhancers())
);
}

export const configureStore = store;
14 changes: 9 additions & 5 deletions src/auth/screens/auth-profile.screen.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,15 @@ const mapStateToProps = state => ({
hasInitialUser: state.auth.hasInitialUser,
});

const mapDispatchToProps = dispatch => bindActionCreators({
getUser,
getOrgs,
getStarCount,
}, dispatch);
const mapDispatchToProps = dispatch =>
bindActionCreators(
{
getUser,
getOrgs,
getStarCount,
},
dispatch
);

const styles = StyleSheet.create({
listTitle: {
Expand Down
10 changes: 7 additions & 3 deletions src/auth/screens/events.screen.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,13 @@ const mapStateToProps = state => ({
isPendingEvents: state.auth.isPendingEvents,
});

const mapDispatchToProps = dispatch => bindActionCreators({
getUserEvents,
}, dispatch);
const mapDispatchToProps = dispatch =>
bindActionCreators(
{
getUserEvents,
},
dispatch
);

const styles = StyleSheet.create({
descriptionContainer: {
Expand Down
Loading