Home

app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.1"
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         applicationId "com.zconnect.login.zconnect"
@@ -25,9 +25,6 @@ android {
 
 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'
 

app/src/main/AndroidManifest.xml

@@ -4,7 +4,8 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
-
+    <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+    <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
     <application
         android:name=".ZConnect"
         android:allowBackup="true"
@@ -67,6 +68,14 @@
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
+        <activity
+            android:name=".Store.StoreRoom"
+            android:label="@string/title_activity_store_room"
+            android:theme="@style/AppTheme" />
+        <activity android:name=".Store.AddProduct" />
+        <activity android:name=".Phonebook.Search" />
+        <activity android:name=".Shop.ShopList.ListOfShop" />
+        <activity android:name=".Shop.Categories.Store" />
 
             <meta-data
                 android:name="android.app.searchable"
@@ -83,9 +92,25 @@
             android:theme="@style/AppTheme" />
         <activity android:name=".NewUser" />
         <activity android:name=".MyProducts" />
+        <activity android:name=".shop.ShopList.ListOfShop" />
+
         <activity android:name=".AddEvent" />
         <activity android:name=".AllEvents" />
         <activity android:name=".OpenEventDetail"></activity>
-    </application>
+        <activity android:name=".Phonebook.Search"></activity>
+
 
+        <activity android:name=".shop.categories.Shop"></activity>
+
+        <activity android:name=".NewUser" />
+
+        <activity android:name=".OpenEventDetail"></activity>
+        <activity
+            android:name=".shop.Details_of_shop.ShopDetails"
+            android:label="@string/title_activity_shop_details"
+
+            android:theme="@style/AppTheme">
+
+        </activity>
+    </application>
 </manifest>

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;
 

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) {
 
+        }
     }
-
-}

app/src/main/java/com/zconnect/login/zconnect/NewUser.java

@@ -10,18 +10,16 @@
 import android.widget.Button;
 import android.widget.EditText;
 
-import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.database.DatabaseReference;
 import com.google.firebase.database.FirebaseDatabase;
-import com.google.firebase.storage.StorageReference;
-import com.google.firebase.storage.UploadTask;
 
 import java.util.HashMap;
 import java.util.Map;
 
 
+
 public class NewUser extends AppCompatActivity {
 
     private DatabaseReference mDatabase;
@@ -48,7 +46,7 @@ protected void onCreate(Bundle savedInstanceState) {
             @Override
             public void onClick(View view) {
                 startPosting();
-                startActivity(new Intent(NewUser.this, home.class));
+                startActivity(new Intent(NewUser.this, com.zconnect.login.zconnect.home.class));
             }
         });
     }
@@ -96,7 +94,7 @@ private void startPosting() {
 //                    map1.put("PhoneNumber", PhoneNumber);
 //                    mDatabase.setValue(map1);
                     mProgress.dismiss();
-                    startActivity(new Intent(NewUser.this,home.class));
+                    startActivity(new Intent(NewUser.this, com.zconnect.login.zconnect.home.class));
 //                }
         //    });
         }

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;