Merge pull request #136 from evgenii-kanivets/dev

Month text summary. BYN currency. Update tools.

Author: Evgenii

.travis.yml

@@ -1,16 +1,17 @@
 language: android
+jdk: oraclejdk8
 android:
   components:
     # Uncomment the lines below if you want to
     # use the latest revision of Android SDK Tools
-    # - platform-tools
-    # - tools
+    - platform-tools
+    - tools
 
     # The BuildTools version used by your project
-    - build-tools-22.0.1
+    - build-tools-25.0.2
 
     # The SDK version used to compile your project
-    - android-23
+    - android-25
 
     # Additional components
     - extra-google-google_play_services

app/build.gradle

@@ -17,12 +17,12 @@ repositories {
 apply plugin: 'com.neenbedankt.android-apt'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion '21.1.2'
+    compileSdkVersion 25
+    buildToolsVersion '25.0.2'
     defaultConfig {
         applicationId 'com.blogspot.e_kanivets.moneytracker'
         minSdkVersion 17
-        targetSdkVersion 23
+        targetSdkVersion 25
         versionCode 18
         versionName '1.8.1'
     }
@@ -62,24 +62,28 @@ apply plugin: 'com.getkeepsafe.dexcount'
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-v4:23.2.1'
-    compile 'com.android.support:appcompat-v7:23.2.1'
-    compile 'com.android.support:design:23.2.1'
 
-    compile 'com.jakewharton:butterknife:7.0.1' // View annotation bindings
-    compile 'com.google.dagger:dagger:2.0.1' // Dependency injection tool
-    compile 'com.github.PhilJay:MPAndroidChart:v2.2.4' // Charts
-    compile 'com.jakewharton.timber:timber:4.1.2' // Advanced logging tool
+    // View annotation bindings
+    // Dependency injection tool
+    // Charts
+    // Advanced logging tool
 
-    apt 'com.google.dagger:dagger-compiler:2.0.1'
-    provided 'org.glassfish:javax.annotation:10.0-b28'
 
+    compile('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') {
+        transitive = true;
+    }
+    compile 'com.android.support:support-v4:25.1.0'
+    compile 'com.android.support:appcompat-v7:25.1.0'
+    compile 'com.android.support:design:25.1.0'
+    compile 'com.jakewharton:butterknife:7.0.1'
+    compile 'com.google.dagger:dagger:2.0.1'
+    compile 'com.github.PhilJay:MPAndroidChart:v2.2.4'
+    compile 'com.jakewharton.timber:timber:4.1.2'
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:2.0.43-beta'
     androidTestCompile 'com.crittercism.dexmaker:dexmaker:1.4'
     androidTestCompile 'com.crittercism.dexmaker:dexmaker-dx:1.4'
     androidTestCompile 'com.crittercism.dexmaker:dexmaker-mockito:1.4'
-    compile('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') {
-        transitive = true;
-    }
+    apt 'com.google.dagger:dagger-compiler:2.0.1'
+    provided 'org.glassfish:javax.annotation:10.0-b28'
 }

app/src/main/AndroidManifest.xml

@@ -67,7 +67,7 @@
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Default" />
         <activity
-            android:name=".activity.ChartsActivity"
+            android:name=".activity.charts.ChartsActivity"
             android:label="@string/title_charts"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Default" />

app/src/main/java/com/blogspot/e_kanivets/moneytracker/MtApp.java

@@ -7,7 +7,9 @@
 import com.blogspot.e_kanivets.moneytracker.di.module.ControllerModule;
 import com.blogspot.e_kanivets.moneytracker.di.module.repo.CachedRepoModule;
 
+import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy;
 import com.crashlytics.android.Crashlytics;
+
 import io.fabric.sdk.android.Fabric;
 import timber.log.Timber;
 
