diff --git a/app/app-release.apk b/app/app-release.apk index 5ee42e358f4f..e3ccbd20b2b1 100644 Binary files a/app/app-release.apk and b/app/app-release.apk differ diff --git a/app/build.gradle b/app/build.gradle index 927d2a969adf..746a95dcb450 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "openfoodfacts.github.scrachx.openfood" minSdkVersion 16 targetSdkVersion 24 - versionCode 24 - versionName "0.2.6" + versionCode 25 + versionName "0.2.7" } dexOptions { @@ -69,6 +69,8 @@ dependencies { compile 'com.loopj.android:android-async-http:1.4.9' + compile 'com.opencsv:opencsv:3.8' + compile 'com.fasterxml.jackson.core:jackson-core:2.8.3' compile 'com.fasterxml.jackson.core:jackson-databind:2.8.3' compile 'com.fasterxml.jackson.core:jackson-annotations:2.8.3' diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/views/HistoryScanActivity.java b/app/src/main/java/openfoodfacts/github/scrachx/openfood/views/HistoryScanActivity.java index 34633f391bf0..e31dedcfe966 100644 --- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/views/HistoryScanActivity.java +++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/views/HistoryScanActivity.java @@ -1,15 +1,21 @@ package openfoodfacts.github.scrachx.openfood.views; +import android.Manifest; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; +import android.provider.Settings; +import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.support.v4.app.ActivityCompat; import android.support.v4.app.NavUtils; -import android.support.v4.view.MenuItemCompat; +import android.support.v4.content.ContextCompat; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.ShareActionProvider; @@ -19,19 +25,27 @@ import android.view.MenuItem; import android.widget.Toast; +import com.afollestad.materialdialogs.DialogAction; +import com.afollestad.materialdialogs.MaterialDialog; +import com.opencsv.CSVWriter; import com.orm.query.Select; +import java.io.File; +import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; import java.net.HttpURLConnection; import java.net.URL; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; import butterknife.BindView; import openfoodfacts.github.scrachx.openfood.R; import openfoodfacts.github.scrachx.openfood.models.HistoryItem; import openfoodfacts.github.scrachx.openfood.models.HistoryProduct; +import openfoodfacts.github.scrachx.openfood.utils.Utils; import openfoodfacts.github.scrachx.openfood.views.adapters.HistoryListAdapter; public class HistoryScanActivity extends BaseActivity { @@ -64,29 +78,76 @@ public boolean onOptionsItemSelected(MenuItem item) { case android.R.id.home: NavUtils.navigateUpFromSameTask(this); return true; - case R.id.action_edit_product: - // TODO : export option + case R.id.action_remove_all_history: + new MaterialDialog.Builder(this) + .title(R.string.title_clear_history_dialog) + .content(R.string.text_clear_history_dialog) + .onPositive(new MaterialDialog.SingleButtonCallback() { + @Override + public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { + HistoryProduct.deleteAll(HistoryProduct.class); + productItems.clear(); + recyclerHistoryScanView.getAdapter().notifyDataSetChanged(); + } + }) + .positiveText(R.string.txtYes) + .negativeText(R.string.txtNo) + .show(); + return true; + case R.id.action_export_all_history: + if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { + if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + new MaterialDialog.Builder(this) + .title(R.string.action_about) + .content(R.string.permision_write_external_storage) + .neutralText(R.string.txtOk) + .show(); + } else { + ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, Utils.MY_PERMISSIONS_REQUEST_STORAGE); + } + } else { + exportCSV(); + } + return true; default: return super.onOptionsItemSelected(item); } } + public void exportCSV() { + Toast.makeText(this, R.string.txt_exporting_history, Toast.LENGTH_LONG).show(); + String baseDir = android.os.Environment.getExternalStorageDirectory().getAbsolutePath(); + Log.d("dir", baseDir); + String fileName = "exportHistoryOFF"+new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(new Date())+".csv"; + String filePath = baseDir + File.separator + fileName; + File f = new File(filePath ); + CSVWriter writer; + FileWriter fileWriter; + try { + if(f.exists() && !f.isDirectory()) { + fileWriter = new FileWriter(filePath , true); + writer = new CSVWriter(fileWriter); + } else { + writer = new CSVWriter(new FileWriter(filePath)); + } + String[] headers = {"Barcode", "Name", "Brands"}; + writer.writeNext(headers); + List listHistoryProducts = HistoryProduct.listAll(HistoryProduct.class); + for (HistoryProduct hp : listHistoryProducts) { + String[] line = {hp.getBarcode(), hp.getTitle(), hp.getBrands()}; + writer.writeNext(line); + } + writer.close(); + Toast.makeText(this, R.string.txt_history_exported, Toast.LENGTH_LONG).show(); + } catch (IOException e) { + e.printStackTrace(); + } + } + @Override public boolean onCreateOptionsMenu(Menu menu) { - /*getMenuInflater().inflate(R.menu.menu_product, menu); - MenuItem item = menu.findItem(R.id.menu_item_share); - mShareActionProvider = (ShareActionProvider) MenuItemCompat.getActionProvider(item); - - Intent shareIntent = new Intent(Intent.ACTION_SEND); - String url = " " + Utils.getUriProductByCurrentLanguage() + mState.getProduct().getCode(); - if (mState.getProduct().getUrl() != null) { - url = " " + mState.getProduct().getUrl(); - } - shareIntent.putExtra(Intent.EXTRA_TEXT, getResources().getString(R.string.msg_share) + url); - shareIntent.setType("text/plain"); - setShareIntent(shareIntent);*/ - + getMenuInflater().inflate(R.menu.menu_history, menu); return true; } @@ -141,4 +202,34 @@ protected void onPostExecute(Context ctx) { } } + @Override + public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + switch (requestCode) { + case Utils.MY_PERMISSIONS_REQUEST_STORAGE: { + if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { + exportCSV(); + } else { + new MaterialDialog.Builder(this) + .title(R.string.permission_title) + .content(R.string.permission_denied) + .negativeText(R.string.txtNo) + .positiveText(R.string.txtYes) + .onPositive(new MaterialDialog.SingleButtonCallback() { + @Override + public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { + Intent intent = new Intent(); + intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); + Uri uri = Uri.fromParts("package", getPackageName(), null); + intent.setData(uri); + startActivity(intent); + } + }) + .show(); + } + break; + } + } + } + } diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/views/holders/HistoryScanHolder.java b/app/src/main/java/openfoodfacts/github/scrachx/openfood/views/holders/HistoryScanHolder.java index ccde2b6cb1c6..a3202f4efcea 100644 --- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/views/holders/HistoryScanHolder.java +++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/views/holders/HistoryScanHolder.java @@ -7,7 +7,6 @@ import android.net.NetworkInfo; import android.support.v7.widget.CardView; import android.support.v7.widget.RecyclerView; -import android.util.Log; import android.view.View; import android.widget.ImageButton; import android.widget.ImageView; @@ -39,7 +38,6 @@ public HistoryScanHolder(final View itemView) { @Override public void onClick(View view) { String url = " " + Utils.getUriProductByCurrentLanguage() + txtBarcode.getText(); - Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND); sharingIntent.setType("text/plain"); String shareBody = itemView.getResources().getString(R.string.msg_share) + url; diff --git a/app/src/main/res/drawable-hdpi/ic_delete_forever_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_delete_forever_white_48dp.png new file mode 100644 index 000000000000..e99d69cd4eea Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_delete_forever_white_48dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_file_download_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_file_download_white_48dp.png new file mode 100644 index 000000000000..671e0b3eceef Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_file_download_white_48dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_delete_forever_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_delete_forever_white_48dp.png new file mode 100644 index 000000000000..0922752e8505 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_delete_forever_white_48dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_file_download_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_file_download_white_48dp.png new file mode 100644 index 000000000000..f53cc0c62c22 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_file_download_white_48dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_delete_forever_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_delete_forever_white_48dp.png new file mode 100644 index 000000000000..a0ac70635873 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_delete_forever_white_48dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_file_download_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_file_download_white_48dp.png new file mode 100644 index 000000000000..ded5652e406a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_file_download_white_48dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete_forever_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_delete_forever_white_48dp.png new file mode 100644 index 000000000000..0eca423b66c7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_delete_forever_white_48dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_file_download_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_file_download_white_48dp.png new file mode 100644 index 000000000000..6602791545ff Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_file_download_white_48dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_delete_forever_white_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_delete_forever_white_48dp.png new file mode 100644 index 000000000000..0e75591102aa Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_delete_forever_white_48dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_file_download_white_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_file_download_white_48dp.png new file mode 100644 index 000000000000..aa3f29864c48 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_file_download_white_48dp.png differ diff --git a/app/src/main/res/menu/menu_history.xml b/app/src/main/res/menu/menu_history.xml new file mode 100644 index 000000000000..52946b081c0d --- /dev/null +++ b/app/src/main/res/menu/menu_history.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/menu_product.xml b/app/src/main/res/menu/menu_product.xml index 4f84d5cb5033..b8e0e87d8c58 100644 --- a/app/src/main/res/menu/menu_product.xml +++ b/app/src/main/res/menu/menu_product.xml @@ -1,8 +1,7 @@ - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 897503336343..2fa9d67b364d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -188,5 +188,12 @@ org.openbeautyfacts.scanner History + Clear history + Clear + Do you want to clear all scan history? + Export CSV + Exporting history... + History exported + Write external storage permission is needed to export history.