HomeAndShop

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>

app/build.gradle

@@ -2,41 +2,46 @@ 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'
         }
     }
 
     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'

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>

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));
                 }

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));
                 }

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