Add share button on product page #27

Fix bug for "fr" New apk release
openfoodfacts · Apr 17, 2016 · 279e816 · teolemon · Apr 17, 2016 · teolemon
1 parent 4c5c210
commit 279e816
Show file tree

Hide file tree

Showing 16 changed files with 96 additions and 143 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,6 @@
 /.idea/workspace.xml
 /.idea/libraries
 .DS_Store
-/build
+/build
+.idea/encodings.xml
+.idea/
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/app/app-release.apk b/app/app-release.apk
diff --git a/app/app.iml b/app/app.iml
@@ -62,20 +62,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
@@ -116,33 +116,33 @@
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="commons-beanutils-1.9.2" level="project" />
+    <orderEntry type="library" exported="" name="jsoup-1.8.3" level="project" />
+    <orderEntry type="library" exported="" name="load-toast-1.0.10" level="project" />
+    <orderEntry type="library" exported="" name="sugar-1.5" level="project" />
+    <orderEntry type="library" exported="" name="jackson-annotations-2.7.3" level="project" />
+    <orderEntry type="library" exported="" name="core-3.2.1" level="project" />
+    <orderEntry type="library" exported="" name="recyclerview-v7-23.2.1" level="project" />
+    <orderEntry type="library" exported="" name="core-1.8.4" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.3.0" level="project" />
+    <orderEntry type="library" exported="" name="library-1.1.5" level="project" />
+    <orderEntry type="library" exported="" name="httpclient-4.3.6" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.3.0" level="project" />
     <orderEntry type="library" exported="" name="support-vector-drawable-23.3.0" level="project" />
-    <orderEntry type="library" exported="" name="commons-digester-1.8.1" level="project" />
-    <orderEntry type="library" exported="" name="jackson-databind-2.7.3" level="project" />
+    <orderEntry type="library" exported="" name="animated-vector-drawable-23.3.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-23.3.0" level="project" />
+    <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
+    <orderEntry type="library" exported="" name="core-0.8.5.7" level="project" />
+    <orderEntry type="library" exported="" name="gson-2.3" level="project" />
     <orderEntry type="library" exported="" name="jackson-core-2.7.3" level="project" />
-    <orderEntry type="library" exported="" name="recyclerview-v7-23.2.1" level="project" />
-    <orderEntry type="library" exported="" name="core-3.2.1" level="project" />
-    <orderEntry type="library" exported="" name="load-toast-1.0.10" level="project" />
-    <orderEntry type="library" exported="" name="httpclient-4.3.6" level="project" />
+    <orderEntry type="library" exported="" name="zxing-1.8.4" level="project" />
+    <orderEntry type="library" exported="" name="jackson-databind-2.7.3" level="project" />
+    <orderEntry type="library" exported="" name="commons-collections-3.2.2" level="project" />
+    <orderEntry type="library" exported="" name="commons-0.8.5.7" level="project" />
     <orderEntry type="library" exported="" name="commons-validator-1.5.0" level="project" />
     <orderEntry type="library" exported="" name="androidasync-2.1.7" level="project" />
     <orderEntry type="library" exported="" name="ion-2.1.7" level="project" />
-    <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-23.3.0" level="project" />
-    <orderEntry type="library" exported="" name="jackson-annotations-2.7.3" level="project" />
-    <orderEntry type="library" exported="" name="core-0.8.5.7" level="project" />
-    <orderEntry type="library" exported="" name="core-1.8.4" level="project" />
     <orderEntry type="library" exported="" name="android-async-http-1.4.9" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.3.0" level="project" />
-    <orderEntry type="library" exported="" name="commons-collections-3.2.2" level="project" />
-    <orderEntry type="library" exported="" name="commons-0.8.5.7" level="project" />
-    <orderEntry type="library" exported="" name="animated-vector-drawable-23.3.0" level="project" />
-    <orderEntry type="library" exported="" name="sugar-1.5" level="project" />
-    <orderEntry type="library" exported="" name="library-1.1.5" level="project" />
-    <orderEntry type="library" exported="" name="jsoup-1.8.3" level="project" />
-    <orderEntry type="library" exported="" name="zxing-1.8.4" level="project" />
-    <orderEntry type="library" exported="" name="gson-2.3" level="project" />
+    <orderEntry type="library" exported="" name="commons-digester-1.8.1" level="project" />
     <orderEntry type="library" exported="" name="org.apache.http.legacy-android-23" level="project" />
   </component>
 </module>
diff --git 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/...src/main/java/openfoodfacts/github/scrachx/openfood/fragments/SummaryProductFragment.java b/...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
@@ -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
@@ -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
@@ -0,0 +1,10 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_item_share"
+        app:showAsAction="ifRoom"
+        android:title="@string/share"
+        app:actionProviderClass="android.support.v7.widget.ShareActionProvider" />
+
+</menu>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -107,4 +107,6 @@
     <string name="no_products">Produits non trouvés</string>
     <string name="search_button">Rechercher</string>
     <string name="try_it_scan_now">Scanner!</string>
+    <string name="share">Partager</string>
+    <string name="msg_share">Regarde ce produit sur OpenFoodFacts :</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -127,6 +127,8 @@
     <string name="txtPalm">The product does not contain any palm oil</string>
     <string name="txtBarcodeNotValid">Barcode not valid</string>
     <string name="try_it_scan_now">Try it! Scan now!</string>
+    <string name="share">Share</string>
+    <string name="msg_share">Look at this product on OpenFoodFact :</string>
 
     <style name="DefaultButtonText">
         <item name="android:layout_width">fill_parent</item>

diff --git a/off_android.iml b/off_android.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="off_android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+    </content>
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>