Merge branch 'master' of https://github.com/pennlabs/penn-mobile-android

Author: rchhaya

PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningInfoFragment.kt

@@ -107,7 +107,7 @@ class DiningInfoFragment : Fragment() {
             layparamtimes.addRule(RelativeLayout.ALIGN_BOTTOM, vertical.last().id)
             layparamtimes.setMargins(0, 10, 0, 0)
             val mealInt = TextView(mActivity)
-            val hoursString = meal.open?.let { meal.getFormattedHourZ(it) } + " - " + meal.close?.let { meal.getFormattedHourZ(it) }
+            val hoursString = meal.open?.let { meal.getFormattedHour(it) } + " - " + meal.close?.let { meal.getFormattedHour(it) }
             mealInt.text = hoursString
             mealInt.id = vertical.last().id + 1
             menuParent.addView(mealInt, layparamtimes)

PennMobile/src/main/java/com/pennapps/labs/pennmobile/HomeFragment.kt

@@ -164,7 +164,7 @@ class HomeFragment : Fragment() {
                 }
             }, { throwable ->
                 mActivity.runOnUiThread {
-                    Log.e("Home", "Could not load Home page", throwable)
+                    Log.e("Home", "Could not load Dining", throwable)
                     throwable.printStackTrace()
                     loadingPanel?.visibility = View.GONE
                     home_refresh_layout?.isRefreshing = false
@@ -180,7 +180,7 @@ class HomeFragment : Fragment() {
                     val gsrBookingCell = HomeCell()
                     gsrBookingCell.type = "gsr_booking"
                     gsrBookingCell.buildings = arrayListOf("Huntsman Hall", "Weigle")
-                    homepageCells.set(3, gsrBookingCell)
+                    homepageCells.set(4, gsrBookingCell)
                     home_cells_rv?.adapter = HomeAdapter(ArrayList(homepageCells))
                     loadingPanel?.visibility = View.GONE
                     home_refresh_layout?.isRefreshing = false

PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/VenueInterval.kt

@@ -49,13 +49,13 @@ class VenueInterval {
             var closeTime = "$date $close"
             // Avoid midnight hour confusion as API returns both 00:00 and 24:00
             // Switch it to more comprehensible 23:59 / 11:59PM
-            if (close == "00:00:00Z" || close == "24:00:00Z") {
-                closeTime = "$date 23:59:59Z"
+            if (close == "00:00:00" || close == "24:00:00") {
+                closeTime = "$date 23:59:59"
             }
             Log.i("VenueInterval", "$openTime")
             if (open == "" && close == "") {
-                open ="00:00:00Z"
-                close ="00:00:00Z"
+                open ="00:00:00"
+                close ="00:00:00"
                 openTime = "$date $open"
                 closeTime = "$date $close"
             }
@@ -64,7 +64,7 @@ class VenueInterval {
             try {
                 closeInstant = DateTime.parse(closeTime, dateFormat)
             } catch (e: IllegalInstantException) {
-                closeTime = "$date 01:00:00Z"
+                closeTime = "$date 01:00:00"
                 closeInstant = DateTime.parse(closeTime, dateFormat)
             }
 
@@ -73,13 +73,7 @@ class VenueInterval {
             if (closeInstant.hourOfDay < 6) {
                 closeInstant = closeInstant.plusDays(1)
             }
-            try {
-                return Interval(openInstant, closeInstant)
-            } catch (e: Exception) {
-                Log.e("VenueInterval", "Error creating interval", e)
-                closeInstant = closeInstant.plusHours(24)
-                return Interval(openInstant, closeInstant)
-            }
+            return Interval(openInstant, closeInstant)
         }
 
         fun getFormattedHour(hours: String): String {
@@ -103,38 +97,12 @@ class VenueInterval {
 
         }
 
-        fun getFormattedHourZ(hours: String): String {
-            try {
-                var newHours = hours.substring(0, 5)
-                var hour = hours.substring(0, 2).toInt() - 5
-                if(hour < 0) {
-                    hour += 24
-                }
-                if (hour > 12) {
-                    newHours = "" + (hour - 12) + hours.substring(2, 5)
-                } else {
-                    newHours = "" + hour + hours.substring(2, 5)
-                }
-                newHours += if (hour >= 12) {
-                    "pm"
-                } else {
-                    "am"
-                }
-                return newHours
-
-            } catch (exception: Exception) {
-                Log.d("Time Formatting Error", exception.message ?: "")
-                return hours
-            }
-
-        }
-
         companion object {
             /**
              * Date format used by dining API.
              * Example: "2015-08-10 15:00:00"
              */
-            val dateFormat: DateTimeFormatter = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ssZ")
+            val dateFormat: DateTimeFormatter = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss")
         }
     }
 }