#69[30m]. Add help for import feature.

Evgenii Kanivets · Evgenii Kanivets · commit dae57fec2cc0 · 2016-06-28T13:30:11.000+03:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -59,7 +59,7 @@
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Default" />
         <activity
-            android:name=".activity.ExportActivity"
+            android:name=".activity.external.ExportActivity"
             android:label="@string/title_export"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Default" />
@@ -74,7 +74,7 @@
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Default" />
         <activity
-            android:name=".activity.ImportActivity"
+            android:name=".activity.external.ImportActivity"
             android:label="@string/title_import"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Default" />
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
@@ -10,8 +10,8 @@
 
 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.external.ExportActivity;
+import com.blogspot.e_kanivets.moneytracker.activity.external.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;
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/external/ExportActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/external/ExportActivity.java
@@ -1,4 +1,4 @@
-package com.blogspot.e_kanivets.moneytracker.activity;
+package com.blogspot.e_kanivets.moneytracker.activity.external;
 
 import android.content.Intent;
 import android.net.Uri;
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/external/ImportActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/external/ImportActivity.java
@@ -1,5 +1,8 @@
-package com.blogspot.e_kanivets.moneytracker.activity;
+package com.blogspot.e_kanivets.moneytracker.activity.external;
 
+import android.support.v7.app.AlertDialog;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.widget.EditText;
 
 import com.blogspot.e_kanivets.moneytracker.R;
@@ -33,6 +36,28 @@ protected boolean initData() {
         return result;
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_import, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_help:
+                AlertDialog.Builder builder = new AlertDialog.Builder(ImportActivity.this);
+                builder.setTitle(R.string.help)
+                        .setMessage(R.string.import_help)
+                        .setPositiveButton(android.R.string.ok, null)
+                        .show();
+                return true;
+
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
     @OnClick(R.id.btn_import)
     public void importRecords() {
         String data = etImportData.getText().toString().trim();
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
@@ -1,8 +1,8 @@
 package com.blogspot.e_kanivets.moneytracker.di;
 
 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.external.ExportActivity;
+import com.blogspot.e_kanivets.moneytracker.activity.external.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;
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_help.png b/app/src/main/res/drawable-xxxhdpi/ic_help.png
diff --git a/app/src/main/res/layout/activity_export.xml b/app/src/main/res/layout/activity_export.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context=".activity.ExportActivity">
+    tools:context=".activity.external.ExportActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_import.xml b/app/src/main/res/layout/activity_import.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context=".activity.ImportActivity">
+    tools:context=".activity.external.ImportActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/menu/menu_import.xml b/app/src/main/res/menu/menu_import.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_help"
+        android:icon="@drawable/ic_help"
+        android:title="@string/help"
+        tools:showAsAction="ifRoom" />
+
+</menu>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -67,4 +67,13 @@
 
     <string name="title_import">Импорт</string>
     <string name="records_imported">%1$s записей было импортировано</string>
+    <string name="help">Справка</string>
+    <string name="import_help">Для импорта записей в приложение:\n
+    1. Создайте CSV файл в формате - \n
+    <b>время;заголовок;категория;цена;валюта.</b>\n
+    2. Скопируйте его контент в текстовое поле.\n
+    3. Нажмите кнопку импорта. Через несколько секунд Вы увидите сколько записей было импортировано.\n
+    \n
+    <b>Важно:</b> время - метка времени в миллисекундах; валюта - 3-х символьный код валюты.\n
+    <b>Пример:</b> 1466948795712;метро;транспорт;-20.0;UAH</string>
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
@@ -67,4 +67,13 @@
 
     <string name="title_import">Iмпорт</string>
     <string name="records_imported">%1$s записів було імпортовано</string>
-</resources>
+    <string name="help">Довідка</string>
+    <string name="import_help">Для импорту записів до застосунку:\n
+    1. Створіть CSV файл у форматі - \n
+    <b>час;заголовок;категорія;ціна;валюта.</b>\n
+    2. Скопіюйте його контент до текстового поля.\n
+    3. Натисніть кнопку імпорту. Через дікілька секунд Ви побачите скільки записів було імпортовано.\n
+    \n
+    <b>Важливо:</b> час - мітка часу у мілісекундах; валюта - 3-х символьний код валюти.\n
+    <b>Приклад:</b> 1466948795712;метро;транспорт;-20.0;UAH</string>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -77,5 +77,15 @@
 
     <string name="title_import">Import</string>
     <string name="records_imported">%1$s records has been imported</string>
+    <string name="help">Help</string>
+    <string name="import_help">To import records into application:\n
+    1. Create CSV file in format - \n
+    <b>time;title;category;price;currency.</b>\n
+    2. Copy its content to text field.\n
+    3. Press import button. In few seconds you will see how much records has been imported.\n
+    \n
+    <b>Note:</b> time - timestamp value in milliseconds; currency - 3 symbols code of currency.\n
+    <b>Example:</b> 1466948795712;metro;transport;-20.0;UAH</string>
+
     <!-- Not translated strings -->
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.blogspot.e_kanivets.moneytracker.activity;`
	`1`	`+package com.blogspot.e_kanivets.moneytracker.activity.external;`
`2`	`2`
`3`	`3`	`import android.content.Intent;`
`4`	`4`	`import android.net.Uri;`