diff --git a/foodinder_app/app/src/main/AndroidManifest.xml b/foodinder_app/app/src/main/AndroidManifest.xml
index 6afdbb8..65145b3 100755
--- a/foodinder_app/app/src/main/AndroidManifest.xml
+++ b/foodinder_app/app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.foodinder_app">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:allowBackup="true"
@@ -10,14 +10,19 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".Main2Activity" android:screenOrientation="portrait">
+        <activity android:name=".Main3Activity"></activity>
+        <activity
+            android:name=".Main2Activity"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".swipper"  android:screenOrientation="portrait">
-        </activity>
+        <activity
+            android:name=".Swipper"
+            android:screenOrientation="portrait"></activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/foodinder_app/app/src/main/java/com/example/foodinder_app/CardItem.java b/foodinder_app/app/src/main/java/com/example/foodinder_app/CardItem.java
index 7080c5c..6646afe 100755
--- a/foodinder_app/app/src/main/java/com/example/foodinder_app/CardItem.java
+++ b/foodinder_app/app/src/main/java/com/example/foodinder_app/CardItem.java
@@ -1,25 +1,28 @@
 package com.example.foodinder_app;
 
+import android.graphics.Bitmap;
+import android.util.Log;
+
+import com.squareup.picasso.Picasso;
+
 public class CardItem {
 
-    private String drawableId;
+    private static final String TAG = Main2Activity.class.getName();
+    private final static int AVATAR_WIDTH = 1000;
+    private final static int AVATAR_HEIGHT = 1000;
+    private Bitmap drawable;
     private String name;
-    private String location;
+    Bitmap bitmap = null;
 
-    public CardItem(String drawableId, String name, String location) {
-        this.drawableId = drawableId;
+    public CardItem(String drawableId, String name) {
+        this.drawable = setBitmapFromURL(drawableId, AVATAR_WIDTH, AVATAR_HEIGHT);
         this.name = name;
-        this.location = location;
     }
 
     public CardItem() {}
 
-    public String getDrawableId() {
-        return drawableId;
-    }
-
-    public void setDrawableId(String drawableId) {
-        this.drawableId = drawableId;
+    public Bitmap getDrawable() {
+        return drawable;
     }
 
     public String getName() {
@@ -30,9 +33,41 @@ public class CardItem {
         this.name = name;
     }
 
-    public String getLocation() {
-        return location;
-    }
+    public void changeBitmap(Bitmap x) { bitmap = x; }
 
-    public void setLocation(String location) { this.location = location; }
+    public Bitmap setBitmapFromURL (final String src, int reqWidth, int reqHeight) {
+
+
+        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);
+                }
+            }
+        });
+
+        thread.start();
+
+        Bitmap end = null;
+
+
+        int a =0;
+        while (end==null) {
+            a+=1;
+            try {
+                end = Bitmap.createScaledBitmap(bitmap, reqWidth, reqHeight, false);
+            } catch (Exception e) {
+
+            }
+        }
+
+        bitmap = null;
+
+        return end;
+
+    }
 }
diff --git a/foodinder_app/app/src/main/java/com/example/foodinder_app/CardsAdapter.java b/foodinder_app/app/src/main/java/com/example/foodinder_app/CardsAdapter.java
index 42a864b..33ceb8e 100755
--- a/foodinder_app/app/src/main/java/com/example/foodinder_app/CardsAdapter.java
+++ b/foodinder_app/app/src/main/java/com/example/foodinder_app/CardsAdapter.java
@@ -1,8 +1,6 @@
 package com.example.foodinder_app;
 
 import android.app.Activity;
-import android.graphics.Bitmap;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,18 +8,12 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.squareup.picasso.Picasso;
-
 import java.util.List;
 
 public class CardsAdapter extends BaseAdapter {
 
     private Activity activity;
-    private final static int AVATAR_WIDTH = 1000;
-    private final static int AVATAR_HEIGHT = 1000;
     private List<CardItem> data;
-    private static final String TAG = Main2Activity.class.getName();
-    Bitmap bitmap = null;
 
     public CardsAdapter(Activity activity, List<CardItem> data) {
         this.data = data;
@@ -62,8 +54,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(getItem(position).getDrawableId(), AVATAR_WIDTH, AVATAR_HEIGHT));
+        holder.avatar.setImageBitmap(getItem(position).getDrawable());
 
         return convertView;
     }
@@ -71,54 +62,12 @@ public class CardsAdapter extends BaseAdapter {
     private class ViewHolder{
         private ImageView avatar;
         private TextView name;
-        private TextView location;
 
         public ViewHolder(View view) {
             avatar = (ImageView)view.findViewById(R.id.avatar);
             name = (TextView)view.findViewById(R.id.name);
-            location = (TextView)view.findViewById(R.id.location);
         }
     }
-
-    public void changeBitmap(Bitmap x) { bitmap = x; }
-
-    public Bitmap decodeSampledBitmapFromResource(final String src, int reqWidth, int reqHeight) {
-
-
-        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);
-                }
-            }
-        });
-
-        thread.start();
-
-        Bitmap end = null;
-
-
-        int a =0;
-        while (end==null) {
-            a+=1;
-            try {
-                end = Bitmap.createScaledBitmap(bitmap, reqWidth, reqHeight, false);
-            } catch (Exception e) {
-
-            }
-        }
-
-        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
index dea3f12..559039f 100755
--- 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
@@ -1,29 +1,46 @@
 package com.example.foodinder_app;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import android.graphics.Color;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.Pair;
 import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
-import java.io.IOException;
-import java.security.GeneralSecurityException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
 
 public class Main2Activity extends AppCompatActivity {
 
-    private View button;
-    private View button2;
-    private TextView text;
+    private Button button;
+    private EditText et;
+    private ImageView avatar;
+    private TextView name;
     public static String stringen;
+    public static int zmienna = 10;
+    private Random random = new Random();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main2);
 
-        button = findViewById(R.id.button);
-        text = (TextView) findViewById(R.id.textView);
-        button2 = findViewById(R.id.button2);
+        button = (Button) findViewById(R.id.buttonStart);
+        button.setBackgroundColor(Color.RED);
+        et = (EditText) findViewById(R.id.editText);
+        et.addTextChangedListener(textWatcher);
+        name = (TextView) findViewById(R.id.name2);
+        avatar = (ImageView) findViewById(R.id.avatar2);
+
+        setCard();
 
         button.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -31,19 +48,119 @@ public class Main2Activity extends AppCompatActivity {
             {
                 new Thread(new Runnable() {
                     public void run() {
-                        Intent intent = new Intent(Main2Activity.this, swipper.class);
+                        Intent intent = new Intent(Main2Activity.this, Swipper.class);
                         startActivity(intent);
+                        //finish();
                     }
                 }).start();
             }
         });
+    }
 
