Skip to content

Commit 2e6c672

Browse files
auserauser
committed
WIP: Upgraded firestack
1 parent 01af03a commit 2e6c672

File tree

9 files changed

+112
-98
lines changed

9 files changed

+112
-98
lines changed

‎android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ android {
126126
}
127127

128128
dependencies {
129-
compile project(':react-native-vector-icons')
130129
compile project(':react-native-firestack')
130+
compile project(':react-native-vector-icons')
131131
compile fileTree(dir: "libs", include: ["*.jar"])
132132
compile "com.android.support:appcompat-v7:23.0.1"
133133
compile "com.facebook.react:react-native:+" // From node_modules

‎android/app/src/main/java/com/firestackapp/MainApplication.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.util.Log;
55

66
import com.facebook.react.ReactApplication;
7+
import io.fullstack.firestack.FirestackPackage;
78
import com.oblador.vectoricons.VectorIconsPackage;
89
import io.fullstack.firestack.FirestackPackage;
910
import com.facebook.react.ReactInstanceManager;
@@ -26,6 +27,7 @@ protected boolean getUseDeveloperSupport() {
2627
protected List<ReactPackage> getPackages() {
2728
return Arrays.<ReactPackage>asList(
2829
new MainReactPackage(),
30+
new FirestackPackage(getApplicationContext()),
2931
new VectorIconsPackage(),
3032
new FirestackPackage(getApplicationContext())
3133
);

‎android/settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
rootProject.name = 'FirestackApp'
22

33
include ':app'
4-
include ':react-native-vector-icons'
5-
project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
64
include ':react-native-firestack'
75
project(':react-native-firestack').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-firestack/android')
6+
include ':react-native-vector-icons'
7+
project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')

‎app/views/Analytics/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import LogEvent from './Demos/LogEvent';
1515
export const Routes = {
1616
'logevent': {
1717
route: {
18-
title: 'Log event',
18+
title: 'Simple log event example',
1919
Component: LogEvent
2020
}
2121
}

‎app/views/Presence/Demos/Online.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export class Online extends React.Component {
1616
console.log('presence', presence)
1717
presence
1818
.on('users/connections')
19-
.setOnlineFor('auser')
19+
.setOnline('auser')
2020
.onConnect(ref => {
2121
console.log('connected', ref);
2222
ref.onDisconnect().remove();

‎ios/FirestackApp.xcodeproj/project.pbxproj

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
1BB9346E5CBD4089AE6CA21E /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B808222ADB44437DA36DCDF9 /* Foundation.ttf */; };
2626
312ED60BB2A348208454DC71 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8AD21815E4A44D239F9534EF /* Zocial.ttf */; };
2727
3292109EDFC74E2EA3382AE7 /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CD1C51677EA04F9098CC993B /* EvilIcons.ttf */; };
28-
3F3FF7DEEF2F4BA9AA0D2BA4 /* libFirestack.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C4202E819964FA480112ED5 /* libFirestack.a */; };
2928
4568701C1A8A4585B4BA4357 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 544026725FD0496BAA65856C /* Ionicons.ttf */; };
3029
4E0702F83A654041B3B8ED66 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 73665BEC25D84E3F9E808CBC /* MaterialIcons.ttf */; };
30+
5B3378442BEE42B585CB695F /* libFirestack.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4FAAB980F91D4B98A4A8112E /* libFirestack.a */; };
3131
652B0EA2CF124EC1B94BD16C /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0EB2DA65D8144CB7AEE992EB /* Entypo.ttf */; };
3232
7F2768C575184BBB9EE606FE /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = ED824E9D6604436D9C2098A8 /* Octicons.ttf */; };
3333
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
3434
92C51B91D42E48249FF35703 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2AE12C0154994575B88D3503 /* FontAwesome.ttf */; };
3535
AB7BCCC7E7984E1BAE8A1483 /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C199524C8BC47899BE343FF /* libRNVectorIcons.a */; };
36-
D90883011D89C36F00FB6742 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = D90883001D89C36F00FB6742 /* GoogleService-Info.plist */; };
36+
D98A122D1D8D1BD5004DB865 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = D98A122C1D8D1BD5004DB865 /* GoogleService-Info.plist */; };
3737
/* End PBXBuildFile section */
3838

