Make loading home cells more modular and fix a possible race condition.

pennlabs · Jan 4, 2024 · 0503f54 · 0503f54
1 parent 298bbab
commit 0503f54
Show file tree

Hide file tree

Showing 9 changed files with 801 additions and 321 deletions.
diff --git a/PennMobile/google-services.json b/PennMobile/google-services.json
@@ -1,37 +1,26 @@
 {
   "project_info": {
-    "project_number": "838434873871",
-    "firebase_url": "https://penn-mobile-release.firebaseio.com",
-    "project_id": "penn-mobile-release",
-    "storage_bucket": "penn-mobile-release.appspot.com"
+    "project_number": "261196915337",
+    "project_id": "penn-mobile-android",
+    "storage_bucket": "penn-mobile-android.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:838434873871:android:f03e90e8574403ad",
+        "mobilesdk_app_id": "1:261196915337:android:82e48698e3df3cdf3bdc58",
         "android_client_info": {
           "package_name": "com.pennapps.labs.pennmobile"
         }
       },
-      "oauth_client": [
-        {
-          "client_id": "838434873871-amrfbe7ekhppak30c64u9a2g7dbe5mif.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
+      "oauth_client": [],
       "api_key": [
         {
-          "current_key": "AIzaSyCFZeo23H-LKCGD4FUDIIbzpdQPIeRgM9k"
+          "current_key": "AIzaSyCavOsfwwY54_dlm_oW4wMDLJgdXghLYP8"
         }
       ],
       "services": {
         "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "838434873871-amrfbe7ekhppak30c64u9a2g7dbe5mif.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
+          "other_platform_oauth_client": []
         }
       }
     }

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/HomeFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/HomeFragment.kt
diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PottruckFragment.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/PottruckFragment.kt
@@ -95,7 +95,7 @@ class PottruckFragment : Fragment() {
                 }
                 val sortedRooms = fitnessRooms.sortedBy {it.roomName}
 
-                dataModel = FitnessPreferenceViewModel(mActivity, mStudentLife, sortedRooms)
+                dataModel = FitnessPreferenceViewModel( mStudentLife, sortedRooms)
 
 
                 mActivity.runOnUiThread {

diff --git a/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningPagerAdapter.kt b/PennMobile/src/main/java/com/pennapps/labs/pennmobile/adapters/DiningPagerAdapter.kt
@@ -19,7 +19,6 @@ class DiningPagerAdapter(fragmentManager: FragmentManager, lifecycle: Lifecycle?
     override fun getItemCount(): Int {
         return COUNT
     }
-
     override fun getItemId(position: Int): Long {
         if (position == HOME_POSITION) {
             return HOME_POSITION.toLong()