Skip to content

Commit

Permalink
created release 2.1
Browse files Browse the repository at this point in the history
added firebase analytics
  • Loading branch information
mannprerak2 committed Jun 7, 2018
1 parent e78faa0 commit f5abdc9
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 8 deletions.
Binary file modified .idea/caches/build_file_checksums.ser
Binary file not shown.
8 changes: 6 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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'
Binary file modified app/release/app-release.apk
Binary file not shown.
2 changes: 1 addition & 1 deletion app/release/output.json
Original file line number Diff line number Diff line change
@@ -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":{}}]
[{"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":{}}]
6 changes: 4 additions & 2 deletions app/src/main/java/com/pkmnapps/activitydo/ListActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -36,7 +37,7 @@ public class ListActivity extends AppCompatActivity implements ListActivityInter
List<ListItem> listItems;
ListAdapter listAdapter;
RecyclerView recyclerView;

FirebaseAnalytics firebaseAnalytics;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/pkmnapps/activitydo/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -28,7 +29,7 @@ public class MainActivity extends AppCompatActivity
TabFragment.OnFragmentInteractionListener,
HomeFragment.OnFragmentInteractionListener,
QuickNotesFragment.OnFragmentInteractionListener
{
{ private FirebaseAnalytics mFirebaseAnalytics;
boolean home = true;
NavigationView navigationView;
@Override
Expand All @@ -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(){
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/pkmnapps/activitydo/NoteActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@
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;

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);
Expand All @@ -41,7 +43,7 @@ protected void onCreate(Bundle savedInstanceState) {
bodyE.setText(body);

setResult(Activity.RESULT_OK,data);

firebaseAnalytics = FirebaseAnalytics.getInstance(this);
}

@Override
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -92,6 +94,7 @@ protected void onCreate(Bundle savedInstanceState) {
setUpJumpControls();
setUpRecyclerView();
initialiseRecyclerViewData();
mFirebaseAnalytics = FirebaseAnalytics.getInstance(this);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f5abdc9

Please sign in to comment.