@@ -29,15 +31,18 @@ public static MtApp get() {
     @Override
     public void onCreate() {
         super.onCreate();
-        if (!BuildConfig.DEBUG) {
-            Fabric.with(this, new Crashlytics());
-        }
 
         mtApp = this;
         buildAppComponent();
 
-        if (BuildConfig.DEBUG) Timber.plant(new Timber.DebugTree());
-        else Timber.plant(new ReleaseTree());
+        if (BuildConfig.DEBUG) {
+            Timber.plant(new Timber.DebugTree());
+            AnswersProxy.get().setEnabled(false);
+        } else {
+            Timber.plant(new ReleaseTree());
+            Fabric.with(this, new Crashlytics());
+            AnswersProxy.get().setEnabled(true);
+        }
     }
 
     public AppComponent getAppComponent() {

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/ChartsActivity.java

@@ -14,8 +14,7 @@
 import com.blogspot.e_kanivets.moneytracker.adapter.AccountAdapter;
 import com.blogspot.e_kanivets.moneytracker.controller.data.AccountController;
 import com.blogspot.e_kanivets.moneytracker.ui.presenter.AccountsSummaryPresenter;
-import com.crashlytics.android.answers.Answers;
-import com.crashlytics.android.answers.ContentViewEvent;
+import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy;
 
 import javax.inject.Inject;
 
@@ -101,22 +100,14 @@ public boolean onContextItemSelected(MenuItem item) {
     }
 
     public void makeTransfer() {
-        // Answers event
-        Answers.getInstance().logContentView(new ContentViewEvent()
-                .putContentName("Add Transfer")
-                .putContentType("Button"));
-
+        AnswersProxy.get().logButton("Add Transfer");
         startActivityForResult(new Intent(AccountsActivity.this, TransferActivity.class),
                 REQUEST_TRANSFER);
     }
 
     @OnClick(R.id.btn_add_account)
     public void addAccount() {
-        // Answers event
-        Answers.getInstance().logContentView(new ContentViewEvent()
-                .putContentName("Add Account")
-                .putContentType("Button"));
-
+        AnswersProxy.get().logButton("Add Account");
         Intent intent = new Intent(AccountsActivity.this, AddAccountActivity.class);
         startActivityForResult(intent, REQUEST_ADD_ACCOUNT);
     }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AccountsActivity.java

@@ -11,10 +11,9 @@
 import com.blogspot.e_kanivets.moneytracker.controller.data.AccountController;
 import com.blogspot.e_kanivets.moneytracker.controller.CurrencyController;
 import com.blogspot.e_kanivets.moneytracker.entity.data.Account;
+import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy;
 import com.blogspot.e_kanivets.moneytracker.util.validator.AccountValidator;
 import com.blogspot.e_kanivets.moneytracker.util.validator.IValidator;
-import com.crashlytics.android.answers.Answers;
-import com.crashlytics.android.answers.ContentViewEvent;
 
 import java.util.ArrayList;
 
@@ -79,17 +78,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     private void tryAddAccount() {
-        // Answers event
-        Answers.getInstance().logContentView(new ContentViewEvent()
-                .putContentName("Done Account")
-                .putContentType("Button"));
-
+        AnswersProxy.get().logButton("Done Account");
         if (addAccount()) {
-            // Answers event
-            Answers.getInstance().logContentView(new ContentViewEvent()
-                    .putContentName("Done Account")
-                    .putContentType("Event"));
-
+            AnswersProxy.get().logEvent("Done Account");
             setResult(RESULT_OK);
             finish();
         }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AddAccountActivity.java

@@ -12,10 +12,9 @@
 import com.blogspot.e_kanivets.moneytracker.controller.data.TransferController;
 import com.blogspot.e_kanivets.moneytracker.entity.data.Account;
 import com.blogspot.e_kanivets.moneytracker.entity.data.Transfer;
+import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy;
 import com.blogspot.e_kanivets.moneytracker.util.validator.IValidator;
 import com.blogspot.e_kanivets.moneytracker.util.validator.TransferValidator;
-import com.crashlytics.android.answers.Answers;
-import com.crashlytics.android.answers.ContentViewEvent;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -100,17 +99,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     private void tryTransfer() {
-        // Answers event
-        Answers.getInstance().logContentView(new ContentViewEvent()
-                .putContentName("Done Transfer")
-                .putContentType("Button"));
-
+        AnswersProxy.get().logButton("Done Transfer");
         if (doTransfer()) {
-            // Answers event
-            Answers.getInstance().logContentView(new ContentViewEvent()
-                    .putContentName("Done Transfer")
-                    .putContentType("Event"));
-
+            AnswersProxy.get().logEvent("Done Transfer");
             setResult(RESULT_OK);
             finish();
         }