diff --git a/foodinder_app/app/src/main/AndroidManifest.xml b/foodinder_app/app/src/main/AndroidManifest.xml index 65145b3..dcc0ea1 100755 --- a/foodinder_app/app/src/main/AndroidManifest.xml +++ b/foodinder_app/app/src/main/AndroidManifest.xml @@ -6,17 +6,17 @@ - + - diff --git a/foodinder_app/app/src/main/java/com/example/foodinder_app/Main3Activity.java b/foodinder_app/app/src/main/java/com/example/foodinder_app/Main3Activity.java index 1921600..1365275 100644 --- a/foodinder_app/app/src/main/java/com/example/foodinder_app/Main3Activity.java +++ b/foodinder_app/app/src/main/java/com/example/foodinder_app/Main3Activity.java @@ -1,13 +1,99 @@ package com.example.foodinder_app; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.os.SystemClock; +import android.support.annotation.UiThread; +import android.support.v7.app.AppCompatActivity; +import android.util.Pair; +import android.widget.ImageView; +import android.widget.TextView; + +import com.android.volley.Request; +import com.android.volley.RequestQueue; +import com.android.volley.Response; +import com.android.volley.VolleyError; +import com.android.volley.toolbox.JsonObjectRequest; +import com.android.volley.toolbox.Volley; + +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; public class Main3Activity extends AppCompatActivity { + private ImageView image; + private TextView text; + int pom = 0; + String photo=null; + String name=null; + private RequestQueue mQueue; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main3); + + mQueue = Volley.newRequestQueue(this); + + image = (ImageView) findViewById(R.id.avatar3); + text = (TextView) findViewById(R.id.name3); + + new Thread(new Runnable() { + public void run() { + while (photo==null) { + parseJSON(); + SystemClock.sleep(1000); + } + + Main3Activity.this.runOnUiThread(new Runnable() { + @Override + public void run() { + setCard(); + } + }); + } + }).start(); + } + + private void setCard() { + + CardItem card = new CardItem(photo, name); + image.setImageBitmap(card.getDrawable()); + text.setText(card.getName()); + + } + + private void parseJSON() { + String url = Swipper.api + "/exec?action=getItem"; + + JsonObjectRequest request = new JsonObjectRequest(Request.Method.GET, url, null, + new Response.Listener() { + @Override + public void onResponse(JSONObject response) { + try { + JSONArray jarray = response.getJSONArray("item"); + + JSONObject jo = jarray.getJSONObject(0); + + photo = jo.getString("photo"); + name = jo.getString("name"); + + } catch (JSONException e) { + e.printStackTrace(); + } + + + } + }, new Response.ErrorListener() { + @Override + public void onErrorResponse(VolleyError error) { + + error.printStackTrace(); + } + }); + + + mQueue.add(request); + } } diff --git a/foodinder_app/app/src/main/java/com/example/foodinder_app/Swipper.java b/foodinder_app/app/src/main/java/com/example/foodinder_app/Swipper.java index 8f2ae9f..6a5e767 100755 --- a/foodinder_app/app/src/main/java/com/example/foodinder_app/Swipper.java +++ b/foodinder_app/app/src/main/java/com/example/foodinder_app/Swipper.java @@ -46,10 +46,10 @@ public class Swipper extends AppCompatActivity { private RequestQueue mQueue; private Random random = new Random(); int i; - int j = Main2Activity.zmienna; + int j = Main2Activity.zmienna - 1; String photo; String name; - final private String api = "https://script.google.com/macros/s/AKfycbxhgRlgu_26AzjeAfJzgpvCRpQaFc47YM1Xyn2F"; + public static final String api = "https://script.google.com/macros/s/AKfycbxhgRlgu_26AzjeAfJzgpvCRpQaFc47YM1Xyn2F"; private int colorJeden = 0; private int colorDwa = 0; private int colorTrzy = 0; diff --git a/foodinder_app/app/src/main/res/drawable-hdpi/healthcare_and_medical.png b/foodinder_app/app/src/main/res/drawable-hdpi/healthcare_and_medical.png new file mode 100644 index 0000000..be07347 Binary files /dev/null and b/foodinder_app/app/src/main/res/drawable-hdpi/healthcare_and_medical.png differ diff --git a/foodinder_app/app/src/main/res/drawable-hdpi/map.png b/foodinder_app/app/src/main/res/drawable-hdpi/map.png new file mode 100644 index 0000000..35ee3f3 Binary files /dev/null and b/foodinder_app/app/src/main/res/drawable-hdpi/map.png differ diff --git a/foodinder_app/app/src/main/res/drawable-mdpi/healthcare_and_medical.png b/foodinder_app/app/src/main/res/drawable-mdpi/healthcare_and_medical.png new file mode 100644 index 0000000..d0f7e3c Binary files /dev/null and b/foodinder_app/app/src/main/res/drawable-mdpi/healthcare_and_medical.png differ diff --git a/foodinder_app/app/src/main/res/drawable-mdpi/map.png b/foodinder_app/app/src/main/res/drawable-mdpi/map.png new file mode 100644 index 0000000..dc95565 Binary files /dev/null and b/foodinder_app/app/src/main/res/drawable-mdpi/map.png differ diff --git a/foodinder_app/app/src/main/res/drawable-xhdpi/healthcare_and_medical.png b/foodinder_app/app/src/main/res/drawable-xhdpi/healthcare_and_medical.png new file mode 100644 index 0000000..7a08e4e Binary files /dev/null and b/foodinder_app/app/src/main/res/drawable-xhdpi/healthcare_and_medical.png differ diff --git a/foodinder_app/app/src/main/res/drawable-xhdpi/map.png b/foodinder_app/app/src/main/res/drawable-xhdpi/map.png new file mode 100644 index 0000000..a54d1d9 Binary files /dev/null and b/foodinder_app/app/src/main/res/drawable-xhdpi/map.png differ diff --git a/foodinder_app/app/src/main/res/drawable-xxhdpi/healthcare_and_medical.png b/foodinder_app/app/src/main/res/drawable-xxhdpi/healthcare_and_medical.png new file mode 100644 index 0000000..242332f Binary files /dev/null and b/foodinder_app/app/src/main/res/drawable-xxhdpi/healthcare_and_medical.png differ diff --git a/foodinder_app/app/src/main/res/drawable-xxhdpi/map.png b/foodinder_app/app/src/main/res/drawable-xxhdpi/map.png new file mode 100644 index 0000000..357f447 Binary files /dev/null and b/foodinder_app/app/src/main/res/drawable-xxhdpi/map.png differ diff --git a/foodinder_app/app/src/main/res/drawable-xxxhdpi/healthcare_and_medical.png b/foodinder_app/app/src/main/res/drawable-xxxhdpi/healthcare_and_medical.png new file mode 100644 index 0000000..85f9ac7 Binary files /dev/null and b/foodinder_app/app/src/main/res/drawable-xxxhdpi/healthcare_and_medical.png differ diff --git a/foodinder_app/app/src/main/res/drawable-xxxhdpi/map.png b/foodinder_app/app/src/main/res/drawable-xxxhdpi/map.png new file mode 100644 index 0000000..98c1981 Binary files /dev/null and b/foodinder_app/app/src/main/res/drawable-xxxhdpi/map.png differ diff --git a/foodinder_app/app/src/main/res/layout/activity_main.xml b/foodinder_app/app/src/main/res/layout/activity_main.xml index 0edbae9..77edac7 100755 --- a/foodinder_app/app/src/main/res/layout/activity_main.xml +++ b/foodinder_app/app/src/main/res/layout/activity_main.xml @@ -22,8 +22,8 @@ @@ -37,8 +37,8 @@ @@ -52,8 +52,8 @@ @@ -67,8 +67,8 @@ @@ -82,8 +82,8 @@ diff --git a/foodinder_app/app/src/main/res/layout/activity_main3.xml b/foodinder_app/app/src/main/res/layout/activity_main3.xml index 0f2a16a..c68e7c8 100644 --- a/foodinder_app/app/src/main/res/layout/activity_main3.xml +++ b/foodinder_app/app/src/main/res/layout/activity_main3.xml @@ -1,9 +1,70 @@ - - \ No newline at end of file + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/foodinder_app/app/src/main/res/values-pl-rPL/strings.xml b/foodinder_app/app/src/main/res/values-pl-rPL/strings.xml index 62756a4..a85a360 100644 --- a/foodinder_app/app/src/main/res/values-pl-rPL/strings.xml +++ b/foodinder_app/app/src/main/res/values-pl-rPL/strings.xml @@ -6,4 +6,5 @@ Danie dnia: Rozpocznij Wpisz liczbę dań jaką chcesz przeanalizować: + Najbardziej dopasowane danie: \ No newline at end of file diff --git a/foodinder_app/app/src/main/res/values/strings.xml b/foodinder_app/app/src/main/res/values/strings.xml index 89aa497..0c9d6d8 100755 --- a/foodinder_app/app/src/main/res/values/strings.xml +++ b/foodinder_app/app/src/main/res/values/strings.xml @@ -5,4 +5,5 @@ Change Dish of the day: Please enter the number in the range of 5-99 + Your the best matched dish: diff --git a/foodinder_app/app/src/main/res/values/styles.xml b/foodinder_app/app/src/main/res/values/styles.xml index 5885930..ba8c699 100755 --- a/foodinder_app/app/src/main/res/values/styles.xml +++ b/foodinder_app/app/src/main/res/values/styles.xml @@ -6,6 +6,15 @@ @color/colorPrimary @color/colorPrimaryDark @color/colorAccent + @color/colorPrimaryDark + + + diff --git a/foodinder_app/app/src/main/resources/credentials.json b/foodinder_app/app/src/main/resources/credentials.json deleted file mode 100755 index bd4d6f3..0000000 --- a/foodinder_app/app/src/main/resources/credentials.json +++ /dev/null @@ -1 +0,0 @@ -{"installed":{"client_id":"938133417828-a6lfc898k3di2e41uvab0q3825b3v0p7.apps.googleusercontent.com","project_id":"quickstart-1574691190977","auth_uri":"https://accounts.google.com/o/oauth2/auth","token_uri":"https://oauth2.googleapis.com/token","auth_provider_x509_cert_url":"https://www.googleapis.com/oauth2/v1/certs","client_secret":"Nfw-2UKc-zK81mm-AHTK3x4O","redirect_uris":["urn:ietf:wg:oauth:2.0:oob","http://localhost"]}} \ No newline at end of file