3939
/* Begin PBXContainerItemProxy section */
@@ -114,20 +114,20 @@
114114
remoteGlobalIDString = 58B5119B1A9E6C1200147676;
115115
remoteInfo = RCTText;
116116
};
117-
D90882F11D89C1FE00FB6742 /* PBXContainerItemProxy */ = {
118-
isa = PBXContainerItemProxy;
119-
containerPortal = 5C79FCFB39474BEE9482AD64 /* Firestack.xcodeproj */;
120-
proxyType = 2;
121-
remoteGlobalIDString = 134814201AA4EA6300B7C361;
122-
remoteInfo = Firestack;
123-
};
124117
D9136C661D86900800ADDA44 /* PBXContainerItemProxy */ = {
125118
isa = PBXContainerItemProxy;
126119
containerPortal = B96EC81B730846B88D21380E /* RNVectorIcons.xcodeproj */;
127120
proxyType = 2;
128121
remoteGlobalIDString = 5DBEB1501B18CEA900B34395;
129122
remoteInfo = RNVectorIcons;
130123
};
124+
D98A121F1D8D16E4004DB865 /* PBXContainerItemProxy */ = {
125+
isa = PBXContainerItemProxy;
126+
containerPortal = 49A82959DF574D23957C2278 /* Firestack.xcodeproj */;
127+
proxyType = 2;
128+
remoteGlobalIDString = 134814201AA4EA6300B7C361;
129+
remoteInfo = Firestack;
130+
};
131131
/* End PBXContainerItemProxy section */
132132

133133
/* Begin PBXCopyFilesBuildPhase section */
@@ -165,18 +165,18 @@
165165
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = FirestackApp/main.m; sourceTree = "<group>"; };
166166
146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; };
167167
2AE12C0154994575B88D3503 /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = "<group>"; };
168-
2C4202E819964FA480112ED5 /* libFirestack.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = archive.ar; path = libFirestack.a; sourceTree = "<group>"; };
168+
49A82959DF574D23957C2278 /* Firestack.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = Firestack.xcodeproj; path = "../node_modules/react-native-firestack/ios/Firestack.xcodeproj"; sourceTree = "<group>"; };
169169
4C199524C8BC47899BE343FF /* libRNVectorIcons.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNVectorIcons.a; sourceTree = "<group>"; };
170+
4FAAB980F91D4B98A4A8112E /* libFirestack.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = archive.ar; path = libFirestack.a; sourceTree = "<group>"; };
170171
544026725FD0496BAA65856C /* Ionicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = unknown; name = Ionicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = "<group>"; };
171-
5C79FCFB39474BEE9482AD64 /* Firestack.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = Firestack.xcodeproj; path = "../node_modules/react-native-firestack/ios/Firestack.xcodeproj"; sourceTree = "<group>"; };
172172
73665BEC25D84E3F9E808CBC /* MaterialIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = "<group>"; };
173173
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
174174
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
175175
8AD21815E4A44D239F9534EF /* Zocial.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = unknown; name = Zocial.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = "<group>"; };
176176
B808222ADB44437DA36DCDF9 /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = "<group>"; };
177177
B96EC81B730846B88D21380E /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = "<group>"; };
178178
CD1C51677EA04F9098CC993B /* EvilIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = unknown; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = "<group>"; };
179-
D90883001D89C36F00FB6742 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
179+
D98A122C1D8D1BD5004DB865 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
180180
ED824E9D6604436D9C2098A8 /* Octicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = unknown; name = Octicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = "<group>"; };
181181
/* End PBXFileReference section */
182182

