Skip to content

Commit 6421f12

Browse files
auserauser
committed
WIP
1 parent 2e6c672 commit 6421f12

File tree

15 files changed

+199
-132
lines changed

15 files changed

+199
-132
lines changed

‎.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,3 @@ buck-out/
3939
\.buckd/
4040
android/app/libs
4141
android/keystores/debug.keystore
42-
ios/GoogleService-Info.plist
43-
config/development.js
44-
config/development*.js
45-
ios/GoogleService-Info*

‎android/app/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,5 +139,3 @@ task copyDownloadableDepsToLibs(type: Copy) {
139139
from configurations.compile
140140
into 'libs'
141141
}
142-
143-
apply plugin: 'com.google.gms.google-services'

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
import com.facebook.react.ReactApplication;
77
import io.fullstack.firestack.FirestackPackage;
8-
import com.oblador.vectoricons.VectorIconsPackage;
98
import io.fullstack.firestack.FirestackPackage;
9+
import com.oblador.vectoricons.VectorIconsPackage;
1010
import com.facebook.react.ReactInstanceManager;
1111
import com.facebook.react.ReactNativeHost;
1212
import com.facebook.react.ReactPackage;
@@ -28,8 +28,8 @@ protected List<ReactPackage> getPackages() {
2828
return Arrays.<ReactPackage>asList(
2929
new MainReactPackage(),
3030
new FirestackPackage(getApplicationContext()),
31-
new VectorIconsPackage(),
32-
new FirestackPackage(getApplicationContext())
31+
new FirestackPackage(getApplicationContext()),
32+
new VectorIconsPackage()
3333
);
3434
}
3535
};

‎android/app/src/main/res/values/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<resources>
22

33

4+
5+
46
<string name="app_name">FirestackApp</string>
57
</resources>

‎android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77
dependencies {
88
classpath 'com.android.tools.build:gradle:1.3.1'
9-
classpath 'com.google.gms:google-services:3.0.0'
9+
1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files
1212
}

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,20 @@ export class Online extends React.Component {
1313
const {firestack} = this.props;
1414
const presence = firestack.presence;
1515

16-
console.log('presence', presence)
17-
presence
18-
.on('users/connections')
19-
.setOnline('auser')
16+
presence.on('auser')
17+
.setOnline()
2018
.onConnect(ref => {
2119
console.log('connected', ref);
2220
ref.onDisconnect().remove();
2321
});
2422
}
2523

24+
componentWillUnmount() {
25+
const {firestack} = this.props;
26+
const presence = firestack.presence;
27+
presence.on('auser').setOffline();
28+
}
29+
2630
_sendHi() {
2731
const {firestack} = this.props;
2832
}

‎config/development.android.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module.exports = {
2+
firestack: {
3+
debug: '*',
4+
}
5+
}

‎config/development.ios.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
module.exports = {
2+
firestack: {
3+
debug: '*',
4+
cloudMessaging: {
5+
enabled: true
6+
}
7+
}
8+
}

‎config/development.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module.exports = {
2+
firestack: {
3+
debug: '*',
4+
}
5+
}

‎ios/FirestackApp.xcodeproj/project.pbxproj

Lines changed: 72 additions & 86 deletions
Large diffs are not rendered by default.

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
</BuildActionEntries>
3838
</BuildAction>
3939
<TestAction
40-
buildConfiguration = "Debug"
4140
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4241
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
shouldUseLaunchSchemeArgsEnv = "YES">
42+
shouldUseLaunchSchemeArgsEnv = "YES"
43+
buildConfiguration = "Debug">
4444
<Testables>
4545
<TestableReference
4646
skipped = "NO">
@@ -62,18 +62,15 @@
6262
ReferencedContainer = "container:FirestackApp.xcodeproj">
6363
</BuildableReference>
6464
</MacroExpansion>
65-
<AdditionalOptions>
66-
</AdditionalOptions>
6765
</TestAction>
6866
<LaunchAction
69-
buildConfiguration = "Debug"
7067
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7168
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
7269
launchStyle = "0"
7370
useCustomWorkingDirectory = "NO"
71+
buildConfiguration = "Debug"
7472
ignoresPersistentStateOnLaunch = "NO"
7573
debugDocumentVersioning = "YES"
76-
debugServiceExtension = "internal"
7774
allowLocationSimulation = "YES">
7875
<BuildableProductRunnable
7976
runnableDebuggingMode = "0">
@@ -85,20 +82,14 @@
8582
ReferencedContainer = "container:FirestackApp.xcodeproj">
8683
</BuildableReference>
8784
</BuildableProductRunnable>
88-
<CommandLineArguments>
89-
<CommandLineArgument
90-
argument = "-FIRAnalyticsDebugEnabled"
91-
isEnabled = "YES">
92-
</CommandLineArgument>
93-
</CommandLineArguments>
9485
<AdditionalOptions>
9586
</AdditionalOptions>
9687
</LaunchAction>
9788
<ProfileAction
98-
buildConfiguration = "Release"
9989
shouldUseLaunchSchemeArgsEnv = "YES"
10090
savedToolIdentifier = ""
10191
useCustomWorkingDirectory = "NO"
92+
buildConfiguration = "Release"
10293
debugDocumentVersioning = "YES">
10394
<BuildableProductRunnable
10495
runnableDebuggingMode = "0">

‎ios/FirestackApp/AppDelegate.m

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,4 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
3434
return YES;
3535
}
3636

37-
- (void)application:(UIApplication *)application didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings
38-
{
39-
// [Firestack setup:application];
40-
// [FirestackCloudMessaging did]
41-
}
42-
4337
@end

