Skip to content

Commit 35a6614

Browse files
authored
Merge pull request #70 from edipo2s/develop
Develop
2 parents 6eed285 + 867b79e commit 35a6614

File tree

81 files changed

+505
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+505
-174
lines changed

app/build.gradle

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,12 @@ dependencies {
100100
compile "com.google.firebase:firebase-config:$playServicesVersion"
101101
compile "com.google.firebase:firebase-database:$playServicesVersion"
102102
compile "com.google.firebase:firebase-messaging:$playServicesVersion"
103+
compile "com.google.firebase:firebase-storage:$playServicesVersion"
103104
releaseCompile "com.google.firebase:firebase-crash:$playServicesVersion"
105+
compile "com.google.firebase:firebase-storage:$playServicesVersion"
106+
compile("com.firebaseui:firebase-ui-storage:1.2.0", {
107+
exclude group: "com.google.firebase", module: "firebase-storage"
108+
})
104109

105110
//Fabric
106111
compile("com.crashlytics.sdk.android:answers:1.3.11") {
@@ -111,12 +116,13 @@ dependencies {
111116
}
112117

113118
//Others
114-
compile "com.mixpanel.android:mixpanel-android:4.9.3"
119+
compile "com.facebook.android:facebook-android-sdk:4.19.0"
115120
compile "com.jakewharton.threetenabp:threetenabp:$threetenabpVersion"
116121
compile "com.jakewharton.timber:timber:4.5.1"
117122
compile "org.greenrobot:eventbus:3.0.0"
118123
compile "com.github.bumptech.glide:glide:3.7.0"
119124
compile "com.github.bumptech.glide:okhttp3-integration:1.4.0@aar"
125+
compile "com.mixpanel.android:mixpanel-android:4.9.3"
120126
compile "com.squareup.okio:okio:$okIOVersion"
121127
compile "com.squareup.okhttp3:okhttp:$okHttpVersion"
122128

app/src/debug/java/com/ediposouza/teslesgendstracker/util/MetricsManager.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ object MetricsManager : MetricsConstants() {
2929
Timber.d(screen.name)
3030
}
3131

32-
fun trackSignUp() {
32+
fun trackSignUp(method: String) {
3333
Timber.d("SignUp")
3434
}
3535

36-
fun trackSignIn(user: FirebaseUser?, success: Boolean) {
36+
fun trackSignIn(user: FirebaseUser?, success: Boolean, method: String) {
3737
Timber.d("SignIn success: $success")
3838
}
3939

app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,10 @@
122122
android:name="io.fabric.ApiKey"
123123
android:value="e056905fcbc01f84ea9cad8acf63b74cb07f2506" />
124124

125+
<meta-data
126+
android:name="com.facebook.sdk.ApplicationId"
127+
android:value="@string/facebook_app_id" />
128+
125129
</application>
126130

127131
</manifest>
Binary file not shown.
Binary file not shown.
-30.1 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)