Skip to content

Commit

Permalink
minor fixes to home page
Browse files Browse the repository at this point in the history
  • Loading branch information
@meiron03
meiron03 committed Nov 12, 2023
1 parent bff40af commit 8c89a1f
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 60 deletions.
1 change: 0 additions & 1 deletion PennMobile/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.pennapps.labs.pennmobile"
android:versionCode="70"
android:versionName="3.0.0">

Expand Down
104 changes: 45 additions & 59 deletions PennMobile/src/main/java/com/pennapps/labs/pennmobile/HomeFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,28 +132,31 @@ class HomeFragment : Fragment() {
homepageCells[0] = pollCell
}
}
loaded++

Log.i("HomeFragment", "polls $loaded")

if (loaded == totalCells) {
binding.homeCellsRv.adapter = HomeAdapter(ArrayList(homepageCells))
loadingPanel?.visibility = View.GONE
binding.internetConnectionHome.visibility = View.GONE
binding.homeRefreshLayout.isRefreshing = false
if (++loaded == totalCells) {
mActivity.runOnUiThread {
binding.homeCellsRv.adapter = HomeAdapter(ArrayList(homepageCells))
loadingPanel?.visibility = View.GONE
binding.internetConnectionHome.visibility = View.GONE
binding.homeRefreshLayout.isRefreshing = false
}
}

Log.i("HomeFragment", "polls success $loaded")

}, { throwable ->
Log.e("Poll", "Error retrieving polls", throwable)
loaded++

Log.i("HomeFragment", "polls $loaded")

if (loaded == totalCells) {
binding.homeCellsRv.adapter = HomeAdapter(ArrayList(homepageCells))
loadingPanel?.visibility = View.GONE
binding.internetConnectionHome.visibility = View.GONE
binding.homeRefreshLayout.isRefreshing = false
if (++loaded >= totalCells) {
mActivity.runOnUiThread {
binding.homeCellsRv.adapter = HomeAdapter(ArrayList(homepageCells))
loadingPanel?.visibility = View.GONE
binding.internetConnectionHome.visibility = View.GONE
binding.homeRefreshLayout.isRefreshing = false
}
}

Log.i("HomeFragment", "polls $loaded")
})

studentLife.news.subscribe({ article ->
Expand All @@ -164,30 +167,27 @@ class HomeFragment : Fragment() {
newsCell.type = "news"
homepageCells[3] = newsCell

loaded++
Log.i("HomeFragment", "news $loaded")

if (loaded == totalCells) {
if (++loaded >= totalCells) {
binding.homeCellsRv.adapter = HomeAdapter(ArrayList(homepageCells))
loadingPanel?.visibility = View.GONE
binding.internetConnectionHome.visibility = View.GONE
binding.homeRefreshLayout.isRefreshing = false
}
Log.i("HomeFragment", "news $loaded")
}
}, { throwable ->
mActivity.runOnUiThread {
Log.e("Home", "Could not load news", throwable)
throwable.printStackTrace()

loaded++
Log.i("HomeFragment", "news $loaded")

if (loaded == totalCells) {
if (++loaded >= totalCells) {
binding.homeCellsRv.adapter = HomeAdapter(ArrayList(homepageCells))
loadingPanel?.visibility = View.GONE
binding.internetConnectionHome.visibility = View.GONE
binding.homeRefreshLayout.isRefreshing = false
}
Log.i("HomeFragment", "news $loaded")

}
})

Expand All @@ -212,30 +212,27 @@ class HomeFragment : Fragment() {
diningCell.info = diningCellInfo
homepageCells[4] = diningCell

loaded++
Log.i("HomeFragment", "dining $loaded")

if (loaded == totalCells) {
if (++loaded >= totalCells) {
binding.homeCellsRv.adapter = HomeAdapter(ArrayList(homepageCells))
loadingPanel?.visibility = View.GONE
binding.internetConnectionHome.visibility = View.GONE
binding.homeRefreshLayout.isRefreshing = false
}

Log.i("HomeFragment", "dining $loaded")
}
}, { throwable ->
mActivity.runOnUiThread {
Log.e("Home", "Could not load Dining", throwable)
throwable.printStackTrace()

loaded++
Log.i("HomeFragment", "dining $loaded")

if (loaded == totalCells) {
if (++loaded >= totalCells) {
binding.homeCellsRv.adapter = HomeAdapter(ArrayList(homepageCells))
loadingPanel?.visibility = View.GONE
binding.internetConnectionHome.visibility = View.GONE
binding.homeRefreshLayout.isRefreshing = false
}
Log.i("HomeFragment", "dining $loaded")
}
})

Expand All @@ -249,29 +246,27 @@ class HomeFragment : Fragment() {
gsrBookingCell.type = "gsr_booking"
gsrBookingCell.buildings = arrayListOf("Huntsman Hall", "Weigle")
homepageCells[5] = gsrBookingCell
loaded++
Log.i("HomeFragment", "calendar $loaded")

if (loaded == totalCells) {
if (++loaded >= totalCells) {
binding.homeCellsRv.adapter = HomeAdapter(ArrayList(homepageCells))
loadingPanel?.visibility = View.GONE
binding.internetConnectionHome.visibility = View.GONE
binding.homeRefreshLayout.isRefreshing = false
}
Log.i("HomeFragment", "calendar $loaded")
}
}, { throwable ->
mActivity.runOnUiThread {
Log.e("Home", "Could not load calendar", throwable)
throwable.printStackTrace()
loaded++
Log.i("HomeFragment", "calendar $loaded")

if (loaded == totalCells) {
if (++loaded >= totalCells) {
binding.homeCellsRv.adapter = HomeAdapter(ArrayList(homepageCells))
loadingPanel?.visibility = View.GONE
binding.internetConnectionHome.visibility = View.GONE
binding.homeRefreshLayout.isRefreshing = false
}
Log.i("HomeFragment", "calendar $loaded")
}
})

Expand All @@ -286,29 +281,27 @@ class HomeFragment : Fragment() {
}
laundryCell.info = laundryCellInfo
homepageCells[6] = laundryCell
loaded++
Log.i("HomeFragment", "laundry $loaded")

if (loaded == totalCells) {
if (++loaded >= totalCells) {
binding.homeCellsRv.adapter = HomeAdapter(ArrayList(homepageCells))
loadingPanel?.visibility = View.GONE
binding.internetConnectionHome.visibility = View.GONE
binding.homeRefreshLayout.isRefreshing = false
}
Log.i("HomeFragment", "laundry $loaded")
}
}, { throwable ->
mActivity.runOnUiThread {
Log.e("Home", "Could not load laundry", throwable)
throwable.printStackTrace()
loaded++
Log.i("HomeFragment", "laundry $loaded")

if (loaded == totalCells) {
if (++loaded >= totalCells) {
binding.homeCellsRv.adapter = HomeAdapter(ArrayList(homepageCells))
loadingPanel?.visibility = View.GONE
binding.internetConnectionHome.visibility = View.GONE
binding.homeRefreshLayout.isRefreshing = false
}
Log.i("HomeFragment", "laundry $loaded")
}
})

Expand All @@ -323,29 +316,26 @@ class HomeFragment : Fragment() {
}
}

