update pottruck fragment

pennlabs · Jan 19, 2025 · c93a93b · c93a93b
1 parent bfa19f6
commit c93a93b
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 10 deletions.
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/FitnessPreferenceViewModel.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/fitness/FitnessPreferenceViewModel.kt
@@ -14,9 +14,9 @@ import retrofit.client.Response
 
 class FitnessPreferenceViewModel(
     private val studentLife: StudentLife,
-    private val roomList: List<FitnessRoom>,
 ) : FitnessAdapterDataModel {
-    private val roomTot = roomList.size
+    private lateinit var roomList: List<FitnessRoom>
+    private var roomTot : Int = 0
 
     // hashset of the favorite room ids
     private val favoriteRooms: HashSet<Int> = hashSetOf()
@@ -120,4 +120,48 @@ class FitnessPreferenceViewModel(
             }
         }
     }
+
+    fun getFitnessRooms(mActivity: MainActivity) {
+        try {
+            studentLife.fitnessRooms
+                .subscribe({ fitnessRooms ->
+                    for (room in fitnessRooms) {
+                        Log.i("Fitness Room${room.roomId}", "${room.roomName}")
+                    }
+                    val sortedRooms = fitnessRooms.sortedBy { it.roomName }
+                    roomList = sortedRooms
+                    roomTot = roomList.size
+
+                    mActivity.runOnUiThread {
+                        mActivity.mNetworkManager.getAccessToken {
+                            val sp = PreferenceManager.getDefaultSharedPreferences(mActivity)
+                            val context = mActivity.applicationContext
+                            val bearerToken =
+                                "Bearer " + sp.getString(context.getString(R.string.access_token), "").toString()
+
+                            studentLife.getFitnessPreferences(bearerToken).subscribe({ favorites ->
+                                mActivity.runOnUiThread {
+                                    for (roomId in favorites) {
+                                        addId(roomId)
+                                    }
+                                    updatePositionMap()
+                                }
+
+                            }, {throwable ->
+                                mActivity.runOnUiThread {
+                                    //call setAdapters
+                                    Log.e(
+                                        "Pottruck Fragment",
+                                        "Could not load Fitness Preferences",
+                                        throwable,
+                                    )
+                                }
+                            })
+                        }
+                    }
+                })
+        }  catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
 }
diff --git a/...Mobile/src/main/java/com/pennapps/labs/pennmobile/fitness/adapters/FitnessPagerAdapter.kt b/...Mobile/src/main/java/com/pennapps/labs/pennmobile/fitness/adapters/FitnessPagerAdapter.kt
@@ -2,7 +2,7 @@ package com.pennapps.labs.pennmobile.fitness.adapters
 
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
-import com.pennapps.labs.pennmobile.gsr.fragments.PottruckFragment
+import com.pennapps.labs.pennmobile.fitness.fragments.PottruckFragment
 
 class FitnessPagerAdapter(
     fragment: Fragment,

diff --git a/...nmobile/gsr/fragments/PottruckFragment.kt → ...ile/fitness/fragments/PottruckFragment.kt b/...nmobile/gsr/fragments/PottruckFragment.kt → ...ile/fitness/fragments/PottruckFragment.kt
@@ -1,4 +1,4 @@
-package com.pennapps.labs.pennmobile.gsr.fragments
+package com.pennapps.labs.pennmobile.fitness.fragments
 
 import android.os.Bundle
 import android.util.Log
@@ -25,8 +25,6 @@ import com.pennapps.labs.pennmobile.databinding.FragmentPottruckBinding
 import com.pennapps.labs.pennmobile.fitness.FitnessPreferenceViewModel
 import com.pennapps.labs.pennmobile.fitness.adapters.FitnessAdapter
 import com.pennapps.labs.pennmobile.fitness.adapters.FitnessHeaderAdapter
-import com.pennapps.labs.pennmobile.fitness.fragments.CloseListener
-import com.pennapps.labs.pennmobile.fitness.fragments.FitnessPreferencesFragment
 import com.pennapps.labs.pennmobile.isOnline
 import com.pennapps.labs.pennmobile.utils.Utils
 
@@ -51,6 +49,7 @@ class PottruckFragment : Fragment() {
         super.onCreate(savedInstanceState)
         mStudentLife = MainActivity.studentLifeInstance
         mActivity = activity as MainActivity
+        dataModel = FitnessPreferenceViewModel(mStudentLife)
     }
 
     override fun onCreateView(
@@ -81,13 +80,19 @@ class PottruckFragment : Fragment() {
         swipeRefresh.setColorSchemeResources(R.color.color_accent, R.color.color_primary)
         recyclerView.layoutManager =
             LinearLayoutManager(mActivity, LinearLayoutManager.VERTICAL, false)
-        swipeRefresh.setOnRefreshListener { getFitnessRooms() }
+        swipeRefresh.setOnRefreshListener { dataModel.getFitnessRooms(mActivity) }
 
         // populate the title/date of the app bar
         initAppBar()
 
         // populate recyclerview
-        getFitnessRooms()
+        if(getConnected()) {
+            dataModel.getFitnessRooms(mActivity)
+            //call setAdapters() after calling getFitnessRooms from data model
+            setAdapters()
+        }
+
+
     }
 
     private fun getFitnessRooms() {
@@ -102,7 +107,7 @@ class PottruckFragment : Fragment() {
                     }
                     val sortedRooms = fitnessRooms.sortedBy { it.roomName }
 
-                    dataModel = FitnessPreferenceViewModel(mStudentLife, sortedRooms)
+                    dataModel = FitnessPreferenceViewModel(mStudentLife)
 
                     mActivity.runOnUiThread {
                         mActivity.mNetworkManager.getAccessToken {

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/fragments/PreferenceFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/more/fragments/PreferenceFragment.kt
@@ -18,7 +18,7 @@ import androidx.preference.PreferenceManager
 import com.pennapps.labs.pennmobile.MainActivity
 import com.pennapps.labs.pennmobile.R
 import com.pennapps.labs.pennmobile.components.dialog.CustomAlertDialogue
-import com.pennapps.labs.pennmobile.gsr.fragments.PottruckFragment
+import com.pennapps.labs.pennmobile.fitness.fragments.PottruckFragment
 import com.pennapps.labs.pennmobile.home.fragments.NewsFragment
 import com.pennapps.labs.pennmobile.showSneakerToast