From 16cb61bddcfa9dfa6dc39efe752f61a2461c4a67 Mon Sep 17 00:00:00 2001 From: Scot SCRIVEN Date: Sun, 17 Apr 2016 21:11:26 +0200 Subject: [PATCH] Add button to the user login view to register on the website --- .../scrachx/openfood/fragments/UserFragment.java | 14 ++++++++++++++ .../github/scrachx/openfood/utils/Utils.java | 11 +++++++++++ app/src/main/res/layout/fragment_home.xml | 1 - app/src/main/res/layout/fragment_user.xml | 13 +++++++++++++ app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values/strings.xml | 7 ++++--- 6 files changed, 43 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/fragments/UserFragment.java b/app/src/main/java/openfoodfacts/github/scrachx/openfood/fragments/UserFragment.java index 04926df5b1ad..4a4c983be814 100644 --- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/fragments/UserFragment.java +++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/fragments/UserFragment.java @@ -2,7 +2,9 @@ import android.app.Fragment; import android.content.Context; +import android.content.Intent; import android.content.SharedPreferences; +import android.net.Uri; import android.os.Bundle; import android.support.annotation.Nullable; import android.util.Log; @@ -19,6 +21,7 @@ import org.apache.http.Header; import openfoodfacts.github.scrachx.openfood.R; import openfoodfacts.github.scrachx.openfood.network.FoodUserClient; +import openfoodfacts.github.scrachx.openfood.utils.Utils; /** * Created by scotscriven on 08/05/15. @@ -28,6 +31,7 @@ public class UserFragment extends Fragment { EditText login, pass; TextView infoLogin; Button save; + Button signup; @Nullable @Override @@ -41,6 +45,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa pass = (EditText) rootView.findViewById(R.id.editTextPass); save = (Button) rootView.findViewById(R.id.buttonSave); infoLogin = (TextView) rootView.findViewById(R.id.textInfoLogin); + signup = (Button) rootView.findViewById(R.id.buttonCreateAccount); login.setSelected(false); pass.setSelected(false); @@ -57,6 +62,15 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa login.setText(loginS); pass.setText(passS); + signup.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent browser = new Intent(Intent.ACTION_VIEW); + browser.setData(Uri.parse(Utils.getUriByCurrentLanguage() + "cgi/user.pl")); + startActivity(browser); + } + }); + save.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/utils/Utils.java b/app/src/main/java/openfoodfacts/github/scrachx/openfood/utils/Utils.java index 66109472875f..f1b66486d9a1 100644 --- a/app/src/main/java/openfoodfacts/github/scrachx/openfood/utils/Utils.java +++ b/app/src/main/java/openfoodfacts/github/scrachx/openfood/utils/Utils.java @@ -27,6 +27,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.util.Locale; /** * @author Eddie @@ -34,6 +35,16 @@ */ public class Utils { + public static String getUriByCurrentLanguage() { + String url; + if (Locale.getDefault().getLanguage().contains("fr")){ + url = "http://fr.openfoodfacts.org/"; + } else { + url = "http://world.openfoodfacts.org/"; + } + return url; + } + public static void hideKeyboard(Activity activity) { InputMethodManager imm = (InputMethodManager) activity.getSystemService(Activity.INPUT_METHOD_SERVICE); //Find the currently focused view, so we can grab the correct window token from it. diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 05d84dd8e052..99cb014788d4 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -32,7 +32,6 @@ style="@style/DefaultButtonText" android:layout_gravity="center" android:gravity="center" - android:layout_alignParentBottom="true" android:text="@string/try_it_scan_now" android:id="@+id/buttonScan" /> diff --git a/app/src/main/res/layout/fragment_user.xml b/app/src/main/res/layout/fragment_user.xml index cdddef6821c3..50321fc56eba 100644 --- a/app/src/main/res/layout/fragment_user.xml +++ b/app/src/main/res/layout/fragment_user.xml @@ -63,6 +63,19 @@ android:id="@+id/textInfoLogin" android:layout_gravity="center_horizontal" /> + +