loaded++
Log.i("HomeFragment", "posts $loaded")

if (loaded == totalCells) {
if (++loaded >= totalCells) {
binding.homeCellsRv.adapter = HomeAdapter(ArrayList(homepageCells))
loadingPanel?.visibility = View.GONE
binding.internetConnectionHome.visibility = View.GONE
binding.homeRefreshLayout.isRefreshing = false
}
Log.i("HomeFragment", "posts $loaded")

}, { throwable ->
mActivity.runOnUiThread {
Log.e("Home", "Could not load posts", throwable)
throwable.printStackTrace()
loaded++
Log.i("HomeFragment", "posts $loaded")

if (loaded == totalCells) {
if (++loaded >= totalCells) {
binding.homeCellsRv.adapter = HomeAdapter(ArrayList(homepageCells))
loadingPanel?.visibility = View.GONE
binding.internetConnectionHome.visibility = View.GONE
binding.homeRefreshLayout.isRefreshing = false
}
Log.i("HomeFragment", "posts $loaded")
}

})
Expand All @@ -358,9 +348,8 @@ class HomeFragment : Fragment() {
calendar.type = "calendar"
calendar.events = events
homepageCells.add(0, calendar)
loaded++

if (loaded == totalCells) {
if (++loaded >= totalCells) {
binding.homeCellsRv.adapter = HomeAdapter(ArrayList(homepageCells))
loadingPanel?.visibility = View.GONE
binding.internetConnectionHome.visibility = View.GONE
Expand All @@ -371,9 +360,8 @@ class HomeFragment : Fragment() {
mActivity.runOnUiThread {
Log.e("Home", "Could not load Home page", throwable)
throwable.printStackTrace()
loaded++

if (loaded == totalCells) {
if (++loaded >= totalCells) {
binding.homeCellsRv.adapter = HomeAdapter(ArrayList(homepageCells))
loadingPanel?.visibility = View.GONE
binding.internetConnectionHome.visibility = View.GONE
Expand All @@ -393,9 +381,8 @@ class HomeFragment : Fragment() {
gsrBookingCell.type = "gsr_booking"
gsrBookingCell.buildings = arrayListOf("Huntsman Hall", "Weigle")
homepageCells.add(homepageCells.size, gsrBookingCell)
loaded++

if (loaded == totalCells) {
if (++loaded >= totalCells) {
binding.homeCellsRv.adapter = HomeAdapter(ArrayList(homepageCells))
loadingPanel?.visibility = View.GONE
binding.internetConnectionHome.visibility = View.GONE
Expand All @@ -406,9 +393,8 @@ class HomeFragment : Fragment() {
mActivity.runOnUiThread {
Log.e("Home", "Could not load Home page", throwable)
throwable.printStackTrace()
loaded++

if (loaded == totalCells) {
if (++loaded >= totalCells) {
binding.homeCellsRv.adapter = HomeAdapter(ArrayList(homepageCells))
loadingPanel?.visibility = View.GONE
binding.internetConnectionHome.visibility = View.GONE
Expand Down

0 comments on commit 8c89a1f

Please sign in to comment.