diff --git a/.gitignore b/.gitignore
index 379e14eb9df7..87f58a8a3aa6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,6 @@
/.idea/workspace.xml
/.idea/libraries
.DS_Store
-/build
\ No newline at end of file
+/build
+.idea/encodings.xml
+.idea/
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 96cc43efa6a0..000000000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 508b3d9b8897..000000000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 5d19981032aa..000000000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 5ab53dbd4b7e..000000000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460d8b38..000000000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/app-release.apk b/app/app-release.apk
index c09ad2d54b88..04575ed98d89 100644
Binary files a/app/app-release.apk and b/app/app-release.apk differ
diff --git a/app/app.iml b/app/app.iml
index c877a73296d4..0c1133314392 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -62,13 +62,6 @@
-
-
-
-
-
-
-
@@ -76,6 +69,13 @@
+
+
+
+
+
+
+
@@ -116,33 +116,33 @@
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 22d44cfdfeca..2f488b01c8fb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
applicationId "openfoodfacts.github.scrachx.openfood"
minSdkVersion 15
targetSdkVersion 21
- versionCode 7
- versionName "0.1.6"
+ versionCode 8
+ versionName "0.1.7"
}
useLibrary 'org.apache.http.legacy'
diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/fragments/SummaryProductFragment.java b/app/src/main/java/openfoodfacts/github/scrachx/openfood/fragments/SummaryProductFragment.java
index 31d2d628ccca..61828ff7a6b0 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/fragments/SummaryProductFragment.java
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/fragments/SummaryProductFragment.java
@@ -15,6 +15,7 @@
import openfoodfacts.github.scrachx.openfood.R;
import openfoodfacts.github.scrachx.openfood.models.State;
+import openfoodfacts.github.scrachx.openfood.views.ProductActivity;
/**
* Created by scotscriven on 04/05/15.
diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/network/FoodAPIRestClient.java b/app/src/main/java/openfoodfacts/github/scrachx/openfood/network/FoodAPIRestClient.java
index ee672e2c1bbc..b0e66e9077d9 100644
--- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/network/FoodAPIRestClient.java
+++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/network/FoodAPIRestClient.java
@@ -21,7 +21,7 @@ public static void get(String url, RequestParams params, AsyncHttpResponseHandle
private static String getAbsoluteUrl(String relativeUrl) {
if (Locale.getDefault().getLanguage().contains("fr")){
- BASE_URL = "http://fr.openfoodfacts.org/api/v0/produit/";
+ BASE_URL = "http://fr.openfoodfacts.org/";
}
return BASE_URL + relativeUrl;
}
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 de959c2807f6..605ddcd86b54 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
@@ -6,10 +6,13 @@
import android.content.res.Configuration;
import android.content.res.TypedArray;
import android.os.Bundle;
+import android.support.v4.view.MenuItemCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.widget.ShareActionProvider;
import android.util.Log;
+import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.AdapterView;
@@ -20,6 +23,7 @@
import openfoodfacts.github.scrachx.openfood.fragments.NutritionProductFragment;
import openfoodfacts.github.scrachx.openfood.fragments.SummaryProductFragment;
import openfoodfacts.github.scrachx.openfood.models.NavDrawerItem;
+import openfoodfacts.github.scrachx.openfood.models.State;
import openfoodfacts.github.scrachx.openfood.views.adapters.NavDrawerListAdapter;
@@ -28,6 +32,7 @@ public class ProductActivity extends ActionBarActivity {
private DrawerLayout mDrawerLayout;
private ListView mDrawerList;
private ActionBarDrawerToggle mDrawerToggle;
+ private ShareActionProvider mShareActionProvider;
// nav drawer title
private CharSequence mDrawerTitle;
@@ -200,4 +205,28 @@ public void onConfigurationChanged(Configuration newConfig) {
mDrawerToggle.onConfigurationChanged(newConfig);
}
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ getMenuInflater().inflate(R.menu.menu_product_share, menu);
+ MenuItem item = menu.findItem(R.id.menu_item_share);
+ mShareActionProvider = (ShareActionProvider) MenuItemCompat.getActionProvider(item);
+
+ Intent intent = getIntent();
+ State state = (State) intent.getExtras().getSerializable("state");
+
+ Intent shareIntent = new Intent();
+ shareIntent.putExtra(Intent.EXTRA_TEXT, getResources().getString(R.string.msg_share) + " http://world.openfoodfacts.org/product/" + state.getProduct().getCode());
+ shareIntent.setType("text/plain");
+ setShareIntent(shareIntent);
+
+ return true;
+ }
+
+ // Call to update the share intent
+ private void setShareIntent(Intent shareIntent) {
+ if (mShareActionProvider != null) {
+ mShareActionProvider.setShareIntent(shareIntent);
+ }
+ }
+
}
diff --git a/app/src/main/res/menu/menu_product_share.xml b/app/src/main/res/menu/menu_product_share.xml
new file mode 100644
index 000000000000..51180cc2c8ff
--- /dev/null
+++ b/app/src/main/res/menu/menu_product_share.xml
@@ -0,0 +1,10 @@
+
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5a110430f86a..dd7c7c997434 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -107,4 +107,6 @@
Produits non trouvés
Rechercher
Scanner!
+ Partager
+ Regarde ce produit sur OpenFoodFacts :
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1c3e3638c4dc..49bcdbfa5669 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -127,6 +127,8 @@
The product does not contain any palm oil
Barcode not valid
Try it! Scan now!
+ Share
+ Look at this product on OpenFoodFact :