diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningHolderFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningHolderFragment.kt index 80216b79..b2d1679d 100644 --- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningHolderFragment.kt +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/DiningHolderFragment.kt @@ -74,8 +74,8 @@ class DiningHolderFragment : Fragment() { override fun onResume() { super.onResume() + getConnected() mActivity.removeTabs() - //mActivity.toolbar.visibility = View.GONE mActivity.setTitle(R.string.dining) mActivity.setSelectedTab(MainActivity.DINING) } diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/HomeFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/HomeFragment.kt index da8a8df6..9cb2c804 100644 --- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/HomeFragment.kt +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/HomeFragment.kt @@ -89,6 +89,7 @@ class HomeFragment : Fragment() { } private fun getHomePage() { + mActivity.showBottomBar() //displays banner if not connected if (!isOnline(context)) { diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessAdapterDataModel.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessAdapterDataModel.kt index ca1f3f0d..97db24d2 100644 --- a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessAdapterDataModel.kt +++ b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/classes/FitnessAdapterDataModel.kt @@ -4,9 +4,7 @@ interface FitnessAdapterDataModel { fun flipState(roomId: Int) : Boolean fun getNumber(isFavorite: Boolean) : Int fun getRoom(isFavorite: Boolean, position: Int) : FitnessRoom - fun getTot() : Int fun getRoomAll(roomId: Int) : FitnessRoom - fun isFavorite(roomId: Int) : Boolean } \ No newline at end of file