#69[1h]. Add import feature.

Evgenii Kanivets · Evgenii Kanivets · commit e64c870ce94b · 2016-06-28T13:02:12.000+03:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -73,6 +73,11 @@
             android:label="@string/title_charts"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Default" />
+        <activity
+            android:name=".activity.ImportActivity"
+            android:label="@string/title_import"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.Default" />
 
         <provider
             android:name="android.support.v4.content.FileProvider"
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/ExportActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/ExportActivity.java
@@ -7,7 +7,7 @@
 
 import com.blogspot.e_kanivets.moneytracker.R;
 import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity;
-import com.blogspot.e_kanivets.moneytracker.controller.ExportController;
+import com.blogspot.e_kanivets.moneytracker.controller.external.ExportController;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/ImportActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/ImportActivity.java
@@ -0,0 +1,45 @@
+package com.blogspot.e_kanivets.moneytracker.activity;
+
+import android.widget.EditText;
+
+import com.blogspot.e_kanivets.moneytracker.R;
+import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity;
+import com.blogspot.e_kanivets.moneytracker.controller.external.ImportController;
+import com.blogspot.e_kanivets.moneytracker.entity.data.Record;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import butterknife.Bind;
+import butterknife.OnClick;
+
+public class ImportActivity extends BaseBackActivity {
+    @Inject
+    ImportController importController;
+
+    @Bind(R.id.et_import_data)
+    EditText etImportData;
+
+    @Override
+    protected int getContentViewId() {
+        return R.layout.activity_import;
+    }
+
+    @Override
+    protected boolean initData() {
+        boolean result = super.initData();
+        getAppComponent().inject(ImportActivity.this);
+        return result;
+    }
+
+    @OnClick(R.id.btn_import)
+    public void importRecords() {
+        String data = etImportData.getText().toString().trim();
+        List<Record> recordList = importController.importRecordsFromCsv(data);
+        showToast(getString(R.string.records_imported, recordList.size()));
+
+        setResult(RESULT_OK);
+        finish();
+    }
+}
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/base/BaseDrawerActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/base/BaseDrawerActivity.java
@@ -11,6 +11,7 @@
 import com.blogspot.e_kanivets.moneytracker.R;
 import com.blogspot.e_kanivets.moneytracker.activity.ChartsActivity;
 import com.blogspot.e_kanivets.moneytracker.activity.ExportActivity;
+import com.blogspot.e_kanivets.moneytracker.activity.ImportActivity;
 import com.blogspot.e_kanivets.moneytracker.activity.SettingsActivity;
 import com.blogspot.e_kanivets.moneytracker.activity.account.AccountsActivity;
 import com.blogspot.e_kanivets.moneytracker.activity.exchange_rate.ExchangeRatesActivity;
@@ -29,6 +30,7 @@ public abstract class BaseDrawerActivity extends BaseActivity
     private static final int REQUEST_ACCOUNTS = 1;
     private static final int REQUEST_RATES = 2;
     private static final int REQUEST_SETTINGS = 3;
+    private static final int REQUEST_IMPORT = 4;
 
     @Bind(R.id.drawer_layout)
     DrawerLayout drawer;
@@ -82,6 +84,11 @@ public boolean onNavigationItemSelected(MenuItem item) {
                 startActivity(new Intent(BaseDrawerActivity.this, ChartsActivity.class));
                 break;
 
+            case R.id.nav_import:
+                startActivityForResult(new Intent(BaseDrawerActivity.this, ImportActivity.class),
+                        REQUEST_IMPORT);
+                break;
+
             case R.id.nav_export:
                 startActivity(new Intent(BaseDrawerActivity.this, ExportActivity.class));
                 break;
@@ -117,6 +124,10 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                     update();
                     break;
 
+                case REQUEST_IMPORT:
+                    update();
+                    break;
+
                 default:
                     break;
             }
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/external/ExportController.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/external/ExportController.java
@@ -1,4 +1,4 @@
-package com.blogspot.e_kanivets.moneytracker.controller;
+package com.blogspot.e_kanivets.moneytracker.controller.external;
 
 import com.blogspot.e_kanivets.moneytracker.controller.data.CategoryController;
 import com.blogspot.e_kanivets.moneytracker.controller.data.RecordController;
