From e1c670fed00022186f00da0969de00ce405c4fd6 Mon Sep 17 00:00:00 2001
From: Aaron Sun <aaronsun@live.com>
Date: Tue, 20 Oct 2020 22:55:43 -0700
Subject: [PATCH] Renamed xml file for list entry

---
 Listify/app/src/main/AndroidManifest.xml                     | 5 ++---
 Listify/app/src/main/java/com/example/listify/ListPage.java  | 4 ++--
 .../{listproduct.xml => activity_listproductentry.xml}       | 0
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename Listify/app/src/main/res/layout/{listproduct.xml => activity_listproductentry.xml} (100%)

diff --git a/Listify/app/src/main/AndroidManifest.xml b/Listify/app/src/main/AndroidManifest.xml
index 980c079..7389dd5 100644
--- a/Listify/app/src/main/AndroidManifest.xml
+++ b/Listify/app/src/main/AndroidManifest.xml
@@ -33,14 +33,13 @@
             android:name=".SearchResults"
             android:label=""
             android:theme="@style/AppTheme.NoActionBar">
-
         </activity>
-  
+
+        <activity android:name="com.example.listify.SplashActivity" />
         <activity android:name="com.example.listify.ui.SignupPage" />
         <activity android:name="com.example.listify.ui.LoginPage" />
         <activity android:name="com.example.listify.ui.ForgotPasswordPage" />
         <activity android:name="com.example.listify.ListPage" />
-        <activity android:name="com.example.listify.SplashActivity" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/Listify/app/src/main/java/com/example/listify/ListPage.java b/Listify/app/src/main/java/com/example/listify/ListPage.java
index f81c481..fa449d2 100644
--- a/Listify/app/src/main/java/com/example/listify/ListPage.java
+++ b/Listify/app/src/main/java/com/example/listify/ListPage.java
@@ -123,7 +123,7 @@ public class ListPage extends AppCompatActivity {
         ArrayList<Integer> pImages;
 
         MyAdapter (Context c, ArrayList<String> names, ArrayList<String> stores, ArrayList<String> prices, ArrayList<String> quantity, ArrayList<Integer> images) {
-            super(c, R.layout.listproduct, R.id.productView, names);
+            super(c, R.layout.activity_listproductentry, R.id.productView, names);
             context = c;
             pNames = names;
             pStores = stores;
@@ -136,7 +136,7 @@ public class ListPage extends AppCompatActivity {
         @Override
         public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
             LayoutInflater layoutInflater = (LayoutInflater) getApplicationContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            View listproduct = layoutInflater.inflate(R.layout.listproduct, parent,false);
+            View listproduct = layoutInflater.inflate(R.layout.activity_listproductentry, parent,false);
 
             decrQuan = (Button) listproduct.findViewById(R.id.buttonDecr);
             incrQuan = (Button) listproduct.findViewById(R.id.buttonIncr);
diff --git a/Listify/app/src/main/res/layout/listproduct.xml b/Listify/app/src/main/res/layout/activity_listproductentry.xml
similarity index 100%
rename from Listify/app/src/main/res/layout/listproduct.xml
rename to Listify/app/src/main/res/layout/activity_listproductentry.xml