Merge pull request #64 from evgenii-kanivets/dev

v1.5.0

Author: Evgenii

app/build.gradle

@@ -6,10 +6,10 @@ android {
     buildToolsVersion '21.1.2'
     defaultConfig {
         applicationId 'com.blogspot.e_kanivets.moneytracker'
-        minSdkVersion 10
+        minSdkVersion 17
         targetSdkVersion 23
-        versionCode 4
-        versionName '1.4.0'
+        versionCode 5
+        versionName '1.5.0'
     }
     signingConfigs {
         releaseConfig {
@@ -45,8 +45,9 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-v4:23.0.0'
-    compile 'com.android.support:appcompat-v7:23.0.0'
+    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'
     compile 'com.google.dagger:dagger:2.0.1'
 
@@ -55,8 +56,7 @@ dependencies {
 
     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"
+    androidTestCompile 'com.crittercism.dexmaker:dexmaker:1.4'
+    androidTestCompile 'com.crittercism.dexmaker:dexmaker-dx:1.4'
+    androidTestCompile 'com.crittercism.dexmaker:dexmaker-mockito:1.4'
 }

app/src/androidTest/java/com/blogspot/e_kanivets/moneytracker/repo/AccountRepoTest.java

@@ -3,7 +3,6 @@
 import android.content.ContentValues;
 import android.database.Cursor;
 
-import com.blogspot.e_kanivets.moneytracker.DbHelper;
 import com.blogspot.e_kanivets.moneytracker.entity.Account;
 
 import junit.framework.TestCase;

app/src/androidTest/java/com/blogspot/e_kanivets/moneytracker/repo/CategoryRepoTest.java

@@ -3,7 +3,6 @@
 import android.content.ContentValues;
 import android.database.Cursor;
 
-import com.blogspot.e_kanivets.moneytracker.DbHelper;
 import com.blogspot.e_kanivets.moneytracker.entity.Category;
 
 import junit.framework.TestCase;

app/src/androidTest/java/com/blogspot/e_kanivets/moneytracker/repo/ExchangeRateRepoTest.java

@@ -3,7 +3,6 @@
 import android.content.ContentValues;
 import android.database.Cursor;
 
-import com.blogspot.e_kanivets.moneytracker.DbHelper;
 import com.blogspot.e_kanivets.moneytracker.entity.ExchangeRate;
 
 import junit.framework.TestCase;

app/src/androidTest/java/com/blogspot/e_kanivets/moneytracker/repo/RecordRepoTest.java

@@ -3,7 +3,6 @@
 import android.content.ContentValues;
 import android.database.Cursor;
 
-import com.blogspot.e_kanivets.moneytracker.DbHelper;
 import com.blogspot.e_kanivets.moneytracker.entity.Record;
 
 import junit.framework.TestCase;
@@ -47,7 +46,7 @@ public void testContentValues() throws Exception {
         expected.put(DbHelper.TYPE_COLUMN, Record.TYPE_EXPENSE);
         expected.put(DbHelper.TITLE_COLUMN, "title");
         expected.put(DbHelper.CATEGORY_ID_COLUMN, 1L);
-        expected.put(DbHelper.PRICE_COLUMN, 100);
+        expected.put(DbHelper.PRICE_COLUMN, 100.0);
         expected.put(DbHelper.ACCOUNT_ID_COLUMN, 1L);
         expected.put(DbHelper.CURRENCY_COLUMN, "NON");
 

app/src/androidTest/java/com/blogspot/e_kanivets/moneytracker/repo/TransferRepoTest.java

@@ -3,7 +3,6 @@
 import android.content.ContentValues;
 import android.database.Cursor;
 
-import com.blogspot.e_kanivets.moneytracker.DbHelper;
 import com.blogspot.e_kanivets.moneytracker.entity.Transfer;
 
 import junit.framework.TestCase;

app/src/main/AndroidManifest.xml

@@ -2,24 +2,14 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.blogspot.e_kanivets.moneytracker">
 
-    <!-- permissions to download and cache video ads for playback -->
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-
     <application
         android:name=".MtApp"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/Theme.Default">
         <activity
-            android:name=".activity.ReportActivity"
-            android:label="@string/report"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.Default" />
-        <activity
-            android:name=".activity.NavDrawerActivity"
+            android:name=".activity.record.MainActivity"
             android:label="@string/app_name"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Default">
@@ -30,28 +20,63 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.AddRecordActivity"
+            android:name=".activity.ReportActivity"
+            android:label="@string/report"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.Default" />
+        <activity
+            android:name=".activity.record.AddRecordActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Default"
             android:windowSoftInputMode="stateVisible" />
         <activity
-            android:name=".activity.AddAccountActivity"
+            android:name=".activity.account.AddAccountActivity"
             android:label="@string/title_add_account"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Default"
             android:windowSoftInputMode="stateVisible" />
         <activity
-            android:name=".activity.AddExchangeRateActivity"
+            android:name=".activity.exchange_rate.AddExchangeRateActivity"
             android:label="@string/add_exchange_rate"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Default"
             android:windowSoftInputMode="stateVisible" />
         <activity
-            android:name=".activity.TransferActivity"
+            android:name=".activity.account.TransferActivity"
             android:label="@string/transfer"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Default"
             android:windowSoftInputMode="stateVisible" />
+        <activity
+            android:name=".activity.account.AccountsActivity"
+            android:label="@string/title_accounts"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.Default" />
+        <activity
+            android:name=".activity.exchange_rate.ExchangeRatesActivity"
+            android:label="@string/title_exchange_rates"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.Default" />
+        <activity
+            android:name=".activity.ExportActivity"
+            android:label="@string/title_export"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.Default" />
+        <activity
+            android:name=".activity.SettingsActivity"
+            android:label="@string/title_settings"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.Default" />
+
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="com.blogspot.e_kanivets.moneytracker"
+            android:grantUriPermissions="true"
+            android:exported="false">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
     </application>
 
-</manifest>
+</manifest>

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

@@ -2,6 +2,11 @@
 
 import android.app.Application;
 
+import com.blogspot.e_kanivets.moneytracker.di.AppComponent;
+import com.blogspot.e_kanivets.moneytracker.di.DaggerAppComponent;
+import com.blogspot.e_kanivets.moneytracker.di.module.ControllerModule;
+import com.blogspot.e_kanivets.moneytracker.di.module.RepoModule;
+
 /**
  * Custom application implementation.
  * Created on 29/08/14.
@@ -16,10 +21,24 @@ public static MtApp get() {
         return mtApp;
     }
 
+    private AppComponent component;
+
     @Override
     public void onCreate() {
         super.onCreate();
 
         mtApp = this;
+        component = buildComponent();
+    }
+
+    public AppComponent getAppComponent() {
+        return component;
+    }
+
+    private AppComponent buildComponent() {
+        return DaggerAppComponent.builder()
+                .repoModule(new RepoModule(get()))
+                .controllerModule(new ControllerModule())
+                .build();
     }
 }

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

@@ -0,0 +1,84 @@
+package com.blogspot.e_kanivets.moneytracker.activity;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.support.annotation.NonNull;
+import android.support.v4.content.FileProvider;
+import android.util.Log;
+
+import com.blogspot.e_kanivets.moneytracker.MtApp;
+import com.blogspot.e_kanivets.moneytracker.R;
+import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity;
+import com.blogspot.e_kanivets.moneytracker.controller.RecordController;
+import com.blogspot.e_kanivets.moneytracker.util.Constants;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.PrintWriter;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import butterknife.OnClick;
+
+public class ExportActivity extends BaseBackActivity {
+    @SuppressWarnings("unused")
+    private static final String TAG = "ExportActivity";
+
+    @Inject
+    RecordController recordController;
+
+    @Override
+    protected int getContentViewId() {
+        return R.layout.activity_export;
+    }
+
+    @Override
+    protected boolean initData() {
+        boolean result = super.initData();
+        MtApp.get().getAppComponent().inject(ExportActivity.this);
+        return result;
+    }
+
+    @OnClick(R.id.btn_export)
+    public void exportRecords() {
+        List<String> records = recordController.getRecordsForExport(0, Long.MAX_VALUE);
+
+        File exportDir = new File(getCacheDir(), "export");
+        boolean exportDirCreated = exportDir.mkdirs();
+        Log.d(TAG, "exportDirCreated: " + exportDirCreated);
+
+        File outFile;
+        if (exportDir.exists()) outFile = new File(exportDir, Constants.DEFAULT_EXPORT_FILE_NAME);
+        else return;
+
+        PrintWriter pw = null;
+        try {
+            pw = new PrintWriter(outFile);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        if (pw != null) {
+            for (String record : records) {
+                pw.println(record);
+                pw.flush();
+            }
+
+            pw.flush();
+            pw.close();
+
+            shareExportedRecords(outFile);
+        }
+    }
+
+    private void shareExportedRecords(@NonNull File exportFile) {
+        Uri fileUri = FileProvider.getUriForFile(ExportActivity.this, getPackageName(), exportFile);
+
+        Intent sendIntent = new Intent();
+        sendIntent.setAction(Intent.ACTION_SEND);
+        sendIntent.putExtra(Intent.EXTRA_STREAM, fileUri);
+        sendIntent.setType("text/plain");
+        startActivity(Intent.createChooser(sendIntent, "Share exported records"));
+    }
+}