‎ios/FirestackApp/Info.plist

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,17 @@
3535
</dict>
3636
<key>NSLocationWhenInUseUsageDescription</key>
3737
<string></string>
38+
<key>UIAppFonts</key>
39+
<array>
40+
<string>Entypo.ttf</string>
41+
<string>EvilIcons.ttf</string>
42+
<string>FontAwesome.ttf</string>
43+
<string>Foundation.ttf</string>
44+
<string>Ionicons.ttf</string>
45+
<string>MaterialIcons.ttf</string>
46+
<string>Octicons.ttf</string>
47+
<string>Zocial.ttf</string>
48+
</array>
3849
<key>UILaunchStoryboardName</key>
3950
<string>LaunchScreen</string>
4051
<key>UIRequiredDeviceCapabilities</key>
@@ -49,18 +60,5 @@
4960
</array>
5061
<key>UIViewControllerBasedStatusBarAppearance</key>
5162
<false/>
52-
<key>FirebaseAppDelegateProxyEnabled</key>
53-
<true/>
54-
<key>UIAppFonts</key>
55-
<array>
56-
<string>Entypo.ttf</string>
57-
<string>EvilIcons.ttf</string>
58-
<string>FontAwesome.ttf</string>
59-
<string>Foundation.ttf</string>
60-
<string>Ionicons.ttf</string>
61-
<string>MaterialIcons.ttf</string>
62-
<string>Octicons.ttf</string>
63-
<string>Zocial.ttf</string>
64-
</array>
6563
</dict>
6664
</plist>

‎ios/GoogleService-Info (3).plist

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>AD_UNIT_ID_FOR_BANNER_TEST</key>
6+
<string>ca-app-pub-3940256099942544/2934735716</string>
7+
<key>AD_UNIT_ID_FOR_INTERSTITIAL_TEST</key>
8+
<string>ca-app-pub-3940256099942544/4411468910</string>
9+
<key>CLIENT_ID</key>
10+
<string>223760557072-iu0fv6fau7dorfbrm74sep00j5c39ov2.apps.googleusercontent.com</string>
11+
<key>REVERSED_CLIENT_ID</key>
12+
<string>com.googleusercontent.apps.223760557072-iu0fv6fau7dorfbrm74sep00j5c39ov2</string>
13+
<key>API_KEY</key>
14+
<string>AIzaSyAqsLoVlJIAyiTI5KK2B5PEESnfgKTMLI4</string>
15+
<key>GCM_SENDER_ID</key>
16+
<string>223760557072</string>
17+
<key>PLIST_VERSION</key>
18+
<string>1</string>
19+
<key>BUNDLE_ID</key>
20+
<string>io.fullstack.FirestackExample</string>
21+
<key>PROJECT_ID</key>
22+
<string>firestack-example</string>
23+
<key>STORAGE_BUCKET</key>
24+
<string>firestack-example.appspot.com</string>
25+
<key>IS_ADS_ENABLED</key>
26+
<true/>
27+
<key>IS_ANALYTICS_ENABLED</key>
28+
<false/>
29+
<key>IS_APPINVITE_ENABLED</key>
30+
<false/>
31+
<key>IS_GCM_ENABLED</key>
32+
<true/>
33+
<key>IS_SIGNIN_ENABLED</key>
34+
<true/>
35+
<key>GOOGLE_APP_ID</key>
36+
<string>1:223760557072:ios:ffd5dcc4243f836b</string>
37+
<key>DATABASE_URL</key>
38+
<string>https://firestack-example.firebaseio.com</string>
39+
</dict>
40+
</plist>

‎ios/GoogleService-Info.plist

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>AD_UNIT_ID_FOR_BANNER_TEST</key>
6+
<string>ca-app-pub-3940256099942544/2934735716</string>
7+
<key>AD_UNIT_ID_FOR_INTERSTITIAL_TEST</key>
8+
<string>ca-app-pub-3940256099942544/4411468910</string>
9+
<key>CLIENT_ID</key>
10+
<string>223760557072-iu0fv6fau7dorfbrm74sep00j5c39ov2.apps.googleusercontent.com</string>
11+
<key>REVERSED_CLIENT_ID</key>
12+
<string>com.googleusercontent.apps.223760557072-iu0fv6fau7dorfbrm74sep00j5c39ov2</string>
13+
<key>API_KEY</key>
14+
<string>AIzaSyAqsLoVlJIAyiTI5KK2B5PEESnfgKTMLI4</string>
15+
<key>GCM_SENDER_ID</key>
16+
<string>223760557072</string>
17+
<key>PLIST_VERSION</key>
18+
<string>1</string>
19+
<key>BUNDLE_ID</key>
20+
<string>io.fullstack.FirestackExample</string>
21+
<key>PROJECT_ID</key>
22+
<string>firestack-example</string>
23+
<key>STORAGE_BUCKET</key>
24+
<string>firestack-example.appspot.com</string>
25+
<key>IS_ADS_ENABLED</key>
26+
<true/>
27+
<key>IS_ANALYTICS_ENABLED</key>
28+
<false/>
29+
<key>IS_APPINVITE_ENABLED</key>
30+
<false/>
31+
<key>IS_GCM_ENABLED</key>
32+
<true/>
33+
<key>IS_SIGNIN_ENABLED</key>
34+
<true/>
35+
<key>GOOGLE_APP_ID</key>
36+
<string>1:223760557072:ios:ffd5dcc4243f836b</string>
37+
<key>DATABASE_URL</key>
38+
<string>https://firestack-example.firebaseio.com</string>
39+
</dict>
40+
</plist>

0 commit comments

Comments
 (0)