diff --git a/app/app.iml b/app/app.iml
index 6d552905c292..ccda6caac85d 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -78,7 +78,6 @@
-
@@ -115,6 +114,5 @@
-
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 765a4c58819a..664cf1536996 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
applicationId "openfoodfacts.github.scrachx.openfood"
minSdkVersion 15
targetSdkVersion 21
- versionCode 1
- versionName "0.1"
+ versionCode 2
+ versionName "0.1.1"
}
buildTypes {
release {
@@ -55,8 +55,6 @@ dependencies {
compile 'net.steamcrafted:load-toast:1.0.6'
- compile 'uk.co.chrisjenx:calligraphy:2.1.0'
-
compile 'me.dm7.barcodescanner:zxing:1.7'
compile 'com.koushikdutta.ion:ion:2.+'
diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/fragments/OfflineEditFragment.java b/app/src/main/java/openfoodfacts/github/scrachx/openfood/fragments/OfflineEditFragment.java
index 550e894f450b..509630b1c7d6 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/fragments/OfflineEditFragment.java
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/fragments/OfflineEditFragment.java
@@ -155,10 +155,7 @@ public void onPositive(MaterialDialog dialog) {
e.printStackTrace();
}
- user.post(getActivity(), params, sp.getImgupload_front().replace(".png", "_small.png"), sp.getBarcode());
- SaveListAdapter sl = (SaveListAdapter) listView.getAdapter();
- saveItems.remove(i);
- sl.notifyDataSetChanged();
+ user.post(getActivity(), params, sp.getImgupload_front().replace(".png", "_small.png"), sp.getBarcode(), listView, i, saveItems);
}
}
@@ -188,6 +185,12 @@ public class FillAdapter extends AsyncTask {
@Override
protected void onPreExecute() {
+ List listSaveProduct = SendProduct.listAll(SendProduct.class);
+ if(listSaveProduct.size() == 0){
+ Toast.makeText(getActivity(), R.string.txtNoData, Toast.LENGTH_LONG).show();
+ }else{
+ Toast.makeText(getActivity(), R.string.txtLoading, Toast.LENGTH_LONG).show();
+ }
}
@Override
diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/models/FoodUserClientUsage.java b/app/src/main/java/openfoodfacts/github/scrachx/openfood/models/FoodUserClientUsage.java
index 4079800a3906..29b5cbc94374 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/models/FoodUserClientUsage.java
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/models/FoodUserClientUsage.java
@@ -3,6 +3,7 @@
import android.app.Activity;
import android.app.Fragment;
import android.app.FragmentTransaction;
+import android.widget.ListView;
import android.widget.Toast;
import com.loopj.android.http.JsonHttpResponseHandler;
import com.loopj.android.http.RequestParams;
@@ -12,16 +13,19 @@
import org.json.JSONObject;
import java.io.File;
import java.io.FileNotFoundException;
+import java.util.ArrayList;
+
import openfoodfacts.github.scrachx.openfood.R;
import openfoodfacts.github.scrachx.openfood.fragments.OfflineEditFragment;
import openfoodfacts.github.scrachx.openfood.network.FoodUserClient;
+import openfoodfacts.github.scrachx.openfood.views.adapters.SaveListAdapter;
/**
* Created by scotscriven on 10/05/15.
*/
public class FoodUserClientUsage {
- public void post(final Activity activity, RequestParams params, final String img, final String barcode){
+ public void post(final Activity activity, RequestParams params, final String img, final String barcode, final ListView lv, final int pos, final ArrayList saveItems){
FoodUserClient.post("/cgi/product_jqm2.pl", params, new JsonHttpResponseHandler() {
LoadToast lt = new LoadToast(activity);
@@ -51,7 +55,7 @@ public void onSuccess(int statusCode, Header[] headers, JSONObject response) {
try {
paramsImg.put("imgupload_front", myFile);
} catch(FileNotFoundException e) {e.getMessage();}
- postImg(activity, paramsImg, barcode, length);
+ postImg(activity, paramsImg, barcode, length, lv, pos, saveItems);
}
} catch (JSONException e) {
e.printStackTrace();
@@ -71,7 +75,7 @@ public void onRetry ( int retryNo){
});
}
- public void postImg(final Activity activity, final RequestParams params, final String barcode, final long length){
+ public void postImg(final Activity activity, final RequestParams params, final String barcode, final long length, final ListView lv, final int pos, final ArrayList saveItems){
FoodUserClient.post("/cgi/product_image_upload.pl", params, new JsonHttpResponseHandler() {
LoadToast lt = new LoadToast(activity);
@@ -94,6 +98,9 @@ public void onSuccess(int statusCode, Header[] headers, JSONObject response) {
} else {
lt.success();
SendProduct.deleteAll(SendProduct.class, "barcode = ?", barcode);
+ SaveListAdapter sl = (SaveListAdapter) lv.getAdapter();
+ saveItems.remove(pos);
+ sl.notifyDataSetChanged();
}
} catch (JSONException e) {
e.printStackTrace();
diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/views/ProductActivity.java b/app/src/main/java/openfoodfacts/github/scrachx/openfood/views/ProductActivity.java
index 63ff94898102..ab7c5abb725a 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/views/ProductActivity.java
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/views/ProductActivity.java
@@ -127,11 +127,6 @@ public void onItemClick(AdapterView> parent, View view, int position,
}
}
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.menu_main, menu);
- return true;
- }
@Override
public boolean onOptionsItemSelected(MenuItem item) {
@@ -139,24 +134,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
if (mDrawerToggle.onOptionsItemSelected(item)) {
return true;
}
- // Handle action bar actions click
- switch (item.getItemId()) {
- case R.id.action_settings:
- return true;
- default:
- return super.onOptionsItemSelected(item);
- }
- }
-
- /***
- * Called when invalidateOptionsMenu() is triggered
- */
- @Override
- public boolean onPrepareOptionsMenu(Menu menu) {
- // if nav drawer is opened, hide the action items
- boolean drawerOpen = mDrawerLayout.isDrawerOpen(mDrawerList);
- menu.findItem(R.id.action_settings).setVisible(!drawerOpen);
- return super.onPrepareOptionsMenu(menu);
+ return super.onOptionsItemSelected(item);
}
/**
diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/views/SaveProductOfflineActivity.java b/app/src/main/java/openfoodfacts/github/scrachx/openfood/views/SaveProductOfflineActivity.java
index 8db4d29ec35c..eed99574595c 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/views/SaveProductOfflineActivity.java
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/views/SaveProductOfflineActivity.java
@@ -98,7 +98,6 @@ public void onClick(View v) {
SendProduct product = new SendProduct(barcode, name.getText().toString(), energy.getText().toString(),
"kJ", weight.getText().toString(), settings.getString("imgUrl", ""), store.getText().toString());
product.save();
- Toast.makeText(getApplicationContext(), R.string.dataSaved, Toast.LENGTH_LONG).show();
}
Toast.makeText(getApplicationContext(), R.string.txtDialogsContentInfoSave, Toast.LENGTH_LONG).show();
Intent intent = new Intent(getApplicationContext(), MainActivity.class);