TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Firebase Analytics & Crashlytics

Browse Source
This commit is contained in:
Sergey Solovyev
2023-09-15 11:29:30 +02:00
parent d9bbdff0e0
commit 0a69050e98
9 changed files with 64 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/java/org/solovyev/android/calculator/BaseActivity.java
View File

@@ -5,8 +5,6 @@ import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
import static android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;
import static org.solovyev.android.calculator.App.cast;
import static org.solovyev.android.calculator.Preferences.Gui.keepScreenOn;
import android.app.Activity;
import android.content.SharedPreferences;
import android.graphics.Typeface;
import android.os.Bundle;
@@ -16,7 +14,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.widget.TextView;
import androidx.annotation.DrawableRes;
import androidx.annotation.LayoutRes;
import androidx.annotation.StringRes;
@@ -25,6 +22,10 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import dagger.Lazy;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.inject.Inject;
import org.solovyev.android.Check;
import org.solovyev.android.calculator.ga.Ga;
import org.solovyev.android.calculator.language.Language;
@@ -32,12 +33,6 @@ import org.solovyev.android.calculator.language.Languages;
import org.solovyev.android.calculator.view.Tabs;
import org.solovyev.android.views.dragbutton.DirectionDragImageButton;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.inject.Inject;
import dagger.Lazy;
public abstract class BaseActivity extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
@Nonnull
@@ -79,14 +74,6 @@ public abstract class BaseActivity extends AppCompatActivity implements SharedPr
this.tabs = new Tabs(this);
}
public void reportActivityStop(@Nonnull Activity activity) {
ga.get().getAnalytics().reportActivityStop(activity);
}
public void reportActivityStart(@Nonnull Activity activity) {
ga.get().getAnalytics().reportActivityStart(activity);
}
public static void setFont(@Nonnull View view, @Nonnull Typeface newTypeface) {
if (view instanceof TextView) {
final TextView textView = (TextView) view;
@@ -210,18 +197,6 @@ public abstract class BaseActivity extends AppCompatActivity implements SharedPr
protected void inject(@Nonnull AppComponent component) {
}
@Override
protected void onStart() {
super.onStart();
reportActivityStart(this);
}
@Override
protected void onStop() {
reportActivityStop(this);
super.onStop();
}
@Override
public boolean onKeyUp(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_MENU && event.getRepeatCount() == 0) {

10
app/src/main/java/org/solovyev/android/calculator/BaseDialogFragment.java
View File

@@ -15,8 +15,6 @@ import androidx.annotation.StringRes;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.FragmentActivity;
import com.google.android.gms.analytics.HitBuilders;
import com.google.android.gms.analytics.Tracker;
import com.google.android.material.textfield.TextInputLayout;
import org.solovyev.android.calculator.ga.Ga;
@@ -76,14 +74,6 @@ public abstract class BaseDialogFragment extends DialogFragment implements View.
return dialog;
}
@Override
public void onResume() {
super.onResume();
final Tracker tracker = ga.getTracker();
tracker.setScreenName(getClass().getSimpleName());
tracker.send(new HitBuilders.ScreenViewBuilder().build());
}
protected void onShowDialog(@NonNull AlertDialog dialog, boolean firstTime) {
}

13
app/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
View File

@@ -25,9 +25,6 @@ package org.solovyev.android.calculator;
import android.content.SharedPreferences;
import android.graphics.Typeface;
import android.os.Bundle;
import androidx.annotation.StringRes;
import androidx.appcompat.widget.PopupMenu;
import androidx.core.view.GravityCompat;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.style.StyleSpan;
@@ -36,8 +33,14 @@ import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.FrameLayout;
import androidx.annotation.StringRes;
import androidx.appcompat.widget.PopupMenu;
import androidx.core.view.GravityCompat;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.inject.Inject;
import jscl.AngleUnit;
import jscl.NumeralBase;
import org.solovyev.android.calculator.converter.ConverterFragment;
@@ -46,10 +49,6 @@ import org.solovyev.android.calculator.history.History;
import org.solovyev.android.calculator.keyboard.PartialKeyboardUi;
import org.solovyev.android.widget.menu.CustomPopupMenu;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.inject.Inject;
public class CalculatorActivity extends BaseActivity implements View.OnClickListener {
@Nonnull

52
app/src/main/java/org/solovyev/android/calculator/ga/Ga.java
View File

@@ -2,53 +2,37 @@ package org.solovyev.android.calculator.ga;
import android.app.Application;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.text.TextUtils;
import com.google.android.gms.analytics.GoogleAnalytics;
import com.google.android.gms.analytics.HitBuilders;
import com.google.android.gms.analytics.Tracker;
import org.solovyev.android.calculator.Preferences;
import org.solovyev.android.calculator.R;
import com.google.firebase.analytics.FirebaseAnalytics;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.solovyev.android.calculator.Preferences;
@Singleton
public final class Ga implements SharedPreferences.OnSharedPreferenceChangeListener {
private static final int LAYOUT = 1;
private static final int THEME = 2;
@Nonnull
private final GoogleAnalytics analytics;
@Nonnull
private final Tracker tracker;
private final FirebaseAnalytics analytics;
@Inject
public Ga(@Nonnull Application application, @Nonnull SharedPreferences preferences) {
analytics = GoogleAnalytics.getInstance(application);
tracker = analytics.newTracker(R.xml.ga);
analytics = FirebaseAnalytics.getInstance(application);
preferences.registerOnSharedPreferenceChangeListener(this);
}
private void reportLayout(@Nonnull Preferences.Gui.Mode mode) {
tracker.send(new HitBuilders.EventBuilder().setCustomDimension(LAYOUT, mode.name()).build());
final Bundle params = new Bundle();
params.putString("name", mode.name());
analytics.logEvent("layout", params);
}
private void reportTheme(@Nonnull Preferences.Gui.Theme theme) {
tracker.send(new HitBuilders.EventBuilder().setCustomDimension(THEME, theme.name()).build());
}
@Nonnull
public GoogleAnalytics getAnalytics() {
return analytics;
}
@Nonnull
public Tracker getTracker() {
return tracker;
final Bundle params = new Bundle();
params.putString("name", theme.name());
analytics.logEvent("theme", params);
}
public void onButtonPressed(@Nullable String text) {
@@ -56,11 +40,9 @@ public final class Ga implements SharedPreferences.OnSharedPreferenceChangeListe
return;
}
final HitBuilders.EventBuilder b = new HitBuilders.EventBuilder();
b.setCategory("ui");
b.setAction("click");
b.setLabel(text);
tracker.send(b.build());
final Bundle params = new Bundle();
params.putString("text", text);
analytics.logEvent("click", params);
}
@Override
@@ -78,10 +60,6 @@ public final class Ga implements SharedPreferences.OnSharedPreferenceChangeListe
}
public void onFloatingCalculatorOpened() {
final HitBuilders.EventBuilder b = new HitBuilders.EventBuilder();
b.setCategory("lifecycle");
b.setAction("floating_calculator");
b.setLabel("start");
tracker.send(b.build());
analytics.logEvent("floating_calculator_open", null);
}
}

12
app/src/main/java/org/solovyev/android/calculator/preferences/PurchaseDialogActivity.java
View File

@@ -72,18 +72,6 @@ public class PurchaseDialogActivity extends AppCompatActivity implements Request
checkout.createPurchaseFlow(this);
}
@Override
protected void onStart() {
super.onStart();
ga.getAnalytics().reportActivityStart(this);
}
@Override
protected void onStop() {
ga.getAnalytics().reportActivityStop(this);
super.onStop();
}
private void purchase() {
checkout.whenReady(new Checkout.EmptyListener() {
@Override