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
4 changes: 2 additions & 2 deletions app/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/build
*._.DS_Store
google-services.json
*._.DS_Store
24 changes: 5 additions & 19 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,21 +1,8 @@
buildscript {
repositories {
maven { url 'https://maven.fabric.io/public' }
}

dependencies {
classpath 'io.fabric.tools:gradle:1.+'
}
}
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'io.fabric'

repositories {
maven { url 'https://maven.fabric.io/public' }
mavenCentral()
}
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'

android {
compileSdkVersion 29
Expand Down Expand Up @@ -77,10 +64,6 @@ android {
}

dependencies {
proprietaryImplementation('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') {
transitive = true
}

implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
Expand All @@ -101,4 +84,7 @@ dependencies {
compileOnly 'org.glassfish:javax.annotation:10.0-b28'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.cardview:cardview:1.0.0'

implementation 'com.google.firebase:firebase-analytics:17.5.0'
implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
}
3 changes: 0 additions & 3 deletions app/fabric.properties

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@

import android.content.Context;
import androidx.annotation.Nullable;

import com.crashlytics.android.Crashlytics;
import com.crashlytics.android.answers.Answers;
import com.crashlytics.android.answers.ContentViewEvent;
import io.fabric.sdk.android.Fabric;
import com.google.firebase.analytics.FirebaseAnalytics;

/**
* Util class that wraps all Crashlytics interactions to disable Answers in
Expand All @@ -31,9 +27,10 @@ private CrashlyticsProxy() {
}

private boolean enabled;
private static FirebaseAnalytics analytics;

public static void startCrashlytics(Context context) {
Fabric.with(context, new Crashlytics());
analytics = FirebaseAnalytics.getInstance(context);
}

public void setEnabled(boolean enabled) {
Expand All @@ -46,9 +43,7 @@ public boolean isEnabled() {

public boolean logEvent(@Nullable String eventName) {
if (enabled) {
Answers.getInstance().logContentView(new ContentViewEvent()
.putContentName(eventName)
.putContentType("Event"));
analytics.logEvent(eventName, null);
return true;
} else {
return false;
Expand All @@ -57,9 +52,7 @@ public boolean logEvent(@Nullable String eventName) {

public boolean logButton(@Nullable String buttonName) {
if (enabled) {
Answers.getInstance().logContentView(new ContentViewEvent()
.putContentName(buttonName)
.putContentType("Button"));
analytics.logEvent(buttonName, null);
return true;
} else {
return false;
Expand Down
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ buildscript {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.4'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
}
}

Expand Down