-        button2.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view)
-            {
-                text.setText("habas");
+    TextWatcher textWatcher =new TextWatcher() {
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+        }
+
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {
+            if(et.getText().length()>0) {
+                int num = Integer.parseInt(et.getText().toString());
+                if (num>=1 && num<=99)
+                {
+                    //save the number
+                    zmienna = num;
+                }
+                else{
+                    Toast.makeText(Main2Activity.this,getResources().getString(R.string.attentio),Toast.LENGTH_SHORT).show();
+                    et.setText("");
+                    zmienna = 10;
+                }
             }
-        });
+        }
+
+        @Override
+        public void afterTextChanged(Editable s) {
+
+        }
+    };
+
+    private void setCard() {
+
+        Pair<String, String> p = returnRandomFromList();
+        CardItem card = new CardItem(p.first, p.second);
+        avatar.setImageBitmap(card.getDrawable());
+        name.setText(card.getName());
+
+    }
+
+    private Pair<String, String> returnRandomFromList() {
+
+        List<Pair<String, String>> list = new ArrayList<Pair<String, String>>();
+        list.add(Pair.create("https://media-cdn.tripadvisor.com/media/photo-o/0e/50/98/36/ali-baba-doner-kebab.jpg", "kebab"));
+        list.add(Pair.create("https://roadtripbus.pl/wp-content/uploads/2019/01/frytki-belgijskie-przepis.jpg", "frytki"));
+        list.add(Pair.create("http://greenlife.com.pl/wp-content/uploads/2014/01/Fotolia_37798945_Subscription_Monthly_M.jpg", "paluszki rybne"));
+        list.add(Pair.create("http://cdn14.beszamel.smcloud.net/t/thumbs/660/441/1/user_photos/zapiekanka-z-pieczarkami-i-serem-przepis.jpg", "zapiekanka "));
+        list.add(Pair.create("https://krosno24.pl/uploads/files/1278/pizza2859233_1280.jpg", "pizza"));
+        list.add(Pair.create("https://bi.im-g.pl/im/97/cf/d6/z14077847M,Hot-dog.jpg", "hot dog"));
+        list.add(Pair.create("https://s3.przepisy.pl/przepisy3ii/img/variants/767x0/wrapy-z-kurczakiem-i-warzywami894020.jpg", "wrapy "));
+        list.add(Pair.create("https://www.thespruceeats.com/thmb/KlbIb2jMzZnPeh5IzFvz10yDk5Y=/1813x1360/smart/filters:no_upscale()/vegetarian-bean-and-rice-burrito-recipe-3378550-9_preview-5b2417e1ff1b780037a58cda.jpeg", "buritto"));
+        list.add(Pair.create("https://www.kwestiasmaku.com/sites/v123.kwestiasmaku.com/files/quesadillas_z_kurczakiem_01.jpg", "quesedilla "));
+        list.add(Pair.create("https://primeburger.eu/wp-content/uploads/2018/10/2_prod_angus.jpg", "Burger"));
+        list.add(Pair.create("https://s3.przepisy.pl/przepisy3ii/img/variants/357x0/klasyczne-spaghetti-bolognese-z-pomidorami.jpg", "spagetti"));
+        list.add(Pair.create("http://obiading.pl/wp-content/uploads/2013/08/lasagne.jpg", "lasagne"));
+        list.add(Pair.create("https://ocdn.eu/pulscms-transforms/1/cR_ktkpTURBXy82Njc1OWY5MzRmNjgwZDNkMmMwNDIzNGRjMjkxMmNkZC5qcGeTlQMAzK_NFfDNDFeTBc0DFM0BvJUH2TIvcHVsc2Ntcy9NREFfLzE0MGIxY2ZlN2YwYWM1MmVkYzAxMGQ3MDk3OGU4NGJlLnBuZwDCAA", "zapiekanka makaronowa"));
+        list.add(Pair.create("https://ocdn.eu/pulscms-transforms/1/Ll1ktkpTURBXy9hOGU3YmU5MjM5MTc2NTFkZjVjNGJjZTYwZWQxMTQyNC5qcGeTlQMAzLTNFoDNDKiTBc0DFM0BvJUH2TIvcHVsc2Ntcy9NREFfLzE0MGIxY2ZlN2YwYWM1MmVkYzAxMGQ3MDk3OGU4NGJlLnBuZwDCAA", "cannelloni"));
+        list.add(Pair.create("https://kobietamag.pl/wp-content/uploads/2015/11/makaron-farfalle-z-dynia-pizmowa-orzechami-i-grana-padano.jpg", "farfalle"));
+        list.add(Pair.create("https://s3.przepisy.pl/przepisy3ii/img/variants/1440x1080/super-szybkie-tagliatelle-z-kurczakiem658590.jpg", "tagliatelle"));
+        list.add(Pair.create("https://static.smaker.pl/photos/5/5/7/557b2c0fb2b8a9ad5d04bd81aaa17a61_367613_59ccc9e3e2f45_wm.jpg", "barszcz"));
+        list.add(Pair.create("https://d3iamf8ydd24h9.cloudfront.net/pictures/articles/2018/02/39528-v-900x556.jpg", "żurek"));
+        list.add(Pair.create("https://s3.przepisy.pl/przepisy3ii/img/variants/767x0/grochowka.jpg", "grochówka"));
+        list.add(Pair.create("https://zakochanewzupach.pl/wp-content/uploads/2017/05/ch%C5%82odnik-z-burak%C3%B3w-1-866x597.jpg", "chłodnik"));
+        list.add(Pair.create("https://s3.przepisy.pl/przepisy3ii/img/variants/767x0/zupa-pomidorowa.jpg", "zupa pomidorowa"));
+        list.add(Pair.create("https://s3.przepisy.pl/przepisy3ii/img/variants/767x0/classic-chicken-soup_a423933.jpg", "rosół"));
+        list.add(Pair.create("https://s3.przepisy.pl/przepisy3ii/img/variants/767x0/golabki.jpg", "gołąbki"));
+        list.add(Pair.create("https://ocdn.eu/pulscms-transforms/1/KXvktkpTURBXy9jMzFlODhjYzk4YmMxNDhiODMyMzFiMzQ2ZGM2ZWI5My5qcGeTlQMAQs0ISc0EqZMFzQMUzQG8lQfZMi9wdWxzY21zL01EQV8vMTQwYjFjZmU3ZjBhYzUyZWRjMDEwZDcwOTc4ZTg0YmUucG5nAMIA", "kotlet schabowy"));
+        list.add(Pair.create("https://i.wpimg.pl/O/555x385/i.wp.pl/a/f/kuchnia/58011461/-EDYSK_2-galerie_nowe-polskie_obiady-148476303.jpg", "kotlet mielony (zraz)"));
+        list.add(Pair.create("https://static.gotujmy.pl/ZDJECIE_PRZEPISU_ETAP/karkowka-po-cygansku-z-lubczykiem-433571.jpg", "karkówka"));
+        list.add(Pair.create("https://www.kuchniabazylii.pl/wp-content/uploads/2019/02/kurczak-w-kurkumie_przepis_1.jpg", "pierś kurczaka"));
+        list.add(Pair.create("https://kuchnia-marty.pl/wp-content/uploads/2015/11/1553.900.jpg", "kopytka"));
+        list.add(Pair.create("https://www.winiary.pl/image.ashx/kluski-slaskie-z-sosem-pieczeniowym.jpg?fileID=210145&width=800&height=1400&frame=False&bg=0&resize=1&crop=0&hRefill=0&vRefill=0&quality=84", "kluski śląskie"));
+        list.add(Pair.create("https://kulinarneprzeboje.pl/wp-content/uploads/2018/08/DSC_0793-660x993.jpg", "knedle"));
+        list.add(Pair.create("https://static.gotujmy.pl/ZDJECIE_PRZEPISU_ETAP/krokiety-z-miesem-grzybami-i-kapusta-415737.jpg", "krokiety z mięsem"));
+        list.add(Pair.create("https://cookit.pl/Data/Images/zjemto.blox.pl/2015_slash_12_slash_Krokiety-z-kapusta-i-grzybami/l/-1540155321.jpg", "krokiety z kapustą i grzybami"));
+        list.add(Pair.create("https://www.nalesniki.eu/wp-content/uploads/2015/02/nalesniki_z_serem.jpg", "naleśniki z serem"));
+        list.add(Pair.create("https://d3iamf8ydd24h9.cloudfront.net/pictures/articles/2018/01/21290-v-900x556.jpg", "naleśniki z owocami"));
+        list.add(Pair.create("https://static.gotujmy.pl/ZDJECIE_PRZEPISU_ETAP/gofry-z-bita-smietana-i-owocami-366132.jpg", "gofry z bitą śmietaną"));
+        list.add(Pair.create("https://www.mniammniam.com/obrazki_mobile/sernik_latwyszybki1_mobile.jpg", "sernik"));
+        list.add(Pair.create("https://www.przyslijprzepis.pl/media/cache/default_view/uploads/media/default/0001/13/2daa72a1a0a24e7dae3da924681d31e7929557a1.jpeg", "lody czekoladowe"));
+        list.add(Pair.create("https://2.bp.blogspot.com/-KIAqdG_dEBc/W1CR4mRLcDI/AAAAAAAAUvA/ryRpfubKHCYe_DcRokWK1zHNm-rrJOCbQCLcBGAs/s1600/Domowe%2BLody%2B%25C5%259Bmietankowe%2Blody%2Bmleczne%2Blody%2Bsmietankowe%2Bnajlepsze%2Blody%2Bsmietankowe%2Bnajlepsze%2Blody%2B%25C5%259Bmietanowe%2Bdomowe%2Blody%2Bnajlepsze%2Bprzepis%2Bprzepis%2Bna%2Blody%2B0.jpg", "lody śmietankowe"));
+        list.add(Pair.create("https://static.mojewypieki.com/upload/images/przepisy/Tiramisu/Tiramisu_01.jpg", "tiramisu"));
+        list.add(Pair.create("https://s3.przepisy.pl/przepisy3ii/img/variants/767x0/wuzetka6100240536839567.jpg", "wuzetka"));
+        list.add(Pair.create("http://www.przepisykulinarne.info/wp-content/uploads/2015/01/jajecznica-z-boczkiem-2.jpg", "jajecznica"));
+        list.add(Pair.create("https://ocdn.eu/pulscms-transforms/1/kHcktkqTURBXy85ZTRmMmRhMWE3NGMxOWI2ZTIwMjdlYTJiNmYxMzk0Yy5qcGVnk5UDAM0Jj80NVc0HgJMFzQMUzQG8lQfZMi9wdWxzY21zL01EQV8vMTQwYjFjZmU3ZjBhYzUyZWRjMDEwZDcwOTc4ZTg0YmUucG5nAMIA", "jajecznica bez mięsa"));
+        list.add(Pair.create("https://d1doqjmisr497k.cloudfront.net/-/media/kamispl-2016/recipe/2000/tosty_z_szynka_i_serem_2000.jpg?vd=20180617T003946Z&ir=1&width=885&height=498&crop=auto&quality=75&speed=0&hash=B683193C23502612DDCBE5E63A072D72C5D6A0C6", "tost"));
+        list.add(Pair.create("https://i.pinimg.com/474x/31/e4/9e/31e49eadb4c89d83045b0abcc4cd187b.jpg", "tost bez miesa"));
+        list.add(Pair.create("https://www.eksperymentalnie.com/wp-content/uploads/2009/01/zupa_mleczna.jpg", "zupa mleczna"));
+        list.add(Pair.create("https://www.mojegotowanie.pl/media/cache/default_view/uploads/media/default/0001/06/06c1ddd737685ab33c7e9e16312264390ff37ed5.jpeg", "omlet"));
+        list.add(Pair.create("https://pliki.portalspozywczy.pl/i/08/79/02/087902_940.jpg", "kanapka"));
+        list.add(Pair.create("https://s3.przepisy.pl/przepisy3ii/img/variants/435x0/kanapka-z-gorgonzola-i-gruszka671748.jpg", "kanapka bez miesa"));
+        list.add(Pair.create("http://jamiprzepisy.pl/wp-content/uploads/2009/05/kotlety_soczewicowe_2_1400.jpg", "kotlety z soczewicy"));
+        list.add(Pair.create("https://www.przyslijprzepis.pl/media/cache/default_view/uploads/media/recipe/0006/16/c28f37349627c7dd1eb1944a1ef43c24b08ee155.jpeg", "kotlety z fasoli"));
+        list.add(Pair.create("https://s3.party.pl/styl-zycia/zdrowie/odchudzanie-i-diety/zielony-wegetarianski-burger-437024-MT.jpg", "burger wege"));
+        list.add(Pair.create("https://v.wpimg.pl/NzI4NDc0YRsoVjh3TEtsDmsObC0KEmJYPBZ0Zkx_YUx9ADZwWwNhHmdDPi0OV2AKJRt7fVsFeUJ8AWNpWgN9SH0Gf3BUHzkfLlUgNwhZYxg8RikhER4kCi4WMw==", "burger wege 2"));
+        list.add(Pair.create("https://static.smaker.pl/photos/9/4/4/9442fbd2e845b0173b063c4ee272dccc_110705_57b497ef426c8_wm.jpg", "placki ziemniaczane"));
+        list.add(Pair.create("https://s3.przepisy.pl/przepisy3ii/img/variants/767x0/2277786.jpg", "ratatuj"));
+        list.add(Pair.create("http://magicznyskladnik.pl/wp-content/uploads/2015/03/przepis-na-ziemniaki-pieczone-w-piekarniku-28-2.jpg", "pieczone ziemniaki"));
+        list.add(Pair.create("https://www.winiary.pl/image.ashx/losos-z-koperkiem.jpg?fileID=43312&width=800&height=1400&frame=False&bg=0&resize=1&crop=0&hRefill=0&vRefill=0&quality=84", "łosos"));
+        list.add(Pair.create("http://cdn30.beszamel.smcloud.net/t/thumbs/640/480/1/user_photos/18671/tani-dorsz-z-kauflandu-najlepszy-przepis.jpg", "dorsz"));
+        list.add(Pair.create("https://rybyswiata.pl/wp-content/uploads/2013/10/halibut-niebieski-rybyswiata-pl.png", "halibut"));
+        list.add(Pair.create("https://www.poezja-smaku.pl/wp-content/uploads/2012/07/aromatyczny-dorsz.jpg", "dorsz w panierce"));
+        list.add(Pair.create("https://media-cdn.tripadvisor.com/media/photo-s/10/19/f2/0b/ryba-miruna-w-zlocistej.jpg", "miruna w panierce"));
+
+
+        int index = random.nextInt(list.size());
+        return list.get(index);
     }
 }
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
new file mode 100644
index 0000000..1921600
--- /dev/null
+++ b/foodinder_app/app/src/main/java/com/example/foodinder_app/Main3Activity.java
@@ -0,0 +1,13 @@
+package com.example.foodinder_app;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+public class Main3Activity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main3);
+    }
+}
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
new file mode 100755
index 0000000..8f2ae9f
--- /dev/null
+++ b/foodinder_app/app/src/main/java/com/example/foodinder_app/Swipper.java
@@ -0,0 +1,370 @@
+package com.example.foodinder_app;
+
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.SystemClock;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+import android.util.Pair;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+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.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.List;
+import java.util.Random;
+
+import link.fls.swipestack.SwipeStack;
+
+public class Swipper extends AppCompatActivity {
+
+    private SwipeStack cardStack;
+    private CardsAdapter cardsAdapter;
+    private ArrayList<CardItem> cardItems = new ArrayList<>();
+    private ImageView btnCancel;
+    private ImageView btnLove;
+    private ImageView jeden;
+    private ImageView dwa;
+    private ImageView trzy;
+    private ImageView cztery;
+    private ImageView piec;
+    private int currentPosition;
+    private RequestQueue mQueue;
+    private Random random = new Random();
+    int i;
+    int j = Main2Activity.zmienna;
+    String photo;
+    String name;
+    final private String api = "https://script.google.com/macros/s/AKfycbxhgRlgu_26AzjeAfJzgpvCRpQaFc47YM1Xyn2F";
+    private int colorJeden = 0;
+    private int colorDwa = 0;
+    private int colorTrzy = 0;
+    private int colorCztery = 0;
+    private int colorPiec = 0;
+    private int green = Color.rgb(106,193,89);
+    private int red = Color.rgb(239,82,39);
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        cardStack = (SwipeStack) findViewById(R.id.container);
+        btnCancel = (ImageView) findViewById(R.id.cancel);
+        btnLove = (ImageView) findViewById(R.id.love);
+        jeden = (ImageView) findViewById(R.id.jeden);
+        dwa = (ImageView) findViewById(R.id.dwa);
+        trzy = (ImageView) findViewById(R.id.trzy);
+        cztery = (ImageView) findViewById(R.id.cztery);
+        piec = (ImageView) findViewById(R.id.piec);
+
+        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) {
+                currentPosition = position + 1;
+                if (i!=0) {
+                    green();
+                }
+                if (i==j) {
+                    i=0;
+                    Intent intent = new Intent(Swipper.this, Main3Activity.class);
+                    startActivity(intent);
+                    finish();
+                }
+                i+=1;
+                changeImageStack(green);
+                setCardStackAdapter();
+            }
+
+            @Override
+            public void onViewSwipedToRight(int position) {
+                currentPosition = position + 1;
+                if (i!=0) {
+                    red();
+                }
+                if (i==j) {
+                    i=0;
+                    Intent intent = new Intent(Swipper.this, Main3Activity.class);
+                    startActivity(intent);
+                    finish();
+                }
+                i+=1;
+                changeImageStack(red);
+                setCardStackAdapter();
+            }
+
+            @Override
+            public void onStackEmpty() {
+
+            }
+        });
+
+        btnCancel.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                cardStack.swipeTopViewToRight();
+            }
+        });
+
+        btnLove.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                cardStack.swipeTopViewToLeft();
+            }
+        });
+    }
+
+    private void setCardStackAdapter() {
+
+        parseJSON();
+        SystemClock.sleep(1000);
+
+        if (i==0) {
+            Pair <String, String > pair = returnRandomFromList();
+            cardItems.add(new CardItem(pair.first,pair.second));
+        }
+        else {
+            cardItems.add(new CardItem(photo,name));
+        }
+
+        cardsAdapter = new CardsAdapter(this, cardItems);
+
+        new Thread(new Runnable() {
+            public void run() {
+                cardStack.setAdapter(cardsAdapter);
+            }
+        }).start();
+    }
+
+    private void changeImageStack( int color ) {
+        int size = cardsAdapter.getCount();
+        Bitmap bitmapJeden = null;
+        Bitmap bitmapDwa = null;
+        Bitmap bitmapTrzy = null;
+        Bitmap bitmapCztery = null;
+        Bitmap bitmapPiec = null;
+        colorPiec = colorCztery;
+        colorCztery = colorTrzy;
+        colorTrzy = colorDwa;
+        colorDwa = colorJeden;
+        colorJeden = color;
+        try {
+            bitmapJeden = cardsAdapter.getItem(size - 1).getDrawable();
+            jeden.setImageBitmap(bitmapJeden);
+            jeden.setBackgroundColor(colorJeden);
+        } catch (Exception e) {
+
+        }
+        try {
+            bitmapDwa = cardsAdapter.getItem(size - 2).getDrawable();
+            dwa.setImageBitmap(bitmapDwa);
+            dwa.setBackgroundColor(colorDwa);
+        } catch (Exception e) {
+
+        }
+        try {
+            bitmapTrzy = cardsAdapter.getItem(size - 3).getDrawable();
+            trzy.setImageBitmap(bitmapTrzy);
+            trzy.setBackgroundColor(colorTrzy);
+        } catch (Exception e) {
+
+        }
+        try {
+            bitmapCztery = cardsAdapter.getItem(size - 4).getDrawable();
+            cztery.setImageBitmap(bitmapCztery);
+            cztery.setBackgroundColor(colorCztery);
+        } catch (Exception e) {
+
+        }
+        try {
+            bitmapPiec = cardsAdapter.getItem(size - 5).getDrawable();
+            piec.setImageBitmap(bitmapPiec);
+            piec.setBackgroundColor(colorPiec);
+        } catch (Exception e) {
+
+        }
+    }
+
+    private void parseJSON() {
+        String url = api + "/exec?action=getItem";
+
+        JsonObjectRequest request = new JsonObjectRequest(Request.Method.GET, url, null,
+                new Response.Listener<JSONObject>() {
+                    @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);
+
+    }
+
+
+    private void green(){
+        String url = api + "/exec?action=green";
+
+        StringRequest stringRequest = new StringRequest(Request.Method.GET, url,
+                new Response.Listener<String>() {
+                    @Override
+                    public void onResponse(String response) {
+                    }
+                },
+                new Response.ErrorListener() {
+                    @Override
+                    public void onErrorResponse(VolleyError error) {
+                        Toast.makeText(getApplicationContext(), error.getMessage(), Toast.LENGTH_SHORT).show();
+                    }
+                });
+        mQueue.add(stringRequest);
+    }
+
+    private void red(){
+        String url = api + "/exec?action=red";
+
+        StringRequest stringRequest = new StringRequest(Request.Method.GET, url,
+                new Response.Listener<String>() {
+                    @Override
+                    public void onResponse(String response) {
+                    }
+                },
+                new Response.ErrorListener() {
+                    @Override
+                    public void onErrorResponse(VolleyError error) {
+                        Toast.makeText(getApplicationContext(), error.getMessage(), Toast.LENGTH_SHORT).show();
+                    }
+                });
+        mQueue.add(stringRequest);
+    }
+
+
+    private void restart(){
+        String url = api + "/exec?action=restart";
+
+        StringRequest stringRequest = new StringRequest(Request.Method.GET, url,
+                new Response.Listener<String>() {
+                    @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 Pair<String, String> returnRandomFromList() {
+
+        List <Pair<String, String>> list = new ArrayList <Pair<String, String>>();
+        list.add(Pair.create("https://media-cdn.tripadvisor.com/media/photo-o/0e/50/98/36/ali-baba-doner-kebab.jpg", "kebab"));
+        list.add(Pair.create("https://roadtripbus.pl/wp-content/uploads/2019/01/frytki-belgijskie-przepis.jpg", "frytki"));
+        list.add(Pair.create("http://greenlife.com.pl/wp-content/uploads/2014/01/Fotolia_37798945_Subscription_Monthly_M.jpg", "paluszki rybne"));
+        list.add(Pair.create("http://cdn14.beszamel.smcloud.net/t/thumbs/660/441/1/user_photos/zapiekanka-z-pieczarkami-i-serem-przepis.jpg", "zapiekanka "));
+        list.add(Pair.create("https://krosno24.pl/uploads/files/1278/pizza2859233_1280.jpg", "pizza"));
+        list.add(Pair.create("https://bi.im-g.pl/im/97/cf/d6/z14077847M,Hot-dog.jpg", "hot dog"));
+        list.add(Pair.create("https://s3.przepisy.pl/przepisy3ii/img/variants/767x0/wrapy-z-kurczakiem-i-warzywami894020.jpg", "wrapy "));
+        list.add(Pair.create("https://www.thespruceeats.com/thmb/KlbIb2jMzZnPeh5IzFvz10yDk5Y=/1813x1360/smart/filters:no_upscale()/vegetarian-bean-and-rice-burrito-recipe-3378550-9_preview-5b2417e1ff1b780037a58cda.jpeg", "buritto"));
+        list.add(Pair.create("https://www.kwestiasmaku.com/sites/v123.kwestiasmaku.com/files/quesadillas_z_kurczakiem_01.jpg", "quesedilla "));
+        list.add(Pair.create("https://primeburger.eu/wp-content/uploads/2018/10/2_prod_angus.jpg", "Burger"));
+        list.add(Pair.create("https://s3.przepisy.pl/przepisy3ii/img/variants/357x0/klasyczne-spaghetti-bolognese-z-pomidorami.jpg", "spagetti"));
+        list.add(Pair.create("http://obiading.pl/wp-content/uploads/2013/08/lasagne.jpg", "lasagne"));
+        list.add(Pair.create("https://ocdn.eu/pulscms-transforms/1/cR_ktkpTURBXy82Njc1OWY5MzRmNjgwZDNkMmMwNDIzNGRjMjkxMmNkZC5qcGeTlQMAzK_NFfDNDFeTBc0DFM0BvJUH2TIvcHVsc2Ntcy9NREFfLzE0MGIxY2ZlN2YwYWM1MmVkYzAxMGQ3MDk3OGU4NGJlLnBuZwDCAA", "zapiekanka makaronowa"));
+        list.add(Pair.create("https://ocdn.eu/pulscms-transforms/1/Ll1ktkpTURBXy9hOGU3YmU5MjM5MTc2NTFkZjVjNGJjZTYwZWQxMTQyNC5qcGeTlQMAzLTNFoDNDKiTBc0DFM0BvJUH2TIvcHVsc2Ntcy9NREFfLzE0MGIxY2ZlN2YwYWM1MmVkYzAxMGQ3MDk3OGU4NGJlLnBuZwDCAA", "cannelloni"));
+        list.add(Pair.create("https://kobietamag.pl/wp-content/uploads/2015/11/makaron-farfalle-z-dynia-pizmowa-orzechami-i-grana-padano.jpg", "farfalle"));
+        list.add(Pair.create("https://s3.przepisy.pl/przepisy3ii/img/variants/1440x1080/super-szybkie-tagliatelle-z-kurczakiem658590.jpg", "tagliatelle"));
+        list.add(Pair.create("https://static.smaker.pl/photos/5/5/7/557b2c0fb2b8a9ad5d04bd81aaa17a61_367613_59ccc9e3e2f45_wm.jpg", "barszcz"));
+        list.add(Pair.create("https://d3iamf8ydd24h9.cloudfront.net/pictures/articles/2018/02/39528-v-900x556.jpg", "żurek"));
+        list.add(Pair.create("https://s3.przepisy.pl/przepisy3ii/img/variants/767x0/grochowka.jpg", "grochówka"));
+        list.add(Pair.create("https://zakochanewzupach.pl/wp-content/uploads/2017/05/ch%C5%82odnik-z-burak%C3%B3w-1-866x597.jpg", "chłodnik"));
+        list.add(Pair.create("https://s3.przepisy.pl/przepisy3ii/img/variants/767x0/zupa-pomidorowa.jpg", "zupa pomidorowa"));
+        list.add(Pair.create("https://s3.przepisy.pl/przepisy3ii/img/variants/767x0/classic-chicken-soup_a423933.jpg", "rosół"));
+        list.add(Pair.create("https://s3.przepisy.pl/przepisy3ii/img/variants/767x0/golabki.jpg", "gołąbki"));
+        list.add(Pair.create("https://ocdn.eu/pulscms-transforms/1/KXvktkpTURBXy9jMzFlODhjYzk4YmMxNDhiODMyMzFiMzQ2ZGM2ZWI5My5qcGeTlQMAQs0ISc0EqZMFzQMUzQG8lQfZMi9wdWxzY21zL01EQV8vMTQwYjFjZmU3ZjBhYzUyZWRjMDEwZDcwOTc4ZTg0YmUucG5nAMIA", "kotlet schabowy"));
+        list.add(Pair.create("https://i.wpimg.pl/O/555x385/i.wp.pl/a/f/kuchnia/58011461/-EDYSK_2-galerie_nowe-polskie_obiady-148476303.jpg", "kotlet mielony (zraz)"));
+        list.add(Pair.create("https://static.gotujmy.pl/ZDJECIE_PRZEPISU_ETAP/karkowka-po-cygansku-z-lubczykiem-433571.jpg", "karkówka"));
+        list.add(Pair.create("https://www.kuchniabazylii.pl/wp-content/uploads/2019/02/kurczak-w-kurkumie_przepis_1.jpg", "pierś kurczaka"));
+        list.add(Pair.create("https://kuchnia-marty.pl/wp-content/uploads/2015/11/1553.900.jpg", "kopytka"));
+        list.add(Pair.create("https://www.winiary.pl/image.ashx/kluski-slaskie-z-sosem-pieczeniowym.jpg?fileID=210145&width=800&height=1400&frame=False&bg=0&resize=1&crop=0&hRefill=0&vRefill=0&quality=84", "kluski śląskie"));
+        list.add(Pair.create("https://kulinarneprzeboje.pl/wp-content/uploads/2018/08/DSC_0793-660x993.jpg", "knedle"));
+        list.add(Pair.create("https://static.gotujmy.pl/ZDJECIE_PRZEPISU_ETAP/krokiety-z-miesem-grzybami-i-kapusta-415737.jpg", "krokiety z mięsem"));
+        list.add(Pair.create("https://cookit.pl/Data/Images/zjemto.blox.pl/2015_slash_12_slash_Krokiety-z-kapusta-i-grzybami/l/-1540155321.jpg", "krokiety z kapustą i grzybami"));
+        list.add(Pair.create("https://www.nalesniki.eu/wp-content/uploads/2015/02/nalesniki_z_serem.jpg", "naleśniki z serem"));
+        list.add(Pair.create("https://d3iamf8ydd24h9.cloudfront.net/pictures/articles/2018/01/21290-v-900x556.jpg", "naleśniki z owocami"));
+        list.add(Pair.create("https://static.gotujmy.pl/ZDJECIE_PRZEPISU_ETAP/gofry-z-bita-smietana-i-owocami-366132.jpg", "gofry z bitą śmietaną"));
+        list.add(Pair.create("https://www.mniammniam.com/obrazki_mobile/sernik_latwyszybki1_mobile.jpg", "sernik"));
+        list.add(Pair.create("https://www.przyslijprzepis.pl/media/cache/default_view/uploads/media/default/0001/13/2daa72a1a0a24e7dae3da924681d31e7929557a1.jpeg", "lody czekoladowe"));
+        list.add(Pair.create("https://2.bp.blogspot.com/-KIAqdG_dEBc/W1CR4mRLcDI/AAAAAAAAUvA/ryRpfubKHCYe_DcRokWK1zHNm-rrJOCbQCLcBGAs/s1600/Domowe%2BLody%2B%25C5%259Bmietankowe%2Blody%2Bmleczne%2Blody%2Bsmietankowe%2Bnajlepsze%2Blody%2Bsmietankowe%2Bnajlepsze%2Blody%2B%25C5%259Bmietanowe%2Bdomowe%2Blody%2Bnajlepsze%2Bprzepis%2Bprzepis%2Bna%2Blody%2B0.jpg", "lody śmietankowe"));
+        list.add(Pair.create("https://static.mojewypieki.com/upload/images/przepisy/Tiramisu/Tiramisu_01.jpg", "tiramisu"));
+        list.add(Pair.create("https://s3.przepisy.pl/przepisy3ii/img/variants/767x0/wuzetka6100240536839567.jpg", "wuzetka"));
+        list.add(Pair.create("http://www.przepisykulinarne.info/wp-content/uploads/2015/01/jajecznica-z-boczkiem-2.jpg", "jajecznica"));
+        list.add(Pair.create("https://ocdn.eu/pulscms-transforms/1/kHcktkqTURBXy85ZTRmMmRhMWE3NGMxOWI2ZTIwMjdlYTJiNmYxMzk0Yy5qcGVnk5UDAM0Jj80NVc0HgJMFzQMUzQG8lQfZMi9wdWxzY21zL01EQV8vMTQwYjFjZmU3ZjBhYzUyZWRjMDEwZDcwOTc4ZTg0YmUucG5nAMIA", "jajecznica bez mięsa"));
+        list.add(Pair.create("https://d1doqjmisr497k.cloudfront.net/-/media/kamispl-2016/recipe/2000/tosty_z_szynka_i_serem_2000.jpg?vd=20180617T003946Z&ir=1&width=885&height=498&crop=auto&quality=75&speed=0&hash=B683193C23502612DDCBE5E63A072D72C5D6A0C6", "tost"));
+        list.add(Pair.create("https://i.pinimg.com/474x/31/e4/9e/31e49eadb4c89d83045b0abcc4cd187b.jpg", "tost bez miesa"));
+        list.add(Pair.create("https://www.eksperymentalnie.com/wp-content/uploads/2009/01/zupa_mleczna.jpg", "zupa mleczna"));
+        list.add(Pair.create("https://www.mojegotowanie.pl/media/cache/default_view/uploads/media/default/0001/06/06c1ddd737685ab33c7e9e16312264390ff37ed5.jpeg", "omlet"));
+        list.add(Pair.create("https://pliki.portalspozywczy.pl/i/08/79/02/087902_940.jpg", "kanapka"));
+        list.add(Pair.create("https://s3.przepisy.pl/przepisy3ii/img/variants/435x0/kanapka-z-gorgonzola-i-gruszka671748.jpg", "kanapka bez miesa"));
+        list.add(Pair.create("http://jamiprzepisy.pl/wp-content/uploads/2009/05/kotlety_soczewicowe_2_1400.jpg", "kotlety z soczewicy"));
+        list.add(Pair.create("https://www.przyslijprzepis.pl/media/cache/default_view/uploads/media/recipe/0006/16/c28f37349627c7dd1eb1944a1ef43c24b08ee155.jpeg", "kotlety z fasoli"));
+        list.add(Pair.create("https://s3.party.pl/styl-zycia/zdrowie/odchudzanie-i-diety/zielony-wegetarianski-burger-437024-MT.jpg", "burger wege"));
+        list.add(Pair.create("https://v.wpimg.pl/NzI4NDc0YRsoVjh3TEtsDmsObC0KEmJYPBZ0Zkx_YUx9ADZwWwNhHmdDPi0OV2AKJRt7fVsFeUJ8AWNpWgN9SH0Gf3BUHzkfLlUgNwhZYxg8RikhER4kCi4WMw==", "burger wege 2"));
+        list.add(Pair.create("https://static.smaker.pl/photos/9/4/4/9442fbd2e845b0173b063c4ee272dccc_110705_57b497ef426c8_wm.jpg", "placki ziemniaczane"));
+        list.add(Pair.create("https://s3.przepisy.pl/przepisy3ii/img/variants/767x0/2277786.jpg", "ratatuj"));
+        list.add(Pair.create("http://magicznyskladnik.pl/wp-content/uploads/2015/03/przepis-na-ziemniaki-pieczone-w-piekarniku-28-2.jpg", "pieczone ziemniaki"));
+        list.add(Pair.create("https://www.winiary.pl/image.ashx/losos-z-koperkiem.jpg?fileID=43312&width=800&height=1400&frame=False&bg=0&resize=1&crop=0&hRefill=0&vRefill=0&quality=84", "łosos"));
+        list.add(Pair.create("http://cdn30.beszamel.smcloud.net/t/thumbs/640/480/1/user_photos/18671/tani-dorsz-z-kauflandu-najlepszy-przepis.jpg", "dorsz"));
+        list.add(Pair.create("https://rybyswiata.pl/wp-content/uploads/2013/10/halibut-niebieski-rybyswiata-pl.png", "halibut"));
+        list.add(Pair.create("https://www.poezja-smaku.pl/wp-content/uploads/2012/07/aromatyczny-dorsz.jpg", "dorsz w panierce"));
+        list.add(Pair.create("https://media-cdn.tripadvisor.com/media/photo-s/10/19/f2/0b/ryba-miruna-w-zlocistej.jpg", "miruna w panierce"));
+
+
+        int index = random.nextInt(list.size());
+        return list.get(index);
+    }
+}
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
deleted file mode 100755
index 25904f0..0000000
--- a/foodinder_app/app/src/main/java/com/example/foodinder_app/swipper.java
+++ /dev/null
@@ -1,257 +0,0 @@
-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;
-
-public class swipper extends AppCompatActivity {
-
-    private SwipeStack cardStack;
-    private CardsAdapter cardsAdapter;
-    private ArrayList<CardItem> 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) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        cardStack = (SwipeStack) findViewById(R.id.container);
-        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) {
-                currentPosition = position + 1;
-                if (i!=0) {
-                    red();
-                }
-                i+=1;
-                setCardStackAdapter();
-            }
-
-            @Override
-            public void onViewSwipedToRight(int position) {
-                currentPosition = position + 1;
-                if (i!=0) {
-                    green();
-                }
-                i+=1;
-                setCardStackAdapter();
-            }
-
-            @Override
-            public void onStackEmpty() {
-
-            }
-        });
-
-        btnCancel.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                cardStack.swipeTopViewToRight();
-            }
-        });
-
-        btnLove.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                cardStack.swipeTopViewToLeft();
-            }
-        });
-    }
-
-    private void setCardStackAdapter() {
-
-
-        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);
-
-        new Thread(new Runnable() {
-            public void run() {
-                cardStack.setAdapter(cardsAdapter);
-            }
-        }).start();
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_main, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.reset) {
-            //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<JSONObject>() {
-                    @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<String>() {
-                    @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<String>() {
-                    @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<String>() {
-                    @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/a.jpg b/foodinder_app/app/src/main/res/drawable/a.jpg
deleted file mode 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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 100755
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
index 719314e..0edbae9 100755
--- a/foodinder_app/app/src/main/res/layout/activity_main.xml
+++ b/foodinder_app/app/src/main/res/layout/activity_main.xml
@@ -12,9 +12,84 @@
     <link.fls.swipestack.SwipeStack
         android:id="@+id/container"
         android:layout_width="match_parent"
-        android:layout_height="500dp"
+        android:layout_height="400dp"
         app:stack_rotation="0" />
 
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="100dp"
+        android:layout_below="@+id/container">
+
+        <ImageView
+            android:id="@+id/jeden"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:padding="2dp"
+            android:layout_toLeftOf="@id/empty1"
+            android:contentDescription="@null" />
+
+
+        <TextView
+            android:id="@+id/empty1"
+            android:layout_width="10dp"
+            android:layout_toLeftOf="@id/dwa"
+            android:layout_height="wrap_content" />
+
+        <ImageView
+            android:id="@+id/dwa"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:padding="2dp"
+            android:layout_toLeftOf="@id/empty2"
+            android:contentDescription="@null" />
+
+
+        <TextView
+            android:id="@+id/empty2"
+            android:layout_width="10dp"
+            android:layout_toLeftOf="@id/trzy"
+            android:layout_height="wrap_content" />
+
+        <ImageView
+            android:id="@+id/trzy"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:padding="2dp"
+            android:layout_centerHorizontal="true"
+            android:contentDescription="@null" />
+
+
+        <TextView
+            android:id="@+id/empty3"
+            android:layout_width="10dp"
+            android:layout_toRightOf="@id/trzy"
+            android:layout_height="wrap_content" />
+
+        <ImageView
+            android:id="@+id/cztery"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:padding="2dp"
+            android:layout_toRightOf="@id/empty3"
+            android:contentDescription="@null" />
+
+
+        <TextView
+            android:id="@+id/empty4"
+            android:layout_width="10dp"
+            android:layout_toRightOf="@id/cztery"
+            android:layout_height="wrap_content" />
+
+        <ImageView
+            android:id="@+id/piec"
+            android:layout_width="70dp"
+            android:layout_height="70dp"
+            android:padding="2dp"
+            android:layout_toRightOf="@id/empty4"
+            android:contentDescription="@null" />
+
+    </RelativeLayout>
+
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -22,14 +97,14 @@
 
         <TextView
             android:id="@+id/empty"
-            android:layout_width="wrap_content"
+            android:layout_width="60dp"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true" />
 
         <ImageView
             android:id="@+id/love"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
             android:layout_centerInParent="true"
             android:layout_marginLeft="10dp"
             android:layout_toRightOf="@id/empty"
@@ -38,8 +113,8 @@
 
         <ImageView
             android:id="@+id/cancel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
             android:layout_centerInParent="true"
             android:layout_marginRight="10dp"
             android:layout_toLeftOf="@id/empty"
diff --git a/foodinder_app/app/src/main/res/layout/activity_main2.xml b/foodinder_app/app/src/main/res/layout/activity_main2.xml
index 8f259f1..3edad5b 100755
--- a/foodinder_app/app/src/main/res/layout/activity_main2.xml
+++ b/foodinder_app/app/src/main/res/layout/activity_main2.xml
@@ -1,35 +1,93 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".Main2Activity">
 
-    <Button
-        android:id="@+id/button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="New Activity Click"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <TextView
+        android:id="@+id/textView2"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_marginTop="10dp"
+        android:layout_alignParentTop="true"
+        android:textAlignment="center"
+        android:textColor="@color/black"
+        android:textSize="40dp"
+        android:text="@string/proposition" />
+
+    <android.support.v7.widget.CardView
+        android:id="@+id/pom"
+        android:layout_width="match_parent"
+        android:layout_height="300dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginTop="10dp"
+        android:layout_below="@id/textView2"
+        android:background="@android:color/white"
+        android:orientation="vertical"
+        app:cardCornerRadius="7dp"
+        app:cardElevation="4dp">
+
+        <ImageView
+            android:id="@+id/avatar2"
+            android:layout_width="match_parent"
+            android:layout_height="250dp"
+            android:layout_marginBottom="75dp"
+            android:contentDescription="@null"
+            android:scaleType="fitXY" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="75dp"
+            android:layout_gravity="bottom"
+            android:gravity="center|left"
+            android:orientation="vertical"
+            android:paddingLeft="20dp">
+
+            <TextView
+                android:id="@+id/name2"
+                android:layout_marginTop="10dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/colorPrimaryDark"
+                android:textAlignment="center"
+                android:textSize="18dp"
+                android:textStyle="bold" />
+        </LinearLayout>
+    </android.support.v7.widget.CardView>
 
     <TextView
         android:id="@+id/textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="TextView"
-        tools:layout_editor_absoluteX="181dp"
-        tools:layout_editor_absoluteY="420dp" />
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_below="@id/pom"
+        android:layout_marginTop="10dp"
+        android:textAlignment="center"
+        android:textColor="@color/black"
+        android:textSize="20dp"
+        android:text="@string/text" />
+
+    <EditText
+        android:id="@+id/editText"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_below="@id/textView"
+        android:textSize="20dp"
+        android:textColor="@color/black"
+        android:textAlignment="center"
+        android:text="10"
+        android:inputType="numberDecimal" />
 
     <Button
-        android:id="@+id/button2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Show Google sheet"
-        tools:layout_editor_absoluteX="160dp"
-        tools:layout_editor_absoluteY="280dp" />
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+        android:id="@+id/buttonStart"
+        android:layout_width="match_parent"
+        android:layout_height="100dp"
+        android:layout_below="@id/editText"
+        android:layout_centerHorizontal="true"
+        android:textColor="@color/white"
+        android:textSize="25dp"
+        android:text="@string/start" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/foodinder_app/app/src/main/res/layout/activity_main3.xml b/foodinder_app/app/src/main/res/layout/activity_main3.xml
new file mode 100644
index 0000000..0f2a16a
--- /dev/null
+++ b/foodinder_app/app/src/main/res/layout/activity_main3.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Main3Activity">
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/foodinder_app/app/src/main/res/layout/item_card.xml b/foodinder_app/app/src/main/res/layout/item_card.xml
index 4acd58d..04a0404 100755
--- a/foodinder_app/app/src/main/res/layout/item_card.xml
+++ b/foodinder_app/app/src/main/res/layout/item_card.xml
@@ -17,7 +17,7 @@
         <ImageView
             android:id="@+id/avatar"
             android:layout_width="match_parent"
-            android:layout_height="350dp"
+            android:layout_height="300dp"
             android:layout_marginBottom="75dp"
             android:contentDescription="@null"
             android:scaleType="fitXY" />
@@ -35,16 +35,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/colorPrimaryDark"
+                android:textAlignment="center"
                 android:textSize="18dp"
                 android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/location"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/colorPrimaryDark"
-                android:textSize="14dp"
-                android:textStyle="normal" />
         </LinearLayout>
     </android.support.v7.widget.CardView>
 </FrameLayout>
\ 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
new file mode 100644
index 0000000..62756a4
--- /dev/null
+++ b/foodinder_app/app/src/main/res/values-pl-rPL/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Foodinder</string>
+    <string name="attentio" translatable="false">Proszę wybrać liczbę z przedziału 5-99</string>
+    <string name="change" translatable="false">Zmień</string>
+    <string name="proposition" translatable="false">Danie dnia:</string>
+    <string name="start" translatable="false">Rozpocznij</string>
+    <string name="text" translatable="false">Wpisz liczbę dań jaką chcesz przeanalizować:</string>
+</resources>
\ No newline at end of file
diff --git a/foodinder_app/app/src/main/res/values/colors.xml b/foodinder_app/app/src/main/res/values/colors.xml
index 16d04c8..9ea94e4 100755
--- a/foodinder_app/app/src/main/res/values/colors.xml
+++ b/foodinder_app/app/src/main/res/values/colors.xml
@@ -3,4 +3,8 @@
     <color name="colorPrimary">#FF0000</color>
     <color name="colorPrimaryDark">#FF0000</color>
     <color name="colorAccent">#FF0000</color>
+    <color name="yellow">#FFFF00</color>
+    <color name="black">#000000</color>
+    <color name="red">#FF0000</color>
+    <color name="white">#FFFFFF</color>
 </resources>
diff --git a/foodinder_app/app/src/main/res/values/dimens.xml b/foodinder_app/app/src/main/res/values/dimens.xml
index 47c8224..04027a7 100755
--- a/foodinder_app/app/src/main/res/values/dimens.xml
+++ b/foodinder_app/app/src/main/res/values/dimens.xml
@@ -2,4 +2,8 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="item1_height">80dp</dimen>
+    <dimen name="item1_width">80dp</dimen>
+    <dimen name="item2_height">120dp</dimen>
+    <dimen name="item2_width">120dp</dimen>
 </resources>
diff --git a/foodinder_app/app/src/main/res/values/strings.xml b/foodinder_app/app/src/main/res/values/strings.xml
index 46dd271..89aa497 100755
--- a/foodinder_app/app/src/main/res/values/strings.xml
+++ b/foodinder_app/app/src/main/res/values/strings.xml
@@ -1,3 +1,8 @@
 <resources>
-    <string name="app_name">Foodinder</string>
+    <string name="app_name" translatable="false">Foodinder</string>
+    <string name="start">Start</string>
+    <string name="text">Enter the number of dishes to be analyzed:</string>
+    <string name="change">Change</string>
+    <string name="proposition">Dish of the day:</string>
+    <string name="attentio">Please enter the number in the range of 5-99</string>
 </resources>