diff --git a/app/build.gradle b/app/build.gradle index e36c2a6..fc60d7a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,5 +54,6 @@ dependencies { transitive = true } - compile 'com.google.android.gms:play-services-ads:8.3.0' + compile 'com.google.android.gms:play-services-ads:8.4.0' + compile 'com.google.android.gms:play-services-analytics:8.4.0' } diff --git a/app/google-services.json b/app/google-services.json new file mode 100644 index 0000000..9f0986e --- /dev/null +++ b/app/google-services.json @@ -0,0 +1,45 @@ +{ + "project_info": { + "project_id": "notificationlogger", + "project_number": "592676030769", + "name": "notificationlogger" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:592676030769:android:01536270f9b0bf2a", + "client_id": "android:net.headlezz.notificationlogger", + "client_type": 1, + "android_client_info": { + "package_name": "net.headlezz.notificationlogger" + } + }, + "oauth_client": [], + "api_key": [], + "services": { + "analytics_service": { + "status": 2, + "analytics_property": { + "tracking_id": "UA-39570140-8" + } + }, + "cloud_messaging_service": { + "status": 1, + "apns_config": [] + }, + "appinvite_service": { + "status": 1, + "other_platform_oauth_client": [] + }, + "google_signin_service": { + "status": 1 + }, + "ads_service": { + "status": 1 + } + } + } + ], + "client_info": [], + "ARTIFACT_VERSION": "1" +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a397742..ef53cf6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,6 +2,8 @@ package="net.headlezz.notificationlogger"> + + onCreateLoader(int id, Bundle args) { Timber.d("blacklistloader created"); diff --git a/app/src/main/java/net/headlezz/notificationlogger/preferences/PreferenceActivity.java b/app/src/main/java/net/headlezz/notificationlogger/preferences/PreferenceActivity.java index 98a63f5..653486c 100644 --- a/app/src/main/java/net/headlezz/notificationlogger/preferences/PreferenceActivity.java +++ b/app/src/main/java/net/headlezz/notificationlogger/preferences/PreferenceActivity.java @@ -10,6 +10,7 @@ import android.support.v7.widget.Toolbar; import com.mikepenz.aboutlibraries.LibsBuilder; import com.mikepenz.aboutlibraries.ui.LibsSupportFragment; +import net.headlezz.notificationlogger.Analytics; import net.headlezz.notificationlogger.R; import butterknife.Bind; @@ -46,6 +47,8 @@ public class PreferenceActivity extends AppCompatActivity implements PreferenceF .replace(R.id.fragment_holder, aboutFrag) .addToBackStack("about") .commit(); + + Analytics.trackEvent(Analytics.ACTION_ABOUT); } @Override diff --git a/app/src/main/java/net/headlezz/notificationlogger/preferences/PreferenceFragment.java b/app/src/main/java/net/headlezz/notificationlogger/preferences/PreferenceFragment.java index 230aa2c..2aac65b 100644 --- a/app/src/main/java/net/headlezz/notificationlogger/preferences/PreferenceFragment.java +++ b/app/src/main/java/net/headlezz/notificationlogger/preferences/PreferenceFragment.java @@ -27,6 +27,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; +import net.headlezz.notificationlogger.Analytics; import net.headlezz.notificationlogger.DatabaseUtils; import net.headlezz.notificationlogger.R; import net.headlezz.notificationlogger.logger.LoggedNotification; @@ -64,6 +65,12 @@ public class PreferenceFragment extends PreferenceFragmentCompat implements Pref setBlacklistItemCount(); } + @Override + public void onResume() { + super.onResume(); + Analytics.trackFragment(this); + } + private void setBlacklistItemCount() { new AsyncTask() { @@ -188,6 +195,7 @@ public class PreferenceFragment extends PreferenceFragmentCompat implements Pref snack.show(); } } + Analytics.trackEvent(Analytics.ACTION_EXPORTED); } }.execute(); } @@ -212,6 +220,7 @@ public class PreferenceFragment extends PreferenceFragmentCompat implements Pref @Override public void onClick(DialogInterface dialog, int which) { clearDatabase(); + Analytics.trackEvent(Analytics.ACTION_DATABASE_CLEARED); } }) .create().show(); diff --git a/app/src/main/res/values/system_strings.xml b/app/src/main/res/values/system_strings.xml index c2cd365..778e869 100644 --- a/app/src/main/res/values/system_strings.xml +++ b/app/src/main/res/values/system_strings.xml @@ -1,4 +1,5 @@ ca-app-pub-0000000000000000/0000000000 + UA-39570140-8 \ No newline at end of file diff --git a/app/src/main/res/xml/global_tracker.xml b/app/src/main/res/xml/global_tracker.xml new file mode 100644 index 0000000..b559a82 --- /dev/null +++ b/app/src/main/res/xml/global_tracker.xml @@ -0,0 +1,12 @@ + + + @string/analytics_tracking_id + 100.0 + 1800 + true + false + true + + Home Screen + Preference Screen + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 2152497..007ab6d 100644 --- a/build.gradle +++ b/build.gradle @@ -14,6 +14,7 @@ buildscript { classpath 'com.neenbedankt.gradle.plugins:android-apt:1.6' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files + classpath 'com.google.gms:google-services:1.5.0-beta2' } }