@@ -204,7 +204,7 @@
204204
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
205205
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
206206
AB7BCCC7E7984E1BAE8A1483 /* libRNVectorIcons.a in Frameworks */,
207-
3F3FF7DEEF2F4BA9AA0D2BA4 /* libFirestack.a in Frameworks */,
207+
5B3378442BEE42B585CB695F /* libFirestack.a in Frameworks */,
208208
);
209209
runOnlyForDeploymentPostprocessing = 0;
210210
};
@@ -343,7 +343,7 @@
343343
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
344344
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
345345
B96EC81B730846B88D21380E /* RNVectorIcons.xcodeproj */,
346-
5C79FCFB39474BEE9482AD64 /* Firestack.xcodeproj */,
346+
49A82959DF574D23957C2278 /* Firestack.xcodeproj */,
347347
);
348348
name = Libraries;
349349
sourceTree = "<group>";
@@ -359,7 +359,7 @@
359359
83CBB9F61A601CBA00E9B192 = {
360360
isa = PBXGroup;
361361
children = (
362-
D90883001D89C36F00FB6742 /* GoogleService-Info.plist */,
362+
D98A122C1D8D1BD5004DB865 /* GoogleService-Info.plist */,
363363
13B07FAE1A68108700A75B9A /* FirestackApp */,
364364
832341AE1AAA6A7D00B99B32 /* Libraries */,
365365
00E356EF1AD99517003FC87E /* FirestackAppTests */,
@@ -379,18 +379,18 @@
379379
name = Products;
380380
sourceTree = "<group>";
381381
};
382-
D90882EE1D89C1FE00FB6742 /* Products */ = {
382+
D9136C581D86900800ADDA44 /* Products */ = {
383383
isa = PBXGroup;
384384
children = (
385-
D90882F21D89C1FE00FB6742 /* libFirestack.a */,
385+
D9136C671D86900800ADDA44 /* libRNVectorIcons.a */,
386386
);
387387
name = Products;
388388
sourceTree = "<group>";
389389
};
390-
D9136C581D86900800ADDA44 /* Products */ = {
390+
D98A121C1D8D16E4004DB865 /* Products */ = {
391391
isa = PBXGroup;
392392
children = (
393-
D9136C671D86900800ADDA44 /* libRNVectorIcons.a */,
393+
D98A12201D8D16E4004DB865 /* libFirestack.a */,
394394
);
395395
name = Products;
396396
sourceTree = "<group>";
@@ -463,8 +463,8 @@
463463
projectDirPath = "";
464464
projectReferences = (
465465
{
466-
ProductGroup = D90882EE1D89C1FE00FB6742 /* Products */;
467-
ProjectRef = 5C79FCFB39474BEE9482AD64 /* Firestack.xcodeproj */;
466+
ProductGroup = D98A121C1D8D16E4004DB865 /* Products */;
467+
ProjectRef = 49A82959DF574D23957C2278 /* Firestack.xcodeproj */;
468468
},
469469
{
470470
ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */;
@@ -590,18 +590,18 @@
590590
remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */;
591591
sourceTree = BUILT_PRODUCTS_DIR;
592592
};
593-
D90882F21D89C1FE00FB6742 /* libFirestack.a */ = {
593+
D9136C671D86900800ADDA44 /* libRNVectorIcons.a */ = {
594594
isa = PBXReferenceProxy;
595595
fileType = archive.ar;
596-
path = libFirestack.a;
597-
remoteRef = D90882F11D89C1FE00FB6742 /* PBXContainerItemProxy */;
596+
path = libRNVectorIcons.a;
597+
remoteRef = D9136C661D86900800ADDA44 /* PBXContainerItemProxy */;
598598
sourceTree = BUILT_PRODUCTS_DIR;
599599
};
600-
D9136C671D86900800ADDA44 /* libRNVectorIcons.a */ = {
600+
D98A12201D8D16E4004DB865 /* libFirestack.a */ = {
601601
isa = PBXReferenceProxy;
602602
fileType = archive.ar;
603-
path = libRNVectorIcons.a;
604-
remoteRef = D9136C661D86900800ADDA44 /* PBXContainerItemProxy */;
603+
path = libFirestack.a;
604+
remoteRef = D98A121F1D8D16E4004DB865 /* PBXContainerItemProxy */;
605605
sourceTree = BUILT_PRODUCTS_DIR;
606606
};
607607
/* End PBXReferenceProxy section */
@@ -619,10 +619,10 @@
619619
buildActionMask = 2147483647;
620620
files = (
621621
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
622+
D98A122D1D8D1BD5004DB865 /* GoogleService-Info.plist in Resources */,
622623
13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
623624
652B0EA2CF124EC1B94BD16C /* Entypo.ttf in Resources */,
624625
3292109EDFC74E2EA3382AE7 /* EvilIcons.ttf in Resources */,
625-
D90883011D89C36F00FB6742 /* GoogleService-Info.plist in Resources */,
626626
92C51B91D42E48249FF35703 /* FontAwesome.ttf in Resources */,
627627
1BB9346E5CBD4089AE6CA21E /* Foundation.ttf in Resources */,
628628
4568701C1A8A4585B4BA4357 /* Ionicons.ttf in Resources */,

‎ios/FirestackApp.xcodeproj/xcshareddata/xcschemes/FirestackApp.xcscheme

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
</BuildActionEntries>
3838
</BuildAction>
3939
<TestAction
40+
buildConfiguration = "Debug"
4041
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4142
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
42-
shouldUseLaunchSchemeArgsEnv = "YES"
43-
buildConfiguration = "Debug">
43+
shouldUseLaunchSchemeArgsEnv = "YES">
4444
<Testables>
4545
<TestableReference
4646
skipped = "NO">
@@ -62,15 +62,18 @@
6262
ReferencedContainer = "container:FirestackApp.xcodeproj">
6363
</BuildableReference>
6464
</MacroExpansion>
65+
<AdditionalOptions>
66+
</AdditionalOptions>
6567
</TestAction>
6668
<LaunchAction
69+
buildConfiguration = "Debug"
6770
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6871
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
6972
launchStyle = "0"
7073
useCustomWorkingDirectory = "NO"
71-
buildConfiguration = "Debug"
7274
ignoresPersistentStateOnLaunch = "NO"
7375
debugDocumentVersioning = "YES"
76+
debugServiceExtension = "internal"
7477
allowLocationSimulation = "YES">
7578
<BuildableProductRunnable
7679
runnableDebuggingMode = "0">
@@ -82,14 +85,20 @@
8285
ReferencedContainer = "container:FirestackApp.xcodeproj">
8386
</BuildableReference>
8487
</BuildableProductRunnable>
88+
<CommandLineArguments>
89+
<CommandLineArgument
90+
argument = "-FIRAnalyticsDebugEnabled"
91+
isEnabled = "YES">
92+
</CommandLineArgument>
93+
</CommandLineArguments>
8594
<AdditionalOptions>
8695
</AdditionalOptions>
8796
</LaunchAction>
8897
<ProfileAction
98+
buildConfiguration = "Release"
8999
shouldUseLaunchSchemeArgsEnv = "YES"
90100
savedToolIdentifier = ""
91101
useCustomWorkingDirectory = "NO"
92-
buildConfiguration = "Release"
93102
debugDocumentVersioning = "YES">
94103
<BuildableProductRunnable
95104
runnableDebuggingMode = "0">

‎ios/FirestackApp/AppDelegate.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
3636

3737
- (void)application:(UIApplication *)application didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings
3838
{
39+
// [Firestack setup:application];
3940
// [FirestackCloudMessaging did]
4041
}
4142

0 commit comments

Comments
 (0)