diff --git a/foodinder_app/.gitignore b/foodinder_app/.gitignore
old mode 100644
new mode 100755
diff --git a/foodinder_app/.idea/codeStyles/Project.xml b/foodinder_app/.idea/codeStyles/Project.xml
old mode 100644
new mode 100755
diff --git a/foodinder_app/.idea/gradle.xml b/foodinder_app/.idea/gradle.xml
old mode 100644
new mode 100755
diff --git a/foodinder_app/.idea/misc.xml b/foodinder_app/.idea/misc.xml
old mode 100644
new mode 100755
diff --git a/foodinder_app/.idea/runConfigurations.xml b/foodinder_app/.idea/runConfigurations.xml
old mode 100644
new mode 100755
diff --git a/foodinder_app/.idea/vcs.xml b/foodinder_app/.idea/vcs.xml
old mode 100644
new mode 100755
diff --git a/foodinder_app/app/.gitignore b/foodinder_app/app/.gitignore
old mode 100644
new mode 100755
diff --git a/foodinder_app/app/build.gradle b/foodinder_app/app/build.gradle
old mode 100644
new mode 100755
index d04c3d8..f0200b3
--- a/foodinder_app/app/build.gradle
+++ b/foodinder_app/app/build.gradle
@@ -31,9 +31,8 @@ dependencies {
implementation 'com.android.support:cardview-v7:25.0.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
- implementation 'com.google.api-client:google-api-client:1.30.6'
- implementation 'com.google.oauth-client:google-oauth-client-jetty:1.30.4'
- implementation 'com.google.apis:google-api-services-sheets:v4-rev9-1.22.0'
+ implementation 'com.android.volley:volley:1.1.1'
+ implementation 'com.squareup.picasso:picasso:2.71828'
}
allprojects {
repositories {
diff --git a/foodinder_app/app/libs/android-card-stack-0.1.5.aar b/foodinder_app/app/libs/android-card-stack-0.1.5.aar
old mode 100644
new mode 100755
diff --git a/foodinder_app/app/proguard-rules.pro b/foodinder_app/app/proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/foodinder_app/app/src/main/AndroidManifest.xml b/foodinder_app/app/src/main/AndroidManifest.xml
old mode 100644
new mode 100755
index 9d6d0b3..64794f1
--- a/foodinder_app/app/src/main/AndroidManifest.xml
+++ b/foodinder_app/app/src/main/AndroidManifest.xml
@@ -4,10 +4,6 @@
-
-
-
-
data;
+ private static final String TAG = Main2Activity.class.getName();
+ Bitmap bitmap = null;
public CardsAdapter(Activity activity, List data) {
this.data = data;
@@ -60,8 +63,7 @@ public class CardsAdapter extends BaseAdapter {
//setting data to views
holder.name.setText(getItem(position).getName());
holder.location.setText(getItem(position).getLocation());
- holder.avatar.setImageBitmap(decodeSampledBitmapFromResource(activity.getResources(),
- getItem(position).getDrawableId(), AVATAR_WIDTH, AVATAR_HEIGHT));
+ holder.avatar.setImageBitmap(decodeSampledBitmapFromResource(getItem(position).getDrawableId(), AVATAR_WIDTH, AVATAR_HEIGHT));
return convertView;
}
@@ -78,40 +80,45 @@ public class CardsAdapter extends BaseAdapter {
}
}
- public static Bitmap decodeSampledBitmapFromResource(Resources res, int resId, int reqWidth, int reqHeight) {
+ public void changeBitmap(Bitmap x) { bitmap = x; }
- // First decode with inJustDecodeBounds=true to check dimensions
- final BitmapFactory.Options options = new BitmapFactory.Options();
- options.inJustDecodeBounds = true;
- BitmapFactory.decodeResource(res, resId, options);
+ public Bitmap decodeSampledBitmapFromResource(final String src, int reqWidth, int reqHeight) {
- // Calculate inSampleSize
- options.inSampleSize = calculateInSampleSize(options, reqWidth, reqHeight);
- // Decode bitmap with inSampleSize set
- options.inJustDecodeBounds = false;
- return BitmapFactory.decodeResource(res, resId, options);
- }
+ Thread thread = new Thread(new Runnable() {
+ public void run() {
+ // a potentially time consuming task
+ try {
+ Bitmap y = Picasso.get().load(src).get();
+ changeBitmap(y);
+ } catch (Exception e) {
+ Log.e(TAG, ""+e);
+ }
+ }
+ });
- public static int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight) {
- // Raw height and width of image
- final int height = options.outHeight;
- final int width = options.outWidth;
- int inSampleSize = 1;
+ thread.start();
- if (height > reqHeight || width > reqWidth) {
+ Bitmap end = null;
- final int halfHeight = height / 2;
- final int halfWidth = width / 2;
- // Calculate the largest inSampleSize value that is a power of 2 and keeps both
- // height and width larger than the requested height and width.
- while ((halfHeight / inSampleSize) >= reqHeight
- && (halfWidth / inSampleSize) >= reqWidth) {
- inSampleSize *= 2;
+ int a =0;
+ while (end==null) {
+ a+=1;
+ try {
+ end = Bitmap.createScaledBitmap(bitmap, reqWidth, reqHeight, false);
+ } catch (Exception e) {
+
}
}
- return inSampleSize;
+ bitmap = null;
+
+ return end;
+
}
+
+
}
+
+
diff --git a/foodinder_app/app/src/main/java/com/example/foodinder_app/Main2Activity.java b/foodinder_app/app/src/main/java/com/example/foodinder_app/Main2Activity.java
old mode 100644
new mode 100755
index a8a8e32..dea3f12
--- a/foodinder_app/app/src/main/java/com/example/foodinder_app/Main2Activity.java
+++ b/foodinder_app/app/src/main/java/com/example/foodinder_app/Main2Activity.java
@@ -14,7 +14,6 @@ public class Main2Activity extends AppCompatActivity {
private View button;
private View button2;
private TextView text;
- private SheetsQuickstart sheetsQuickstart;
public static String stringen;
@Override
@@ -25,14 +24,17 @@ public class Main2Activity extends AppCompatActivity {
button = findViewById(R.id.button);
text = (TextView) findViewById(R.id.textView);
button2 = findViewById(R.id.button2);
- sheetsQuickstart = new SheetsQuickstart();
button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view)
{
- Intent intent = new Intent(Main2Activity.this, swipper.class);
- startActivity(intent);
+ new Thread(new Runnable() {
+ public void run() {
+ Intent intent = new Intent(Main2Activity.this, swipper.class);
+ startActivity(intent);
+ }
+ }).start();
}
});
@@ -40,19 +42,7 @@ public class Main2Activity extends AppCompatActivity {
@Override
public void onClick(View view)
{
- new Thread() {
- @Override
- public void run() {
- try {
- stringen = sheetsQuickstart.return_sheet();
- } catch (IOException e) {
- stringen = "Problem";
- } catch (GeneralSecurityException e) {
- stringen = "Problem";
- }
- }
- }.start();
- text.setText(stringen);
+ text.setText("habas");
}
});
}
diff --git a/foodinder_app/app/src/main/java/com/example/foodinder_app/SheetsQuickstart.java b/foodinder_app/app/src/main/java/com/example/foodinder_app/SheetsQuickstart.java
deleted file mode 100644
index 88849be..0000000
--- a/foodinder_app/app/src/main/java/com/example/foodinder_app/SheetsQuickstart.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.example.foodinder_app;
-
-import com.google.api.client.auth.oauth2.Credential;
-import com.google.api.client.extensions.java6.auth.oauth2.AuthorizationCodeInstalledApp;
-import com.google.api.client.extensions.jetty.auth.oauth2.LocalServerReceiver;
-import com.google.api.client.googleapis.auth.oauth2.GoogleAuthorizationCodeFlow;
-import com.google.api.client.googleapis.auth.oauth2.GoogleClientSecrets;
-import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
-import com.google.api.client.http.javanet.NetHttpTransport;
-import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
-import com.google.api.client.util.store.FileDataStoreFactory;
-import com.google.api.services.sheets.v4.Sheets;
-import com.google.api.services.sheets.v4.SheetsScopes;
-import com.google.api.services.sheets.v4.model.ValueRange;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.security.GeneralSecurityException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-public class SheetsQuickstart {
- private static final String APPLICATION_NAME = "@string/app_name";
- private static final JsonFactory JSON_FACTORY = JacksonFactory.getDefaultInstance();
- private static final String TOKENS_DIRECTORY_PATH = "tokens";
-
- /**
- * Global instance of the scopes required by this quickstart.
- * If modifying these scopes, delete your previously saved tokens/ folder.
- */
- private static final List SCOPES = Collections.singletonList(SheetsScopes.SPREADSHEETS); //_READONLY
- private static final String CREDENTIALS_FILE_PATH = "/credentials.json";
-
- /**
- * Creates an authorized Credential object.
- * @param HTTP_TRANSPORT The network HTTP Transport.
- * @return An authorized Credential object.
- * @throws IOException If the credentials.json file cannot be found.
- */
- private static Credential getCredentials(final NetHttpTransport HTTP_TRANSPORT) throws IOException {
- // Load client secrets.
- InputStream in = SheetsQuickstart.class.getResourceAsStream(CREDENTIALS_FILE_PATH);
- if (in == null) {
- throw new FileNotFoundException("Resource not found: " + CREDENTIALS_FILE_PATH);
- }
- GoogleClientSecrets clientSecrets = GoogleClientSecrets.load(JSON_FACTORY, new InputStreamReader(in));
-
- // Build flow and trigger user authorization request.
- GoogleAuthorizationCodeFlow flow = new GoogleAuthorizationCodeFlow.Builder(
- HTTP_TRANSPORT, JSON_FACTORY, clientSecrets, SCOPES)
- .setDataStoreFactory(new FileDataStoreFactory(new java.io.File(TOKENS_DIRECTORY_PATH)))
- .setAccessType("offline")
- .build();
- LocalServerReceiver receiver = new LocalServerReceiver.Builder().setPort(8888).build();
- return new AuthorizationCodeInstalledApp(flow, receiver).authorize("user");
- }
-
- /**
- * Prints the names and majors of students in a sample spreadsheet:
- * https://docs.google.com/spreadsheets/d/1BxiMVs0XRA5nFMdKvBdBZjgmUUqptlbs74OgvE2upms/edit
- */
- public String return_sheet() throws IOException, GeneralSecurityException {
- // Build a new authorized API client service.
-
- final NetHttpTransport HTTP_TRANSPORT = new com.google.api.client.http.javanet.NetHttpTransport();
- final String spreadsheetId = "10nkzldxOYVa1OoFbdC8aLUGEqq3tgLsF-Jz_XlQfj0s";
- final String range = "(Interfejs + Logi uzytkownika)!D10";
- Sheets service = new Sheets.Builder(HTTP_TRANSPORT, JSON_FACTORY, getCredentials(HTTP_TRANSPORT))
- .setApplicationName(APPLICATION_NAME)
- .build();
- ValueRange response = service.spreadsheets().values()
- .get(spreadsheetId, range)
- .execute();
- List> values = response.getValues();
-
- /*
- ValueRange requestBody = new ValueRange();
- requestBody.setValues(
- Arrays.asList(
- Arrays.asList("Row 1 Cell 1", "Row 1 Cell 2", "Row 1 Cell 3"),
- Arrays.asList("Row 2 Cell 1", "Row 2 Cell 2", "Row 2 Cell 3")));
-
- Sheets.Spreadsheets.Values.Update request2 =
- service.spreadsheets().values().update(spreadsheetId, "(Interfejs + Logi użytkownika)!K32", requestBody).setValueInputOption("RAW"); //USER_ENTERED?
- request2.execute();
- */
-
- StringBuilder stringBuilder = new StringBuilder();
-
- if (values == null || values.isEmpty()) {
- stringBuilder.append("No data found.");
- } else {
- stringBuilder.append("Name, Major");
- for (List row : values) {
- // Print columns A and E, which correspond to indices 0 and 4.
- stringBuilder.append(row.get(0));
- }
- }
-
- String string = stringBuilder.toString();
- return string;
- }
-}
-// [END sheets_quickstart]
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
old mode 100644
new mode 100755
index 361ff30..25904f0
--- 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
@@ -1,13 +1,32 @@
package com.example.foodinder_app;
+import android.app.ProgressDialog;
import android.os.Bundle;
+import android.os.SystemClock;
import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.Toast;
+import com.android.volley.DefaultRetryPolicy;
+import com.android.volley.Request;
+import com.android.volley.RequestQueue;
+import com.android.volley.Response;
+import com.android.volley.RetryPolicy;
+import com.android.volley.VolleyError;
+import com.android.volley.toolbox.JsonArrayRequest;
+import com.android.volley.toolbox.JsonObjectRequest;
+import com.android.volley.toolbox.StringRequest;
+import com.android.volley.toolbox.Volley;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
import java.util.ArrayList;
+import java.util.HashMap;
import link.fls.swipestack.SwipeStack;
@@ -15,10 +34,17 @@ public class swipper extends AppCompatActivity {
private SwipeStack cardStack;
private CardsAdapter cardsAdapter;
- private ArrayList cardItems;
+ private ArrayList cardItems = new ArrayList<>();
private View btnCancel;
private View btnLove;
private int currentPosition;
+ private RequestQueue mQueue;
+ int i;
+ CardItem card;
+ String photo;
+ String name;
+ String description;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -29,26 +55,32 @@ public class swipper extends AppCompatActivity {
btnCancel = findViewById(R.id.cancel);
btnLove = findViewById(R.id.love);
+ mQueue = Volley.newRequestQueue(this);
+
setCardStackAdapter();
currentPosition = 0;
+ i = 0;
//Handling swipe event of Cards stack
cardStack.setListener(new SwipeStack.SwipeStackListener() {
@Override
public void onViewSwipedToLeft(int position) {
-
- Toast.makeText(swipper.this, "You liked " + cardItems.get(currentPosition).getName(),
- Toast.LENGTH_SHORT).show();
currentPosition = position + 1;
-
+ if (i!=0) {
+ red();
+ }
+ i+=1;
+ setCardStackAdapter();
}
@Override
public void onViewSwipedToRight(int position) {
-
- Toast.makeText(swipper.this, "You DON'T liked " + cardItems.get(currentPosition).getName(),
- Toast.LENGTH_SHORT).show();
currentPosition = position + 1;
+ if (i!=0) {
+ green();
+ }
+ i+=1;
+ setCardStackAdapter();
}
@Override
@@ -73,29 +105,31 @@ public class swipper extends AppCompatActivity {
}
private void setCardStackAdapter() {
- cardItems = new ArrayList<>();
- cardItems.add(new CardItem(R.drawable.a, "JedzenieA", "Jedzenie"));
- cardItems.add(new CardItem(R.drawable.b, "JedzenieB", "Jedzenie"));
- cardItems.add(new CardItem(R.drawable.c, "JedzenieC", "Jedzenie"));
- cardItems.add(new CardItem(R.drawable.d, "JedzenieD", "Jedzenie"));
- cardItems.add(new CardItem(R.drawable.e, "JedzenieE", "Jedzenie"));
- cardItems.add(new CardItem(R.drawable.f, "JedzenieF", "Jedzenie"));
- cardItems.add(new CardItem(R.drawable.g, "JedzenieG", "Jedzenie"));
- cardItems.add(new CardItem(R.drawable.h, "JedzenieH", "Jedzenie"));
- cardItems.add(new CardItem(R.drawable.i, "JedzenieI", "Jedzenie"));
- cardItems.add(new CardItem(R.drawable.j, "JedzenieJ", "Jedzenie"));
- cardItems.add(new CardItem(R.drawable.k, "JedzenieK", "Jedzenie"));
- cardItems.add(new CardItem(R.drawable.l, "JedzenieL", "Jedzenie"));
- cardItems.add(new CardItem(R.drawable.m, "JedzenieM", "Jedzenie"));
- cardItems.add(new CardItem(R.drawable.n, "JedzenieN", "Jedzenie"));
- cardItems.add(new CardItem(R.drawable.o, "JedzenieO", "Jedzenie"));
- cardItems.add(new CardItem(R.drawable.p, "JedzenieP", "Jedzenie"));
- cardItems.add(new CardItem(R.drawable.r, "JedzenieR", "Jedzenie"));
+ parseJSON();
+
+
+
+ SystemClock.sleep(1000);
+
+ Toast.makeText(swipper.this, photo + " " + name + " " + description,
+ Toast.LENGTH_SHORT).show();
+
+ if (i==0) {
+ cardItems.add(new CardItem("https://im0-tub-com.yandex.net/i?id=5165d6043f5ca303aa3a791f91be3f9f&n=13&exp=1","pączki","lorem_ipsum"));
+ }
+ else {
+ cardItems.add(new CardItem(photo,name,description));
+ }
cardsAdapter = new CardsAdapter(this, cardItems);
- cardStack.setAdapter(cardsAdapter);
+
+ new Thread(new Runnable() {
+ public void run() {
+ cardStack.setAdapter(cardsAdapter);
+ }
+ }).start();
}
@Override
@@ -107,9 +141,117 @@ public class swipper extends AppCompatActivity {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == R.id.reset) {
- cardStack.resetStack();
- currentPosition = 0;
+ //cardStack.resetStack();
+ //currentPosition = 0;
+ restart();
}
return super.onOptionsItemSelected(item);
}
+
+//https://script.google.com/macros/s/AKfycbxhgRlgu_26AzjeAfJzgpvCRpQaFc47YM1Xyn2F/exec?action=red
+
+
+ private void parseJSON() {
+ String url = "https://script.google.com/macros/s/AKfycbxhgRlgu_26AzjeAfJzgpvCRpQaFc47YM1Xyn2F/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");
+ description = jo.getString("description");
+
+
+ //Toast.makeText(swipper.this, photo + " " + name + " " + description,
+ // Toast.LENGTH_SHORT).show();
+
+ } catch (JSONException e) {
+ e.printStackTrace();
+ }
+
+
+ }
+ }, new Response.ErrorListener() {
+ @Override
+ public void onErrorResponse(VolleyError error) {
+
+ error.printStackTrace();
+ }
+ });
+
+
+ mQueue.add(request);
+
+ }
+
+
+ private void green(){
+ String url = "https://script.google.com/macros/s/AKfycbxhgRlgu_26AzjeAfJzgpvCRpQaFc47YM1Xyn2F/exec?action=green";
+
+ StringRequest stringRequest = new StringRequest(Request.Method.GET, url,
+ new Response.Listener() {
+ @Override
+ public void onResponse(String response) {
+
+ Log.d("strrrrr",">>"+response);
+ }
+ },
+ new Response.ErrorListener() {
+ @Override
+ public void onErrorResponse(VolleyError error) {
+ //displaying the error in toast if occurrs
+ Toast.makeText(getApplicationContext(), error.getMessage(), Toast.LENGTH_SHORT).show();
+ }
+ });
+ mQueue.add(stringRequest);
+ }
+
+ private void red(){
+ String url = "https://script.google.com/macros/s/AKfycbxhgRlgu_26AzjeAfJzgpvCRpQaFc47YM1Xyn2F/exec?action=red";
+
+ StringRequest stringRequest = new StringRequest(Request.Method.GET, url,
+ new Response.Listener() {
+ @Override
+ public void onResponse(String response) {
+
+ Log.d("strrrrr",">>"+response);
+ }
+ },
+ new Response.ErrorListener() {
+ @Override
+ public void onErrorResponse(VolleyError error) {
+ //displaying the error in toast if occurrs
+ Toast.makeText(getApplicationContext(), error.getMessage(), Toast.LENGTH_SHORT).show();
+ }
+ });
+ mQueue.add(stringRequest);
+ }
+
+
+ private void restart(){
+ String url = "https://script.google.com/macros/s/AKfycbxhgRlgu_26AzjeAfJzgpvCRpQaFc47YM1Xyn2F/exec?action=restart";
+
+ StringRequest stringRequest = new StringRequest(Request.Method.GET, url,
+ new Response.Listener() {
+ @Override
+ public void onResponse(String response) {
+
+ Log.d("strrrrr",">>"+response);
+ }
+ },
+ new Response.ErrorListener() {
+ @Override
+ public void onErrorResponse(VolleyError error) {
+ //displaying the error in toast if occurrs
+ Toast.makeText(getApplicationContext(), error.getMessage(), Toast.LENGTH_SHORT).show();
+ }
+ });
+ mQueue.add(stringRequest);
+ }
}
diff --git a/foodinder_app/app/src/main/res/drawable-hdpi/green.png b/foodinder_app/app/src/main/res/drawable-hdpi/green.png
new file mode 100644
index 0000000..83897e4
Binary files /dev/null and b/foodinder_app/app/src/main/res/drawable-hdpi/green.png differ
diff --git a/foodinder_app/app/src/main/res/drawable-hdpi/red.png b/foodinder_app/app/src/main/res/drawable-hdpi/red.png
new file mode 100644
index 0000000..dc68067
Binary files /dev/null and b/foodinder_app/app/src/main/res/drawable-hdpi/red.png differ
diff --git a/foodinder_app/app/src/main/res/drawable-mdpi/green.png b/foodinder_app/app/src/main/res/drawable-mdpi/green.png
new file mode 100644
index 0000000..09ea19e
Binary files /dev/null and b/foodinder_app/app/src/main/res/drawable-mdpi/green.png differ
diff --git a/foodinder_app/app/src/main/res/drawable-mdpi/red.png b/foodinder_app/app/src/main/res/drawable-mdpi/red.png
new file mode 100644
index 0000000..7878bbe
Binary files /dev/null and b/foodinder_app/app/src/main/res/drawable-mdpi/red.png differ
diff --git a/foodinder_app/app/src/main/res/drawable-xhdpi/green.png b/foodinder_app/app/src/main/res/drawable-xhdpi/green.png
new file mode 100644
index 0000000..101e149
Binary files /dev/null and b/foodinder_app/app/src/main/res/drawable-xhdpi/green.png differ
diff --git a/foodinder_app/app/src/main/res/drawable-xhdpi/red.png b/foodinder_app/app/src/main/res/drawable-xhdpi/red.png
new file mode 100644
index 0000000..48af482
Binary files /dev/null and b/foodinder_app/app/src/main/res/drawable-xhdpi/red.png differ
diff --git a/foodinder_app/app/src/main/res/drawable-xxhdpi/green.png b/foodinder_app/app/src/main/res/drawable-xxhdpi/green.png
new file mode 100644
index 0000000..f0e2f37
Binary files /dev/null and b/foodinder_app/app/src/main/res/drawable-xxhdpi/green.png differ
diff --git a/foodinder_app/app/src/main/res/drawable-xxhdpi/red.png b/foodinder_app/app/src/main/res/drawable-xxhdpi/red.png
new file mode 100644
index 0000000..560f1a7
Binary files /dev/null and b/foodinder_app/app/src/main/res/drawable-xxhdpi/red.png differ
diff --git a/foodinder_app/app/src/main/res/drawable-xxxhdpi/green.png b/foodinder_app/app/src/main/res/drawable-xxxhdpi/green.png
new file mode 100644
index 0000000..62e50ea
Binary files /dev/null and b/foodinder_app/app/src/main/res/drawable-xxxhdpi/green.png differ
diff --git a/foodinder_app/app/src/main/res/drawable-xxxhdpi/red.png b/foodinder_app/app/src/main/res/drawable-xxxhdpi/red.png
new file mode 100644
index 0000000..1ad966b
Binary files /dev/null and b/foodinder_app/app/src/main/res/drawable-xxxhdpi/red.png differ
diff --git a/foodinder_app/app/src/main/res/drawable/a.jpg b/foodinder_app/app/src/main/res/drawable/a.jpg
deleted file mode 100644
index 2d9a2b9..0000000
Binary files a/foodinder_app/app/src/main/res/drawable/a.jpg and /dev/null differ
diff --git a/foodinder_app/app/src/main/res/drawable/b.jpg b/foodinder_app/app/src/main/res/drawable/b.jpg
deleted file mode 100644
index 9f26ffd..0000000
Binary files a/foodinder_app/app/src/main/res/drawable/b.jpg and /dev/null differ
diff --git a/foodinder_app/app/src/main/res/drawable/c.jpg b/foodinder_app/app/src/main/res/drawable/c.jpg
deleted file mode 100644
index 496f8fc..0000000
Binary files a/foodinder_app/app/src/main/res/drawable/c.jpg and /dev/null differ
diff --git a/foodinder_app/app/src/main/res/drawable/d.jpg b/foodinder_app/app/src/main/res/drawable/d.jpg
deleted file mode 100644
index fa1ee2b..0000000
Binary files a/foodinder_app/app/src/main/res/drawable/d.jpg and /dev/null differ
diff --git a/foodinder_app/app/src/main/res/drawable/e.jpg b/foodinder_app/app/src/main/res/drawable/e.jpg
deleted file mode 100644
index 36ee769..0000000
Binary files a/foodinder_app/app/src/main/res/drawable/e.jpg and /dev/null differ
diff --git a/foodinder_app/app/src/main/res/drawable/f.jpg b/foodinder_app/app/src/main/res/drawable/f.jpg
deleted file mode 100644
index dfb8d67..0000000
Binary files a/foodinder_app/app/src/main/res/drawable/f.jpg and /dev/null differ
diff --git a/foodinder_app/app/src/main/res/drawable/g.jpg b/foodinder_app/app/src/main/res/drawable/g.jpg
deleted file mode 100644
index dfb8d67..0000000
Binary files a/foodinder_app/app/src/main/res/drawable/g.jpg and /dev/null differ
diff --git a/foodinder_app/app/src/main/res/drawable/h.jpg b/foodinder_app/app/src/main/res/drawable/h.jpg
deleted file mode 100644
index a805ae0..0000000
Binary files a/foodinder_app/app/src/main/res/drawable/h.jpg and /dev/null differ
diff --git a/foodinder_app/app/src/main/res/drawable/i.jpg b/foodinder_app/app/src/main/res/drawable/i.jpg
deleted file mode 100644
index b8013cc..0000000
Binary files a/foodinder_app/app/src/main/res/drawable/i.jpg and /dev/null differ
diff --git a/foodinder_app/app/src/main/res/drawable/j.jpg b/foodinder_app/app/src/main/res/drawable/j.jpg
deleted file mode 100644
index 3145250..0000000
Binary files a/foodinder_app/app/src/main/res/drawable/j.jpg and /dev/null differ
diff --git a/foodinder_app/app/src/main/res/drawable/k.jpg b/foodinder_app/app/src/main/res/drawable/k.jpg
deleted file mode 100644
index c95369d..0000000
Binary files a/foodinder_app/app/src/main/res/drawable/k.jpg and /dev/null differ
diff --git a/foodinder_app/app/src/main/res/drawable/l.jpg b/foodinder_app/app/src/main/res/drawable/l.jpg
deleted file mode 100644
index de2fd42..0000000
Binary files a/foodinder_app/app/src/main/res/drawable/l.jpg and /dev/null differ
diff --git a/foodinder_app/app/src/main/res/drawable/m.jpg b/foodinder_app/app/src/main/res/drawable/m.jpg
deleted file mode 100644
index 88010dc..0000000
Binary files a/foodinder_app/app/src/main/res/drawable/m.jpg and /dev/null differ
diff --git a/foodinder_app/app/src/main/res/drawable/n.jpg b/foodinder_app/app/src/main/res/drawable/n.jpg
deleted file mode 100644
index 6033e74..0000000
Binary files a/foodinder_app/app/src/main/res/drawable/n.jpg and /dev/null differ
diff --git a/foodinder_app/app/src/main/res/drawable/o.jpg b/foodinder_app/app/src/main/res/drawable/o.jpg
deleted file mode 100644
index 78cd3b0..0000000
Binary files a/foodinder_app/app/src/main/res/drawable/o.jpg and /dev/null differ
diff --git a/foodinder_app/app/src/main/res/drawable/p.jpg b/foodinder_app/app/src/main/res/drawable/p.jpg
deleted file mode 100644
index de20486..0000000
Binary files a/foodinder_app/app/src/main/res/drawable/p.jpg and /dev/null differ
diff --git a/foodinder_app/app/src/main/res/drawable/r.jpg b/foodinder_app/app/src/main/res/drawable/r.jpg
deleted file mode 100644
index 682a58c..0000000
Binary files a/foodinder_app/app/src/main/res/drawable/r.jpg and /dev/null 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
old mode 100644
new mode 100755
index 73061d5..719314e
--- a/foodinder_app/app/src/main/res/layout/activity_main.xml
+++ b/foodinder_app/app/src/main/res/layout/activity_main.xml
@@ -34,7 +34,7 @@
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/empty"
android:contentDescription="@null"
- android:src="@mipmap/ic_launcher" />
+ android:src="@drawable/green" />
+ android:src="@drawable/red" />
diff --git a/foodinder_app/app/src/main/res/layout/activity_main2.xml b/foodinder_app/app/src/main/res/layout/activity_main2.xml
old mode 100644
new mode 100755
diff --git a/foodinder_app/app/src/main/res/layout/item_card.xml b/foodinder_app/app/src/main/res/layout/item_card.xml
old mode 100644
new mode 100755
diff --git a/foodinder_app/app/src/main/res/menu/menu_main.xml b/foodinder_app/app/src/main/res/menu/menu_main.xml
old mode 100644
new mode 100755
diff --git a/foodinder_app/app/src/main/res/mipmap-hdpi/ic_launcher.png b/foodinder_app/app/src/main/res/mipmap-hdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/foodinder_app/app/src/main/res/mipmap-mdpi/ic_launcher.png b/foodinder_app/app/src/main/res/mipmap-mdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/foodinder_app/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/foodinder_app/app/src/main/res/mipmap-xhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/foodinder_app/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/foodinder_app/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/foodinder_app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/foodinder_app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/foodinder_app/app/src/main/res/values-w820dp/dimens.xml b/foodinder_app/app/src/main/res/values-w820dp/dimens.xml
old mode 100644
new mode 100755
diff --git a/foodinder_app/app/src/main/res/values/colors.xml b/foodinder_app/app/src/main/res/values/colors.xml
old mode 100644
new mode 100755
diff --git a/foodinder_app/app/src/main/res/values/dimens.xml b/foodinder_app/app/src/main/res/values/dimens.xml
old mode 100644
new mode 100755
diff --git a/foodinder_app/app/src/main/res/values/strings.xml b/foodinder_app/app/src/main/res/values/strings.xml
old mode 100644
new mode 100755
diff --git a/foodinder_app/app/src/main/res/values/styles.xml b/foodinder_app/app/src/main/res/values/styles.xml
old mode 100644
new mode 100755
diff --git a/foodinder_app/build.gradle b/foodinder_app/build.gradle
old mode 100644
new mode 100755
diff --git a/foodinder_app/gradle.properties b/foodinder_app/gradle.properties
old mode 100644
new mode 100755
diff --git a/foodinder_app/gradle/wrapper/gradle-wrapper.jar b/foodinder_app/gradle/wrapper/gradle-wrapper.jar
old mode 100644
new mode 100755
diff --git a/foodinder_app/gradle/wrapper/gradle-wrapper.properties b/foodinder_app/gradle/wrapper/gradle-wrapper.properties
old mode 100644
new mode 100755
diff --git a/foodinder_app/gradlew.bat b/foodinder_app/gradlew.bat
old mode 100644
new mode 100755
diff --git a/foodinder_app/settings.gradle b/foodinder_app/settings.gradle
old mode 100644
new mode 100755