delete unused styles

pennlabs · Dec 5, 2015 · 2ac3076 · 2ac3076
1 parent 713e6b6
commit 2ac3076
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 22 deletions.
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningInfoFragment.java b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningInfoFragment.java
@@ -109,12 +109,12 @@ public void call(List<Building> buildings) {
         }
     }
 
-    private void drawMarker(LatLng courseLatLng) {
-        if (map != null && courseLatLng != null && mapFrame != null) {
+    private void drawMarker(LatLng diningHallLatLng) {
+        if (map != null && diningHallLatLng != null && mapFrame != null) {
             mapFrame.setVisibility(View.VISIBLE);
-            map.moveCamera(CameraUpdateFactory.newLatLngZoom(courseLatLng, 17));
+            map.moveCamera(CameraUpdateFactory.newLatLngZoom(diningHallLatLng, 17));
             Marker marker = map.addMarker(new MarkerOptions()
-                    .position(courseLatLng)
+                    .position(diningHallLatLng)
                     .title(mDiningHall.getName()));
             marker.showInfoWindow();
         }
@@ -152,7 +152,6 @@ public LinkedList<TextView> addDiningHour(VenueInterval day, LinkedList<TextView
             TextView mealType = new TextView(mActivity);
             mealType.setText(meal.type);
             mealType.setId(vertical.getLast().getId() + 1);
-            mealType.setTextAppearance(mActivity, R.style.DiningInfoType);
             RelativeLayout.LayoutParams layparammeal = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT,
                     RelativeLayout.LayoutParams.WRAP_CONTENT);
             layparammeal.addRule(RelativeLayout.BELOW, vertical.getLast().getId());
@@ -168,7 +167,6 @@ public LinkedList<TextView> addDiningHour(VenueInterval day, LinkedList<TextView
             TextView mealInt = new TextView(mActivity);
             String hoursString = meal.getFormattedHour(meal.open) + " - " + meal.getFormattedHour(meal.close);
             mealInt.setText(hoursString);
-            mealInt.setTextAppearance(mActivity, R.style.DiningInfoHours);
             mealInt.setId(vertical.getLast().getId() + 1);
             menuParent.addView(mealInt, layparamtimes);
             vertical.add(mealInt);

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningHall.java b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/DiningHall.java
@@ -18,7 +18,7 @@
 public class DiningHall implements Parcelable {
 
     private int id;
-    private String name, location;
+    private String name;
     // Refers to whether the dining hall is residential or retail
     private boolean residential;
     private HashMap<String, Interval> openHours;
@@ -98,9 +98,6 @@ public boolean hasMenu() {
         return menus.size() > 0;
     }
 
-    public String getLocation() {
-        return location;
-    }
 
     public Venue getVenue(){
         return venue;

diff --git a/PennMobile/src/main/res/values/styles.xml b/PennMobile/src/main/res/values/styles.xml
@@ -106,18 +106,6 @@
         <item name="android:layout_marginTop">4dp</item>
     </style>
 
-    <style name="DiningInfoHours" parent="TextAppearance.AppCompat.Body2">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_alignParentRight">true</item>
-    </style>
-
-    <style name="DiningInfoType" parent="TextAppearance.AppCompat.Body2">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_alignParentBottom">true</item>
-    </style>
-
     <style name="DiningInfoDate" parent="TextAppearance.AppCompat.Subhead">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>