diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index fe72da5..ae871af 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.14.1" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-3.3" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..e1d62a3
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,11 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="AndroidLintDuplicateActivity" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="AndroidLintGradleCompatible" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
+      <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..3b31283
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,7 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="PROJECT_PROFILE" value="Project Default" />
+    <option name="USE_PROJECT_PROFILE" value="true" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index fbb6828..049e78a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -43,4 +43,5 @@
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_3" assert-keyword="false" jdk-15="false" />
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 7da25f5..11d1519 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/ZConnect.iml" filepath="$PROJECT_DIR$/ZConnect.iml" />
+      <module fileurl="file://$PROJECT_DIR$/ZConnect2.iml" filepath="$PROJECT_DIR$/ZConnect2.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
diff --git a/ZConnect2.iml b/ZConnect2.iml
new file mode 100644
index 0000000..b5ae9d9
--- /dev/null
+++ b/ZConnect2.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="ZConnect2" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/app/.gitignore b/app/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/app/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/app/build.gradle b/app/build.gradle
index 8a9ead3..fad1adb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,18 +2,22 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.1"
-
+    buildToolsVersion '25.0.0'
+    dexOptions {
+        javaMaxHeapSize "4g"
+    }
     defaultConfig {
         applicationId "com.zconnect.login.zconnect"
-        minSdkVersion 16
+        minSdkVersion 18
         targetSdkVersion 24
         versionCode 1
         versionName "1.0"
+        multiDexEnabled true
+
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -21,22 +25,23 @@ android {
     repositories {
         maven { url 'https://maven.fabric.io/public' }
     }
+
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-
-    compile files('libs/zbar.jar')
-
 //    compile 'com.firebaseui:firebase-ui:1.0.0'
 //    compile 'com.firebaseui:firebase-ui-database:1.0.0'
 
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    compile 'com.google.firebase:firebase-core:9.8.0'
-    compile 'com.google.firebase:firebase-database:9.8.0'
-    compile 'com.google.firebase:firebase-storage:9.8.0'
-    compile 'com.google.firebase:firebase-auth:9.8.0'
-    compile 'com.google.android.gms:play-services-auth:9.8.0'
+    //compile 'com.android.support:multidex:1.0.1'
+
+
+    compile 'com.android.support:appcompat-v7:24.2.0'
+    compile 'com.google.firebase:firebase-core:10.0.1'
+    compile 'com.google.firebase:firebase-database:10.0.1'
+    compile 'com.google.firebase:firebase-storage:10.0.1'
+    compile 'com.google.firebase:firebase-auth:10.0.1'
+    compile 'com.google.android.gms:play-services-auth:10.0.1'
     compile 'com.android.support:support-v4:24.2.1'
     compile 'com.android.support:design:24.2.1'
     compile 'com.android.support:recyclerview-v7:24.2.1'
@@ -46,8 +51,11 @@ dependencies {
     compile 'com.miguelcatalan:materialsearchview:1.4.0'
     compile 'com.facebook.fresco:fresco:0.12.0'
     compile 'com.github.jjobes:slideDateTimePicker:1.0.2'
+    compile 'com.google.android.gms:play-services:10.0.1'
+    compile 'com.android.support.constraint:constraint-layout:1.0.0-beta4'
     testCompile 'junit:junit:4.12'
 }
 
 
+
 apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
diff --git a/app/libs/zbar.jar b/app/libs/zbar.jar
deleted file mode 100644
index 7d50b95..0000000
Binary files a/app/libs/zbar.jar and /dev/null differ
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
deleted file mode 100644
index e2df740..0000000
--- a/app/proguard-rules.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in C:\Users\Lokesh Garg\AppData\Local\Android\Sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/app/src/androidTest/java/com/zconnect/login/zconnect/ApplicationTest.java b/app/src/androidTest/java/com/zconnect/login/zconnect/ApplicationTest.java
deleted file mode 100644
index 78e3d96..0000000
--- a/app/src/androidTest/java/com/zconnect/login/zconnect/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.zconnect.login.zconnect;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8b37caf..e855849 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.CALL_PHONE" />
 
     <application
         android:name=".ZConnect"
@@ -50,6 +51,7 @@
             <meta-data
                 android:name="android.app.default_searchable"
                 android:value=".Phonebook_File.PhonebookSearch" />
+                android:value=".Phonebook_File.PhonebookSearch" />
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".HomeActivity" />
@@ -97,11 +99,15 @@
                 android:value=".HomeActivity" />
         </activity>
         <activity android:name=".OpenEventDetail" />
+        <activity android:name=".shop.Details_of_shop.ShopDetails" />
+        <activity android:name=".shop.categories.Shop" />
+        <activity android:name=".shop.ShopList.ListOfShop" />
+
         <activity android:name=".OpenProductDetail" />
         <activity
             android:name=".HomeActivity"
             android:label="ZConnect"
-            android:theme="@style/AppTheme"></activity>
+            android:theme="@style/AppTheme" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/zconnect/login/zconnect/AddEvent.java b/app/src/main/java/com/zconnect/login/zconnect/AddEvent.java
index 97b04d9..48993d4 100644
--- a/app/src/main/java/com/zconnect/login/zconnect/AddEvent.java
+++ b/app/src/main/java/com/zconnect/login/zconnect/AddEvent.java
@@ -56,7 +56,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mEventDescription = (EditText) findViewById(R.id.EventDescription);
         mPostBtn = (Button) findViewById(R.id.postButton);
         mStorage = FirebaseStorage.getInstance().getReference();
-        mDatabase = FirebaseDatabase.getInstance().getReference().child("ZConnect/Events/Posts");
+        mDatabase = FirebaseDatabase.getInstance().getReference().child("ZConnect");
 
         CalendarButton = (Button) findViewById(R.id.Calender_button);
 
@@ -104,16 +104,26 @@ private void startPosting() {
                 @Override
                 public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
                     Uri downloadUri = taskSnapshot.getDownloadUrl();
-                    DatabaseReference newPost = mDatabase.push();
-                    String key = newPost.getKey();
-                    newPost.child("Key").setValue(key);
-                    newPost.child("EventName").setValue(eventNameValue);
-                    newPost.child("EventDescription").setValue(eventDescriptionValue);
-                    newPost.child("EventImage").setValue(downloadUri.toString());
-                    newPost.child("EventDate").setValue(eventDate);
-                    newPost.child("FormatDate").setValue(dateString);
-
-
+                    {
+                        DatabaseReference newPost = mDatabase.child("/Events/Posts").push();
+                        String key = newPost.getKey();
+                        newPost.child("Key").setValue(key);
+                        newPost.child("EventName").setValue(eventNameValue);
+                        newPost.child("EventDescription").setValue(eventDescriptionValue);
+                        newPost.child("EventImage").setValue(downloadUri.toString());
+                        newPost.child("EventDate").setValue(eventDate);
+                        newPost.child("FormatDate").setValue(dateString);
+
+                    }
+                    {
+                        DatabaseReference newPost = mDatabase.child("ZConnect/everything").push();
+                        newPost.child("Title").setValue(eventNameValue);
+                        newPost.child("Description").setValue(eventDescriptionValue);
+                        newPost.child("Url").setValue(downloadUri.toString());
+                        newPost.child("multiUse2").setValue(eventDate);
+                        newPost.child("multiUse1").setValue(dateString);
+
+                    }
                     mProgress.dismiss();
                     startActivity(new Intent(AddEvent.this, AllEvents.class));
                 }
diff --git a/app/src/main/java/com/zconnect/login/zconnect/AddProduct.java b/app/src/main/java/com/zconnect/login/zconnect/AddProduct.java
index 158ff5c..114d9d2 100644
--- a/app/src/main/java/com/zconnect/login/zconnect/AddProduct.java
+++ b/app/src/main/java/com/zconnect/login/zconnect/AddProduct.java
@@ -30,7 +30,7 @@ public class AddProduct extends AppCompatActivity {
     private Uri mImageUri = null;
     private ImageButton mAddImage;
     private Button mPostBtn;
-    private EditText mProductName;
+    private EditText mProductName, mPosterNumber;
     private EditText mProductDescription;
     private StorageReference mStorage;
     private DatabaseReference mDatabase;
@@ -50,10 +50,11 @@ protected void onCreate(Bundle savedInstanceState) {
         mProductDescription = (EditText)findViewById(R.id.description);
         mPostBtn = (Button)findViewById(R.id.postButton);
         mStorage = FirebaseStorage.getInstance().getReference();
-        mDatabase = FirebaseDatabase.getInstance().getReference().child("ZConnect/storeroom");
+        mDatabase = FirebaseDatabase.getInstance().getReference().child("ZConnect");
         spinner1 = (Spinner) findViewById(R.id.spinner1);
         mAuth = FirebaseAuth.getInstance();
         mProgress = new ProgressDialog(this);
+        mPosterNumber = (EditText) findViewById(R.id.PosterPhoneNo);
 
         mAddImage.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -104,16 +105,27 @@ public void onCancelled(DatabaseError databaseError) {
                 @Override
                 public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
                     Uri downloadUri = taskSnapshot.getDownloadUrl();
-
-                    DatabaseReference newPost = mDatabase.push();
-                    String key = newPost.getKey();
-                    newPost.child("Category").setValue(String.valueOf(spinner1.getSelectedItem()));
-                    newPost.child("Key").setValue(key);
-                    newPost.child("ProductName").setValue(productNameValue);
-                    newPost.child("ProductDescription").setValue(productDescriptionValue);
-                    newPost.child("Image").setValue(downloadUri.toString());
-                    newPost.child("PostedBy").setValue(mAuth.getCurrentUser().getUid());
-                    newPost.child("SellerUsername").setValue(sellerName);
+                    { //Store in Storeroom
+                        DatabaseReference newPost = mDatabase.child("storeroom").push();
+                        String key = newPost.getKey();
+                        newPost.child("Category").setValue(String.valueOf(spinner1.getSelectedItem()));
+                        newPost.child("Key").setValue(key);
+                        newPost.child("ProductName").setValue(productNameValue);
+                        newPost.child("ProductDescription").setValue(productDescriptionValue);
+                        newPost.child("Image").setValue(downloadUri.toString());
+                        newPost.child("PostedBy").setValue(mAuth.getCurrentUser().getUid());
+                        newPost.child("SellerUsername").setValue(sellerName);
+                    }
+                    {
+                        { //Store in everything
+                            DatabaseReference newPost = mDatabase.child("everything").push();
+                            newPost.child("Title").setValue(productNameValue);
+                            newPost.child("Description").setValue(productDescriptionValue);
+                            newPost.child("Url").setValue(downloadUri.toString());
+                            newPost.child("Phone_no").setValue(mPosterNumber.getText().toString());
+
+                        }
+                    }
                     mProgress.dismiss();
                     startActivity(new Intent(AddProduct.this,TabStoreRoom.class));
                 }
diff --git a/app/src/main/java/com/zconnect/login/zconnect/CategoriesTab.java b/app/src/main/java/com/zconnect/login/zconnect/CategoriesTab.java
index 8b18240..0e08f32 100644
--- a/app/src/main/java/com/zconnect/login/zconnect/CategoriesTab.java
+++ b/app/src/main/java/com/zconnect/login/zconnect/CategoriesTab.java
@@ -9,11 +9,9 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.GridView;
 import android.widget.ImageView;
-import android.widget.Toast;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/com/zconnect/login/zconnect/CollapseAnimation.java b/app/src/main/java/com/zconnect/login/zconnect/CollapseAnimation.java
index 9c4b010..98d8ffc 100644
--- a/app/src/main/java/com/zconnect/login/zconnect/CollapseAnimation.java
+++ b/app/src/main/java/com/zconnect/login/zconnect/CollapseAnimation.java
@@ -7,10 +7,10 @@
 import android.widget.LinearLayout;
 
 
-public class CollapseAnimation extends TranslateAnimation implements TranslateAnimation.AnimationListener{
+public class CollapseAnimation extends TranslateAnimation implements TranslateAnimation.AnimationListener {
 
-    private LinearLayout slidingLayout;
     int panelWidth;
+    private LinearLayout slidingLayout;
 
     public CollapseAnimation(LinearLayout layout, int width, int fromXType, float fromXValue, int toXType,
                              float toXValue, int fromYType, float fromYValue, int toYType, float toYValue) {
@@ -21,7 +21,7 @@ public CollapseAnimation(LinearLayout layout, int width, int fromXType, float fr
         slidingLayout = layout;
         panelWidth = width;
         setDuration(400);
-        setFillAfter( false );
+        setFillAfter(false);
         setInterpolator(new AccelerateDecelerateInterpolator());
         setAnimationListener(this);
 
@@ -34,6 +34,7 @@ public CollapseAnimation(LinearLayout layout, int width, int fromXType, float fr
         slidingLayout.startAnimation(this);
 
     }
+
     public void onAnimationEnd(Animation animation) {
 
     }
diff --git a/app/src/main/java/com/zconnect/login/zconnect/ExpandAnimation.java b/app/src/main/java/com/zconnect/login/zconnect/ExpandAnimation.java
index 01e76ae..6aebcd2 100644
--- a/app/src/main/java/com/zconnect/login/zconnect/ExpandAnimation.java
+++ b/app/src/main/java/com/zconnect/login/zconnect/ExpandAnimation.java
@@ -7,45 +7,44 @@
 import android.widget.FrameLayout.LayoutParams;
 import android.widget.LinearLayout;
 
-public class ExpandAnimation extends TranslateAnimation implements Animation.AnimationListener{
+    public class ExpandAnimation extends TranslateAnimation implements Animation.AnimationListener{
 
-    private LinearLayout slidingLayout;
-    int panelWidth;
+        private LinearLayout slidingLayout;
+        int panelWidth;
 
-    public ExpandAnimation(LinearLayout layout, int width, int fromXType, float fromXValue, int toXType,
-                           float toXValue, int fromYType, float fromYValue, int toYType, float toYValue) {
+        public ExpandAnimation(LinearLayout layout, int width, int fromXType, float fromXValue, int toXType,
+                               float toXValue, int fromYType, float fromYValue, int toYType, float toYValue) {
 
-        super(fromXType, fromXValue, toXType, toXValue, fromYType, fromYValue, toYType, toYValue);
+            super(fromXType, fromXValue, toXType, toXValue, fromYType, fromYValue, toYType, toYValue);
 
-        //Initialize
-        slidingLayout = layout;
-        panelWidth = width;
-        setDuration(400);
-        setFillAfter( false );
-        setInterpolator(new AccelerateDecelerateInterpolator());
-        setAnimationListener(this);
-        slidingLayout.startAnimation(this);
-    }
+            //Initialize
+            slidingLayout = layout;
+            panelWidth = width;
+            setDuration(400);
+            setFillAfter( false );
+            setInterpolator(new AccelerateDecelerateInterpolator());
+            setAnimationListener(this);
+            slidingLayout.startAnimation(this);
+        }
 
 
-    public void onAnimationEnd(Animation arg0) {
+        public void onAnimationEnd(Animation arg0) {
 
-        //Create margin and align left
-        LayoutParams params = (LayoutParams) slidingLayout.getLayoutParams();
-        params.rightMargin = panelWidth;
-        params.gravity = Gravity.RIGHT;
-        slidingLayout.clearAnimation();
-        slidingLayout.setLayoutParams(params);
-        slidingLayout.requestLayout();
+            //Create margin and align left
+            LayoutParams params = (LayoutParams) slidingLayout.getLayoutParams();
+            params.rightMargin = panelWidth;
+            params.gravity = Gravity.RIGHT;
+            slidingLayout.clearAnimation();
+            slidingLayout.setLayoutParams(params);
+            slidingLayout.requestLayout();
 
-    }
+        }
 
-    public void onAnimationRepeat(Animation arg0) {
+        public void onAnimationRepeat(Animation arg0) {
 
-    }
+        }
 
-    public void onAnimationStart(Animation arg0) {
+        public void onAnimationStart(Animation arg0) {
 
+        }
     }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/zconnect/login/zconnect/HomeActivity.java b/app/src/main/java/com/zconnect/login/zconnect/HomeActivity.java
index 982ab51..22b37e2 100644
--- a/app/src/main/java/com/zconnect/login/zconnect/HomeActivity.java
+++ b/app/src/main/java/com/zconnect/login/zconnect/HomeActivity.java
@@ -7,17 +7,29 @@
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.CardView;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 
+import com.firebase.ui.database.FirebaseRecyclerAdapter;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
 import com.zconnect.login.zconnect.Phonebook_File.Phonebook;
+import com.zconnect.login.zconnect.Phonebook_File.PhonebookDisplayItem;
+import com.zconnect.login.zconnect.shop.categories.Shop;
+
+import java.util.Calendar;
 
 public class HomeActivity extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener {
-    CardView card1, card2, card3, card4;
+    LinearLayoutManager linearLayoutManager;
+    RecyclerView mEverything;
+    RelativeLayout mType12;
+    LinearLayout mtype3;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -30,36 +42,27 @@ protected void onCreate(Bundle savedInstanceState) {
                 this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
         drawer.setDrawerListener(toggle);
         toggle.syncState();
-        card1 = (CardView) findViewById(R.id.card1);
-        card2 = (CardView) findViewById(R.id.card2);
-        card3 = (CardView) findViewById(R.id.card3);
-        card4 = (CardView) findViewById(R.id.card4);
+        mEverything = (RecyclerView) findViewById(R.id.everything);
+        mEverything.setHasFixedSize(true);
+        linearLayoutManager = new LinearLayoutManager(this);
+        linearLayoutManager.setReverseLayout(true);
+        linearLayoutManager.setStackFromEnd(true);
+        mEverything.setLayoutManager(linearLayoutManager);
+
+
         NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
         navigationView.setNavigationItemSelectedListener(this);
+//        makeRecyclerView();
 
-        card1.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Intent intent = new Intent(getApplicationContext(), Phonebook.class);
-                startActivity(intent);
-            }
-        });
-        card2.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Intent intent = new Intent(getApplicationContext(), TabStoreRoom.class);
-                startActivity(intent);
-            }
-        });
-        card3.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Intent intent = new Intent(getApplicationContext(), AllEvents.class);
-                startActivity(intent);
-            }
-        });
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        makeRecyclerView();
+    }
+
+
     @Override
     public void onBackPressed() {
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
@@ -103,6 +106,9 @@ public boolean onNavigationItemSelected(MenuItem item) {
         } else if (id == R.id.nav_storeroom) {
             Intent intent = new Intent(this, TabStoreRoom.class);
             startActivity(intent);
+        } else if (id == R.id.nav_shop) {
+            Intent intent = new Intent(this, Shop.class);
+            startActivity(intent);
         } else if (id == R.id.nav_signout) {
 
 
@@ -112,4 +118,50 @@ public boolean onNavigationItemSelected(MenuItem item) {
         drawer.closeDrawer(GravityCompat.START);
         return true;
     }
+
+    void makeRecyclerView() {
+        DatabaseReference mDatabase = FirebaseDatabase.getInstance().getReference("ZConnect").child("everything");
+        FirebaseRecyclerAdapter<Home_data, everythingViewHolder> firebaseRecyclerAdapter = new FirebaseRecyclerAdapter<Home_data, everythingViewHolder>(
+                Home_data.class,
+                R.layout.everything_row,
+                everythingViewHolder.class,
+                mDatabase) {
+
+
+            @Override
+            protected void populateViewHolder(everythingViewHolder viewHolder, Home_data model, int position) {
+
+
+                if (model.getType() == 0) {
+
+                    viewHolder.removeView();
+                    viewHolder.setTitle(model.getTitle());
+                    viewHolder.setDescription(model.getDescription());
+                    viewHolder.setImage(getApplicationContext(), model.getUrl());
+                    Calendar cal = Calendar.getInstance();
+                    viewHolder.setDate(model.getmultiUse2(), false, getApplicationContext());
+                    viewHolder.makeButton(model.getTitle(), model.getDescription(), Long.parseLong(model.getmultiUse1()) - cal.getTimeInMillis());
+                } else if (model.getType() == 1) {
+                    viewHolder.removeView();
+                    viewHolder.setTitle(model.getTitle());
+                    viewHolder.setDescription(model.getDescription());
+                    viewHolder.setImage(getApplicationContext(), model.getUrl());
+                    viewHolder.setDate(String.valueOf(model.getPhone_no()), true, getApplicationContext());
+
+
+                } else if (model.getType() == 2) {
+
+                    PhonebookDisplayItem displayItem = new PhonebookDisplayItem(model.getUrl(), model.getTitle(), model.getDescription(), String.valueOf(model.getPhone_no()), model.getmultiUse1(), model.getmultiUse2());
+                    viewHolder.makeContactView(getApplicationContext(), displayItem);
+
+                }
+                //Toast.makeText(getApplicationContext(),"Check 1",Toast.LENGTH_LONG);
+
+
+            }
+
+
+        };
+        mEverything.setAdapter(firebaseRecyclerAdapter);
+    }
 }
diff --git a/app/src/main/java/com/zconnect/login/zconnect/Home_data.java b/app/src/main/java/com/zconnect/login/zconnect/Home_data.java
new file mode 100644
index 0000000..3f635a8
--- /dev/null
+++ b/app/src/main/java/com/zconnect/login/zconnect/Home_data.java
@@ -0,0 +1,52 @@
+package com.zconnect.login.zconnect;
+
+
+/**
+ * Created by Lokesh Garg on 14-11-2016.
+ */
+public class Home_data {
+    private String Title, Description, Url, multiUse2, multiUse1, Phone_no;
+    private long type;
+
+    public Home_data() {
+
+    }
+
+    public Home_data(String title, String description, String url, String multiUse2, String multiUse1, String phnNo, long type) {
+        Title = title;
+        Description = description;
+        Url = url;
+        this.multiUse2 = multiUse2;
+        this.type = type;
+        this.multiUse1 = multiUse1;
+        Phone_no = phnNo;
+    }
+
+    public String getTitle() {
+        return Title;
+    }
+
+    public long getType() {
+        return type;
+    }
+
+    public String getDescription() {
+        return Description;
+    }
+
+    public String getUrl() {
+        return Url;
+    }
+
+    public String getmultiUse2() {
+        return multiUse2;
+    }
+
+    public String getmultiUse1() {
+        return multiUse1;
+    }
+
+    public String getPhone_no() {
+        return Phone_no;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/zconnect/login/zconnect/MyProducts.java b/app/src/main/java/com/zconnect/login/zconnect/MyProducts.java
index f20fc3e..12d3bf6 100644
--- a/app/src/main/java/com/zconnect/login/zconnect/MyProducts.java
+++ b/app/src/main/java/com/zconnect/login/zconnect/MyProducts.java
@@ -1,14 +1,13 @@
 package com.zconnect.login.zconnect;
 
 import android.content.Context;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.Switch;
 import android.widget.TextView;
 
 import com.firebase.ui.database.FirebaseRecyclerAdapter;
@@ -19,21 +18,16 @@
 import com.google.firebase.database.Query;
 import com.squareup.picasso.Picasso;
 
-import java.util.List;
-
-import static com.facebook.FacebookSdk.getApplicationContext;
-
 public class MyProducts extends AppCompatActivity {
 
 
+    //    String reserveString;
+    Query query;
     //private DatabaseReference mReservedProducts;
     private DatabaseReference mDatabase;
     private RecyclerView mProductList;
-//    private List<String> reserveList;
+    //    private List<String> reserveList;
     private FirebaseAuth mAuth;
-//    String reserveString;
-    Query query;
-
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -44,7 +38,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mProductList.setHasFixedSize(true);
         mProductList.setLayoutManager(new LinearLayoutManager(MyProducts.this));
 
-       // mReservedProducts = FirebaseDatabase.getInstance().getReference().child("ZConnect/Users");
+        // mReservedProducts = FirebaseDatabase.getInstance().getReference().child("ZConnect/Users");
         mDatabase = FirebaseDatabase.getInstance().getReference().child("ZConnect/storeroom");
 
 
@@ -93,7 +87,7 @@ protected void populateViewHolder(final MyProducts.ProductViewHolder viewHolder,
                     @Override
                     public void onClick(View view) {
 
-                        viewHolder.ReserveReference = FirebaseDatabase.getInstance().getReference().child("ZConnect/storeroom/"+product_key);
+                        viewHolder.ReserveReference = FirebaseDatabase.getInstance().getReference().child("ZConnect/storeroom/" + product_key);
                         viewHolder.ReserveReference.getRef().removeValue();
                     }
                 });
@@ -103,11 +97,11 @@ public void onClick(View view) {
         mProductList.setAdapter(firebaseRecyclerAdapter);
     }
 
-    public static class ProductViewHolder extends RecyclerView.ViewHolder{
+    public static class ProductViewHolder extends RecyclerView.ViewHolder {
 
-        private DatabaseReference ReserveReference;
         View mView;
-//        private Switch mReserve;
+        private DatabaseReference ReserveReference;
+        //        private Switch mReserve;
 //        private TextView ReserveStatus;
         private ImageButton deleteButton;
 //        private FirebaseAuth mAuth;
@@ -118,24 +112,24 @@ public ProductViewHolder(View itemView) {
             super(itemView);
             mView = itemView;
             //to delete reserved items
-            deleteButton = (ImageButton)mView.findViewById(R.id.delete);
+            deleteButton = (ImageButton) mView.findViewById(R.id.delete);
         }
 
-        public void setProductName(String productName){
+        public void setProductName(String productName) {
 
             TextView post_name = (TextView) mView.findViewById(R.id.productName);
             post_name.setText(productName);
 
         }
 
-        public void setProductDesc(String productDesc){
+        public void setProductDesc(String productDesc) {
 
             TextView post_desc = (TextView) mView.findViewById(R.id.productDescription);
             post_desc.setText(productDesc);
 
         }
 
-        public void setImage(Context ctx, String image){
+        public void setImage(Context ctx, String image) {
 
 
             ImageView post_image = (ImageView) mView.findViewById(R.id.postImg);
diff --git a/app/src/main/java/com/zconnect/login/zconnect/NewUser.java b/app/src/main/java/com/zconnect/login/zconnect/NewUser.java
index 93207df..192517a 100644
--- a/app/src/main/java/com/zconnect/login/zconnect/NewUser.java
+++ b/app/src/main/java/com/zconnect/login/zconnect/NewUser.java
@@ -103,9 +103,9 @@ public void onClick(View view) {
             @Override
             public void onClick(View view) {
                 startPosting();
+                startActivity(new Intent(NewUser.this, home.class));
             }
         });
-
     }
 
     @Override
diff --git a/app/src/main/java/com/zconnect/login/zconnect/Phonebook/Phonebook_search.java b/app/src/main/java/com/zconnect/login/zconnect/Phonebook/Phonebook_search.java
new file mode 100644
index 0000000..778c5d6
--- /dev/null
+++ b/app/src/main/java/com/zconnect/login/zconnect/Phonebook/Phonebook_search.java
@@ -0,0 +1,42 @@
+package com.zconnect.login.zconnect.Phonebook;
+
+public class Phonebook_search {
+    String category, desc, name, imageurl, email, number;
+
+    public Phonebook_search(String category, String desc, String name, String imageurl, String email, String number) {
+        this.category = category;
+        this.desc = desc;
+        this.name = name;
+        this.imageurl = imageurl;
+        this.email = email;
+        this.number = number;
+    }
+
+    Phonebook_search() {
+
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getImageurl() {
+        return imageurl;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+}
diff --git a/app/src/main/java/com/zconnect/login/zconnect/Phonebook/Search.java b/app/src/main/java/com/zconnect/login/zconnect/Phonebook/Search.java
new file mode 100644
index 0000000..18f8be7
--- /dev/null
+++ b/app/src/main/java/com/zconnect/login/zconnect/Phonebook/Search.java
@@ -0,0 +1,105 @@
+package com.zconnect.login.zconnect.Phonebook;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.firebase.ui.database.FirebaseRecyclerAdapter;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+import com.google.firebase.database.Query;
+import com.zconnect.login.zconnect.R;
+
+public class Search extends AppCompatActivity {
+    String textInput;
+    DatabaseReference mdata;
+    RecyclerView mView;
+    private LinearLayoutManager linearLayoutManager;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.search_contacts);
+        FirebaseDatabase.getInstance().setPersistenceEnabled(true);
+        final EditText mtext = (EditText) findViewById(R.id.editText);
+
+        TextWatcher mTextWatcher = new TextWatcher() {
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                textInput = mtext.getText().toString().trim();
+                listView();
+            }
+
+            public void afterTextChanged(Editable s) {
+                textInput = mtext.getText().toString().trim();
+                listView();
+
+            }
+        };
+        mtext.addTextChangedListener(mTextWatcher);
+
+
+    }
+
+    void listView() {
+        mView = (RecyclerView) findViewById(R.id.Rec);
+
+        linearLayoutManager = new LinearLayoutManager(this);
+        linearLayoutManager.setReverseLayout(true);
+        linearLayoutManager.setStackFromEnd(true);
+        mView.setLayoutManager(linearLayoutManager);
+
+        mdata = FirebaseDatabase.getInstance().getReference("ZConnect").child("Phonebook");
+        Toast.makeText(getApplicationContext(), mdata.toString(), Toast.LENGTH_LONG).show();
+        mdata.keepSynced(true);
+        Query mQuery = mdata.orderByChild("name").startAt(textInput);
+
+        FirebaseRecyclerAdapter<Phonebook_search, ViewHolder> firebaseRecyclerAdapter = new FirebaseRecyclerAdapter<Phonebook_search, ViewHolder>(
+                Phonebook_search.class,
+                R.layout.phonebook,
+                ViewHolder.class,
+                mQuery) {
+
+
+            @Override
+            protected void populateViewHolder(ViewHolder viewHolder, final Phonebook_search model, int position) {
+                Toast.makeText(getApplicationContext(), "Populate " + textInput, Toast.LENGTH_SHORT).show();
+                if (textInput != null) {
+                    if (model.getName().toLowerCase().startsWith(textInput.toLowerCase())) {
+
+                        viewHolder.setTitle(model.getName());
+                        viewHolder.setAddress(model.getNumber());
+
+                    } else {
+
+                        viewHolder.destroy();
+                    }
+
+
+                    //Toast.makeText(getApplicationContext(),"Check 1",Toast.LENGTH_SHORT);
+                } else {
+                    viewHolder.setTitle(model.getName());
+                    viewHolder.setAddress(model.getNumber());
+                }
+
+            }
+
+        };
+        mView.setAdapter(firebaseRecyclerAdapter);
+
+    }
+}
+
+
+
+
+
+
diff --git a/app/src/main/java/com/zconnect/login/zconnect/Phonebook/ViewHolder.java b/app/src/main/java/com/zconnect/login/zconnect/Phonebook/ViewHolder.java
new file mode 100644
index 0000000..f8e556e
--- /dev/null
+++ b/app/src/main/java/com/zconnect/login/zconnect/Phonebook/ViewHolder.java
@@ -0,0 +1,44 @@
+package com.zconnect.login.zconnect.Phonebook;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.zconnect.login.zconnect.R;
+
+class ViewHolder extends RecyclerView.ViewHolder
+
+{
+    View mView;
+
+    public ViewHolder(View itemView) {
+
+        super(itemView);
+        mView = itemView;
+
+
+    }
+
+    public void destroy() {
+        View v1 = mView.findViewById(R.id.textNumber);
+        ((ViewGroup) v1.getParent()).removeView(v1);
+        v1.layout(0, 0, 0, 0);
+
+        View v2 = mView.findViewById(R.id.textName);
+        ((ViewGroup) v2.getParent()).removeView(v2);
+    }
+
+    public void setTitle(String title) {
+        TextView postTitle = (TextView) mView.findViewById(R.id.textName);
+        postTitle.setText(title);
+
+    }
+
+    public void setAddress(String description) {
+        TextView postDesc = (TextView) mView.findViewById(R.id.textNumber);
+        postDesc.setText(description);
+
+    }
+}
+
diff --git a/app/src/main/java/com/zconnect/login/zconnect/Phonebook_File/AddContact.java b/app/src/main/java/com/zconnect/login/zconnect/Phonebook_File/AddContact.java
index 8269597..8d61af6 100644
--- a/app/src/main/java/com/zconnect/login/zconnect/Phonebook_File/AddContact.java
+++ b/app/src/main/java/com/zconnect/login/zconnect/Phonebook_File/AddContact.java
@@ -40,7 +40,7 @@ public class AddContact extends AppCompatActivity {
     private android.support.design.widget.TextInputEditText editTextDetails;
     private android.support.design.widget.TextInputEditText editTextNumber;
     private StorageReference mStorage = FirebaseStorage.getInstance().getReference();
-    private DatabaseReference ref = FirebaseDatabase.getInstance().getReference().child("ZConnect").child("Phonebook");
+    private DatabaseReference ref = FirebaseDatabase.getInstance().getReference().child("ZConnect");
     private ProgressDialog mProgress;
     private RadioButton radioButtonS, radioButtonA, radioButtonO;
     private String name, email, details, number, category = null, imageurl;
@@ -170,16 +170,24 @@ public void startposting() {
                 @Override
                 public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
                     Uri downloadUri = taskSnapshot.getDownloadUrl();
-
-                    DatabaseReference newPost = ref.push();
-                    // String key = newPost.getKey();
-                    newPost.child("name").setValue(name);
-                    newPost.child("desc").setValue(details);
-                    newPost.child("imageurl").setValue(downloadUri.toString());
-                    newPost.child("number").setValue(number);
-                    newPost.child("category").setValue(category);
-                    newPost.child("email").setValue(email);
-
+                    {
+                        DatabaseReference newPost = ref.child("Phonebook").push();
+                        // String key = newPost.getKey();
+                        newPost.child("name").setValue(name);
+                        newPost.child("desc").setValue(details);
+                        newPost.child("imageurl").setValue(downloadUri.toString());
+                        newPost.child("number").setValue(number);
+                        newPost.child("category").setValue(category);
+                        newPost.child("email").setValue(email);
+                    }
+                    {
+                        DatabaseReference newPost = ref.child("everything").push();
+                        newPost.child("Title").setValue(name);
+                        newPost.child("Description").setValue(details);
+                        newPost.child("Url").setValue(downloadUri.toString());
+                        newPost.child("Phone_no").setValue(number);
+                        newPost.child("multiUse1").setValue(email);
+                    }
                     mProgress.dismiss();
                     startActivity(new Intent(AddContact.this, Phonebook.class));
                 }
diff --git a/app/src/main/java/com/zconnect/login/zconnect/ProductViewHolder.java b/app/src/main/java/com/zconnect/login/zconnect/ProductViewHolder.java
index d5d7545..751437a 100644
--- a/app/src/main/java/com/zconnect/login/zconnect/ProductViewHolder.java
+++ b/app/src/main/java/com/zconnect/login/zconnect/ProductViewHolder.java
@@ -18,6 +18,7 @@
 import com.google.firebase.database.FirebaseDatabase;
 import com.google.firebase.database.ValueEventListener;
 import com.squareup.picasso.Picasso;
+import com.zconnect.login.zconnect.R;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/app/src/main/java/com/zconnect/login/zconnect/ProductsTab.java b/app/src/main/java/com/zconnect/login/zconnect/ProductsTab.java
index 29a9fca..02344bb 100644
--- a/app/src/main/java/com/zconnect/login/zconnect/ProductsTab.java
+++ b/app/src/main/java/com/zconnect/login/zconnect/ProductsTab.java
@@ -33,7 +33,7 @@ public class ProductsTab extends Fragment {
 
     private RecyclerView mProductList;
     private DatabaseReference mDatabase;
-    private boolean flag=false;
+    private boolean flag = false;
     private FirebaseAuth mAuth;
     //notify
     private NotificationCompat.Builder mBuilder;
@@ -82,7 +82,7 @@ public void onStart() {
         super.onStart();
 
         // Firebase predefined Recycler Adapter
-        FirebaseRecyclerAdapter<Product,ProductsTab.ProductViewHolder> firebaseRecyclerAdapter = new FirebaseRecyclerAdapter<Product, ProductsTab.ProductViewHolder>(
+        FirebaseRecyclerAdapter<Product, ProductsTab.ProductViewHolder> firebaseRecyclerAdapter = new FirebaseRecyclerAdapter<Product, ProductsTab.ProductViewHolder>(
 
                 Product.class,
                 R.layout.products_row,
@@ -142,7 +142,7 @@ public static class ProductViewHolder extends RecyclerView.ViewHolder{
         Switch mReserve;
         TextView ReserveStatus;
         // Flag Variable to get each Reserve Id
-        String [] keyList;
+        String[] keyList;
         // Flag to get combined user Id
         String ReservedUid;
         private DatabaseReference Users = FirebaseDatabase.getInstance().getReference().child("ZConnect/Users");
@@ -155,8 +155,8 @@ public static class ProductViewHolder extends RecyclerView.ViewHolder{
         public ProductViewHolder(View itemView) {
             super(itemView);
             mView = itemView;
-            mReserve = (Switch)mView.findViewById(R.id.switch1);
-            ReserveStatus = (TextView)mView.findViewById(R.id.switch1);
+            mReserve = (Switch) mView.findViewById(R.id.switch1);
+            ReserveStatus = (TextView) mView.findViewById(R.id.switch1);
             StoreRoom.keepSynced(true);
         }
 
@@ -175,8 +175,7 @@ public void onClick(View view) {
         }
 
         // Setting default switch
-        public void defaultSwitch(final String key)
-        {
+        public void defaultSwitch(final String key) {
             // Getting User ID
             mAuth = FirebaseAuth.getInstance();
             FirebaseUser user = mAuth.getCurrentUser();
@@ -291,21 +290,23 @@ public void onCancelled(DatabaseError databaseError) {
 //        };
 
         //Set name of product
-        public void setProductName(String productName){
+        public void setProductName(String productName) {
 
             TextView post_name = (TextView) mView.findViewById(R.id.productName);
             post_name.setText(productName);
 
         }
+
         //Set Product Description
-        public void setProductDesc(String productDesc){
+        public void setProductDesc(String productDesc) {
 
             TextView post_desc = (TextView) mView.findViewById(R.id.productDescription);
             post_desc.setText(productDesc);
 
         }
+
         //Set Product Image
-        public void setImage(Context ctx, String image){
+        public void setImage(Context ctx, String image) {
 
             ImageView post_image = (ImageView) mView.findViewById(R.id.postImg);
             Picasso.with(ctx).load(image).into(post_image);
diff --git a/app/src/main/java/com/zconnect/login/zconnect/ReservedTab.java b/app/src/main/java/com/zconnect/login/zconnect/ReservedTab.java
index 219dc66..9c626ab 100644
--- a/app/src/main/java/com/zconnect/login/zconnect/ReservedTab.java
+++ b/app/src/main/java/com/zconnect/login/zconnect/ReservedTab.java
@@ -3,7 +3,6 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v7.app.NotificationCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -35,7 +34,6 @@ public class ReservedTab extends Fragment {
     private RecyclerView mProductList;
     private List<String> reserveList;
     private FirebaseAuth mAuth;
-    private NotificationCompat.Builder mBuilder;
 
     public ReservedTab() {
         // Required empty public constructor
@@ -56,10 +54,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         mReservedProducts = FirebaseDatabase.getInstance().getReference().child("ZConnect/Users");
         mDatabase = FirebaseDatabase.getInstance().getReference().child("ZConnect/storeroom");
 
+
         mAuth = FirebaseAuth.getInstance();
         FirebaseUser user = mAuth.getCurrentUser();
         final String userId = user.getUid();
-        query = mDatabase.orderByChild("UsersReserved/"+ userId).equalTo(user.getDisplayName());
+        query = mDatabase.orderByChild("UsersReserved/" + userId).equalTo(user.getDisplayName());
 
 //        mReservedProducts.addValueEventListener(new ValueEventListener() {
 //            @Override
@@ -92,19 +91,19 @@ public void onStart() {
             @Override
             protected void populateViewHolder(final ProductViewHolder viewHolder, Product model, int position) {
 
-                    final String product_key = getRef(position).getKey();
+                final String product_key = getRef(position).getKey();
 
 //               if(reserveList.contains(model.getKey())) {
-                    viewHolder.setProductName(model.getProductName());
-                    viewHolder.setProductDesc(model.getProductDescription());
-                    viewHolder.setImage(getApplicationContext(), model.getImage());
+                viewHolder.setProductName(model.getProductName());
+                viewHolder.setProductDesc(model.getProductDescription());
+                viewHolder.setImage(getApplicationContext(), model.getImage());
 //                }else {
 //               }
                 viewHolder.deleteButton.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
 
-                        viewHolder.ReserveReference = FirebaseDatabase.getInstance().getReference().child("ZConnect/storeroom/"+product_key+"/UsersReserved");
+                        viewHolder.ReserveReference = FirebaseDatabase.getInstance().getReference().child("ZConnect/storeroom/" + product_key + "/UsersReserved");
 
                         mAuth = FirebaseAuth.getInstance();
                         FirebaseUser user = mAuth.getCurrentUser();
@@ -118,7 +117,7 @@ public void onClick(View view) {
         mProductList.setAdapter(firebaseRecyclerAdapter);
     }
 
-    public static class ProductViewHolder extends RecyclerView.ViewHolder{
+    public static class ProductViewHolder extends RecyclerView.ViewHolder {
 
 
         View mView;
@@ -134,24 +133,24 @@ public ProductViewHolder(View itemView) {
             super(itemView);
             mView = itemView;
             //to delete reserved items
-            deleteButton = (ImageButton)mView.findViewById(R.id.delete);
+            deleteButton = (ImageButton) mView.findViewById(R.id.delete);
         }
 
-        public void setProductName(String productName){
+        public void setProductName(String productName) {
 
             TextView post_name = (TextView) mView.findViewById(R.id.productName);
             post_name.setText(productName);
 
         }
 
-        public void setProductDesc(String productDesc){
+        public void setProductDesc(String productDesc) {
 
             TextView post_desc = (TextView) mView.findViewById(R.id.productDescription);
             post_desc.setText(productDesc);
 
         }
 
-        public void setImage(Context ctx, String image){
+        public void setImage(Context ctx, String image) {
 
 
             ImageView post_image = (ImageView) mView.findViewById(R.id.postImg);
diff --git a/app/src/main/java/com/zconnect/login/zconnect/StoreRoom.java b/app/src/main/java/com/zconnect/login/zconnect/StoreRoom.java
index eab3509..bccb430 100644
--- a/app/src/main/java/com/zconnect/login/zconnect/StoreRoom.java
+++ b/app/src/main/java/com/zconnect/login/zconnect/StoreRoom.java
@@ -3,14 +3,10 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
-import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.ImageView;
@@ -29,21 +25,15 @@
 import com.google.firebase.database.ValueEventListener;
 import com.squareup.picasso.Picasso;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 
 public class StoreRoom extends AppCompatActivity {
 
-    private RecyclerView mProductList;
-    private DatabaseReference mDatabase;
     public String category;
     Query queryCategory;
+    private RecyclerView mProductList;
+    private DatabaseReference mDatabase;
     private FirebaseAuth mAuth;
-    private boolean flag=false;
+    private boolean flag = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -51,21 +41,20 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_store_room);
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
-            Intent intent =getIntent();
-            if (intent!=null)
-            {
-                category= intent.getStringExtra("Category");
-            }
+        Intent intent = getIntent();
+        if (intent != null) {
+            category = intent.getStringExtra("Category");
+        }
         Toast.makeText(this, category, Toast.LENGTH_SHORT).show();
         mProductList = (RecyclerView) findViewById(R.id.productList);
-            mProductList.setHasFixedSize(true);
-            mProductList.setLayoutManager(new LinearLayoutManager(this));
+        mProductList.setHasFixedSize(true);
+        mProductList.setLayoutManager(new LinearLayoutManager(this));
 
         mAuth = FirebaseAuth.getInstance();
 
 
-            mDatabase = FirebaseDatabase.getInstance().getReference().child("ZConnect/storeroom");
-            queryCategory = mDatabase.orderByChild("Category").equalTo(category);
+        mDatabase = FirebaseDatabase.getInstance().getReference().child("ZConnect/storeroom");
+        queryCategory = mDatabase.orderByChild("Category").equalTo(category);
         mDatabase.keepSynced(true);
 
 //        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
@@ -85,7 +74,7 @@ protected void onCreate(Bundle savedInstanceState) {
     protected void onStart() {
         super.onStart();
 
-        FirebaseRecyclerAdapter<Product,ProductViewHolder> firebaseRecyclerAdapter = new FirebaseRecyclerAdapter<Product, ProductViewHolder>(
+        FirebaseRecyclerAdapter<Product, ProductViewHolder> firebaseRecyclerAdapter = new FirebaseRecyclerAdapter<Product, ProductViewHolder>(
 
                 Product.class,
                 R.layout.products_row,
@@ -136,28 +125,27 @@ public void onCancelled(DatabaseError databaseError) {
         mProductList.setAdapter(firebaseRecyclerAdapter);
     }
 
-    public static class ProductViewHolder extends RecyclerView.ViewHolder{
+    public static class ProductViewHolder extends RecyclerView.ViewHolder {
 
+        public CompoundButton.OnCheckedChangeListener mListener;
         View mView;
+        String[] keyList;
+        String ReservedUid;
         private Switch mReserve;
         private TextView ReserveStatus;
-        private DatabaseReference StoreRoom= FirebaseDatabase.getInstance().getReference().child("ZConnect/storeroom");
+        private DatabaseReference StoreRoom = FirebaseDatabase.getInstance().getReference().child("ZConnect/storeroom");
         private FirebaseAuth mAuth;
-        String [] keyList;
-        String ReservedUid;
-        public CompoundButton.OnCheckedChangeListener mListener;
 
         public ProductViewHolder(View itemView) {
             super(itemView);
             mView = itemView;
-            mReserve = (Switch)mView.findViewById(R.id.switch1);
-            ReserveStatus = (TextView)mView.findViewById(R.id.switch1);
+            mReserve = (Switch) mView.findViewById(R.id.switch1);
+            ReserveStatus = (TextView) mView.findViewById(R.id.switch1);
             StoreRoom.keepSynced(true);
 
         }
 
-        public void defaultSwitch(final String key)
-        {
+        public void defaultSwitch(final String key) {
             // Getting User ID
             mAuth = FirebaseAuth.getInstance();
             FirebaseUser user = mAuth.getCurrentUser();
@@ -168,11 +156,9 @@ public void defaultSwitch(final String key)
                 @Override
                 public void onDataChange(DataSnapshot dataSnapshot) {
                     mReserve.setOnCheckedChangeListener(null);
-                    if(dataSnapshot.child(key).child("UsersReserved").hasChild(userId))
-                    {
+                    if (dataSnapshot.child(key).child("UsersReserved").hasChild(userId)) {
                         mReserve.setChecked(true);
-                    }
-                    else{
+                    } else {
                         mReserve.setChecked(false);
                     }
                     mReserve.setOnCheckedChangeListener(mListener);
@@ -189,21 +175,21 @@ public void onCancelled(DatabaseError databaseError) {
 
         }
 
-        public void setProductName(String productName){
+        public void setProductName(String productName) {
 
             TextView post_name = (TextView) mView.findViewById(R.id.productName);
             post_name.setText(productName);
 
         }
 
-        public void setProductDesc(String productDesc){
+        public void setProductDesc(String productDesc) {
 
             TextView post_desc = (TextView) mView.findViewById(R.id.productDescription);
             post_desc.setText(productDesc);
 
         }
 
-        public void setImage(Context ctx,String image){
+        public void setImage(Context ctx, String image) {
 
 
             ImageView post_image = (ImageView) mView.findViewById(R.id.postImg);
diff --git a/app/src/main/java/com/zconnect/login/zconnect/TabStoreRoom.java b/app/src/main/java/com/zconnect/login/zconnect/TabStoreRoom.java
index 962c624..c5c021c 100644
--- a/app/src/main/java/com/zconnect/login/zconnect/TabStoreRoom.java
+++ b/app/src/main/java/com/zconnect/login/zconnect/TabStoreRoom.java
@@ -117,7 +117,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
         //noinspection SimplifiableIfStatement
         if (id == R.id.action_storeroom) {
-           // Add the onclicklistner code
+            // Add the onclicklistner code
             startActivity(new Intent(TabStoreRoom.this, MyProducts.class));
             return true;
         }
@@ -174,7 +174,7 @@ public SectionsPagerAdapter(FragmentManager fm) {
 
         @Override
         public Fragment getItem(int position) {
-            switch(position){
+            switch (position) {
                 case 0:
                     ProductsTab productsTab = new ProductsTab();
                     return productsTab;
diff --git a/app/src/main/java/com/zconnect/login/zconnect/ZConnect.java b/app/src/main/java/com/zconnect/login/zconnect/ZConnect.java
index 3df6ece..28b2797 100644
--- a/app/src/main/java/com/zconnect/login/zconnect/ZConnect.java
+++ b/app/src/main/java/com/zconnect/login/zconnect/ZConnect.java
@@ -17,7 +17,7 @@ public void onCreate() {
         //this will speed download process and is required by this library
         //more info http://frescolib.org/
         FirebaseDatabase.getInstance().setPersistenceEnabled(true);
-        Fresco.initialize(this);
+        Fresco.initialize(getApplicationContext());
 
 
     }
diff --git a/app/src/main/java/com/zconnect/login/zconnect/everythingViewHolder.java b/app/src/main/java/com/zconnect/login/zconnect/everythingViewHolder.java
new file mode 100644
index 0000000..7926317
--- /dev/null
+++ b/app/src/main/java/com/zconnect/login/zconnect/everythingViewHolder.java
@@ -0,0 +1,164 @@
+package com.zconnect.login.zconnect;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.squareup.picasso.Picasso;
+import com.zconnect.login.zconnect.Phonebook_File.PhonebookDetails;
+import com.zconnect.login.zconnect.Phonebook_File.PhonebookDisplayItem;
+
+import java.util.Calendar;
+
+class everythingViewHolder extends RecyclerView.ViewHolder
+
+{
+    View mView;
+
+    public everythingViewHolder(View itemView) {
+
+        super(itemView);
+        mView = itemView;
+
+
+    }
+
+    public void removeView() {
+        RelativeLayout mRelativeLayout = (RelativeLayout) mView.findViewById(R.id.ContactCardEverything);
+        mRelativeLayout.setVisibility(View.GONE);
+    }
+
+    public void setTitle(String title) {
+
+        TextView postTitle = (TextView) mView.findViewById(R.id.title_everything);
+        postTitle.setText(title);
+
+    }
+
+    public void setDescription(String description) {
+
+
+        TextView postDesc = (TextView) mView.findViewById(R.id.description_or_price);
+        postDesc.setText(description);
+    }
+
+    public void setDate(final String title, boolean isNumber, final Context context) {
+        TextView setDate = (TextView) mView.findViewById(R.id.date_event);
+        setDate.setText(title);
+        if (isNumber)
+
+        {
+            setDate.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    context.startActivity(new Intent(String.valueOf(Uri.parse("tel:" + title.trim()))).setType(Intent.ACTION_DIAL).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+                }
+            });
+        }
+        Button makeCall = (Button) mView.findViewById(R.id.reminder_or_call);
+        makeCall.setText("CALL");
+        makeCall.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+                context.startActivity(new Intent(String.valueOf(Uri.parse("tel:" + title.trim()))).setType(Intent.ACTION_DIAL).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+
+            }
+        });
+    }
+
+    public void setTime(String title) {
+
+
+        TextView setTime = (TextView) mView.findViewById(R.id.time);
+        setTime.setText(title);
+
+    }
+
+    public void setImage(Context context, String url) {
+
+
+        ImageView imageView = (ImageView) mView.findViewById(R.id.Image_everything);
+        Picasso.with(context).load(url).into(imageView);
+
+    }
+
+    public void makeButton(final String title, final String desc, final long time) {
+        Button set_reminder = (Button) mView.findViewById(R.id.reminder_or_call);
+        set_reminder.setText("SET REMINDER");
+        set_reminder.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+                addReminderInCalendar(title, desc, time, mView.getContext());
+
+            }
+        });
+    }
+
+    private void addReminderInCalendar(String title, String desc, long time_gaph, Context context) {
+        Calendar cal = Calendar.getInstance();
+        Intent intent = new Intent(Intent.ACTION_EDIT);
+        intent.setType("vnd.android.cursor.item/event");
+        intent.putExtra("beginTime", cal.getTimeInMillis() + time_gaph);
+        intent.putExtra("allDay", false);
+        intent.putExtra("rrule", "FREQ=DAILY");
+        intent.putExtra("endTime", cal.getTimeInMillis() + time_gaph + 60 * 60 * 1000);
+        intent.putExtra("title", title);
+        intent.putExtra("description", desc);
+        context.startActivity(intent);
+
+        // Display event id.
+        //Toast.makeText(getAppli
+        //cationContext(), "Event added :: ID :: " + event.getLastPathSegment(), Toast.LENGTH_SHORT).show();
+
+        /** Adding reminder for event added. *
+         }
+
+         /** Returns Calendar Base URI, supports both new and old OS. */
+
+
+    }
+
+    public void makeContactView(final Context context, final PhonebookDisplayItem phonebookDisplayItem) {
+
+        LinearLayout mlayout = (LinearLayout) mView.findViewById(R.id.EventsAndDescriptionEverything);
+        mlayout.setVisibility(View.GONE);
+        RelativeLayout mRel = (RelativeLayout) mView.findViewById(R.id.ContactCardEverything);
+        SimpleDraweeView simpleDraweeView = (SimpleDraweeView) mView.findViewById(R.id.everything_item_format_image);
+        simpleDraweeView.setImageURI(Uri.parse(phonebookDisplayItem.getImageurl()));
+        TextView name = (TextView) mView.findViewById(R.id.everything_name1);
+        name.setText(phonebookDisplayItem.getName());
+        TextView number = (TextView) mView.findViewById(R.id.everything_number1);
+        number.setText(phonebookDisplayItem.getNumber());
+        mRel.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(context, PhonebookDetails.class);
+                //intent.putExtra("Workshop", workshopItemformat1);
+                intent.putExtra("desc", phonebookDisplayItem.getDesc());
+                intent.putExtra("name", phonebookDisplayItem.getName());
+                intent.putExtra("number", phonebookDisplayItem.getNumber());
+                intent.putExtra("image", phonebookDisplayItem.getImageurl());
+                intent.putExtra("email", phonebookDisplayItem.getEmail());
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                context.startActivity(intent);
+                if (context instanceof PhonebookDetails) {
+                    ((PhonebookDetails) context).finish();
+                }
+            }
+        });
+
+
+    }
+}
+
+
diff --git a/app/src/main/java/com/zconnect/login/zconnect/home.java b/app/src/main/java/com/zconnect/login/zconnect/home.java
index bd9be0c..4e1cc70 100644
--- a/app/src/main/java/com/zconnect/login/zconnect/home.java
+++ b/app/src/main/java/com/zconnect/login/zconnect/home.java
@@ -5,6 +5,8 @@
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Gravity;
@@ -36,8 +38,9 @@
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.GoogleAuthProvider;
 import com.zconnect.login.zconnect.Phonebook_File.Phonebook;
+import com.zconnect.login.zconnect.shop.categories.Shop;
 
-public class home extends AppCompatActivity implements View.OnClickListener, GoogleApiClient.OnConnectionFailedListener{
+public class home extends AppCompatActivity implements View.OnClickListener, GoogleApiClient.OnConnectionFailedListener {
 
     private static final String TAG = "SignOutActivity";
     private static final int RC_SIGN_IN = 9001;
@@ -45,11 +48,9 @@ public class home extends AppCompatActivity implements View.OnClickListener, Goo
     FrameLayout.LayoutParams slidingPanelParameters;
     LinearLayout.LayoutParams headerPanelParameters;
     LinearLayout.LayoutParams listViewParameters;
+    RecyclerView mEverything;
     private GoogleApiClient mGoogleApiClient;
     private com.google.android.gms.common.SignInButton signInButton;
-
-
-    /////Menu Bar
     private Button signOutButton;
     private FirebaseAuth mAuth;
     private FirebaseAuth.AuthStateListener mAuthListener;
@@ -62,6 +63,7 @@ public class home extends AppCompatActivity implements View.OnClickListener, Goo
     private RelativeLayout menuPanel;
     private int panelWidth;
     private ImageView menuViewButton;
+    private LinearLayoutManager linearLayoutManager;
 
 /////MenuBar
 
@@ -69,13 +71,19 @@ public class home extends AppCompatActivity implements View.OnClickListener, Goo
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_home);
+        mEverything = (RecyclerView) findViewById(R.id.everything);
+        mEverything.setHasFixedSize(true);
+        linearLayoutManager = new LinearLayoutManager(this);
+        linearLayoutManager.setReverseLayout(true);
+        linearLayoutManager.setStackFromEnd(true);
+        mEverything.setLayoutManager(linearLayoutManager);
 
         /////MenuBar
 
         //Initialize
         metrics = new DisplayMetrics();
         getWindowManager().getDefaultDisplay().getMetrics(metrics);
-        panelWidth = (int) ((metrics.widthPixels)*0.33);
+        panelWidth = (int) ((metrics.widthPixels) * 0.33);
 
         headerPanel = (RelativeLayout) findViewById(R.id.header);
         headerPanelParameters = (LinearLayout.LayoutParams) headerPanel.getLayoutParams();
@@ -99,13 +107,14 @@ protected void onCreate(Bundle savedInstanceState) {
         listViewParameters = (LinearLayout.LayoutParams) listView.getLayoutParams();
         listViewParameters.width = metrics.widthPixels;
         listView.setLayoutParams(listViewParameters);
+        mEverything.setLayoutManager(linearLayoutManager);
 
 
         //Slide the Panel
         menuViewButton = (ImageView) findViewById(R.id.menuViewButton);
         menuViewButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
-                if(!isExpanded){
+                if (!isExpanded) {
                     isExpanded = true;
 
                     //Expand
@@ -113,12 +122,12 @@ public void onClick(View v) {
                             Animation.RELATIVE_TO_PARENT, 0.0f,
                             Animation.RELATIVE_TO_PARENT, -0.33f, 0, 0.0f, 0, 0.0f);
                     // if you want left to right just remove ( - ) before 0.33f
-                }else{
+                } else {
                     isExpanded = false;
 
                     //Collapse
-                    new CollapseAnimation(slidingPanel,panelWidth,
-                            TranslateAnimation.RELATIVE_TO_PARENT,-0.33f,
+                    new CollapseAnimation(slidingPanel, panelWidth,
+                            TranslateAnimation.RELATIVE_TO_PARENT, -0.33f,
                             TranslateAnimation.RELATIVE_TO_PARENT, 0.0f, 0, 0.0f, 0, 0.0f);
                     // if you want left to right just remove ( - ) before 0.33f
 
@@ -199,20 +208,33 @@ public void onClick(View v) {
             public void onClick(View v) {
                 Intent intent = new Intent(home.this, Phonebook.class);
                 startActivity(intent);
+
                 // request your webservice here. Possible use of AsyncTask and ProgressDialog
                 // show the result here - dialog or Toast
             }
 
         });
-    }
+        final TextView storeroom_item_4 = (TextView) findViewById(R.id.menu_item_4);
+        storeroom_item_4.setOnClickListener(new View.OnClickListener() {
 
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(home.this, Shop.class);
+                startActivity(intent);
 
+                // request your webservice here. Possible use of AsyncTask and ProgressDialog
+                // show the result here - dialog or Toast
+            }
+
+        });
+    }
 
 
     @Override
     public void onStart() {
         super.onStart();
         mAuth.addAuthStateListener(mAuthListener);
+        //makeRecyclerView();
     }
 
     @Override
@@ -236,7 +258,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
 //            Google Sign In was successful, authenticate with Firebase
                 GoogleSignInAccount account = result.getSignInAccount();
                 firebaseAuthWithGoogle(account);
-            }else {
+            } else {
 
                 updateUI(null);
             }
@@ -307,21 +329,18 @@ private void updateUI(FirebaseUser user) {
 //                findViewById(R.id.sign_in_button).setVisibility(View.GONE);
 //                findViewById(R.id.sign_out_and_disconnect).setVisibility(View.VISIBLE);
 
-        }
-
-        else {
+        } else {
 //                Intent intent = new Intent(logIn.this,logIn.class);
 //                startActivity(intent);
-
-            Intent intent = new Intent(home.this,logIn.class);
-            startActivity(intent);
+//
+//            Intent intent = new Intent(home.this,logIn.class);
+//            startActivity(intent);
         }
     }
 
     @Override
     public void onClick(View view) {
-        switch (view.getId())
-        {
+        switch (view.getId()) {
             case R.id.sign_out_button:
                 signOut();
                 break;
@@ -330,7 +349,6 @@ public void onClick(View view) {
     }
 
 
-
 //
 //    private void handleSignInResult(GoogleSignInResult result) {
 //        Log.d(TAG, "handleSignInResult:" + result.isSuccess());
@@ -352,10 +370,6 @@ public void onClick(View view) {
 //    }
 
 
-
-
-
-
     @Override
     public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
         // An unresolvable error has occurred and Google APIs (including Sign-In) will not
@@ -381,10 +395,55 @@ public void hideProgressDialog() {
         }
     }
 
-    public String getUid() {
-        return FirebaseAuth.getInstance().getCurrentUser().getUid();
-    }
 
+//    void makeRecyclerView()
+//    {
+//        DatabaseReference mDatabase = FirebaseDatabase.getInstance().getReference("ZConnect").child("everything");
+//        FirebaseRecyclerAdapter<Home_data, everythingViewHolder> firebaseRecyclerAdapter = new FirebaseRecyclerAdapter<Home_data, everythingViewHolder>(
+//                Home_data.class,
+//                R.layout.everything_row,
+//                everythingViewHolder.class,
+//                mDatabase) {
+//            @Override
+//            protected void populateViewHolder(everythingViewHolder viewHolder, Home_data model, int position) {
+//                viewHolder.setTitle(model.getTitl());
+//
+//                viewHolder.setDescription(model.getDesc());
+////                viewHolder.setImage(getApplicationContext(), model.getImage());
+////
+////                String Date = model.getDa()+"/"+model.getMon()+"/"+model.getYea()+"";
+////                String Time = model.getHo()+":"+model.getMin()+"";
+////                if(model.getTypeOfevent()==0) {
+////                    viewHolder.setDate(Date);
+////                    viewHolder.setTime(Time);
+////
+////
+////                    Calendar cal = Calendar.getInstance();
+////                    SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+////
+////                    try {
+////                        java.util.Date endDate = outputFormat.parse(model.getYea() + "-" + model.getMon() + "-" + model.getDa() + " " + model.getHo() + ":" + model.getMin());
+////
+////                        viewHolder.makeButton(model.getTitl(), model.getDesc(), endDate.getTime() - cal.getTimeInMillis());
+////
+////                    } catch (ParseException e) {
+////                        e.printStackTrace();
+////                    }
+////
+////                }
+////                else if(model.getTypeOfevent()==1) {
+////                            //TODO change this
+////
+////                }
+////                //Toast.makeText(getApplicationContext(),"Check 1",Toast.LENGTH_LONG);
+////
+//
+//            }
+//
+//
+//        };
+//        mEverything.setAdapter(firebaseRecyclerAdapter);
+//            }
 
 }
 
diff --git a/app/src/main/java/com/zconnect/login/zconnect/logIn.java b/app/src/main/java/com/zconnect/login/zconnect/logIn.java
index fe887a1..042b0fc 100644
--- a/app/src/main/java/com/zconnect/login/zconnect/logIn.java
+++ b/app/src/main/java/com/zconnect/login/zconnect/logIn.java
@@ -349,5 +349,3 @@ public Map<String, Object> toMap() {
     }
 
 }
-
-
diff --git a/app/src/main/java/com/zconnect/login/zconnect/logo.java b/app/src/main/java/com/zconnect/login/zconnect/logo.java
index 98174aa..236829e 100644
--- a/app/src/main/java/com/zconnect/login/zconnect/logo.java
+++ b/app/src/main/java/com/zconnect/login/zconnect/logo.java
@@ -54,7 +54,7 @@ protected void onCreate(Bundle savedInstanceState) {
         // Calling xml view file
         this.setContentView(R.layout.activity_logo);
 
-        // Time Delay for the logo activity
+        // Time Delay ofor the logo activity
         new Timer().schedule(new TimerTask(){
             public void run() {
                 startActivity(new Intent(logo.this, logIn.class));
diff --git a/app/src/main/java/com/zconnect/login/zconnect/shop/Details_of_shop/ImageViewHolder.java b/app/src/main/java/com/zconnect/login/zconnect/shop/Details_of_shop/ImageViewHolder.java
new file mode 100644
index 0000000..436048d
--- /dev/null
+++ b/app/src/main/java/com/zconnect/login/zconnect/shop/Details_of_shop/ImageViewHolder.java
@@ -0,0 +1,47 @@
+package com.zconnect.login.zconnect.shop.Details_of_shop;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.squareup.picasso.Picasso;
+import com.zconnect.login.zconnect.R;
+
+public class ImageViewHolder extends RecyclerView.ViewHolder {
+
+
+    View mView;
+
+    public ImageViewHolder(View itemView) {
+        super(itemView);
+        mView = itemView;
+    }
+
+    public void setProductTitle(String productDesc) {
+
+        TextView post_desc = (TextView) mView.findViewById(R.id.TitleOfImageWalaView);
+        post_desc.setText(productDesc);
+
+    }
+
+    public void setProductDesc(String productDesc) {
+
+        TextView post_desc = (TextView) mView.findViewById(R.id.TextOfImageWalaView);
+        post_desc.setText(productDesc);
+
+    }
+
+    public void setImage(Context ctx, String image) {
+
+
+        ImageView post_image = (ImageView) mView.findViewById(R.id.ImageOfImageWalaView);
+        Picasso.with(ctx).load(image).into(post_image);
+
+
+    }
+
+}
+
+
diff --git a/app/src/main/java/com/zconnect/login/zconnect/shop/Details_of_shop/ShopDetails.java b/app/src/main/java/com/zconnect/login/zconnect/shop/Details_of_shop/ShopDetails.java
new file mode 100644
index 0000000..3c3b9cd
--- /dev/null
+++ b/app/src/main/java/com/zconnect/login/zconnect/shop/Details_of_shop/ShopDetails.java
@@ -0,0 +1,98 @@
+package com.zconnect.login.zconnect.shop.Details_of_shop;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MenuItem;
+import android.widget.Toast;
+
+import com.facebook.FacebookSdk;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+import com.zconnect.login.zconnect.R;
+
+public class ShopDetails extends AppCompatActivity {
+
+    Bundle dataIntent;
+    String shopName;
+    private SectionsPagerAdapter mSectionsPagerAdapter;
+    private ViewPager mViewPager;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Intent intent = getIntent();
+        dataIntent = intent.getExtras();
+        shopName = (String) dataIntent.get("name");
+        setContentView(R.layout.activity_shop_details);
+        FacebookSdk.sdkInitialize(getApplication());
+        mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
+        mViewPager = (ViewPager) findViewById(R.id.container);
+        mViewPager.setAdapter(mSectionsPagerAdapter);
+        mViewPager = (ViewPager) findViewById(R.id.container);
+        setupViewPager(mViewPager);
+        TabLayout tabLayout = (TabLayout) findViewById(R.id.tabs);
+        tabLayout.setupWithViewPager(mViewPager);
+
+        Toast.makeText(getApplicationContext(), shopName, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+
+        int id = item.getItemId();
+        if (id == R.id.action_settings) {
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void setupViewPager(ViewPager viewPager) {
+        SectionsPagerAdapter adapter = new SectionsPagerAdapter(getSupportFragmentManager());
+        viewPager.setAdapter(adapter);
+    }
+
+    public class SectionsPagerAdapter extends FragmentPagerAdapter {
+
+        DatabaseReference mData = FirebaseDatabase.getInstance().getReference("ZConnect/Shop/ShopDetails");
+        public SectionsPagerAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            switch (position) {
+                case 0:
+                    return TabView1.newInstance(position + 1, mData.child("Main-Page").child("RedChillies"));//Todo change structure
+
+                case 1:
+                    return TabView2.newInstance(position, mData.child("Coupons"));//Todo change structure
+
+            }
+            return null;
+        }
+
+        @Override
+        public int getCount() {
+            return 2;
+        }
+
+        @Override
+        public CharSequence getPageTitle(int position) {
+            switch (position) {
+                case 0:
+                    return shopName;
+                case 1:
+                    return "Coupons";
+
+            }
+            return null;
+        }
+    }
+}
diff --git a/app/src/main/java/com/zconnect/login/zconnect/shop/Details_of_shop/TabView1.java b/app/src/main/java/com/zconnect/login/zconnect/shop/Details_of_shop/TabView1.java
new file mode 100644
index 0000000..c617fae
--- /dev/null
+++ b/app/src/main/java/com/zconnect/login/zconnect/shop/Details_of_shop/TabView1.java
@@ -0,0 +1,75 @@
+package com.zconnect.login.zconnect.shop.Details_of_shop;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.google.firebase.database.DataSnapshot;
+import com.google.firebase.database.DatabaseError;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.ValueEventListener;
+import com.squareup.picasso.Picasso;
+import com.zconnect.login.zconnect.R;
+
+import static com.facebook.FacebookSdk.getApplicationContext;
+
+public class TabView1 extends Fragment {
+    private static final String ARG_SECTION_NUMBER = "section_number";
+    private static DatabaseReference mDatabase;
+    TextView mNameView, mDescription;
+    ImageView mShopOffer;
+    View rootView;
+
+    public static TabView1 newInstance(int sectionNumber, DatabaseReference mData) {
+        TabView1 fragment = new TabView1();
+        Bundle args = new Bundle();
+        args.putInt(ARG_SECTION_NUMBER, sectionNumber);
+        mDatabase = mData;
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+
+        rootView = inflater.inflate(R.layout.shop_details_tab1, container, false);
+        mNameView = (TextView) rootView.findViewById(R.id.Name_Shop_offer);
+        mDescription = (TextView) rootView.findViewById(R.id.Description_shop_offer);
+        mShopOffer = (ImageView) rootView.findViewById(R.id.image_Shop_offer);
+        mDatabase.addValueEventListener(new ValueEventListener() {
+            @Override
+            public void onDataChange(DataSnapshot dataSnapshot) {
+
+
+                modelData details = dataSnapshot.getValue(modelData.class);
+                CreateDetailTab(details.getTitl(), details.getDesc(), details.getUl());
+            }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+
+            }
+
+
+        });
+        return rootView;
+
+    }
+
+    public void CreateDetailTab(String Title, String Disc, String url) {
+        mNameView.setText(Title);
+        mDescription.setText(Disc);
+        Picasso.with(getApplicationContext()).load(url).into(mShopOffer);
+    }
+
+
+}
+
+
diff --git a/app/src/main/java/com/zconnect/login/zconnect/shop/Details_of_shop/TabView2.java b/app/src/main/java/com/zconnect/login/zconnect/shop/Details_of_shop/TabView2.java
new file mode 100644
index 0000000..f62d484
--- /dev/null
+++ b/app/src/main/java/com/zconnect/login/zconnect/shop/Details_of_shop/TabView2.java
@@ -0,0 +1,63 @@
+package com.zconnect.login.zconnect.shop.Details_of_shop;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.firebase.ui.database.FirebaseRecyclerAdapter;
+import com.google.firebase.database.DatabaseReference;
+import com.zconnect.login.zconnect.R;
+
+import static com.facebook.FacebookSdk.getApplicationContext;
+
+public class TabView2 extends Fragment {
+    private static final String ARG_SECTION_NUMBER = "section_number";
+    private static DatabaseReference mDatabase; //TODO add location
+    RecyclerView mRecyclerView;
+    LinearLayoutManager linearLayoutManager;
+
+    public static TabView2 newInstance(int sectionNumber, DatabaseReference mData) {
+        TabView2 fragment = new TabView2();
+        Bundle args = new Bundle();
+        mDatabase = mData;
+        args.putInt(ARG_SECTION_NUMBER, sectionNumber);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+
+        View rootView = inflater.inflate(R.layout.shop_details_tab2, container, false);
+        linearLayoutManager = new LinearLayoutManager(getApplicationContext());
+        linearLayoutManager.setReverseLayout(true);
+        linearLayoutManager.setStackFromEnd(true);
+        mRecyclerView = (RecyclerView) rootView.findViewById(R.id.ImageWalaView);
+        mRecyclerView.setLayoutManager(linearLayoutManager);
+        FirebaseRecyclerAdapter<modelData, ImageViewHolder> firebaseRecyclerAdapter = new FirebaseRecyclerAdapter<modelData, ImageViewHolder>(
+
+                modelData.class,
+                R.layout.image_wala_view,
+                ImageViewHolder.class,
+                mDatabase
+        ) {
+            @Override
+            protected void populateViewHolder(ImageViewHolder viewHolder, modelData modeldata, int position) {
+                viewHolder.setProductDesc(modeldata.getDesc());
+                viewHolder.setImage(getApplicationContext(), modeldata.getUl());
+                viewHolder.setProductTitle(modeldata.getTitl());
+
+            }
+        };
+        mRecyclerView.setAdapter(firebaseRecyclerAdapter);
+        return rootView;
+    }
+
+}
+
diff --git a/app/src/main/java/com/zconnect/login/zconnect/shop/Details_of_shop/modelData.java b/app/src/main/java/com/zconnect/login/zconnect/shop/Details_of_shop/modelData.java
new file mode 100644
index 0000000..58bd2cf
--- /dev/null
+++ b/app/src/main/java/com/zconnect/login/zconnect/shop/Details_of_shop/modelData.java
@@ -0,0 +1,30 @@
+package com.zconnect.login.zconnect.shop.Details_of_shop;
+
+/**
+ * Created by f390 on 28/1/17.
+ */
+
+public class modelData {
+    String Url, Title, Description;
+
+    public modelData(String abc, String def, String ghi) {
+        Url = abc;
+        Title = def;
+        Description = ghi;
+    }
+
+    public modelData() {
+    }
+
+    public String getUl() {
+        return Url;
+    }
+
+    public String getTitl() {
+        return Title;
+    }
+
+    public String getDesc() {
+        return Description;
+    }
+}
diff --git a/app/src/main/java/com/zconnect/login/zconnect/shop/ShopList/ListOfShop.java b/app/src/main/java/com/zconnect/login/zconnect/shop/ShopList/ListOfShop.java
new file mode 100644
index 0000000..68a01cf
--- /dev/null
+++ b/app/src/main/java/com/zconnect/login/zconnect/shop/ShopList/ListOfShop.java
@@ -0,0 +1,83 @@
+package com.zconnect.login.zconnect.shop.ShopList;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.Menu;
+import android.view.View;
+
+import com.firebase.ui.database.FirebaseRecyclerAdapter;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+import com.zconnect.login.zconnect.R;
+
+import static com.zconnect.login.zconnect.R.layout.card_shop;
+
+
+public class ListOfShop extends AppCompatActivity {
+    String CatName;
+    private RecyclerView mStoreList;
+    private DatabaseReference mDatabase;
+    private LinearLayoutManager linearLayoutManager;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_list_of_shops);
+        mStoreList = (RecyclerView) findViewById(R.id.StoreList);
+        mStoreList.setHasFixedSize(true);
+        Intent intent = getIntent();
+        CatName = intent.getExtras().getString("Cat_name");
+        mDatabase = FirebaseDatabase.getInstance().getReference("ZConnect/Shop/List").child(CatName);
+        linearLayoutManager = new LinearLayoutManager(this);
+        linearLayoutManager.setReverseLayout(true);
+        linearLayoutManager.setStackFromEnd(true);
+        mStoreList.setLayoutManager(linearLayoutManager);
+    }
+
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+
+
+        FirebaseRecyclerAdapter<shopList, shopListViewHolder> firebaseRecyclerAdapter = new FirebaseRecyclerAdapter<shopList, shopListViewHolder>(
+                shopList.class,
+                card_shop,
+                shopListViewHolder.class,
+                mDatabase) {
+
+
+            @Override
+            protected void populateViewHolder(final shopListViewHolder viewHolder, final shopList model, int position) {
+                viewHolder.setTitle(model.getTitle());
+                viewHolder.setAddress(model.getAddress());
+                viewHolder.setPhn(model.getPhnNo(), getApplicationContext());
+                viewHolder.setImage(model.getImage_Url(), model.getTitle());
+                viewHolder.makeButton(model.getLattitude(), model.getLongitude(), getApplicationContext());
+                viewHolder.mView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        viewHolder.call_detailsOfShops(model.getTitle());
+
+                    }
+                });
+                //Toast.makeText(getApplicationContext(),"Check 1",Toast.LENGTH_LONG);
+            }
+
+
+        };
+        mStoreList.setAdapter(firebaseRecyclerAdapter);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        return super.onCreateOptionsMenu(menu);
+
+    }
+
+
+}
diff --git a/app/src/main/java/com/zconnect/login/zconnect/shop/ShopList/shopList.java b/app/src/main/java/com/zconnect/login/zconnect/shop/ShopList/shopList.java
new file mode 100644
index 0000000..caa1020
--- /dev/null
+++ b/app/src/main/java/com/zconnect/login/zconnect/shop/ShopList/shopList.java
@@ -0,0 +1,47 @@
+package com.zconnect.login.zconnect.shop.ShopList;
+
+/**
+ * Created by f390 on 21/1/17.
+ */
+
+public class shopList {
+
+    private Double longitude, lattitude;
+    private String address, Title, Image_Url, phnNo;
+
+    public shopList(Double longitude, Double lattitude, String address, String title, String image_Url, String phnNo) {
+        this.longitude = longitude;
+        this.lattitude = lattitude;
+        this.address = address;
+        Title = title;
+        Image_Url = image_Url;
+        this.phnNo = phnNo;
+    }
+
+    public shopList() {
+    }
+
+    public Double getLongitude() {
+        return longitude;
+    }
+
+    public Double getLattitude() {
+        return lattitude;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public String getTitle() {
+        return Title;
+    }
+
+    public String getImage_Url() {
+        return Image_Url;
+    }
+
+    public String getPhnNo() {
+        return phnNo;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/zconnect/login/zconnect/shop/ShopList/shopListViewHolder.java b/app/src/main/java/com/zconnect/login/zconnect/shop/ShopList/shopListViewHolder.java
new file mode 100644
index 0000000..d7c3845
--- /dev/null
+++ b/app/src/main/java/com/zconnect/login/zconnect/shop/ShopList/shopListViewHolder.java
@@ -0,0 +1,85 @@
+package com.zconnect.login.zconnect.shop.ShopList;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.zconnect.login.zconnect.R;
+import com.zconnect.login.zconnect.shop.Details_of_shop.ShopDetails;
+
+public class shopListViewHolder extends RecyclerView.ViewHolder
+
+{
+    View mView;
+
+    public shopListViewHolder(View itemView) {
+
+        super(itemView);
+        mView = itemView;
+
+
+    }
+
+    public void call_detailsOfShops(String ShopName) {
+        Intent goToDetails = new Intent(mView.getContext(), ShopDetails.class);
+        goToDetails.putExtra("name", ShopName);
+        goToDetails.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        mView.getContext().startActivity(goToDetails);
+    }
+
+
+
+    public void setTitle(String title) {
+        TextView postTitle = (TextView) mView.findViewById(R.id.Title_store);
+        postTitle.setText(title);
+
+    }
+
+    public void setAddress(String description) {
+        TextView postDesc = (TextView) mView.findViewById(R.id.Address_store);
+        postDesc.setText(description);
+
+    }
+
+    public void setPhn(final String description, final Context context) {
+        TextView postDesc = (TextView) mView.findViewById(R.id.Phone_No);
+        postDesc.setText(description);
+        postDesc.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                context.startActivity(new Intent(Intent.ACTION_DIAL, Uri.parse("tel:" + description)));
+            }
+        });
+
+    }
+
+    public void setImage(String url, final String title) {
+        SimpleDraweeView imageView = (SimpleDraweeView) mView.findViewById(R.id.StoreImage);
+        imageView.setImageURI(Uri.parse(url));
+        imageView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                call_detailsOfShops(title);
+            }
+        });
+    }
+
+    public void makeButton(final double lat, final double lon, final Context context) {
+        Button getDirection = (Button) mView.findViewById(R.id.Direction);
+        getDirection.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(android.content.Intent.ACTION_VIEW, Uri.parse("http://maps.google.com/maps?daddr=" + lat + "," + lon));
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                context.startActivity(intent);
+            }
+        });
+
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/zconnect/login/zconnect/shop/categories/Adapter.java b/app/src/main/java/com/zconnect/login/zconnect/shop/categories/Adapter.java
new file mode 100644
index 0000000..31ee378
--- /dev/null
+++ b/app/src/main/java/com/zconnect/login/zconnect/shop/categories/Adapter.java
@@ -0,0 +1,68 @@
+package com.zconnect.login.zconnect.shop.categories;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+
+import com.squareup.picasso.Picasso;
+import com.zconnect.login.zconnect.R;
+
+/**
+ * Created by f390 on 21/1/17.
+ */
+
+public class Adapter extends BaseAdapter {
+    int[] categoriesIcons = {R.drawable.electronics, R.drawable.beanbags, R.drawable.speakers, R.drawable.fashion, R.drawable.storage, R.drawable.books, R.drawable.labcoats, R.drawable.roomnecessities, R.drawable.novels, R.drawable.others};
+    private Context context;
+    private String[] names, Url;
+
+
+    public Adapter(Context context, String[] Url, String[] names) {
+        this.context = context;
+        this.Url = Url;
+        this.names = names;
+    }
+
+    public View getView(int position, View convertView, ViewGroup parent) {
+
+        LayoutInflater inflater = (LayoutInflater) context
+                .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+        View gridView;
+
+        if (convertView == null) {
+
+            gridView = new View(context);
+
+            // get layout from mobile.xml
+            gridView = inflater.inflate(R.layout.gv_item, null);
+            ImageView imageView = (ImageView) gridView.findViewById(R.id.GV_imageView);
+            Picasso.with(context).load(Url[position]).into(imageView);
+        } else {
+            gridView = convertView;
+        }
+
+        return gridView;
+    }
+
+    @Override
+    public int getCount() {
+        return names.length;
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return null;
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return 0;
+    }
+
+
+}
+
diff --git a/app/src/main/java/com/zconnect/login/zconnect/shop/categories/Shop.java b/app/src/main/java/com/zconnect/login/zconnect/shop/categories/Shop.java
new file mode 100644
index 0000000..b69ec76
--- /dev/null
+++ b/app/src/main/java/com/zconnect/login/zconnect/shop/categories/Shop.java
@@ -0,0 +1,96 @@
+package com.zconnect.login.zconnect.shop.categories;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.GridView;
+
+import com.google.firebase.database.DataSnapshot;
+import com.google.firebase.database.DatabaseError;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+import com.google.firebase.database.ValueEventListener;
+import com.zconnect.login.zconnect.R;
+import com.zconnect.login.zconnect.shop.ShopList.ListOfShop;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+public class Shop extends AppCompatActivity {
+    GridView gv;
+    ArrayAdapter<String> adapter;
+    ArrayList<String> mCategoryName = new ArrayList<>();
+    ArrayList<String> mCategoryUrl = new ArrayList<>();
+    DatabaseReference db;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_shop);
+
+        gv = (GridView) findViewById(R.id.gv);
+        db = FirebaseDatabase.getInstance().getReference("ZConnect/Shop").child("categories");
+        retrieve();
+        adapter = new ArrayAdapter<String>(getApplicationContext(), android.R.layout.simple_list_item_2, mCategoryName);
+        gv.setAdapter(adapter);
+
+
+    }
+
+    public void drawGV() {
+        Adapter adapter = new Adapter(getApplicationContext(), mCategoryUrl.toArray(new String[mCategoryUrl.size()]), mCategoryName.toArray(new String[mCategoryName.size()]));
+        gv.setAdapter(adapter);
+        gv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                Intent intent = new Intent(getApplicationContext(), ListOfShop.class);
+                intent.putExtra("Cat_name", mCategoryName.get(position));
+                startActivity(intent);
+            }
+
+        });
+        //Toast.makeText(getApplicationContext(),mCategoryName.get(1),Toast.LENGTH_LONG);
+
+    }
+
+    public void retrieve() {
+
+        db.addValueEventListener(new ValueEventListener() {
+            @Override
+            public void onDataChange(DataSnapshot dataSnapshot) {
+                Mcategories((Map<String, Object>) dataSnapshot.getValue());
+                drawGV();
+
+
+            }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+
+            }
+        });
+
+    }
+
+    private void Mcategories(Map<String, Object> Cat) {
+
+
+        //iterate through each user, ignoring their UID
+        for (Map.Entry<String, Object> entry : Cat.entrySet()) {
+
+            //Get user map
+            Map singleCat = (Map) entry.getValue();
+            //Get phone field and append st list
+            mCategoryName.add((String) singleCat.get("name"));
+            mCategoryUrl.add((String) singleCat.get("url"));
+            drawGV();
+
+        }
+    }
+
+}
+
diff --git a/app/src/main/java/com/zconnect/login/zconnect/shop/categories/categories.java b/app/src/main/java/com/zconnect/login/zconnect/shop/categories/categories.java
new file mode 100644
index 0000000..82cfbf6
--- /dev/null
+++ b/app/src/main/java/com/zconnect/login/zconnect/shop/categories/categories.java
@@ -0,0 +1,31 @@
+package com.zconnect.login.zconnect.shop.categories;
+
+/**
+ * Created by f390 on 19/1/17.
+ */
+
+public class categories {
+
+
+    String name, url;
+
+    public categories(String name, String url) {
+        this.name = name;
+        this.url = url;
+    }
+
+    public categories() {
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/app/src/main/res/drawable/arun.jpg b/app/src/main/res/drawable/arun.jpg
new file mode 100755
index 0000000..78307fd
Binary files /dev/null and b/app/src/main/res/drawable/arun.jpg differ
diff --git a/app/src/main/res/drawable/layout_border.xml b/app/src/main/res/drawable/layout_border.xml
new file mode 100644
index 0000000..7a40f2b
--- /dev/null
+++ b/app/src/main/res/drawable/layout_border.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#FFFFFF" />
+    <stroke
+        android:width="3dip"
+        android:color="#B1BCBE" />
+    <corners android:radius="10dip" />
+    <padding
+        android:bottom="0dip"
+        android:left="0dip"
+        android:right="0dip"
+        android:top="0dip" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/noimg.png b/app/src/main/res/drawable/noimg.png
new file mode 100644
index 0000000..b6ffa81
Binary files /dev/null and b/app/src/main/res/drawable/noimg.png differ
diff --git a/app/src/main/res/drawable/room_necessities.png b/app/src/main/res/drawable/room_necessities.png
new file mode 100644
index 0000000..1c2f267
Binary files /dev/null and b/app/src/main/res/drawable/room_necessities.png differ
diff --git a/app/src/main/res/layout/activity_add_product.xml b/app/src/main/res/layout/activity_add_product.xml
index d494af0..ea2d529 100644
--- a/app/src/main/res/layout/activity_add_product.xml
+++ b/app/src/main/res/layout/activity_add_product.xml
@@ -3,55 +3,72 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.zconnect.login.zconnect.AddProduct"
-    android:background="#ffffff">
+    android:background="#ffffff"
+    tools:context="com.zconnect.login.zconnect.AddProduct">
 
     <ImageButton
+        android:id="@+id/imageButton"
         android:layout_width="fill_parent"
         android:layout_height="250dp"
-        android:id="@+id/imageButton"
         android:layout_centerHorizontal="true"
+        android:layout_margin="7dp"
         android:background="@drawable/input_outline"
-        android:padding="10dp"
-        android:layout_margin="7dp" />
+        android:padding="10dp" />
 
     <EditText
+        android:id="@+id/nameOfProduct"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/nameOfProduct"
-        android:padding="10dp"
-        android:layout_below="@+id/imageButton"
         android:layout_alignLeft="@+id/imageButton"
         android:layout_alignStart="@+id/imageButton"
+        android:layout_below="@+id/imageButton"
+        android:layout_marginBottom="7dp"
+        android:layout_marginRight="7dp"
+        android:layout_marginTop="7dp"
         android:background="@drawable/input_outline"
         android:hint="@string/add_name"
-        android:layout_marginTop="7dp"
-        android:layout_marginBottom="7dp"
-        android:layout_marginRight="7dp" />
+        android:padding="10dp" />
 
     <EditText
-        android:layout_width="fill_parent"
-        android:layout_height="100dp"
-        android:inputType="textMultiLine"
-        android:ems="10"
         android:id="@+id/description"
+        android:layout_width="fill_parent"
+        android:layout_height="90dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:layout_below="@+id/nameOfProduct"
         android:layout_centerHorizontal="true"
-        android:padding="10dp"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
+        android:layout_marginLeft="7dp"
+        android:layout_marginRight="7dp"
+        android:layout_marginTop="7dp"
         android:background="@drawable/input_outline"
+        android:ems="10"
         android:hint="add description"
-        android:layout_margin="7dp" />
+        android:inputType="textMultiLine"
+        android:padding="10dp" />
+
+    <EditText
+        android:id="@+id/PosterPhoneNo"
+        android:layout_width="fill_parent"
+        android:layout_height="30dp"
+        android:layout_above="@+id/spinner1"
+        android:layout_alignParentStart="true"
+        android:layout_below="@+id/description"
+        android:layout_marginLeft="7dp"
+        android:layout_marginRight="7dp"
+        android:background="@drawable/input_outline"
+        android:ems="10"
+        android:hint="PhoneNumber"
+        android:inputType="phone"
+        android:padding="10dp" />
 
     <Button
+        android:id="@+id/postButton"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:text="post"
-        android:id="@+id/postButton"
-        android:background="@color/colorPrimary"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
+        android:background="@color/colorPrimary"
+        android:text="post"
         android:textColor="#ffffff"
         android:textSize="20dp" />
 
@@ -59,11 +76,19 @@
         android:id="@+id/spinner1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:entries="@array/categories"
-        android:prompt="@string/category_prompt"
         android:layout_above="@+id/postButton"
-        android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
-        android:layout_marginBottom="31dp" />
+        android:layout_alignParentRight="true"
+        android:layout_marginBottom="31dp"
+        android:entries="@array/categories"
+        android:prompt="@string/category_prompt" />
+
+    <EditText
+        android:id="@+id/editText4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignEnd="@+id/imageButton"
+        android:layout_alignTop="@+id/imageButton"
+        android:ems="10" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index cc8f335..ea6fb30 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -1,47 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-xmlns:tools="http://schemas.android.com/tools"
-android:gravity="right"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_weight="1"
+    android:background="@color/material_grey_50"
+    android:gravity="right"
+    android:padding="0dp"
 android:paddingBottom="@dimen/activity_vertical_margin"
 android:paddingLeft="@dimen/activity_horizontal_margin"
 android:paddingRight="@dimen/activity_horizontal_margin"
-android:paddingTop="@dimen/activity_vertical_margin"
-android:layout_width="match_parent"
-android:layout_height="match_parent"
-android:layout_weight="1"
-android:background="@color/material_grey_50"
 
-tools:context=".home"
+android:paddingTop="@dimen/activity_vertical_margin"
 
 
-    android:padding="0dp">
+    tools:context=".home">
 
 <!-- Menu Panel -->
 
     <!-- Sliding Panel -->
 
+
     <ImageView
         android:id="@+id/menuViewButton"
         android:layout_width="50dp"
         android:layout_height="50dp"
-        android:clickable="true"
-        android:contentDescription="@string/description"
-        android:visibility="visible"
-        android:background="@android:drawable/ic_menu_more"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
         android:layout_gravity="right|top"
-        android:translationZ="1dp" />
+        android:background="@android:drawable/ic_menu_more"
+        android:clickable="true"
+        android:contentDescription="@string/description"
+        android:translationZ="1dp"
+        android:visibility="visible" />
 
     <RelativeLayout
         android:id="@+id/menuPanel"
-        android:layout_height="match_parent"
         android:layout_width="match_parent"
-        android:gravity="right"
+        android:layout_height="match_parent"
+        android:layout_margin="0dp"
         android:background="@color/highlighted_text_material_dark"
-        android:orientation="vertical"
-        android:layout_margin="0dp">
+        android:gravity="right"
+        android:orientation="vertical">
 
 
         <TextView
@@ -50,37 +51,37 @@ tools:context=".home"
             android:layout_height="50dp"
             android:layout_alignParentTop="true"
             android:layout_marginLeft="0dp"
-            android:paddingLeft="15dp"
             android:gravity="center_vertical"
-            android:textColor="@android:color/white"
-            android:text="@string/menu_title">
+            android:paddingLeft="15dp"
+            android:text="@string/menu_title"
+            android:textColor="@android:color/white">
         </TextView>
 
         <View
             android:id="@+id/menu_item_divider_1"
             android:layout_width="fill_parent"
             android:layout_height="0.5dp"
+            android:layout_below="@+id/menu_title_1"
             android:layout_marginLeft="0dp"
             android:layout_marginRight="0dp"
-            android:layout_below="@+id/menu_title_1"
             android:background="#b5b5b5"/>
 
         <TextView
             android:id="@+id/menu_item_1"
             android:layout_width="fill_parent"
             android:layout_height="50dp"
+            android:layout_below="@+id/menu_item_divider_1"
             android:layout_marginLeft="15dp"
             android:gravity="center_vertical"
-            android:layout_below="@+id/menu_item_divider_1"
             android:text="@string/item_1">
         </TextView>
         <View
             android:id="@+id/menu_item_divider_2"
             android:layout_width="fill_parent"
             android:layout_height="0.5dp"
+            android:layout_below="@+id/menu_item_1"
             android:layout_marginLeft="5dp"
             android:layout_marginRight="5dp"
-            android:layout_below="@+id/menu_item_1"
             android:background="#b5b5b5"/>
         <TextView
             android:id="@+id/menu_item_2"
@@ -95,9 +96,9 @@ tools:context=".home"
             android:id="@+id/menu_item_divider_3"
             android:layout_width="fill_parent"
             android:layout_height="0.5dp"
+            android:layout_below="@+id/menu_item_2"
             android:layout_marginLeft="5dp"
             android:layout_marginRight="5dp"
-            android:layout_below="@+id/menu_item_2"
             android:background="#b5b5b5" />
 
         <TextView
@@ -109,30 +110,62 @@ tools:context=".home"
             android:gravity="center_vertical"
             android:text="@string/item_3">
         </TextView>
+        <View
+            android:id="@+id/menu_item_divider_4"
+            android:layout_width="fill_parent"
+            android:layout_height="0.5dp"
+            android:layout_below="@+id/menu_item_3"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
+            android:background="#b5b5b5" />
+
+        <TextView
+            android:id="@+id/menu_item_4"
+            android:layout_width="fill_parent"
+            android:layout_height="50dp"
+            android:layout_below="@+id/menu_item_divider_4"
+            android:layout_marginLeft="15dp"
+            android:gravity="center_vertical"
+            android:text="@string/item_4">
+        </TextView>
+
+        <Button
+            android:id="@+id/sign_out_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginLeft="50dp"
+            android:layout_marginTop="450dp"
+            android:layout_weight="1"
+            android:background="@color/colorPrimary"
+            android:text="@string/sign_out"
+            android:theme="@style/ThemeOverlay.MyDarkButton" />
+
+
     </RelativeLayout>
 
     <LinearLayout
         android:id="@+id/slidingPanel"
         android:layout_width="282dp"
         android:layout_height="fill_parent"
+        android:background="@android:color/white"
         android:gravity="right"
-        android:orientation="vertical"
-        android:background="@android:color/white" >
+        android:orientation="vertical">
 
         <RelativeLayout
             android:id="@+id/header"
             android:layout_width="385dp"
             android:layout_height="50dp"
-            android:background="@color/material_deep_teal_500"
+            android:layout_gravity="top"
             android:layout_marginLeft="0dp"
-            android:layout_gravity="top">
+            android:background="@color/material_deep_teal_500">
 
             <View
                 android:id="@+id/header_vertical_divider_1"
                 android:layout_width="2dp"
                 android:layout_height="fill_parent"
-                android:background="@color/primary_material_dark"
-                android:layout_alignParentTop="true" />
+                android:layout_alignParentTop="true"
+                android:background="@color/primary_material_dark" />
 
         </RelativeLayout>
 
@@ -145,38 +178,33 @@ tools:context=".home"
             android:id="@+id/list"
             android:layout_width="245dp"
             android:layout_height="match_parent"
+            android:background="@android:color/white"
             android:divider="#b5b5b5"
             android:dividerHeight="0.5dp"
-            android:background="@android:color/white"
             >
         </ListView>
 
     </LinearLayout>
 
-    <Button
-        android:id="@+id/sign_out_button"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:text="@string/sign_out"
-        android:theme="@style/ThemeOverlay.MyDarkButton"
-        android:layout_width="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:background="@color/colorPrimary"
-        android:layout_marginLeft="50dp"
-        android:layout_marginTop="450dp" />
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/everything"
+        android:layout_width="match_parent"
+        android:layout_height="484dp">
+
+    </android.support.v7.widget.RecyclerView>
 
     <TextView
+        android:id="@+id/title"
         android:layout_width="fill_parent"
         android:layout_height="52dp"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="ZConnect"
-        android:id="@+id/title"
-        android:layout_centerVertical="true"
         android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
         android:paddingLeft="15dp"
         android:paddingTop="8dp"
-        android:textSize="25dp"
-        android:textColor="@color/abc_tint_switch_thumb" />
+        android:text="ZConnect"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="@color/abc_tint_switch_thumb"
+        android:textSize="25dp" />
 
 </FrameLayout>
 
diff --git a/app/src/main/res/layout/activity_home2.xml b/app/src/main/res/layout/activity_home2.xml
index 818a675..0a031e2 100644
--- a/app/src/main/res/layout/activity_home2.xml
+++ b/app/src/main/res/layout/activity_home2.xml
@@ -13,6 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+
     <android.support.design.widget.NavigationView
         android:id="@+id/nav_view"
         android:layout_width="wrap_content"
@@ -22,4 +23,5 @@
         app:headerLayout="@layout/nav_header_home"
         app:menu="@menu/activity_home2_drawer" />
 
+
 </android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_list_of_shops.xml b/app/src/main/res/layout/activity_list_of_shops.xml
new file mode 100644
index 0000000..c3cdb8b
--- /dev/null
+++ b/app/src/main/res/layout/activity_list_of_shops.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.zconnect.login.zconnect.shop.ShopList.ListOfShop">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/StoreList"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    </android.support.v7.widget.RecyclerView>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_log_in.xml b/app/src/main/res/layout/activity_log_in.xml
index 3e13e1b..bfee4bb 100644
--- a/app/src/main/res/layout/activity_log_in.xml
+++ b/app/src/main/res/layout/activity_log_in.xml
@@ -35,6 +35,7 @@
 
 
     </LinearLayout>
+
     <TextView
         android:id="@+id/textView"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_shop.xml b/app/src/main/res/layout/activity_shop.xml
new file mode 100644
index 0000000..9f5d283
--- /dev/null
+++ b/app/src/main/res/layout/activity_shop.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.zconnect.login.zconnect.shop.categories.Shop">
+
+    <GridView
+        android:id="@+id/gv"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_x="4dp"
+        android:layout_y="4dp"
+        android:numColumns="2" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_shop_details.xml b/app/src/main/res/layout/activity_shop_details.xml
new file mode 100644
index 0000000..de91a18
--- /dev/null
+++ b/app/src/main/res/layout/activity_shop_details.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout 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:id="@+id/main_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context="com.zconnect.login.zconnect.shop.Details_of_shop.ShopDetails">
+
+    <android.support.design.widget.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/appbar_padding_top"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+
+        <android.support.design.widget.TabLayout
+            android:id="@+id/tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </android.support.design.widget.AppBarLayout>
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/app_bar_home.xml b/app/src/main/res/layout/app_bar_home.xml
index ef61f4d..88bb64a 100644
--- a/app/src/main/res/layout/app_bar_home.xml
+++ b/app/src/main/res/layout/app_bar_home.xml
@@ -18,9 +18,7 @@
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
-
     </android.support.design.widget.AppBarLayout>
 
     <include layout="@layout/content_home" />
-
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/card_shop.xml b/app/src/main/res/layout/card_shop.xml
new file mode 100644
index 0000000..fc973ec
--- /dev/null
+++ b/app/src/main/res/layout/card_shop.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <com.facebook.drawee.view.SimpleDraweeView
+        android:id="@+id/StoreImage"
+        android:layout_width="match_parent"
+        android:layout_height="230dp"
+        android:adjustViewBounds="true"
+        android:contextClickable="true"
+        android:cropToPadding="true"
+        app:srcCompat="@drawable/beanbags" />
+
+    <TextView
+        android:id="@+id/Title_store"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Text"
+
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+
+    <TextView
+        android:id="@+id/Address_store"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Address of store"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/viewText"
+            android:layout_width="190dp"
+            android:layout_height="wrap_content"
+            android:text="Phone Number"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+
+        <TextView
+            android:id="@+id/Phone_No"
+            android:layout_width="190dp"
+            android:layout_height="wrap_content"
+            android:text="Phone no view"
+            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+            android:visibility="visible" />
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/Direction"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Get Directions" />
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_home.xml b/app/src/main/res/layout/content_home.xml
index 26cd84b..6df192f 100644
--- a/app/src/main/res/layout/content_home.xml
+++ b/app/src/main/res/layout/content_home.xml
@@ -5,78 +5,19 @@
     android:id="@+id/content_home"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
     tools:context="com.zconnect.login.zconnect.HomeActivity"
     tools:showIn="@layout/app_bar_home">
 
-    <android.support.v7.widget.CardView
-        android:id="@+id/card1"
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/everything"
         android:layout_width="match_parent"
-        android:layout_height="100dp"
-        android:layout_margin="1dp"
-        android:background="@color/amber500">
+        android:layout_height="match_parent">
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="Infone"
-            android:textAlignment="center"
-            android:textColor="@color/black"
-            android:textSize="20sp" />
-    </android.support.v7.widget.CardView>
+    </android.support.v7.widget.RecyclerView>
 
-    <android.support.v7.widget.CardView
-        android:id="@+id/card2"
-        android:layout_width="match_parent"
-        android:layout_height="100dp"
-        android:layout_below="@+id/card1"
-        android:layout_margin="1dp"
-        android:background="@color/red500">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="Storeroom"
-            android:textAlignment="center"
-            android:textColor="@color/black"
-            android:textSize="20sp" />
-    </android.support.v7.widget.CardView>
-
-    <android.support.v7.widget.CardView
-        android:id="@+id/card3"
-        android:layout_width="match_parent"
-        android:layout_height="100dp"
-        android:layout_below="@+id/card2"
-        android:layout_margin="1dp"
-        android:background="@color/green500">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="Event"
-            android:textAlignment="center"
-            android:textColor="@color/black"
-            android:textSize="20sp" />
-    </android.support.v7.widget.CardView>
-
-    <android.support.v7.widget.CardView
-        android:id="@+id/card4"
-        android:layout_width="match_parent"
-        android:layout_height="100dp"
-        android:layout_below="@+id/card3"
-        android:layout_margin="1dp"
-        android:background="@color/blue500">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="Shop"
-            android:textAlignment="center"
-            android:textColor="@color/black"
-            android:textSize="20sp" />
-    </android.support.v7.widget.CardView>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/everything_row.xml b/app/src/main/res/layout/everything_row.xml
new file mode 100644
index 0000000..be1522d
--- /dev/null
+++ b/app/src/main/res/layout/everything_row.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="10dp"
+        android:layout_marginEnd="10dp"
+        android:background="@drawable/layout_border"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/EventsAndDescriptionEverything"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/Image_everything"
+                android:layout_width="match_parent"
+                android:layout_height="265dp"
+                android:adjustViewBounds="true"
+                android:background="@drawable/input_outline"
+                android:scaleType="centerCrop"
+                app:srcCompat="@drawable/beanbags" />
+
+
+            <TextView
+                android:id="@+id/title_everything"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:padding="12dp"
+                android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+
+
+            <TextView
+                android:id="@+id/date_event"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:contextClickable="true"
+                android:cursorVisible="false"
+                android:paddingBottom="5dp"
+                android:paddingLeft="0dp"
+                android:paddingRight="5dp"
+                android:paddingTop="5dp"
+
+                android:textAlignment="textEnd"
+                android:textColor="@color/grey" />
+
+            <TextView
+                android:id="@+id/description_or_price"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:paddingBottom="10dp"
+                android:paddingLeft="0dp"
+                android:paddingRight="10dp"
+                android:paddingTop="5dp"
+                android:textColor="@color/authui_inputTextColorDarkDisabled"
+                android:textSize="16dp" />
+
+            <Button
+                android:id="@+id/reminder_or_call"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="5dp"
+                android:layout_marginBottom="5dp"
+                android:layout_marginEnd="5dp"
+                android:elevation="9dp" />
+
+        </LinearLayout>
+
+        <RelativeLayout
+            android:id="@+id/ContactCardEverything"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginEnd="10dp"
+            android:padding="12dp">
+
+
+            <com.facebook.drawee.view.SimpleDraweeView xmlns:fresco="http://schemas.android.com/apk/res-auto"
+                android:id="@+id/everything_item_format_image"
+                android:layout_width="60dip"
+                android:layout_height="60dip"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_margin="4dp"
+                android:layout_marginTop="4dp"
+                android:scaleType="centerCrop"
+                app:actualImageScaleType="centerCrop"
+                fresco:placeholderImageScaleType="centerCrop"
+                fresco:roundAsCircle="true"
+                fresco:srcCompat="@drawable/books" />
+
+            <TextView
+                android:id="@+id/everything_name_textview"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/everything_item_format_image"
+                android:padding="10dp"
+                android:text="NAME"
+                android:textColor="@android:color/black"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/colon1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/everything_name_textview"
+                android:padding="10dp"
+                android:text=":"
+                android:textColor="@android:color/black"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/everything_name1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/colon1"
+                android:fontFamily="monospace"
+                android:padding="10dp"
+                android:textColor="@android:color/black"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/everything_number_textview"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/everything_name_textview"
+                android:layout_toRightOf="@+id/everything_item_format_image"
+                android:padding="10dp"
+                android:text="NUMBER"
+                android:textColor="@android:color/black"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/colon2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/everything_name_textview"
+                android:layout_toRightOf="@+id/everything_number_textview"
+                android:padding="10dp"
+                android:text=":"
+                android:textColor="@android:color/black"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/everything_number1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/everything_name_textview"
+                android:layout_toRightOf="@+id/colon2"
+                android:fontFamily="monospace"
+                android:padding="10dp"
+                android:textColor="@android:color/black"
+                android:textSize="16sp" />
+
+
+        </RelativeLayout>
+
+
+    </LinearLayout>
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_tab_store_room.xml b/app/src/main/res/layout/fragment_tab_store_room.xml
index bf35c29..5a4355a 100644
--- a/app/src/main/res/layout/fragment_tab_store_room.xml
+++ b/app/src/main/res/layout/fragment_tab_store_room.xml
@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.zconnect.login.zconnect.TabStoreRoom$PlaceholderFragment">
+    tools:context="com.zconnect.login.zconnect.TabStoreRoom$">
     <!--android:paddingBottom="@dimen/activity_vertical_margin"-->
     <!--android:paddingLeft="@dimen/activity_horizontal_margin"-->
     <!--android:paddingRight="@dimen/activity_horizontal_margin"-->
diff --git a/app/src/main/res/layout/gv_item.xml b/app/src/main/res/layout/gv_item.xml
new file mode 100644
index 0000000..fe9cc0f
--- /dev/null
+++ b/app/src/main/res/layout/gv_item.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/GV_imageView"
+        android:layout_width="match_parent"
+        android:layout_height="150dp"
+        android:adjustViewBounds="true"
+        android:padding="5dp"
+        android:paddingBottom="5dp"
+        android:scaleType="fitCenter"
+        android:visibility="visible"
+        app:srcCompat="@android:drawable/ic_delete" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/image_wala_view.xml b/app/src/main/res/layout/image_wala_view.xml
new file mode 100644
index 0000000..a4ab272
--- /dev/null
+++ b/app/src/main/res/layout/image_wala_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/ShopListCard"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+    <ImageView
+        android:id="@+id/ImageOfImageWalaView"
+        android:layout_width="match_parent"
+        android:layout_height="300dp"
+        app:srcCompat="@drawable/beanbags" />
+
+    <TextView
+        android:id="@+id/TitleOfImageWalaView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="mBmasbdj"
+        android:textSize="45sp" />
+
+    <TextView
+        android:id="@+id/TextOfImageWalaView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+</LinearLayout>
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/phonebook.xml b/app/src/main/res/layout/phonebook.xml
new file mode 100644
index 0000000..0e21344
--- /dev/null
+++ b/app/src/main/res/layout/phonebook.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="0dp"
+    android:paddingBottom="0dp"
+    android:paddingEnd="0dp"
+    android:paddingLeft="0dp"
+    android:paddingRight="0dp"
+    android:paddingStart="0dp"
+    android:paddingTop="0dp"
+    app:layout_collapseParallaxMultiplier="0.0">
+
+    <TextView
+        android:id="@+id/textName"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="" />
+
+    <TextView
+        android:id="@+id/textNumber"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_below="@+id/textName"
+        android:text="" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/search_contacts.xml b/app/src/main/res/layout/search_contacts.xml
new file mode 100644
index 0000000..5997af9
--- /dev/null
+++ b/app/src/main/res/layout/search_contacts.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.zconnect.login.zconnect.Phonebook.Search">
+
+    <EditText
+        android:id="@+id/editText"
+        android:layout_width="match_parent"
+        android:layout_height="50dp" />
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/Rec"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_below="@+id/editText">
+
+    </android.support.v7.widget.RecyclerView>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/shop_details_tab1.xml b/app/src/main/res/layout/shop_details_tab1.xml
new file mode 100644
index 0000000..446781f
--- /dev/null
+++ b/app/src/main/res/layout/shop_details_tab1.xml
@@ -0,0 +1,52 @@
+<ScrollView 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"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="com.zconnect.login.zconnect.shop.Details_of_shop.TabView1">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:id="@+id/image_Shop_offer"
+            android:layout_width="match_parent"
+            android:layout_height="480dp"
+            app:srcCompat="@drawable/beanbags" />
+
+        <TextView
+            android:id="@+id/Description_shop_offer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@+id/Name_Shop_offer"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignStart="@+id/Name_Shop_offer"
+            android:layout_below="@+id/Name_Shop_offer"
+            android:ems="10"
+            android:hint="Description"
+            android:inputType="textPersonName" />
+
+        <TextView
+            android:id="@+id/Name_Shop_offer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentStart="true"
+            android:layout_below="@+id/image_Shop_offer"
+            android:ems="10"
+
+            android:hint="Name"
+            android:inputType="textPersonName"
+            android:textSize="45sp" />
+
+
+    </RelativeLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/shop_details_tab2.xml b/app/src/main/res/layout/shop_details_tab2.xml
new file mode 100644
index 0000000..4a2a1c4
--- /dev/null
+++ b/app/src/main/res/layout/shop_details_tab2.xml
@@ -0,0 +1,19 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="com.zconnect.login.zconnect.shop.Details_of_shop.TabView1">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/ImageWalaView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    </android.support.v7.widget.RecyclerView>
+
+
+</RelativeLayout>
diff --git a/app/src/main/res/menu/activity_home2_drawer.xml b/app/src/main/res/menu/activity_home2_drawer.xml
index 69cde0f..8cd8c88 100644
--- a/app/src/main/res/menu/activity_home2_drawer.xml
+++ b/app/src/main/res/menu/activity_home2_drawer.xml
@@ -14,6 +14,10 @@
             android:id="@+id/nav_event"
             android:icon="@drawable/ic_event_black_24dp"
             android:title="Event" />
+        <item
+            android:id="@+id/nav_shop"
+            android:icon="@drawable/beanbags"
+            android:title="Shop" />
 
     </group>
 
diff --git a/app/src/main/res/menu/add_menu.xml b/app/src/main/res/menu/add_menu.xml
new file mode 100644
index 0000000..7d1dd3c
--- /dev/null
+++ b/app/src/main/res/menu/add_menu.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:id="@+id/action_add"
+        android:title="Add Post"
+        app:showAsAction="always" />
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d722e17..42b46ea 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,6 +2,7 @@
 <resources>
     <color name="colorPrimary">@color/material_deep_teal_500</color>
     <!--<color name="colorPrimaryDark">#303F9F</color>-->
+    <color name="colorPrimaryDark">#303F9F</color>
     <color name="colorAccent">#FF4081</color>
     <color name="grey">#777777</color>
     <color name="black_overlay">#660000</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 896d81f..900e238 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -66,6 +66,7 @@
     <string name="item_1">Store room</string>
     <string name="item_2">Events</string>
     <string name="item_3">Phonebook</string>
+    <string name="item_4">Shop</string>
     <string name="description">Hurrey</string>
     <string name="title_activity_phonebook">Phonebook</string>
 
@@ -105,4 +106,6 @@
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
 
+    <string name="title_activity_shop_details">ShopDetails</string>
+
 </resources>
diff --git a/app/src/test/java/com/zconnect/login/zconnect/ExampleUnitTest.java b/app/src/test/java/com/zconnect/login/zconnect/ExampleUnitTest.java
deleted file mode 100644
index 65db7ad..0000000
--- a/app/src/test/java/com/zconnect/login/zconnect/ExampleUnitTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.zconnect.login.zconnect;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index ee2e079..f7de921 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,13 +5,14 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.3.0-beta2'
         classpath 'com.google.gms:google-services:3.0.0'
 
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
+
 }
 
 allprojects {
diff --git a/gradle.properties b/gradle.properties
deleted file mode 100644
index 1d3591c..0000000
--- a/gradle.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
\ No newline at end of file
diff --git a/local.properties b/local.properties
new file mode 100644
index 0000000..26cf3aa
--- /dev/null
+++ b/local.properties
@@ -0,0 +1,12 @@
+## This file is automatically generated by Android Studio.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Fri Jan 27 13:52:19 IST 2017
+ndk.dir=/mnt/2265A8DD27504807/Android/Sdk/ndk-bundle
+sdk.dir=/mnt/2265A8DD27504807/Android/Sdk