diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index ff00e28..9350830 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index 73496c4..c281b4a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "com.pkmnapps.activitydo" minSdkVersion 19 targetSdkVersion 27 - versionCode 2 - versionName "2.0" + versionCode 3 + versionName "2.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" multiDexEnabled true @@ -43,4 +43,8 @@ dependencies { implementation 'com.android.support:multidex:1.0.3' + implementation 'com.google.firebase:firebase-core:16.0.0' + } + +apply plugin: 'com.google.gms.google-services' diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 1937f43..66ec853 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/output.json b/app/release/output.json index 6d4de0c..6f593b5 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"2.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":3,"versionName":"2.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/pkmnapps/activitydo/ListActivity.java b/app/src/main/java/com/pkmnapps/activitydo/ListActivity.java index e85139e..a65a786 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/ListActivity.java +++ b/app/src/main/java/com/pkmnapps/activitydo/ListActivity.java @@ -18,6 +18,7 @@ import android.widget.EditText; import android.widget.TextView; +import com.google.firebase.analytics.FirebaseAnalytics; import com.pkmnapps.activitydo.adapters.ListAdapter; import com.pkmnapps.activitydo.custominterfaces.ListActivityInterface; import com.pkmnapps.activitydo.databasehelpers.DBHelperList; @@ -36,7 +37,7 @@ public class ListActivity extends AppCompatActivity implements ListActivityInter List listItems; ListAdapter listAdapter; RecyclerView recyclerView; - + FirebaseAnalytics firebaseAnalytics; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -80,8 +81,9 @@ public boolean onKey(View v, int keyCode, KeyEvent event) { listAdapter = new ListAdapter(listItems, ListActivity.this); recyclerView.setAdapter(listAdapter); - + setResult(Activity.RESULT_OK,data); + firebaseAnalytics = FirebaseAnalytics.getInstance(this); } @Override diff --git a/app/src/main/java/com/pkmnapps/activitydo/MainActivity.java b/app/src/main/java/com/pkmnapps/activitydo/MainActivity.java index db57f0b..a7e5adf 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/MainActivity.java +++ b/app/src/main/java/com/pkmnapps/activitydo/MainActivity.java @@ -19,6 +19,7 @@ import android.view.MenuItem; import android.view.SubMenu; +import com.google.firebase.analytics.FirebaseAnalytics; import com.pkmnapps.activitydo.databasehelpers.DBHelper; import com.pkmnapps.activitydo.dataclasses.ActivityData; @@ -28,7 +29,7 @@ public class MainActivity extends AppCompatActivity TabFragment.OnFragmentInteractionListener, HomeFragment.OnFragmentInteractionListener, QuickNotesFragment.OnFragmentInteractionListener -{ +{ private FirebaseAnalytics mFirebaseAnalytics; boolean home = true; NavigationView navigationView; @Override @@ -55,6 +56,7 @@ protected void onCreate(Bundle savedInstanceState) { FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); fragmentTransaction.replace(R.id.fragment_parent_main,new TabFragment(),"back").commit(); + mFirebaseAnalytics = FirebaseAnalytics.getInstance(this); } public void menuAddPinned(){ diff --git a/app/src/main/java/com/pkmnapps/activitydo/NoteActivity.java b/app/src/main/java/com/pkmnapps/activitydo/NoteActivity.java index 644004e..89d0473 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/NoteActivity.java +++ b/app/src/main/java/com/pkmnapps/activitydo/NoteActivity.java @@ -14,6 +14,7 @@ import android.view.View; import android.widget.EditText; +import com.google.firebase.analytics.FirebaseAnalytics; import com.pkmnapps.activitydo.databasehelpers.DBHelperText; import com.pkmnapps.activitydo.dataclasses.SimpleTextWidget; @@ -21,6 +22,7 @@ public class NoteActivity extends AppCompatActivity { String uid,head,body; EditText headE,bodyE; Intent data; + private FirebaseAnalytics firebaseAnalytics; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -41,7 +43,7 @@ protected void onCreate(Bundle savedInstanceState) { bodyE.setText(body); setResult(Activity.RESULT_OK,data); - + firebaseAnalytics = FirebaseAnalytics.getInstance(this); } @Override diff --git a/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java b/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java index f5ae6f4..990781e 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java +++ b/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java @@ -39,6 +39,7 @@ import com.flipboard.bottomsheet.BottomSheetLayout; import com.flipboard.bottomsheet.commons.ImagePickerSheetView; import com.flipboard.bottomsheet.commons.MenuSheetView; +import com.google.firebase.analytics.FirebaseAnalytics; import com.pkmnapps.activitydo.adapters.ActivityContentAdapter; import com.pkmnapps.activitydo.custominterfaces.TaskActivityInterface; import com.pkmnapps.activitydo.databasehelpers.DBHelper; @@ -71,6 +72,7 @@ public class TaskActivity extends AppCompatActivity implements TaskActivityInter Uri cameraImageUri = null; String tempUid; DBHelperWidgets dbHelperWidgets; + private FirebaseAnalytics mFirebaseAnalytics; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -92,6 +94,7 @@ protected void onCreate(Bundle savedInstanceState) { setUpJumpControls(); setUpRecyclerView(); initialiseRecyclerViewData(); + mFirebaseAnalytics = FirebaseAnalytics.getInstance(this); } @Override diff --git a/build.gradle b/build.gradle index 8fd7939..4c5192e 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.1.2' - + classpath 'com.google.gms:google-services:4.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files