@@ -16,13 +16,6 @@
  * @author Evgenii Kanivets
  */
 public class ExportController {
-    private static final String HEAD_TIME = "time";
-    private static final String HEAD_TITLE = "title";
-    private static final String HEAD_CATEGORY = "category";
-    private static final String HEAD_PRICE = "price";
-    private static final String HEAD_CURRENCY = "currency";
-    private static final String DELIMITER = ";";
-
     private final RecordController recordController;
     private final CategoryController categoryController;
 
@@ -37,11 +30,11 @@ public List<String> getRecordsForExport(long fromDate, long toDate) {
         /* First of all add a header */
         @SuppressWarnings("StringBufferReplaceableByString")
         StringBuilder sb = new StringBuilder();
-        sb.append(HEAD_TIME).append(DELIMITER);
-        sb.append(HEAD_TITLE).append(DELIMITER);
-        sb.append(HEAD_CATEGORY).append(DELIMITER);
-        sb.append(HEAD_PRICE).append(DELIMITER);
-        sb.append(HEAD_CURRENCY);
+        sb.append(Head.TIME).append(Head.DELIMITER);
+        sb.append(Head.TITLE).append(Head.DELIMITER);
+        sb.append(Head.CATEGORY).append(Head.DELIMITER);
+        sb.append(Head.PRICE).append(Head.DELIMITER);
+        sb.append(Head.CURRENCY);
 
         result.add(sb.toString());
 
@@ -52,16 +45,16 @@ public List<String> getRecordsForExport(long fromDate, long toDate) {
 
         for (Record record : recordList) {
             sb = new StringBuilder();
-            sb.append(record.getTime()).append(DELIMITER);
-            sb.append(record.getTitle()).append(DELIMITER);
+            sb.append(record.getTime()).append(Head.DELIMITER);
+            sb.append(record.getTitle()).append(Head.DELIMITER);
 
             Category category = null;
             if (record.getCategory() != null)
                 category = categoryController.read(record.getCategory().getId());
 
-            sb.append(category == null ? "NONE" : category.getName()).append(DELIMITER);
+            sb.append(category == null ? "NONE" : category.getName()).append(Head.DELIMITER);
             sb.append(record.getType() == 0 ? record.getFullPrice()
-                    : -record.getFullPrice()).append(DELIMITER);
+                    : -record.getFullPrice()).append(Head.DELIMITER);
             sb.append(record.getCurrency() == null ? DbHelper.DEFAULT_ACCOUNT_CURRENCY
                     : record.getCurrency());
 
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/external/Head.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/external/Head.java
@@ -0,0 +1,17 @@
+package com.blogspot.e_kanivets.moneytracker.controller.external;
+
+/**
+ * Interface for head titles in import/export features.
+ * Created on 6/28/16.
+ *
+ * @author Evgenii Kanivets
+ */
+public interface Head {
+    String TIME = "time";
+    String TITLE = "title";
+    String CATEGORY = "category";
+    String PRICE = "price";
+    String CURRENCY = "currency";
+    String DELIMITER = ";";
+    int COLUMN_COUNT = 5;
+}
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/external/ImportController.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/external/ImportController.java
@@ -0,0 +1,70 @@
+package com.blogspot.e_kanivets.moneytracker.controller.external;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import com.blogspot.e_kanivets.moneytracker.controller.data.RecordController;
+import com.blogspot.e_kanivets.moneytracker.entity.data.Account;
+import com.blogspot.e_kanivets.moneytracker.entity.data.Category;
+import com.blogspot.e_kanivets.moneytracker.entity.data.Record;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Controller class to encapsulate import logic.
+ * Created on 6/28/16.
+ *
+ * @author Evgenii Kanivets
+ */
+public class ImportController {
+    private final RecordController recordController;
+
+    public ImportController(RecordController recordController) {
+        this.recordController = recordController;
+    }
+
+    @NonNull
+    public List<Record> importRecordsFromCsv(@Nullable String csv) {
+        List<Record> recordList = new ArrayList<>();
+        if (csv == null) return recordList;
+
+        String lines[] = csv.split("\\r?\\n");
+        for (String line : lines) {
+            String[] words = line.split(Head.DELIMITER);
+            if (words.length != Head.COLUMN_COUNT) continue;
+
+            String timeCol = words[0];
+            String titleCol = words[1];
+            String categoryCol = words[2];
+            String priceCol = words[3];
+            String currencyCol = words[4];
+
+            try {
+                long time = Long.parseLong(timeCol);
+                String title = titleCol.trim();
+                String categoryName = categoryCol.trim();
+                double price = Double.parseDouble(priceCol);
+                String currency = currencyCol.trim();
+
+                if (currency.length() != 3) continue;
+                if (categoryName.isEmpty()) continue;
+
+                int type;
+                if (price < 0.0) type = Record.TYPE_EXPENSE;
+                else type = Record.TYPE_INCOME;
+
+                Category category = new Category(categoryName);
+                Account account = new Account(-1, "MOCK", -1, currency, 0);
+
+                Record record = new Record(time, type, title, category, Math.abs(price), account, currency);
+                Record createdRecord = recordController.create(record);
+                if (createdRecord != null) recordList.add(createdRecord);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        return recordList;
+    }
+}
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/di/AppComponent.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/di/AppComponent.java
@@ -2,6 +2,7 @@
 
 import com.blogspot.e_kanivets.moneytracker.activity.ChartsActivity;
 import com.blogspot.e_kanivets.moneytracker.activity.ExportActivity;
+import com.blogspot.e_kanivets.moneytracker.activity.ImportActivity;
 import com.blogspot.e_kanivets.moneytracker.activity.ReportActivity;
 import com.blogspot.e_kanivets.moneytracker.activity.SettingsActivity;
 import com.blogspot.e_kanivets.moneytracker.activity.account.AccountsActivity;
@@ -48,6 +49,8 @@ public interface AppComponent {
 
     void inject(TransferActivity transferActivity);
 
+    void inject(ImportActivity importActivity);
+
     void inject(ExportActivity exportActivity);
 
     void inject(ReportActivity reportActivity);
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/di/module/ControllerModule.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/di/module/ControllerModule.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.support.annotation.NonNull;
 
-import com.blogspot.e_kanivets.moneytracker.controller.ExportController;
+import com.blogspot.e_kanivets.moneytracker.controller.external.ExportController;
 import com.blogspot.e_kanivets.moneytracker.controller.FormatController;
 import com.blogspot.e_kanivets.moneytracker.controller.PeriodController;
 import com.blogspot.e_kanivets.moneytracker.controller.data.AccountController;
@@ -13,6 +13,7 @@
 import com.blogspot.e_kanivets.moneytracker.controller.PreferenceController;
 import com.blogspot.e_kanivets.moneytracker.controller.data.RecordController;
 import com.blogspot.e_kanivets.moneytracker.controller.data.TransferController;
+import com.blogspot.e_kanivets.moneytracker.controller.external.ImportController;
 import com.blogspot.e_kanivets.moneytracker.entity.data.Account;
 import com.blogspot.e_kanivets.moneytracker.entity.data.Category;
 import com.blogspot.e_kanivets.moneytracker.entity.data.ExchangeRate;
@@ -114,4 +115,11 @@ public ExportController providesExportController(RecordController recordControll
                                                      CategoryController categoryController) {
         return new ExportController(recordController, categoryController);
     }
+
+    @Provides
+    @NonNull
+    @Singleton
+    public ImportController providesImportController(RecordController recordController) {
+        return new ImportController(recordController);
+    }
 }
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_import.png b/app/src/main/res/drawable-xxxhdpi/ic_import.png
diff --git a/app/src/main/res/layout/activity_import.xml b/app/src/main/res/layout/activity_import.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".activity.ImportActivity">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+    </android.support.design.widget.AppBarLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/light_grey"
+        android:orientation="vertical"
+        android:padding="@dimen/activity_horizontal_margin"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <EditText
+            android:id="@+id/et_import_data"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_gravity="center_horizontal|top"
+            android:layout_weight="1"
+            android:gravity="top"
+            android:textSize="12sp" />
+
+        <Button
+            android:id="@+id/btn_import"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/activity_vertical_margin"
+            android:background="@drawable/selector_add_income"
+            android:padding="15dp"
+            android:text="@string/title_import" />
+
+    </LinearLayout>
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/menu/menu_nav_drawer.xml b/app/src/main/res/menu/menu_nav_drawer.xml
@@ -16,6 +16,10 @@
     </group>
 
     <group android:id="@+id/group_2">
+        <item
+            android:id="@+id/nav_import"
+            android:icon="@drawable/ic_import"
+            android:title="@string/title_import" />
         <item
             android:id="@+id/nav_export"
             android:icon="@drawable/ic_export"
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -64,4 +64,7 @@
     <string name="expenses">Расходы</string>
 
     <string name="display_precision">Точность отображения</string>
+
+    <string name="title_import">Импорт</string>
+    <string name="records_imported">%1$s записей было импортировано</string>
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
@@ -64,4 +64,7 @@
     <string name="expenses">Витрати</string>
 
     <string name="display_precision">Точність відображення</string>
+
+    <string name="title_import">Iмпорт</string>
+    <string name="records_imported">%1$s записів було імпортовано</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -74,5 +74,8 @@
     <string name="precision_math">9.99$ = 10$</string>
     <string name="precision_int">9.99$ = 9$</string>
     <string name="precision_none">9.99$ = 9.99$</string>
+
+    <string name="title_import">Import</string>
+    <string name="records_imported">%1$s records has been imported</string>
     <!-- Not translated strings -->
 </resources>
